Half-way through trying to make seek work again.
[dcpomatic.git] / src / lib / ffmpeg_decoder.cc
index ca35c6e81279b7c90f6e029a5c0ae03e9746f1f7..0ca9fc53585f31e090eb1f866116fc19313d317a 100644 (file)
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -41,23 +43,36 @@ extern "C" {
 #include "transcoder.h"
 #include "job.h"
 #include "filter.h"
-#include "film_state.h"
-#include "options.h"
 #include "exceptions.h"
 #include "image.h"
 #include "util.h"
 #include "log.h"
 #include "ffmpeg_decoder.h"
-
-using namespace std;
-using namespace boost;
-
-FFmpegDecoder::FFmpegDecoder (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Job* j, Log* l, bool minimal, bool ignore_length)
-       : Decoder (s, o, j, l, minimal, ignore_length)
+#include "filter_graph.h"
+#include "subtitle.h"
+#include "audio_buffers.h"
+
+#include "i18n.h"
+
+using std::cout;
+using std::string;
+using std::vector;
+using std::stringstream;
+using std::list;
+using boost::shared_ptr;
+using boost::optional;
+using boost::dynamic_pointer_cast;
+using libdcp::Size;
+
+boost::mutex FFmpegDecoder::_mutex;
+
+FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegContent> c, bool video, bool audio, bool subtitles)
+       : Decoder (f)
+       , VideoDecoder (f, c)
+       , AudioDecoder (f, c)
+       , _ffmpeg_content (c)
        , _format_context (0)
        , _video_stream (-1)
-       , _audio_stream (-1)
-       , _subtitle_stream (-1)
        , _frame (0)
        , _video_codec_context (0)
        , _video_codec (0)
