virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc: move AVCodecInternal.last_audio_frame to EncodeContext

Browse Source 
It does not need to be visible outside of encode.c.
This commit is contained in:
Anton Khirnov
2023-06-20 13:26:32 +02:00
parent 232700154c
commit fd915dc1da
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/encode.c
View File

@@ -42,6 +42,12 @@ typedef struct EncodeContext {
* This is used to set said flag generically for said encoders. * This is used to set said flag generically for said encoders.
*/ */
int intra_only_flag; int intra_only_flag;
/**
* An audio frame with less than required samples has been submitted (and
* potentially padded with silence). Reject all subsequent frames.
*/
int last_audio_frame;
} EncodeContext; } EncodeContext;
static EncodeContext *encode_ctx(AVCodecInternal *avci) static EncodeContext *encode_ctx(AVCodecInternal *avci)
@@ -174,7 +180,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; encode_ctx(s->internal)->last_audio_frame = 0;
return ret; return ret;
} }
@@ -446,6 +452,7 @@ static int encode_generate_icc_profile(av_unused AVCodecContext *c, av_unused AV
static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src) static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src)
{ {
AVCodecInternal *avci = avctx->internal; AVCodecInternal *avci = avctx->internal;
EncodeContext *ec = encode_ctx(avci);
AVFrame *dst = avci->buffer_frame; AVFrame *dst = avci->buffer_frame;
int ret; int ret;
@@ -458,7 +465,7 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src)
/* check for valid frame size */ /* check for valid frame size */
if (!(avctx->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) { 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 (ec->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);
} }
@@ -467,7 +474,7 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (src->nb_samples < avctx->frame_size) { if (src->nb_samples < avctx->frame_size) {
avctx->internal->last_audio_frame = 1; ec->last_audio_frame = 1;
if (!(avctx->codec->capabilities & AV_CODEC_CAP_SMALL_LAST_FRAME)) { if (!(avctx->codec->capabilities & AV_CODEC_CAP_SMALL_LAST_FRAME)) {
int pad_samples = avci->pad_samples ? avci->pad_samples : avctx->frame_size; int pad_samples = avci->pad_samples ? avci->pad_samples : avctx->frame_size;
int out_samples = (src->nb_samples + pad_samples - 1) / pad_samples * pad_samples; int out_samples = (src->nb_samples + pad_samples - 1) / pad_samples * pad_samples;

6
libavcodec/internal.h
View File

@@ -56,12 +56,6 @@ typedef struct AVCodecInternal {
*/ */
int is_copy; int is_copy;
/**
* An audio frame with less than required samples has been submitted (and
* potentially padded with silence). Reject all subsequent frames.
*/
int last_audio_frame;
/** /**
* Audio encoders can set this flag during init to indicate that they * Audio encoders can set this flag during init to indicate that they
* want the small last frame to be padded to a multiple of pad_samples. * want the small last frame to be padded to a multiple of pad_samples.