RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-28 18:32:22 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/encode: Redo checks for small last audio frame

Browse Source 
In particular, check that there is only one small last frame
in case the encoder has the AV_CODEC_CAP_SMALL_LAST_FRAME set.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-09-15 16:57:18 +02:00
parent e6bfb14223
commit dc7b664557
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/encode.c
View File

@ -157,6 +157,7 @@ static int pad_last_frame(AVCodecContext *s, AVFrame *frame, const AVFrame *src)
fail: fail:
av_frame_unref(frame); av_frame_unref(frame);
s->internal->last_audio_frame = 0;
return ret; return ret;
} }
@ -392,28 +393,24 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src)
avctx->audio_service_type = *(enum AVAudioServiceType*)sd->data; avctx->audio_service_type = *(enum AVAudioServiceType*)sd->data;
/* check for valid frame size */ /* check for valid frame size */
if (avctx->codec->capabilities & AV_CODEC_CAP_SMALL_LAST_FRAME) { if (!(avctx->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) {
if (src->nb_samples > avctx->frame_size) {
av_log(avctx, AV_LOG_ERROR, "more samples than frame size\n");
return AVERROR(EINVAL);
}
} else if (!(avctx->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) {
/* if we already got an undersized frame, that must have been the last */ /* if we already got an undersized frame, that must have been the last */
if (avctx->internal->last_audio_frame) { if (avctx->internal->last_audio_frame) {
av_log(avctx, AV_LOG_ERROR, "frame_size (%d) was not respected for a non-last frame\n", avctx->frame_size); av_log(avctx, AV_LOG_ERROR, "frame_size (%d) was not respected for a non-last frame\n", avctx->frame_size);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (src->nb_samples > avctx->frame_size) {
av_log(avctx, AV_LOG_ERROR, "nb_samples (%d) > frame_size (%d)\n", src->nb_samples, avctx->frame_size);
return AVERROR(EINVAL);
}
if (src->nb_samples < avctx->frame_size) { if (src->nb_samples < avctx->frame_size) {
avctx->internal->last_audio_frame = 1;
if (!(avctx->codec->capabilities & AV_CODEC_CAP_SMALL_LAST_FRAME)) {
ret = pad_last_frame(avctx, dst, src); ret = pad_last_frame(avctx, dst, src);
if (ret < 0) if (ret < 0)
return ret; return ret;
avctx->internal->last_audio_frame = 1;
goto finish; goto finish;
} else if (src->nb_samples > avctx->frame_size) { }
av_log(avctx, AV_LOG_ERROR, "nb_samples (%d) != frame_size (%d)\n", src->nb_samples, avctx->frame_size);
return AVERROR(EINVAL);
} }
} }
} }

4
libavcodec/internal.h
View File

@ -57,8 +57,8 @@ typedef struct AVCodecInternal {
int is_copy; int is_copy;
/** /**
* An audio frame with less than required samples has been submitted and * An audio frame with less than required samples has been submitted (and
* padded with silence. Reject all subsequent frames. * potentially padded with silence). Reject all subsequent frames.
*/ */
int last_audio_frame; int last_audio_frame;