projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
operator bool on Time is a really bad idea; removed it and fixed lots of bugs.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.cc
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index 3df1ba57ee78ddd1422f0cedc74c64ba696951c9..e9be3cc46bfa1c69284f805e2d39c0129de7f0ad 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-60,7
+60,7
@@
FFmpegContent::FFmpegContent (shared_ptr<const Film> f, boost::filesystem::path
FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
: Content (f, node)
FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
: Content (f, node)
- , VideoContent (f, node)
+ , VideoContent (f, node
, version
)
, AudioContent (f, node)
, SubtitleContent (f, node, version)
{
, AudioContent (f, node)
, SubtitleContent (f, node, version)
{
@@
-147,7
+147,7
@@
FFmpegContent::as_xml (xmlpp::Node* node) const
}
if (_first_video) {
}
if (_first_video) {
- node->add_child("FirstVideo")->add_child_text (lexical_cast<string> (_first_video.get
()));
+ node->add_child("FirstVideo")->add_child_text (lexical_cast<string> (_first_video.get
().get
()));
}
}
}
}
@@
-162,10
+162,10
@@
FFmpegContent::examine (shared_ptr<Job> job)
assert (film);
shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
assert (film);
shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
+ take_from_video_examiner (examiner);
- VideoFrame video_length = 0;
- video_length = examiner->video_length ();
- film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length));
+ ContentTime video_length = examiner->video_length ();
+ film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate ())));
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
@@
-185,8
+185,6
@@
FFmpegContent::examine (shared_ptr<Job> job)
_first_video = examiner->first_video ();
}
_first_video = examiner->first_video ();
}
- take_from_video_examiner (examiner);
-
signal_changed (ContentProperty::LENGTH);
signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
signal_changed (ContentProperty::LENGTH);
signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
@@
-228,13
+226,13
@@
FFmpegContent::technical_summary () const
string
FFmpegContent::information () const
{
string
FFmpegContent::information () const
{
- if (video_length() ==
0
|| video_frame_rate() == 0) {
+ if (video_length() ==
ContentTime (0)
|| video_frame_rate() == 0) {
return "";
}
stringstream s;
return "";
}
stringstream s;
- s << String::compose (_("%1 frames; %2 frames per second"), video_length(), video_frame_rate()) << "\n";
+ s << String::compose (_("%1 frames; %2 frames per second"), video_length()
.frames (video_frame_rate())
, video_frame_rate()) << "\n";
s << VideoContent::information ();
return s.str ();
s << VideoContent::information ();
return s.str ();
@@
-262,19
+260,17
@@
FFmpegContent::set_audio_stream (shared_ptr<FFmpegAudioStream> s)
signal_changed (FFmpegContentProperty::AUDIO_STREAM);
}
signal_changed (FFmpegContentProperty::AUDIO_STREAM);
}
-
AudioFra
me
+
ContentTi
me
FFmpegContent::audio_length () const
{
FFmpegContent::audio_length () const
{
- int const cafr = content_audio_frame_rate ();
- int const vfr = video_frame_rate ();
- VideoFrame const vl = video_length ();
-
- boost::mutex::scoped_lock lm (_mutex);
- if (!_audio_stream) {
- return 0;
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ if (!_audio_stream) {
+ return ContentTime ();
+ }
}
}
-
- return video_
frames_to_audio_frames (vl, cafr, vfr
);
+
+ return video_
length(
);
}
int
}
int
@@
-366,7
+362,7
@@
FFmpegAudioStream::as_xml (xmlpp::Node* root) const
root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate));
root->add_child("Channels")->add_child_text (lexical_cast<string> (channels));
if (first_audio) {
root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate));
root->add_child("Channels")->add_child_text (lexical_cast<string> (channels));
if (first_audio) {
- root->add_child("FirstAudio")->add_child_text (lexical_cast<string> (first_audio.get
()));
+ root->add_child("FirstAudio")->add_child_text (lexical_cast<string> (first_audio.get
().get
()));
}
mapping.as_xml (root->add_child("Mapping"));
}
}
mapping.as_xml (root->add_child("Mapping"));
}
@@
-421,9
+417,7
@@
FFmpegContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
-
- FrameRateChange frc (video_frame_rate (), film->video_frame_rate ());
- return video_length() * frc.factor() * TIME_HZ / film->video_frame_rate ();
+ return DCPTime (video_length(), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
}
AudioMapping
}
AudioMapping