X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=5352f176a91b58f784df14dcfb8426d31dbd3f79;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=57327b63d8a070c6259493ad8d34a852b072832f;hpb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 57327b63d..5352f176a 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -27,14 +28,17 @@ #include "util.h" #include "log.h" #include "ffmpeg_decoder.h" +#include "subtitle_decoder.h" #include "ffmpeg_audio_stream.h" #include "ffmpeg_subtitle_stream.h" #include "video_filter_graph.h" #include "audio_buffers.h" #include "ffmpeg_content.h" #include "raw_image_proxy.h" +#include "video_decoder.h" #include "film.h" #include "md5_digester.h" +#include "audio_decoder.h" #include "compose.hpp" #include #include @@ -72,13 +76,30 @@ using boost::split; using dcp::Size; FFmpegDecoder::FFmpegDecoder (shared_ptr c, shared_ptr log, bool fast) - : VideoDecoder (c->video, log) - , AudioDecoder (c->audio, fast, log) - , SubtitleDecoder (c->subtitle) - , FFmpeg (c) + : FFmpeg (c) , _log (log) - , _pts_offset (pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->video->frame_rate())) { + if (c->video) { + video.reset (new VideoDecoder (this, c, log)); + _pts_offset = pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->active_video_frame_rate()); + } else { + _pts_offset = ContentTime (); + } + + if (c->audio) { + audio.reset (new AudioDecoder (this, c->audio, fast, log)); + } + + if (c->subtitle) { + subtitle.reset ( + new SubtitleDecoder ( + this, + c->subtitle, + bind (&FFmpegDecoder::image_subtitles_during, this, _1, _2), + bind (&FFmpegDecoder::text_subtitles_during, this, _1, _2) + ) + ); + } } void @@ -91,10 +112,12 @@ FFmpegDecoder::flush () /* XXX: should we reset _packet.data and size after each *_decode_* call? */ - while (decode_video_packet ()) {} + while (video && decode_video_packet ()) {} - decode_audio_packet (); - AudioDecoder::flush (); + if (audio) { + decode_audio_packet (); + audio->flush (); + } } bool @@ -121,7 +144,7 @@ FFmpegDecoder::pass (PassReason reason, bool accurate) int const si = _packet.stream_index; shared_ptr fc = _ffmpeg_content; - if (si == _video_stream && !_ignore_video && (accurate || reason != PASS_REASON_SUBTITLE)) { + if (_video_stream && si == _video_stream.get() && !video->ignore() && (accurate || reason != PASS_REASON_SUBTITLE)) { decode_video_packet (); } else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index (_format_context, si)) { decode_subtitle_packet (); @@ -206,7 +229,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream) const int sample = 0; int channel = 0; for (int i = 0; i < total_samples; ++i) { - audio->data(channel)[sample] = static_cast(*p++) / (1 << 31); + audio->data(channel)[sample] = static_cast(*p++) / 2147483648; ++channel; if (channel == stream->channels()) { @@ -222,7 +245,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream) const int32_t** p = reinterpret_cast (_frame->data); 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 << 31); + audio->data(i)[j] = static_cast(p[i][j]) / 2147483648; } } } @@ -280,9 +303,17 @@ FFmpegDecoder::bytes_per_audio_sample (shared_ptr stream) con void FFmpegDecoder::seek (ContentTime time, bool accurate) { - VideoDecoder::seek (time, accurate); - AudioDecoder::seek (time, accurate); - SubtitleDecoder::seek (time, accurate); + if (video) { + video->seek (time, accurate); + } + + if (audio) { + audio->seek (time, accurate); + } + + if (subtitle) { + subtitle->seek (time, accurate); + } /* 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. @@ -295,11 +326,18 @@ FFmpegDecoder::seek (ContentTime time, bool accurate) http://www.mjbshaw.com/2012/04/seeking-in-ffmpeg-know-your-timestamp.html */ + DCPOMATIC_ASSERT (_video_stream); + 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); + av_seek_frame ( + _format_context, + _video_stream.get(), + u.seconds() / av_q2d (_format_context->streams[_video_stream.get()]->time_base), + AVSEEK_FLAG_BACKWARD + ); avcodec_flush_buffers (video_codec_context()); @@ -368,7 +406,7 @@ FFmpegDecoder::decode_audio_packet () } if (data->frames() > 0) { - audio (*stream, data, ct); + audio->give (*stream, data, ct); } } @@ -380,6 +418,8 @@ FFmpegDecoder::decode_audio_packet () bool FFmpegDecoder::decode_video_packet () { + DCPOMATIC_ASSERT (_video_stream); + int frame_finished; if (avcodec_decode_video2 (video_codec_context(), _frame, &frame_finished, &_packet) < 0 || !frame_finished) { return false; @@ -410,10 +450,10 @@ FFmpegDecoder::decode_video_packet () shared_ptr image = i->first; if (i->second != AV_NOPTS_VALUE) { - double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset.seconds (); - video ( + double const pts = i->second * av_q2d (_format_context->streams[_video_stream.get()]->time_base) + _pts_offset.seconds (); + video->give ( shared_ptr (new RawImageProxy (image)), - llrint (pts * _ffmpeg_content->video->frame_rate ()) + llrint (pts * _ffmpeg_content->active_video_frame_rate ()) ); } else { LOG_WARNING_NC ("Dropping frame without PTS"); @@ -555,7 +595,7 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP static_cast (rect->h) / vs.height ); - image_subtitle (period, image, scaled_rect); + subtitle->give_image (period, image, scaled_rect); } void @@ -622,5 +662,5 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period) } } - text_subtitle (period, ss); + subtitle->give_text (period, ss); }