@@ -65,7 +80,9 @@ FFmpegDecoder::FFmpegDecoder (boost::shared_ptr<const FilmState> s, boost::share
        , _audio_codec (0)
        , _subtitle_codec_context (0)
        , _subtitle_codec (0)
-       , _have_subtitle (false)
+       , _decode_video (video)
+       , _decode_audio (audio)
+       , _decode_subtitles (subtitles)
 {
        setup_general ();
        setup_video ();
@@ -75,203 +92,301 @@ FFmpegDecoder::FFmpegDecoder (boost::shared_ptr<const FilmState> s, boost::share
 
 FFmpegDecoder::~FFmpegDecoder ()
 {
+       boost::mutex::scoped_lock lm (_mutex);
+       
        if (_audio_codec_context) {
                avcodec_close (_audio_codec_context);
        }
-       
+
        if (_video_codec_context) {
                avcodec_close (_video_codec_context);
        }
 
-       if (_have_subtitle) {
-               avsubtitle_free (&_subtitle);
-       }
-
        if (_subtitle_codec_context) {
                avcodec_close (_subtitle_codec_context);
        }
-       
+
        av_free (_frame);
+       
        avformat_close_input (&_format_context);
 }      
 
 void
 FFmpegDecoder::setup_general ()
 {
-       int r;
-       
        av_register_all ();
 
-       if ((r = avformat_open_input (&_format_context, _fs->content_path().c_str(), 0, 0)) != 0) {
-               throw OpenFileError (_fs->content_path ());
+       if (avformat_open_input (&_format_context, _ffmpeg_content->file().string().c_str(), 0, 0) < 0) {
+               throw OpenFileError (_ffmpeg_content->file().string ());
        }
 
        if (avformat_find_stream_info (_format_context, 0) < 0) {
-               throw DecodeError ("could not find stream information");
+               throw DecodeError (_("could not find stream information"));
        }
 
+       /* Find video, audio and subtitle streams */
+
        for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
-               if (_format_context->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+               AVStream* s = _format_context->streams[i];
+               if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
                        _video_stream = i;
-               } else if (_format_context->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
-                       _audio_stream = i;
-               } else if (_format_context->streams[i]->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-                       _subtitle_stream = i;
+               } else if (s->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+
+                       /* This is a hack; sometimes it seems that _audio_codec_context->channel_layout isn't set up,
+                          so bodge it here.  No idea why we should have to do this.
+                       */
+
+                       if (s->codec->channel_layout == 0) {
+                               s->codec->channel_layout = av_get_default_channel_layout (s->codec->channels);
+                       }
+                       
+                       _audio_streams.push_back (
+                               shared_ptr<FFmpegAudioStream> (
+                                       new FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channels)
+                                       )
+                               );
+
+               } else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
+                       _subtitle_streams.push_back (shared_ptr<FFmpegSubtitleStream> (new FFmpegSubtitleStream (stream_name (s), i)));
                }
        }
 
        if (_video_stream < 0) {
-               throw DecodeError ("could not find video stream");
+               throw DecodeError (N_("could not find video stream"));
        }
 
        _frame = avcodec_alloc_frame ();
        if (_frame == 0) {
-               throw DecodeError ("could not allocate frame");
+               throw DecodeError (N_("could not allocate frame"));
        }
 }
 
 void
 FFmpegDecoder::setup_video ()
 {
+       boost::mutex::scoped_lock lm (_mutex);
+       
        _video_codec_context = _format_context->streams[_video_stream]->codec;
        _video_codec = avcodec_find_decoder (_video_codec_context->codec_id);
 
        if (_video_codec == 0) {
-               throw DecodeError ("could not find video decoder");
+               throw DecodeError (_("could not find video decoder"));
        }
-       
+
        if (avcodec_open2 (_video_codec_context, _video_codec, 0) < 0) {
-               throw DecodeError ("could not open video decoder");
+               throw DecodeError (N_("could not open video decoder"));
        }
 }
 
 void
 FFmpegDecoder::setup_audio ()
 {
-       if (_audio_stream < 0) {
+       boost::mutex::scoped_lock lm (_mutex);
+       
+       if (!_ffmpeg_content->audio_stream ()) {
                return;
        }
-       
-       _audio_codec_context = _format_context->streams[_audio_stream]->codec;
+
+       _audio_codec_context = _format_context->streams[_ffmpeg_content->audio_stream()->id]->codec;
        _audio_codec = avcodec_find_decoder (_audio_codec_context->codec_id);
 
        if (_audio_codec == 0) {
-               throw DecodeError ("could not find audio decoder");
+               throw DecodeError (_("could not find audio decoder"));
        }
 
        if (avcodec_open2 (_audio_codec_context, _audio_codec, 0) < 0) {
-               throw DecodeError ("could not open audio decoder");
-       }
-
-       /* This is a hack; sometimes it seems that _audio_codec_context->channel_layout isn't set up,
-          so bodge it here.  No idea why we should have to do this.
-       */
-
-       if (_audio_codec_context->channel_layout == 0) {
-               _audio_codec_context->channel_layout = av_get_default_channel_layout (audio_channels ());
+               throw DecodeError (N_("could not open audio decoder"));
        }
 }
 
 void
 FFmpegDecoder::setup_subtitle ()
 {
-       if (_subtitle_stream < 0) {
+       boost::mutex::scoped_lock lm (_mutex);
+       
+       if (!_ffmpeg_content->subtitle_stream() || _ffmpeg_content->subtitle_stream()->id >= int (_format_context->nb_streams)) {
                return;
        }
 
-       _subtitle_codec_context = _format_context->streams[_subtitle_stream]->codec;
+       _subtitle_codec_context = _format_context->streams[_ffmpeg_content->subtitle_stream()->id]->codec;
        _subtitle_codec = avcodec_find_decoder (_subtitle_codec_context->codec_id);
 
        if (_subtitle_codec == 0) {
-               throw DecodeError ("could not find subtitle decoder");
+               throw DecodeError (_("could not find subtitle decoder"));
        }
        
        if (avcodec_open2 (_subtitle_codec_context, _subtitle_codec, 0) < 0) {
-               throw DecodeError ("could not open subtitle decoder");
+               throw DecodeError (N_("could not open subtitle decoder"));
        }
 }
 
 
 bool
-FFmpegDecoder::do_pass ()
+FFmpegDecoder::pass ()
 {
+       cout << "ffd pass.\n";
        int r = av_read_frame (_format_context, &_packet);
+       cout << "A " << r << "\n";
+
        if (r < 0) {
                if (r != AVERROR_EOF) {
-                       throw DecodeError ("error on av_read_frame");
+                       /* Maybe we should fail here, but for now we'll just finish off instead */
+                       char buf[256];
+                       av_strerror (r, buf, sizeof(buf));
+                       _film->log()->log (String::compose (N_("error on av_read_frame (%1) (%2)"), buf, r));
                }
-               
+
                /* Get any remaining frames */
                
                _packet.data = 0;
                _packet.size = 0;
-
-               int frame_finished;
-
-               while (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
-                       process_video (_frame);
+               
+               /* XXX: should we reset _packet.data and size after each *_decode_* call? */
+               
+               if (_decode_video) {
+                       while (decode_video_packet ());
                }
 
-               if (_audio_stream >= 0 && _opt->decode_audio) {
-                       while (avcodec_decode_audio4 (_audio_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
-                               int const data_size = av_samples_get_buffer_size (
-                                       0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1
-                                       );
-                               
-                               assert (_audio_codec_context->channels == _fs->audio_channels);
-                               process_audio (_frame->data[0], data_size);
-                       }
+               if (_ffmpeg_content->audio_stream() && _decode_audio) {
+                       decode_audio_packet ();
                }
-
+                       
                return true;
        }
 
-       if (_packet.stream_index == _video_stream) {
+       avcodec_get_frame_defaults (_frame);
 
-               int frame_finished;
-               if (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
-                       process_video (_frame);
-               }
-
-       } else if (_audio_stream >= 0 && _packet.stream_index == _audio_stream && _opt->decode_audio) {
-               
-               avcodec_get_frame_defaults (_frame);
-               
-               int frame_finished;
-               if (avcodec_decode_audio4 (_audio_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
-                       int const data_size = av_samples_get_buffer_size (
-                               0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1
-                               );
-
-                       assert (_audio_codec_context->channels == _fs->audio_channels);
-                       process_audio (_frame->data[0], data_size);
-               }
-
-       } else if (_subtitle_stream >= 0 && _packet.stream_index == _subtitle_stream && _fs->with_subtitles) {
-
-               if (_have_subtitle) {
-                       avsubtitle_free (&_subtitle);
-                       _have_subtitle = false;
-               }
+       if (_packet.stream_index == _video_stream && _decode_video) {
+               cout << "dvp\n";
+               decode_video_packet ();
+               cout << "ok.\n";
+       } else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->id && _decode_audio) {
+               decode_audio_packet ();
+       } else if (_ffmpeg_content->subtitle_stream() && _packet.stream_index == _ffmpeg_content->subtitle_stream()->id && _decode_subtitles) {
 
                int got_subtitle;
-               if (avcodec_decode_subtitle2 (_subtitle_codec_context, &_subtitle, &got_subtitle, &_packet) && got_subtitle) {
-                       _have_subtitle = true;
+               AVSubtitle sub;
+               if (avcodec_decode_subtitle2 (_subtitle_codec_context, &sub, &got_subtitle, &_packet) && got_subtitle) {
+                       /* Sometimes we get an empty AVSubtitle, which is used by some codecs to
+                          indicate that the previous subtitle should stop.
+                       */
+                       if (sub.num_rects > 0) {
+                               shared_ptr<TimedSubtitle> ts;
+                               try {
+                                       emit_subtitle (shared_ptr<TimedSubtitle> (new TimedSubtitle (sub)));
+                               } catch (...) {
+                                       /* some problem with the subtitle; we probably didn't understand it */
+                               }
+                       } else {
+                               emit_subtitle (shared_ptr<TimedSubtitle> ());
+                       }
+                       avsubtitle_free (&sub);
                }
        }
-       
+
+       cout << "out.\n";
        av_free_packet (&_packet);
        return false;
 }
 
-int
-FFmpegDecoder::length_in_frames () const
+/** @param data pointer to array of pointers to buffers.
+ *  Only the first buffer will be used for non-planar data, otherwise there will be one per channel.
+ */
+shared_ptr<AudioBuffers>
+FFmpegDecoder::deinterleave_audio (uint8_t** data, int size)
 {
-       return (_format_context->duration / AV_TIME_BASE) * frames_per_second ();
+       assert (_ffmpeg_content->audio_channels());
+       assert (bytes_per_audio_sample());
+
+       /* Deinterleave and convert to float */
+
+       assert ((size % (bytes_per_audio_sample() * _ffmpeg_content->audio_channels())) == 0);
+
+       int const total_samples = size / bytes_per_audio_sample();
+       int const frames = total_samples / _ffmpeg_content->audio_channels();
+       shared_ptr<AudioBuffers> audio (new AudioBuffers (_ffmpeg_content->audio_channels(), frames));
+
+       switch (audio_sample_format()) {
+       case AV_SAMPLE_FMT_S16:
+       {
+               int16_t* p = reinterpret_cast<int16_t *> (data[0]);
+               int sample = 0;
+               int channel = 0;
+               for (int i = 0; i < total_samples; ++i) {
+                       audio->data(channel)[sample] = float(*p++) / (1 << 15);
+
+                       ++channel;
+                       if (channel == _ffmpeg_content->audio_channels()) {
+                               channel = 0;
+                               ++sample;
+                       }
+               }
+       }
+       break;
+
+       case AV_SAMPLE_FMT_S16P:
+       {
+               int16_t** p = reinterpret_cast<int16_t **> (data);
+               for (int i = 0; i < _ffmpeg_content->audio_channels(); ++i) {
+                       for (int j = 0; j < frames; ++j) {
+                               audio->data(i)[j] = static_cast<float>(p[i][j]) / (1 << 15);
+                       }
+               }
+       }
+       break;
+       
+       case AV_SAMPLE_FMT_S32:
+       {
+               int32_t* p = reinterpret_cast<int32_t *> (data[0]);
+               int sample = 0;
+               int channel = 0;
+               for (int i = 0; i < total_samples; ++i) {
+                       audio->data(channel)[sample] = static_cast<float>(*p++) / (1 << 31);
+
+                       ++channel;
+                       if (channel == _ffmpeg_content->audio_channels()) {
+                               channel = 0;
+                               ++sample;
+                       }
+               }
+       }
+       break;
+
+       case AV_SAMPLE_FMT_FLT:
+       {
+               float* p = reinterpret_cast<float*> (data[0]);
+               int sample = 0;
+               int channel = 0;
+               for (int i = 0; i < total_samples; ++i) {
+                       audio->data(channel)[sample] = *p++;
+
+                       ++channel;
+                       if (channel == _ffmpeg_content->audio_channels()) {
+                               channel = 0;
+                               ++sample;
+                       }
+               }
+       }
+       break;
+               
+       case AV_SAMPLE_FMT_FLTP:
+       {
+               float** p = reinterpret_cast<float**> (data);
+               for (int i = 0; i < _ffmpeg_content->audio_channels(); ++i) {
+                       memcpy (audio->data(i), p[i], frames * sizeof(float));
+               }
+       }
+       break;
+
+       default:
+               throw DecodeError (String::compose (_("Unrecognised audio sample format (%1)"), static_cast<int> (audio_sample_format())));
+       }
+
+       return audio;
 }
 
 float
-FFmpegDecoder::frames_per_second () const
+FFmpegDecoder::video_frame_rate () const
 {
        AVStream* s = _format_context->streams[_video_stream];
 
@@ -282,26 +397,6 @@ FFmpegDecoder::frames_per_second () const
        return av_q2d (s->r_frame_rate);
 }
 
-int
-FFmpegDecoder::audio_channels () const
-{
-       if (_audio_codec_context == 0) {
-               return 0;
-       }
-
-       return _audio_codec_context->channels;
-}
-
-int
-FFmpegDecoder::audio_sample_rate () const
-{
-       if (_audio_codec_context == 0) {
-               return 0;
-       }
-       
-       return _audio_codec_context->sample_rate;
-}
-
 AVSampleFormat
 FFmpegDecoder::audio_sample_format () const
 {
@@ -312,20 +407,10 @@ FFmpegDecoder::audio_sample_format () const
        return _audio_codec_context->sample_fmt;
 }
 
-int64_t
-FFmpegDecoder::audio_channel_layout () const
-{
-       if (_audio_codec_context == 0) {
-               return 0;
-       }
-       
-       return _audio_codec_context->channel_layout;
-}
-
-Size
+libdcp::Size
 FFmpegDecoder::native_size () const
 {
-       return Size (_video_codec_context->width, _video_codec_context->height);
+       return libdcp::Size (_video_codec_context->width, _video_codec_context->height);
 }
 
 PixelFormat
@@ -358,107 +443,213 @@ FFmpegDecoder::sample_aspect_ratio_denominator () const
        return _video_codec_context->sample_aspect_ratio.den;
 }
 
-void
-FFmpegDecoder::overlay (shared_ptr<Image> image) const
+string
+FFmpegDecoder::stream_name (AVStream* s) const
 {
-       if (!_have_subtitle) {
-               return;
+       stringstream n;
+
+       if (s->metadata) {
+               AVDictionaryEntry const * lang = av_dict_get (s->metadata, N_("language"), 0, 0);
+               if (lang) {
+                       n << lang->value;
+               }
+               
+               AVDictionaryEntry const * title = av_dict_get (s->metadata, N_("title"), 0, 0);
+               if (title) {
+                       if (!n.str().empty()) {
+                               n << N_(" ");
+                       }
+                       n << title->value;
+               }
+       }
+
+       if (n.str().empty()) {
+               n << N_("unknown");
+       }
+
+       return n.str ();
+}
+
+int
+FFmpegDecoder::bytes_per_audio_sample () const
+{
+       return av_get_bytes_per_sample (audio_sample_format ());
+}
+
+bool
+FFmpegDecoder::seek (Time t)
+{
+       return do_seek (t, false, false);
+}
+
+bool
+FFmpegDecoder::seek_back ()
+{
+       if (last_content_time() < 2.5) {
+               return true;
        }
        
-       /* subtitle PTS in seconds */
-       float const packet_time = (_subtitle.pts / AV_TIME_BASE) + float (_subtitle.pts % AV_TIME_BASE) / 1e6;
-       /* hence start time for this sub */
-       float const from = packet_time + (float (_subtitle.start_display_time) / 1e3);
-       float const to = packet_time + (float (_subtitle.end_display_time) / 1e3);
+       return do_seek (last_content_time() - 2.5 * TIME_HZ / video_frame_rate(), true, true);
+}
+
+bool
+FFmpegDecoder::seek_forward ()
+{
+       if (last_content_time() >= (video_length() - video_frame_rate())) {
+               return true;
+       }
        
-       float const video_frame_time = float (last_video_frame ()) / rint (_fs->frames_per_second);
+       return do_seek (last_content_time() - 0.5 * TIME_HZ / video_frame_rate(), true, true);
+}
 
-       if (from > video_frame_time || video_frame_time < to) {
-               return;
+bool
+FFmpegDecoder::do_seek (Time t, bool backwards, bool accurate)
+{
+       int64_t const vt = t / (av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ);
+
+       cout << "seek to " << vt << " (acc=" << accurate << ") (sec " << (vt * av_q2d (_format_context->streams[_video_stream]->time_base)) << "\n";
+
+       int const r = av_seek_frame (_format_context, _video_stream, vt, backwards ? AVSEEK_FLAG_BACKWARD : 0);
+
+       avcodec_flush_buffers (_video_codec_context);
+       if (_subtitle_codec_context) {
+               avcodec_flush_buffers (_subtitle_codec_context);
        }
 
-       for (unsigned int i = 0; i < _subtitle.num_rects; ++i) {
-               AVSubtitleRect* rect = _subtitle.rects[i];
-               if (rect->type != SUBTITLE_BITMAP) {
-                       throw DecodeError ("non-bitmap subtitles not yet supported");
+       if (accurate) {
+               while (1) {
+                       int r = av_read_frame (_format_context, &_packet);
+                       if (r < 0) {
+                               return true;
+                       }
+                       
+                       avcodec_get_frame_defaults (_frame);
+                       
+                       if (_packet.stream_index == _video_stream) {
+                               int finished = 0;
+                               int const r = avcodec_decode_video2 (_video_codec_context, _frame, &finished, &_packet);
+                               if (r >= 0 && finished) {
+                                       int64_t const bet = av_frame_get_best_effort_timestamp (_frame);
+                                       if (bet > vt) {
+                                               break;
+                                       }
+                               }
+                       }
+                       
+                       av_free_packet (&_packet);
                }
+       }
 
-               /* XXX: all this assumes YUV420 in image */
-               
-               assert (rect->pict.data[0]);
+       cout << "seek ok.\n";
+       return r < 0;
+}
 
-               /* Start of the first line in the target image */
-               uint8_t* frame_y_p = image->data()[0] + rect->y * image->line_size()[0];
-               uint8_t* frame_u_p = image->data()[1] + (rect->y / 2) * image->line_size()[1];
-               uint8_t* frame_v_p = image->data()[2] + (rect->y / 2) * image->line_size()[2];
+void
+FFmpegDecoder::film_changed (Film::Property p)
+{
+       switch (p) {
+       case Film::FILTERS:
+       {
+               boost::mutex::scoped_lock lm (_filter_graphs_mutex);
+               _filter_graphs.clear ();
+       }
+       break;
 
-               int const hlim = min (rect->y + rect->h, image->size().height) - rect->y;
-               
-               /* Start of the first line in the subtitle */
-               uint8_t* sub_p = rect->pict.data[0];
-               /* sub_p looks up into a RGB palette which is here */
-               uint32_t const * palette = (uint32_t *) rect->pict.data[1];
-               
-               for (int sub_y = 0; sub_y < hlim; ++sub_y) {
-                       /* Pointers to the start of this line */
-                       uint8_t* sub_line_p = sub_p;
-                       uint8_t* frame_line_y_p = frame_y_p + rect->x;
-                       uint8_t* frame_line_u_p = frame_u_p + (rect->x / 2);
-                       uint8_t* frame_line_v_p = frame_v_p + (rect->x / 2);
-                       
-                       /* U and V are subsampled */
-                       uint8_t next_u = 0;
-                       uint8_t next_v = 0;
-                       int subsample_step = 0;
+       default:
+               break;
+       }
+}
+
+/** @return Length (in video frames) according to our content's header */
+ContentVideoFrame
+FFmpegDecoder::video_length () const
+{
+       return (double(_format_context->duration) / AV_TIME_BASE) * video_frame_rate();
+}
+
+void
+FFmpegDecoder::decode_audio_packet ()
+{
+       /* Audio packets can contain multiple frames, so we may have to call avcodec_decode_audio4
+          several times.
+       */
+       
+       AVPacket copy_packet = _packet;
+
+       while (copy_packet.size > 0) {
+
+               int frame_finished;
+               int const decode_result = avcodec_decode_audio4 (_audio_codec_context, _frame, &frame_finished, &copy_packet);
+               if (decode_result >= 0) {
+                       if (frame_finished) {
                        
-                       for (int sub_x = 0; sub_x < rect->w; ++sub_x) {
-                               
-                               /* RGB value for this subtitle pixel */
-                               uint32_t const val = palette[*sub_line_p++];
+                               /* Where we are in the source, in seconds */
+                               double const source_pts_seconds = av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
+                                       * av_frame_get_best_effort_timestamp(_frame);
                                
-                               int const     red =  (val &       0xff);
-                               int const   green =  (val &     0xff00) >> 8;
-                               int const    blue =  (val &   0xff0000) >> 16;
-                               float const alpha = ((val & 0xff000000) >> 24) / 255.0;
-                               
-                               /* Alpha-blend Y */
-                               int const cy = *frame_line_y_p;
-                               *frame_line_y_p++ = int (cy * (1 - alpha)) + int (RGB_TO_Y_CCIR (red, green, blue) * alpha);
-                               
-                               /* Store up U and V */
-                               next_u |= ((RGB_TO_U_CCIR (red, green, blue, 0) & 0xf0) >> 4) << (4 * subsample_step);
-                               next_v |= ((RGB_TO_V_CCIR (red, green, blue, 0) & 0xf0) >> 4) << (4 * subsample_step);
-                               
-                               if (subsample_step == 1 && (sub_y % 2) == 0) {
-                                       int const cu = *frame_line_u_p;
-                                       int const cv = *frame_line_v_p;
-
-                                       *frame_line_u_p++ =
-                                               int (((cu & 0x0f) * (1 - alpha) + (next_u & 0x0f) * alpha)) |
-                                               int (((cu & 0xf0) * (1 - alpha) + (next_u & 0xf0) * alpha));
-
-                                       *frame_line_v_p++ = 
-                                               int (((cv & 0x0f) * (1 - alpha) + (next_v & 0x0f) * alpha)) |
-                                               int (((cv & 0xf0) * (1 - alpha) + (next_v & 0xf0) * alpha));
-                                       
-                                       next_u = next_v = 0;
-                               }
+                               int const data_size = av_samples_get_buffer_size (
+                                       0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1
+                                       );
                                
-                               subsample_step = (subsample_step + 1) % 2;
+                               assert (_audio_codec_context->channels == _ffmpeg_content->audio_channels());
+                               Audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds);
                        }
                        
-                       sub_p += rect->pict.linesize[0];
-                       frame_y_p += image->line_size()[0];
-                       if ((sub_y % 2) == 0) {
-                               frame_u_p += image->line_size()[1];
-                               frame_v_p += image->line_size()[2];
-                       }
+                       copy_packet.data += decode_result;
+                       copy_packet.size -= decode_result;
                }
        }
 }
-    
+
 bool
-FFmpegDecoder::has_subtitles () const
+FFmpegDecoder::decode_video_packet ()
 {
-       return (_subtitle_stream != -1);
+       int frame_finished;
+       cout << "avc decode v2\n";
+       if (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) < 0 || !frame_finished) {
+               return false;
+       }
+       cout << "done that.\n";
+               
+       boost::mutex::scoped_lock lm (_filter_graphs_mutex);
+
+       cout << "got lock.\n";
+       
+       shared_ptr<FilterGraph> graph;
+       
+       list<shared_ptr<FilterGraph> >::iterator i = _filter_graphs.begin();
+       while (i != _filter_graphs.end() && !(*i)->can_process (libdcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format)) {
+               ++i;
+       }
+
+       cout << "found graph.\n";
+       
+       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);
+               _film->log()->log (String::compose (N_("New graph for %1x%2, pixel format %3"), _frame->width, _frame->height, _frame->format));
+       } else {
+               graph = *i;
+       }
+
+
+       cout << "pushed in.\n";
+       list<shared_ptr<Image> > images = graph->process (_frame);
+       cout << "got " << images.size() << "\n";
+       
+       for (list<shared_ptr<Image> >::iterator i = images.begin(); i != images.end(); ++i) {
+               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)
+                       */
+                       cout << "emitting.\n";
+                       emit_video (*i, false, bet * av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ);
+                       cout << "emitted.\n";
+               } else {
+                       _film->log()->log ("Dropping frame without PTS");
+               }
+       }
+
+       return true;
 }