/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2015 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
#include "lib/ffmpeg_decoder.h"
#include "lib/ffmpeg_audio_stream.h"
#include "lib/content_video.h"
+#include "lib/video_content_scale.h"
+#include "lib/video_content.h"
+#include "lib/video_decoder.h"
#include "test.h"
+#include <iostream>
using std::cout;
using std::list;
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
film->examine_and_add_content (content);
wait_for_jobs ();
- content->set_scale (VideoContentScale (Ratio::from_id ("185")));
-
+ content->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+
/* Work out the first video frame index that we will be given, taking into account
* the difference between first video and first audio.
*/
- ContentTime video_delay = content->first_video().get() - content->audio_stream()->first_audio.get();
+ ContentTime video_delay = content->first_video().get() - content->ffmpeg_audio_streams().front()->first_audio.get();
if (video_delay < ContentTime ()) {
video_delay = ContentTime ();
}
- VideoFrame const first_frame = video_delay.round_up (content->video_frame_rate ()).frames (content->video_frame_rate ());
+ Frame const first_frame = video_delay.round_up (content->active_video_frame_rate ()).frames_round (content->active_video_frame_rate ());
- FFmpegDecoder decoder (content, film->log());
- list<ContentVideo> a = decoder.get_video (first_frame, true);
+ FFmpegDecoder decoder (content, film->log(), false);
+ list<ContentVideo> a = decoder.video->get (first_frame, true);
BOOST_CHECK (a.size() == 1);
BOOST_CHECK_EQUAL (a.front().frame, first_frame);
}