X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=04dd7fd2d27fb141c1f4e17f5df9bbc54a10f829;hp=d9729ee1ac899eaca53ace8a3494a52db1ee78e4;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=e15fa4fe6d519c92f2083ca42c18675c729bda30 diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index d9729ee1a..83bce1830 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington 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 @@ -21,123 +21,71 @@ * @brief A decoder using FFmpeg to decode content. */ -#include -#include -#include -#include -#include -#include -#include -#include -extern "C" { -#include -#include -} -#include "film.h" #include "filter.h" #include "exceptions.h" #include "image.h" #include "util.h" #include "log.h" #include "ffmpeg_decoder.h" +#include "ffmpeg_audio_stream.h" +#include "ffmpeg_subtitle_stream.h" #include "filter_graph.h" #include "audio_buffers.h" #include "ffmpeg_content.h" +#include "raw_image_proxy.h" +#include "film.h" +#include "compose.hpp" +extern "C" { +#include +#include +} +#include +#include +#include +#include +#include #include "i18n.h" +#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +#define LOG_ERROR(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR); +#define LOG_WARNING_NC(...) _log->log (__VA_ARGS__, LogEntry::TYPE_WARNING); +#define LOG_WARNING(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_WARNING); + using std::cout; -using std::string; using std::vector; -using std::stringstream; using std::list; using std::min; using std::pair; +using std::max; using boost::shared_ptr; -using boost::optional; -using boost::dynamic_pointer_cast; using dcp::Size; -FFmpegDecoder::FFmpegDecoder (shared_ptr f, shared_ptr c, bool video, bool audio) - : Decoder (f) - , VideoDecoder (f, c) - , AudioDecoder (f, c) - , SubtitleDecoder (f) +FFmpegDecoder::FFmpegDecoder (shared_ptr c, shared_ptr log, bool fast) + : VideoDecoder (c) + , AudioDecoder (c, fast) + , SubtitleDecoder (c) , FFmpeg (c) - , _subtitle_codec_context (0) - , _subtitle_codec (0) - , _decode_video (video) - , _decode_audio (audio) - , _pts_offset (0) + , _log (log) + , _pts_offset (pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->video_frame_rate())) { - setup_subtitle (); - - /* Audio and video frame PTS values may not start with 0. We want - to fiddle them so that: - - 1. One of them starts at time 0. - 2. The first video PTS value ends up on a frame boundary. - Then we remove big initial gaps in PTS and we allow our - insertion of black frames to work. - - We will do pts_to_use = pts_from_ffmpeg + pts_offset; - */ - - bool const have_video = video && c->first_video(); - bool const have_audio = _decode_audio && c->audio_stream () && c->audio_stream()->first_audio; - - /* First, make one of them start at 0 */ - - if (have_audio && have_video) { - _pts_offset = - min (c->first_video().get(), c->audio_stream()->first_audio.get()); - } else if (have_video) { - _pts_offset = - c->first_video().get(); - } else if (have_audio) { - _pts_offset = - c->audio_stream()->first_audio.get(); - } - - /* Now adjust both so that the video pts starts on a frame */ - if (have_video && have_audio) { - double first_video = c->first_video().get() + _pts_offset; - double const old_first_video = first_video; - - /* Round the first video up to a frame boundary */ - if (fabs (rint (first_video * c->video_frame_rate()) - first_video * c->video_frame_rate()) > 1e-6) { - first_video = ceil (first_video * c->video_frame_rate()) / c->video_frame_rate (); - } - - _pts_offset += first_video - old_first_video; - } -} - -FFmpegDecoder::~FFmpegDecoder () -{ - boost::mutex::scoped_lock lm (_mutex); - - if (_subtitle_codec_context) { - avcodec_close (_subtitle_codec_context); - } } void FFmpegDecoder::flush () { /* Get any remaining frames */ - + _packet.data = 0; _packet.size = 0; - + /* XXX: should we reset _packet.data and size after each *_decode_* call? */ - - if (_decode_video) { - while (decode_video_packet ()) {} - } - - if (_ffmpeg_content->audio_stream() && _decode_audio) { - decode_audio_packet (); - AudioDecoder::flush (); - } + + while (decode_video_packet ()) {} + + decode_audio_packet (); + AudioDecoder::flush (); } bool @@ -145,31 +93,31 @@ FFmpegDecoder::pass () { int r = av_read_frame (_format_context, &_packet); - if (r < 0) { + /* AVERROR_INVALIDDATA can apparently be returned sometimes even when av_read_frame + has pretty-much succeeded (and hence generated data which should be processed). + Hence it makes sense to continue here in that case. + */ + if (r < 0 && r != AVERROR_INVALIDDATA) { if (r != AVERROR_EOF) { /* Maybe we should fail here, but for now we'll just finish off instead */ char buf[256]; av_strerror (r, buf, sizeof(buf)); - shared_ptr film = _film.lock (); - assert (film); - film->log()->log (String::compose (N_("error on av_read_frame (%1) (%2)"), buf, r)); + LOG_ERROR (N_("error on av_read_frame (%1) (%2)"), buf, r); } flush (); return true; } - shared_ptr film = _film.lock (); - assert (film); - int const si = _packet.stream_index; - - if (si == _video_stream && _decode_video) { + shared_ptr fc = _ffmpeg_content; + + if (si == _video_stream && !_ignore_video) { decode_video_packet (); - } else if (_ffmpeg_content->audio_stream() && _ffmpeg_content->audio_stream()->uses_index (_format_context, si) && _decode_audio) { - decode_audio_packet (); - } else if (_ffmpeg_content->subtitle_stream() && _ffmpeg_content->subtitle_stream()->uses_index (_format_context, si) && film->with_subtitles ()) { + } else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index (_format_context, si)) { decode_subtitle_packet (); + } else { + decode_audio_packet (); } av_free_packet (&_packet); @@ -180,20 +128,37 @@ FFmpegDecoder::pass () * Only the first buffer will be used for non-planar data, otherwise there will be one per channel. */ shared_ptr -FFmpegDecoder::deinterleave_audio (uint8_t** data, int size) +FFmpegDecoder::deinterleave_audio (shared_ptr stream, uint8_t** data, int size) { - assert (_ffmpeg_content->audio_channels()); - assert (bytes_per_audio_sample()); + DCPOMATIC_ASSERT (bytes_per_audio_sample (stream)); /* Deinterleave and convert to float */ - assert ((size % (bytes_per_audio_sample() * _ffmpeg_content->audio_channels())) == 0); + /* total_samples and frames will be rounded down here, so if there are stray samples at the end + of the block that do not form a complete sample or frame they will be dropped. + */ + int const total_samples = size / bytes_per_audio_sample (stream); + int const frames = total_samples / stream->channels(); + shared_ptr audio (new AudioBuffers (stream->channels(), frames)); + + switch (audio_sample_format (stream)) { + case AV_SAMPLE_FMT_U8: + { + uint8_t* p = reinterpret_cast (data[0]); + int sample = 0; + int channel = 0; + for (int i = 0; i < total_samples; ++i) { + audio->data(channel)[sample] = float(*p++) / (1 << 23); - int const total_samples = size / bytes_per_audio_sample(); - int const frames = total_samples / _ffmpeg_content->audio_channels(); - shared_ptr audio (new AudioBuffers (_ffmpeg_content->audio_channels(), frames)); + ++channel; + if (channel == stream->channels()) { + channel = 0; + ++sample; + } + } + } + break; - switch (audio_sample_format()) { case AV_SAMPLE_FMT_S16: { int16_t* p = reinterpret_cast (data[0]); @@ -203,7 +168,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size) audio->data(channel)[sample] = float(*p++) / (1 << 15); ++channel; - if (channel == _ffmpeg_content->audio_channels()) { + if (channel == stream->channels()) { channel = 0; ++sample; } @@ -214,14 +179,14 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size) case AV_SAMPLE_FMT_S16P: { int16_t** p = reinterpret_cast (data); - for (int i = 0; i < _ffmpeg_content->audio_channels(); ++i) { + for (int i = 0; i < stream->channels(); ++i) { for (int j = 0; j < frames; ++j) { audio->data(i)[j] = static_cast(p[i][j]) / (1 << 15); } } } break; - + case AV_SAMPLE_FMT_S32: { int32_t* p = reinterpret_cast (data[0]); @@ -231,7 +196,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size) audio->data(channel)[sample] = static_cast(*p++) / (1 << 31); ++channel; - if (channel == _ffmpeg_content->audio_channels()) { + if (channel == stream->channels()) { channel = 0; ++sample; } @@ -248,182 +213,72 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size) audio->data(channel)[sample] = *p++; ++channel; - if (channel == _ffmpeg_content->audio_channels()) { + if (channel == stream->channels()) { channel = 0; ++sample; } } } break; - + case AV_SAMPLE_FMT_FLTP: { float** p = reinterpret_cast (data); - for (int i = 0; i < _ffmpeg_content->audio_channels(); ++i) { + for (int i = 0; i < stream->channels(); ++i) { memcpy (audio->data(i), p[i], frames * sizeof(float)); } } break; default: - throw DecodeError (String::compose (_("Unrecognised audio sample format (%1)"), static_cast (audio_sample_format()))); + throw DecodeError (String::compose (_("Unrecognised audio sample format (%1)"), static_cast (audio_sample_format (stream)))); } return audio; } AVSampleFormat -FFmpegDecoder::audio_sample_format () const -{ - if (!_ffmpeg_content->audio_stream()) { - return (AVSampleFormat) 0; - } - - return audio_codec_context()->sample_fmt; -} - -int -FFmpegDecoder::bytes_per_audio_sample () const +FFmpegDecoder::audio_sample_format (shared_ptr stream) const { - return av_get_bytes_per_sample (audio_sample_format ()); + return stream->stream (_format_context)->codec->sample_fmt; } int -FFmpegDecoder::minimal_run (boost::function, optional, int)> finished) -{ - int frames_read = 0; - optional last_video; - optional last_audio; - - while (!finished (last_video, last_audio, frames_read)) { - int r = av_read_frame (_format_context, &_packet); - if (r < 0) { - /* We should flush our decoders here, possibly yielding a few more frames, - but the consequence of having to do that is too hideous to contemplate. - Instead we give up and say that you can't seek too close to the end - of a file. - */ - return frames_read; - } - - ++frames_read; - - double const time_base = av_q2d (_format_context->streams[_packet.stream_index]->time_base); - - if (_packet.stream_index == _video_stream) { - - avcodec_get_frame_defaults (_frame); - - int finished = 0; - r = avcodec_decode_video2 (video_codec_context(), _frame, &finished, &_packet); - if (r >= 0 && finished) { - last_video = rint ( - (av_frame_get_best_effort_timestamp (_frame) * time_base + _pts_offset) * TIME_HZ - ); - } - - } else if (_ffmpeg_content->audio_stream() && _ffmpeg_content->audio_stream()->uses_index (_format_context, _packet.stream_index)) { - AVPacket copy_packet = _packet; - while (copy_packet.size > 0) { - - int finished; - r = avcodec_decode_audio4 (audio_codec_context(), _frame, &finished, &_packet); - if (r >= 0 && finished) { - last_audio = rint ( - (av_frame_get_best_effort_timestamp (_frame) * time_base + _pts_offset) * TIME_HZ - ); - } - - copy_packet.data += r; - copy_packet.size -= r; - } - } - - av_free_packet (&_packet); - } - - return frames_read; -} - -bool -FFmpegDecoder::seek_overrun_finished (ContentTime seek, optional last_video, optional last_audio) const +FFmpegDecoder::bytes_per_audio_sample (shared_ptr stream) const { - return (last_video && last_video.get() >= seek) || (last_audio && last_audio.get() >= seek); -} - -bool -FFmpegDecoder::seek_final_finished (int n, int done) const -{ - return n == done; + return av_get_bytes_per_sample (audio_sample_format (stream)); } void -FFmpegDecoder::seek_and_flush (ContentTime t) +FFmpegDecoder::seek (ContentTime time, bool accurate) { - int64_t s = ((double (t) / TIME_HZ) - _pts_offset) / - av_q2d (_format_context->streams[_video_stream]->time_base); - - if (_ffmpeg_content->audio_stream ()) { - s = min ( - s, int64_t ( - ((double (t) / TIME_HZ) - _pts_offset) / - av_q2d (_ffmpeg_content->audio_stream()->stream(_format_context)->time_base) - ) - ); - } - - cout << "S&F " << t << "\n"; + VideoDecoder::seek (time, accurate); + AudioDecoder::seek (time, accurate); + SubtitleDecoder::seek (time, accurate); - /* Ridiculous empirical hack */ - s--; - if (s < 0) { - s = 0; - } - - av_seek_frame (_format_context, _video_stream, s, 0); + /* If we are doing an `accurate' seek, we need to use pre-roll, as + we don't really know what the seek will give us. + */ - avcodec_flush_buffers (video_codec_context()); - if (audio_codec_context ()) { - avcodec_flush_buffers (audio_codec_context ()); - } - if (_subtitle_codec_context) { - avcodec_flush_buffers (_subtitle_codec_context); - } -} + ContentTime pre_roll = accurate ? ContentTime::from_seconds (2) : ContentTime (0); + time -= pre_roll; -void -FFmpegDecoder::seek (ContentTime time, bool accurate) -{ - Decoder::seek (time, accurate); - if (_decode_audio) { - AudioDecoder::seek (time, accurate); - } - - /* If we are doing an accurate seek, our initial shot will be 200ms (200 being - a number plucked from the air) earlier than we want to end up. The loop below - will hopefully then step through to where we want to be. + /* XXX: it seems debatable whether PTS should be used here... + http://www.mjbshaw.com/2012/04/seeking-in-ffmpeg-know-your-timestamp.html */ - ContentTime pre_roll = accurate ? (0.2 * TIME_HZ) : 0; - ContentTime initial_seek = time - pre_roll; - if (initial_seek < 0) { - initial_seek = 0; + ContentTime u = time - _pts_offset; + if (u < ContentTime ()) { + u = ContentTime (); } + av_seek_frame (_format_context, _video_stream, u.seconds() / av_q2d (_format_context->streams[_video_stream]->time_base), AVSEEK_FLAG_BACKWARD); - /* Initial seek time in the video stream's timebase */ - - seek_and_flush (initial_seek); - - if (!accurate) { - /* That'll do */ - return; - } + avcodec_flush_buffers (video_codec_context()); - int const N = minimal_run (boost::bind (&FFmpegDecoder::seek_overrun_finished, this, time, _1, _2)); + /* XXX: should be flushing audio buffers? */ - seek_and_flush (initial_seek); - if (N > 0) { - minimal_run (boost::bind (&FFmpegDecoder::seek_final_finished, this, N - 1, _3)); + if (subtitle_codec_context ()) { + avcodec_flush_buffers (subtitle_codec_context ()); } } @@ -433,35 +288,66 @@ 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; - + + /* XXX: inefficient */ + vector > streams = ffmpeg_content()->ffmpeg_audio_streams (); + vector >::const_iterator stream = streams.begin (); + while (stream != streams.end () && !(*stream)->uses_index (_format_context, copy_packet.stream_index)) { + ++stream; + } + + if (stream == streams.end ()) { + /* The packet's stream may not be an audio one; just ignore it in this method if so */ + return; + } + while (copy_packet.size > 0) { int frame_finished; - int const decode_result = avcodec_decode_audio4 (audio_codec_context(), _frame, &frame_finished, ©_packet); - + int decode_result = avcodec_decode_audio4 ((*stream)->stream (_format_context)->codec, _frame, &frame_finished, ©_packet); if (decode_result < 0) { - shared_ptr film = _film.lock (); - assert (film); - film->log()->log (String::compose ("avcodec_decode_audio4 failed (%1)", decode_result)); - return; + /* avcodec_decode_audio4 can sometimes return an error even though it has decoded + some valid data; for example dca_subframe_footer can return AVERROR_INVALIDDATA + if it overreads the auxiliary data. ffplay carries on if frame_finished is true, + even in the face of such an error, so I think we should too. + + Returning from the method here caused mantis #352. + */ + LOG_WARNING ("avcodec_decode_audio4 failed (%1)", decode_result); + + /* Fudge decode_result so that we come out of the while loop when + we've processed this data. + */ + decode_result = copy_packet.size; } if (frame_finished) { - ContentTime const ct = ( + ContentTime ct = ContentTime::from_seconds ( av_frame_get_best_effort_timestamp (_frame) * - av_q2d (_ffmpeg_content->audio_stream()->stream (_format_context)->time_base) - + _pts_offset - ) * TIME_HZ; - + av_q2d ((*stream)->stream (_format_context)->time_base)) + + _pts_offset; + int const data_size = av_samples_get_buffer_size ( - 0, audio_codec_context()->channels, _frame->nb_samples, audio_sample_format (), 1 + 0, (*stream)->stream(_format_context)->codec->channels, _frame->nb_samples, audio_sample_format (*stream), 1 ); - audio (deinterleave_audio (_frame->data, data_size), ct); + shared_ptr data = deinterleave_audio (*stream, _frame->data, data_size); + + if (ct < ContentTime ()) { + /* Discard audio data that comes before time 0 */ + Frame const remove = min (int64_t (data->frames()), (-ct).frames_ceil(double((*stream)->frame_rate ()))); + data->move (remove, 0, data->frames() - remove); + data->set_frames (data->frames() - remove); + ct += ContentTime::from_frames (remove, (*stream)->frame_rate ()); + } + + if (data->frames() > 0) { + audio (*stream, data, ct); + } } - + copy_packet.data += decode_result; copy_packet.size -= decode_result; } @@ -478,109 +364,106 @@ FFmpegDecoder::decode_video_packet () boost::mutex::scoped_lock lm (_filter_graphs_mutex); shared_ptr graph; - + list >::iterator i = _filter_graphs.begin(); while (i != _filter_graphs.end() && !(*i)->can_process (dcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format)) { ++i; } if (i == _filter_graphs.end ()) { - shared_ptr film = _film.lock (); - assert (film); - graph.reset (new FilterGraph (_ffmpeg_content, dcp::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)); + LOG_GENERAL (N_("New graph for %1x%2, pixel format %3"), _frame->width, _frame->height, _frame->format); } else { graph = *i; } list, int64_t> > images = graph->process (_frame); - string post_process = Filter::ffmpeg_strings (_ffmpeg_content->filters()).second; - for (list, int64_t> >::iterator i = images.begin(); i != images.end(); ++i) { shared_ptr image = i->first; - if (!post_process.empty ()) { - image = image->post_process (post_process, true); - } - + if (i->second != AV_NOPTS_VALUE) { - double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset; - VideoFrame const f = rint (pts * _ffmpeg_content->video_frame_rate ()); - video (image, false, f); + double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset.seconds (); + video ( + shared_ptr (new RawImageProxy (image)), + llrint (pts * _ffmpeg_content->video_frame_rate ()) + ); } else { - shared_ptr film = _film.lock (); - assert (film); - film->log()->log ("Dropping frame without PTS"); + LOG_WARNING_NC ("Dropping frame without PTS"); } } return true; } - -void -FFmpegDecoder::setup_subtitle () -{ - boost::mutex::scoped_lock lm (_mutex); - - if (!_ffmpeg_content->subtitle_stream()) { - return; - } - - _subtitle_codec_context = _ffmpeg_content->subtitle_stream()->stream(_format_context)->codec; - if (_subtitle_codec_context == 0) { - throw DecodeError (N_("could not find subtitle stream")); - } - - _subtitle_codec = avcodec_find_decoder (_subtitle_codec_context->codec_id); - - if (_subtitle_codec == 0) { - throw DecodeError (N_("could not find subtitle decoder")); - } - - if (avcodec_open2 (_subtitle_codec_context, _subtitle_codec, 0) < 0) { - throw DecodeError (N_("could not open subtitle decoder")); - } -} - void FFmpegDecoder::decode_subtitle_packet () { int got_subtitle; AVSubtitle sub; - if (avcodec_decode_subtitle2 (_subtitle_codec_context, &sub, &got_subtitle, &_packet) < 0 || !got_subtitle) { + if (avcodec_decode_subtitle2 (subtitle_codec_context(), &sub, &got_subtitle, &_packet) < 0 || !got_subtitle) { return; } - /* 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) { - image_subtitle (shared_ptr (), dcpomatic::Rect (), 0, 0); + /* Sometimes we get an empty AVSubtitle, which is used by some codecs to + indicate that the previous subtitle should stop. We can ignore it here. + */ return; - } else if (sub.num_rects > 1) { - throw DecodeError (_("multi-part subtitles not yet supported")); } - - /* Subtitle PTS in seconds (within the source, not taking into account any of the - source that we may have chopped off for the DCP) + + /* Subtitle PTS (within the source, not taking into account any of the + source that we may have chopped off for the DCP). */ - double const packet_time = (static_cast (sub.pts) / AV_TIME_BASE) + _pts_offset; - - /* hence start time for this sub */ - ContentTime const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ; - ContentTime const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ; + FFmpegSubtitlePeriod sub_period = subtitle_period (sub); + ContentTimePeriod period; + period.from = sub_period.from + _pts_offset; + if (sub_period.to) { + /* We already know the subtitle period `to' time */ + period.to = sub_period.to.get() + _pts_offset; + } else { + /* We have to look up the `to' time in the stream's records */ + period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (period.from); + } + + for (unsigned int i = 0; i < sub.num_rects; ++i) { + AVSubtitleRect const * rect = sub.rects[i]; + + switch (rect->type) { + case SUBTITLE_NONE: + break; + case SUBTITLE_BITMAP: + decode_bitmap_subtitle (rect, period); + break; + case SUBTITLE_TEXT: + cout << "XXX: SUBTITLE_TEXT " << rect->text << "\n"; + break; + case SUBTITLE_ASS: + cout << "XXX: SUBTITLE_ASS " << rect->ass << "\n"; + break; + } + } - AVSubtitleRect const * rect = sub.rects[0]; + avsubtitle_free (&sub); +} - if (rect->type != SUBTITLE_BITMAP) { - throw DecodeError (_("non-bitmap subtitles not yet supported")); - } +list +FFmpegDecoder::image_subtitles_during (ContentTimePeriod p, bool starting) const +{ + return _ffmpeg_content->subtitles_during (p, starting); +} + +list +FFmpegDecoder::text_subtitles_during (ContentTimePeriod, bool) const +{ + return list (); +} +void +FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period) +{ /* Note RGBA is expressed little-endian, so the first byte in the word is R, second G, third B, fourth A. */ @@ -607,19 +490,12 @@ FFmpegDecoder::decode_subtitle_packet () } dcp::Size const vs = _ffmpeg_content->video_size (); - - image_subtitle ( - image, - dcpomatic::Rect ( - static_cast (rect->x) / vs.width, - static_cast (rect->y) / vs.height, - static_cast (rect->w) / vs.width, - static_cast (rect->h) / vs.height - ), - from, - to + dcpomatic::Rect const scaled_rect ( + static_cast (rect->x) / vs.width, + static_cast (rect->y) / vs.height, + static_cast (rect->w) / vs.width, + static_cast (rect->h) / vs.height ); - - - avsubtitle_free (&sub); + + image_subtitle (period, image, scaled_rect); }