projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested merge of master.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.cc
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index d36abe2c3ffdef191f4c0238bdf5f331fc6d112e..719c4cb53ecf03488d8266954b6309205657bb5e 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-31,6
+31,7
@@
using std::string;
using std::stringstream;
using std::vector;
using std::list;
using std::stringstream;
using std::vector;
using std::list;
+using std::cout;
using boost::shared_ptr;
using boost::lexical_cast;
using boost::shared_ptr;
using boost::lexical_cast;
@@
-114,7
+115,7
@@
FFmpegContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
Content::examine (film, job, quick);
Content::examine (film, job, quick);
- shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false
, true
));
+ shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false));
ContentVideoFrame video_length = 0;
if (quick) {
ContentVideoFrame video_length = 0;
if (quick) {
@@
-215,7
+216,7
@@
FFmpegContent::audio_channels () const
return 0;
}
return 0;
}
- return _audio_stream->channels
()
;
+ return _audio_stream->channels;
}
int
}
int
@@
-228,16
+229,6
@@
FFmpegContent::audio_frame_rate () const
return _audio_stream->frame_rate;
}
return _audio_stream->frame_rate;
}
-int64_t
-FFmpegContent::audio_channel_layout () const
-{
- if (!_audio_stream) {
- return 0;
- }
-
- return _audio_stream->channel_layout;
-}
-
bool
operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b)
{
bool
operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b)
{
@@
-255,7
+246,7
@@
FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
name = node->string_child ("Name");
id = node->number_child<int> ("Id");
frame_rate = node->number_child<int> ("FrameRate");
name = node->string_child ("Name");
id = node->number_child<int> ("Id");
frame_rate = node->number_child<int> ("FrameRate");
- channel
_layout = node->number_child<int64_t> ("ChannelLayout
");
+ channel
s = node->number_child<int64_t> ("Channels
");
}
void
}
void
@@
-264,7
+255,7
@@
FFmpegAudioStream::as_xml (xmlpp::Node* root) const
root->add_child("Name")->add_child_text (name);
root->add_child("Id")->add_child_text (lexical_cast<string> (id));
root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate));
root->add_child("Name")->add_child_text (name);
root->add_child("Id")->add_child_text (lexical_cast<string> (id));
root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate));
- root->add_child("Channel
Layout")->add_child_text (lexical_cast<string> (channel_layout
));
+ root->add_child("Channel
s")->add_child_text (lexical_cast<string> (channels
));
}
/** Construct a SubtitleStream from a value returned from to_string().
}
/** Construct a SubtitleStream from a value returned from to_string().