summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
-rw-r--r--src/lib/ffmpeg_decoder.cc65
1 files changed, 23 insertions, 42 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index a9db6f489..47cc02e61 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -61,9 +61,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, shared_ptr<const Options> o, J
, _video_stream (-1)
, _audio_stream (-1)
, _subtitle_stream (-1)
- , _last_video_frame (-1)
- , _this_video_frame (0)
- , _audio_frame (0)
+ , _frame (0)
, _video_codec_context (0)
, _video_codec (0)
, _audio_codec_context (0)
@@ -71,10 +69,6 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, shared_ptr<const Options> o, J
, _subtitle_codec_context (0)
, _subtitle_codec (0)
{
- for (int i = 0; i < 2; ++i) {
- _video_frame[i] = 0;
- }
-
setup_general ();
setup_video ();
setup_audio ();
@@ -95,11 +89,7 @@ FFmpegDecoder::~FFmpegDecoder ()
avcodec_close (_subtitle_codec_context);
}
- for (int i = 0; i < 2; ++i) {
- av_free (_video_frame[i]);
- }
-
- av_free (_audio_frame);
+ av_free (_frame);
avformat_close_input (&_format_context);
}
@@ -152,15 +142,8 @@ FFmpegDecoder::setup_general ()
throw DecodeError ("could not find video stream");
}
- for (int i = 0; i < 2; ++i) {
- _video_frame[i] = avcodec_alloc_frame ();
- if (_video_frame[i] == 0) {
- throw DecodeError ("could not allocate frame");
- }
- }
-
- _audio_frame = avcodec_alloc_frame ();
- if (_audio_frame == 0) {
+ _frame = avcodec_alloc_frame ();
+ if (_frame == 0) {
throw DecodeError ("could not allocate frame");
}
}
@@ -253,18 +236,18 @@ FFmpegDecoder::do_pass ()
int frame_finished;
- while (avcodec_decode_video2 (_video_codec_context, _video_frame[_this_video_frame], &frame_finished, &_packet) >= 0 && frame_finished) {
- process_video (_video_frame[_this_video_frame]);
+ while (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
+ process_video (_frame);
}
if (_audio_stream >= 0 && _opt->decode_audio) {
- while (avcodec_decode_audio4 (_audio_codec_context, _audio_frame, &frame_finished, &_packet) >= 0 && frame_finished) {
+ 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, _audio_frame->nb_samples, audio_sample_format (), 1
+ 0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1
);
assert (_audio_codec_context->channels == _film->audio_channels());
- process_audio (_audio_frame->data[0], data_size);
+ process_audio (_frame->data[0], data_size);
}
}
@@ -273,16 +256,16 @@ FFmpegDecoder::do_pass ()
double const pts_seconds = av_q2d (_format_context->streams[_packet.stream_index]->time_base) * _packet.pts;
+ avcodec_get_frame_defaults (_frame);
+
if (_packet.stream_index == _video_stream) {
- avcodec_get_frame_defaults (_video_frame[_this_video_frame]);
-
if (!_first_video) {
_first_video = pts_seconds;
}
int frame_finished;
- if (avcodec_decode_video2 (_video_codec_context, _video_frame[_this_video_frame], &frame_finished, &_packet) >= 0 && frame_finished) {
+ if (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
/* Where we are in the output, in seconds */
double const out_pts_seconds = video_frame_index() / frames_per_second();
@@ -291,29 +274,27 @@ FFmpegDecoder::do_pass ()
double const delta = pts_seconds - out_pts_seconds;
double const one_frame = 1 / frames_per_second();
- /* Insert the last frame if we have one, otherwise just use this one */
- int const insert_frame = _last_video_frame == -1 ? _this_video_frame : _last_video_frame;
-
/* Insert frames if required to get out_pts_seconds up to pts_seconds */
if (delta > one_frame) {
int const extra = rint (delta / one_frame);
for (int i = 0; i < extra; ++i) {
- _film->log()->log (String::compose ("Extra frame inserted at %1s", out_pts_seconds));
- process_video (_video_frame[insert_frame]);
+ repeat_last_video ();
+ _film->log()->log (
+ String::compose (
+ "Extra frame inserted at %1s; DCP frame %2, packet PTS %3",
+ out_pts_seconds, video_frame_index(), pts_seconds
+ )
+ );
}
}
if (delta > -one_frame) {
/* Process this frame */
- process_video (_video_frame[_this_video_frame]);
+ process_video (_frame);
} else {
/* Otherwise we are omitting a frame to keep things right */
_film->log()->log (String::compose ("Frame removed at %1s", out_pts_seconds));
}
-
- /* Swap over so that we use the alternate video frames next time */
- _this_video_frame = 1 - _this_video_frame;
- _last_video_frame = 1 - _this_video_frame;
}
} else if (_audio_stream >= 0 && _packet.stream_index == _audio_stream && _opt->decode_audio && _first_video && _first_video.get() <= pts_seconds) {
@@ -354,13 +335,13 @@ FFmpegDecoder::do_pass ()
}
int frame_finished;
- if (avcodec_decode_audio4 (_audio_codec_context, _audio_frame, &frame_finished, &_packet) >= 0 && 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, _audio_frame->nb_samples, audio_sample_format (), 1
+ 0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1
);
assert (_audio_codec_context->channels == _film->audio_channels());
- process_audio (_audio_frame->data[0], data_size);
+ process_audio (_frame->data[0], data_size);
}
} else if (_subtitle_stream >= 0 && _packet.stream_index == _subtitle_stream && _opt->decode_subtitles && _first_video) {
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-06 22:53:28 +0000