-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
#include <libcxml/cxml.h>
#include "ffmpeg_content.h"
-#include "ffmpeg_decoder.h"
+#include "ffmpeg_examiner.h"
#include "compose.hpp"
#include "job.h"
#include "util.h"
#include "filter.h"
+#include "film.h"
#include "log.h"
#include "i18n.h"
: Content (f, p)
, VideoContent (f, p)
, AudioContent (f, p)
+ , SubtitleContent (f, p)
{
}
: Content (f, node)
, VideoContent (f, node)
, AudioContent (f, node)
+ , SubtitleContent (f, node)
{
list<shared_ptr<cxml::Node> > c = node->node_children ("SubtitleStream");
for (list<shared_ptr<cxml::Node> >::const_iterator i = c.begin(); i != c.end(); ++i) {
for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
_filters.push_back (Filter::from_id ((*i)->content ()));
}
+
+ _first_video = node->optional_number_child<Time> ("FirstVideo");
}
FFmpegContent::FFmpegContent (FFmpegContent const & o)
: Content (o)
, VideoContent (o)
, AudioContent (o)
+ , SubtitleContent (o)
, _subtitle_streams (o._subtitle_streams)
, _subtitle_stream (o._subtitle_stream)
, _audio_streams (o._audio_streams)
Content::as_xml (node);
VideoContent::as_xml (node);
AudioContent::as_xml (node);
+ SubtitleContent::as_xml (node);
boost::mutex::scoped_lock lm (_mutex);
for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
node->add_child("Filter")->add_child_text ((*i)->id ());
}
+
+ if (_first_video) {
+ node->add_child("FirstVideo")->add_child_text (lexical_cast<string> (_first_video.get ()));
+ }
}
void
shared_ptr<const Film> film = _film.lock ();
assert (film);
- shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false));
+ shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
- ContentVideoFrame video_length = 0;
- video_length = decoder->video_length ();
- film->log()->log (String::compose ("Video length obtained from header as %1 frames", decoder->video_length ()));
+ VideoContent::Frame video_length = 0;
+ video_length = examiner->video_length ();
+ film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length));
{
boost::mutex::scoped_lock lm (_mutex);
_video_length = video_length;
- _subtitle_streams = decoder->subtitle_streams ();
+ _subtitle_streams = examiner->subtitle_streams ();
if (!_subtitle_streams.empty ()) {
_subtitle_stream = _subtitle_streams.front ();
}
- _audio_streams = decoder->audio_streams ();
+ _audio_streams = examiner->audio_streams ();
if (!_audio_streams.empty ()) {
_audio_stream = _audio_streams.front ();
}
+
+ _first_video = examiner->first_video ();
}
- take_from_video_decoder (decoder);
+ take_from_video_examiner (examiner);
signal_changed (ContentProperty::LENGTH);
signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
signal_changed (FFmpegContentProperty::AUDIO_STREAM);
}
-ContentAudioFrame
+AudioContent::Frame
FFmpegContent::audio_length () const
{
int const cafr = content_audio_frame_rate ();
int const vfr = video_frame_rate ();
- ContentVideoFrame const vl = video_length ();
+ VideoContent::Frame const vl = video_length ();
boost::mutex::scoped_lock lm (_mutex);
if (!_audio_stream) {
frame_rate = node->number_child<int> ("FrameRate");
channels = node->number_child<int64_t> ("Channels");
mapping = AudioMapping (node->node_child ("Mapping"));
+ first_audio = node->optional_number_child<Time> ("FirstAudio");
}
void
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("Channels")->add_child_text (lexical_cast<string> (channels));
+ if (first_audio) {
+ root->add_child("FirstAudio")->add_child_text (lexical_cast<string> (first_audio));
+ }
mapping.as_xml (root->add_child("Mapping"));
}