Merge master.

[dcpomatic.git] / src / lib / ffmpeg_decoder.cc

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 799e89a38b50e79763a8c8817d8831ad27257bb0..1d000b62bc3d210f3fdbbb26e4adea73553d71be 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -31,7 +31,6 @@
 #include <stdint.h>
 #include <boost/lexical_cast.hpp>
 extern "C" {
-#include <tiffio.h>
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
@@ -39,9 +38,6 @@ extern "C" {
 }
 #include <sndfile.h>
 #include "film.h"
-#include "format.h"
-#include "transcoder.h"
-#include "job.h"
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
@@ -452,7 +448,7 @@ FFmpegDecoder::seek (Time t)
 void
 FFmpegDecoder::seek_back ()
 {
-       if (next() < 2.5) {
+       if (next() < (2.5 * TIME_HZ / video_frame_rate())) {
                return;
        }
        
@@ -462,7 +458,7 @@ FFmpegDecoder::seek_back ()
 void
 FFmpegDecoder::seek_forward ()
 {
-       if (next() >= (video_length() - video_frame_rate())) {
+       if (next() >= (_ffmpeg_content->length() - 0.5 * TIME_HZ / video_frame_rate())) {
                return;
        }
        
@@ -507,22 +503,6 @@ FFmpegDecoder::do_seek (Time t, bool backwards, bool accurate)
        return;
 }
 
-void
-FFmpegDecoder::film_changed (Film::Property p)
-{
-       switch (p) {
-       case Film::FILTERS:
-       {
-               boost::mutex::scoped_lock lm (_filter_graphs_mutex);
-               _filter_graphs.clear ();
-       }
-       break;
-
-       default:
-               break;
-       }
-}
-
 /** @return Length (in video frames) according to our content's header */
 ContentVideoFrame
 FFmpegDecoder::video_length () const
@@ -555,7 +535,7 @@ FFmpegDecoder::decode_audio_packet ()
                                        );
                                
                                assert (_audio_codec_context->channels == _ffmpeg_content->audio_channels());
-                               Audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds);
+                               audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds);
                        }
                        
                        copy_packet.data += decode_result;
@@ -582,27 +562,35 @@ FFmpegDecoder::decode_video_packet ()
        }
 
        if (i == _filter_graphs.end ()) {
-               graph.reset (new FilterGraph (_film, this, libdcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format));
-               _filter_graphs.push_back (graph);
-
                shared_ptr<const Film> film = _film.lock ();
                assert (film);
+
+               graph.reset (new FilterGraph (_ffmpeg_content, libdcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format));
+               _filter_graphs.push_back (graph);
+
                film->log()->log (String::compose (N_("New graph for %1x%2, pixel format %3"), _frame->width, _frame->height, _frame->format));
        } else {
                graph = *i;
        }
 
-
        list<shared_ptr<Image> > images = graph->process (_frame);
+
+       string post_process = Filter::ffmpeg_strings (_ffmpeg_content->filters()).second;
        
        for (list<shared_ptr<Image> >::iterator i = images.begin(); i != images.end(); ++i) {
+
+               shared_ptr<Image> image = *i;
+               if (!post_process.empty ()) {
+                       image = image->post_process (post_process, true);
+               }
+               
                int64_t const bet = av_frame_get_best_effort_timestamp (_frame);
                if (bet != AV_NOPTS_VALUE) {
                        /* XXX: may need to insert extra frames / remove frames here ...
                           (as per old Matcher)
                        */
                        Time const t = bet * av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ;
-                       video (*i, false, t);
+                       video (image, false, t);
                } else {
                        shared_ptr<const Film> film = _film.lock ();
                        assert (film);
@@ -616,13 +604,20 @@ FFmpegDecoder::decode_video_packet ()
 Time
 FFmpegDecoder::next () const
 {
-       if (_decode_video && _decode_audio) {
+       if (_decode_video && _decode_audio && _audio_codec_context) {
                return min (_next_video, _next_audio);
        }
 
-       if (_decode_audio) {
+       if (_decode_audio && _audio_codec_context) {
                return _next_audio;
        }
 
        return _next_video;
 }
+
+bool
+FFmpegDecoder::done () const
+{
+       return (!_decode_audio || !_audio_codec_context || audio_done()) && (!_decode_video || video_done());
+}
+