X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=1f11f70a0a462d9d5ac265c8b6e3961879bd46c7;hb=284d33037f878e6e3bc97238e0c18b0bbb92b990;hp=9fd6a0c05b91ad7e726b0b72e15a254ed07ac6f8;hpb=bd75347a20c3952954121ce00ec2ac6fa62a01ac;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 9fd6a0c05..1f11f70a0 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -58,11 +58,12 @@ using std::list; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; +using libdcp::Size; -FFmpegDecoder::FFmpegDecoder (shared_ptr f, shared_ptr o, Job* j) - : Decoder (f, o, j) - , VideoDecoder (f, o, j) - , AudioDecoder (f, o, j) +FFmpegDecoder::FFmpegDecoder (shared_ptr f, DecodeOptions o) + : Decoder (f, o) + , VideoDecoder (f, o) + , AudioDecoder (f, o) , _format_context (0) , _video_stream (-1) , _frame (0) @@ -78,7 +79,9 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr f, shared_ptrChanged.connect (bind (&FFmpegDecoder::film_changed, this, _1)); + if (!o.video_sync) { + _first_video = 0; + } } FFmpegDecoder::~FFmpegDecoder () @@ -164,14 +167,7 @@ FFmpegDecoder::setup_video () throw DecodeError ("could not find video decoder"); } - /* I think this prevents problems with green hash on decodes and - "changing frame properties on the fly is not supported by all filters" - messages with some content. Although I'm not sure; needs checking. - */ - AVDictionary* opts = 0; - av_dict_set (&opts, "threads", "1", 0); - - if (avcodec_open2 (_video_codec_context, _video_codec, &opts) < 0) { + if (avcodec_open2 (_video_codec_context, _video_codec, 0) < 0) { throw DecodeError ("could not open video decoder"); } } @@ -244,7 +240,7 @@ FFmpegDecoder::pass () filter_and_emit_video (_frame); } - if (_audio_stream && _opt->decode_audio) { + if (_audio_stream && _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 @@ -261,7 +257,7 @@ FFmpegDecoder::pass () avcodec_get_frame_defaults (_frame); shared_ptr ffa = dynamic_pointer_cast (_audio_stream); - + if (_packet.stream_index == _video_stream) { int frame_finished; @@ -272,14 +268,14 @@ FFmpegDecoder::pass () _film->log()->log (String::compose ("Used only %1 bytes of %2 in packet", r, _packet.size)); } - if (_opt->video_sync) { + if (_opt.video_sync) { out_with_sync (); } else { filter_and_emit_video (_frame); } } - } else if (ffa && _packet.stream_index == ffa->id() && _opt->decode_audio) { + } else if (ffa && _packet.stream_index == ffa->id() && _opt.decode_audio) { int frame_finished; if (avcodec_decode_audio4 (_audio_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) { @@ -328,7 +324,7 @@ FFmpegDecoder::pass () } } - } else if (_subtitle_stream && _packet.stream_index == _subtitle_stream->id() && _opt->decode_subtitles && _first_video) { + } else if (_subtitle_stream && _packet.stream_index == _subtitle_stream->id() && _opt.decode_subtitles && _first_video) { int got_subtitle; AVSubtitle sub; @@ -339,7 +335,7 @@ FFmpegDecoder::pass () if (sub.num_rects > 0) { shared_ptr ts; try { - emit_subtitle (shared_ptr (new TimedSubtitle (sub, _first_video.get()))); + emit_subtitle (shared_ptr (new TimedSubtitle (sub))); } catch (...) { /* some problem with the subtitle; we probably didn't understand it */ } @@ -374,7 +370,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t* data, int size) switch (audio_sample_format()) { case AV_SAMPLE_FMT_S16: { - int16_t* p = (int16_t *) data; + int16_t* p = reinterpret_cast (data); int sample = 0; int channel = 0; for (int i = 0; i < total_samples; ++i) { @@ -389,13 +385,24 @@ FFmpegDecoder::deinterleave_audio (uint8_t* data, int size) } break; + case AV_SAMPLE_FMT_S16P: + { + int16_t* p = reinterpret_cast (data); + for (int i = 0; i < _film->audio_channels(); ++i) { + for (int j = 0; j < frames; ++j) { + audio->data(i)[j] = static_cast(*p++) / (1 << 15); + } + } + } + break; + case AV_SAMPLE_FMT_S32: { - int32_t* p = (int32_t *) data; + int32_t* p = reinterpret_cast (data); int sample = 0; int channel = 0; for (int i = 0; i < total_samples; ++i) { - audio->data(channel)[sample] = float(*p++) / (1 << 31); + audio->data(channel)[sample] = static_cast(*p++) / (1 << 31); ++channel; if (channel == _film->audio_channels()) { @@ -404,7 +411,25 @@ FFmpegDecoder::deinterleave_audio (uint8_t* data, int size) } } } + break; + case AV_SAMPLE_FMT_FLT: + { + float* p = reinterpret_cast (data); + int sample = 0; + int channel = 0; + for (int i = 0; i < total_samples; ++i) { + audio->data(channel)[sample] = *p++; + + ++channel; + if (channel == _film->audio_channels()) { + channel = 0; + ++sample; + } + } + } + break; + case AV_SAMPLE_FMT_FLTP: { float* p = reinterpret_cast (data); @@ -416,7 +441,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t* data, int size) break; default: - assert (false); + throw DecodeError (String::compose ("Unrecognised audio sample format (%1)", static_cast (audio_sample_format()))); } return audio; @@ -444,10 +469,10 @@ FFmpegDecoder::audio_sample_format () const return _audio_codec_context->sample_fmt; } -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 @@ -523,6 +548,7 @@ FFmpegDecoder::set_subtitle_stream (shared_ptr s) { VideoDecoder::set_subtitle_stream (s); setup_subtitle (); + OutputChanged (); } void @@ -533,12 +559,12 @@ FFmpegDecoder::filter_and_emit_video (AVFrame* frame) shared_ptr graph; list >::iterator i = _filter_graphs.begin(); - while (i != _filter_graphs.end() && !(*i)->can_process (Size (frame->width, frame->height), (AVPixelFormat) frame->format)) { + while (i != _filter_graphs.end() && !(*i)->can_process (libdcp::Size (frame->width, frame->height), (AVPixelFormat) frame->format)) { ++i; } if (i == _filter_graphs.end ()) { - graph.reset (new FilterGraph (_film, this, Size (frame->width, frame->height), (AVPixelFormat) frame->format)); + 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 ("New graph for %1x%2, pixel format %3", frame->width, frame->height, frame->format)); } else { @@ -548,19 +574,36 @@ FFmpegDecoder::filter_and_emit_video (AVFrame* frame) list > images = graph->process (frame); for (list >::iterator i = images.begin(); i != images.end(); ++i) { - emit_video (*i); + emit_video (*i, frame_time ()); } } bool -FFmpegDecoder::seek (SourceFrame f) +FFmpegDecoder::seek (double p) { - int64_t const t = static_cast(f) / (av_q2d (_format_context->streams[_video_stream]->time_base) * frames_per_second()); - int const r = av_seek_frame (_format_context, _video_stream, t, 0); - avcodec_flush_buffers (_video_codec_context); + return do_seek (p, false); +} + +bool +FFmpegDecoder::seek_to_last () +{ + /* This AVSEEK_FLAG_BACKWARD in do_seek is a bit of a hack; without it, if we ask for a seek to the same place as last time + (used when we change decoder parameters and want to re-fetch the frame) we end up going forwards rather than + staying in the same place. + */ + return do_seek (last_source_time(), true); +} + +bool +FFmpegDecoder::do_seek (double p, bool backwards) +{ + int64_t const vt = p / av_q2d (_format_context->streams[_video_stream]->time_base); - if (r >= 0) { - OutputChanged (); + 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); } return r < 0; @@ -618,7 +661,6 @@ FFmpegAudioStream::to_string () const return String::compose ("ffmpeg %1 %2 %3 %4", _id, _sample_rate, _channel_layout, _name); } - void FFmpegDecoder::out_with_sync () { @@ -651,7 +693,7 @@ FFmpegDecoder::out_with_sync () String::compose ( "Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)", out_pts_seconds, video_frame(), source_pts_seconds, frames_per_second() - ) + ) ); } } @@ -670,6 +712,7 @@ FFmpegDecoder::film_changed (Film::Property p) { switch (p) { case Film::CROP: + case Film::FILTERS: { boost::mutex::scoped_lock lm (_filter_graphs_mutex); _filter_graphs.clear (); @@ -682,3 +725,16 @@ FFmpegDecoder::film_changed (Film::Property p) } } +/** @return Length (in video frames) according to our content's header */ +SourceFrame +FFmpegDecoder::length () const +{ + return (double(_format_context->duration) / AV_TIME_BASE) * frames_per_second(); +} + +double +FFmpegDecoder::frame_time () const +{ + return av_frame_get_best_effort_timestamp(_frame) * av_q2d (_format_context->streams[_video_stream]->time_base); +} +