highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aacenc: quit when the audio queue reaches 0 rather than keeping track of empty frames

Browse Source 
The libopus encoder does the same thing and its better than
keeping track of when the empty flush frames appear.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov
2016-11-07 02:11:50 +00:00
parent ef6a786401
commit 0cf6853804
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/aacenc.c
View File

@@ -520,13 +520,13 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
int chan_el_counter[4]; int chan_el_counter[4];
FFPsyWindowInfo windows[AAC_MAX_CHANNELS]; FFPsyWindowInfo windows[AAC_MAX_CHANNELS];
if (s->last_frame == 2)
return 0;
/* add current frame to queue */ /* add current frame to queue */
if (frame) { if (frame) {
if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) if ((ret = ff_af_queue_add(&s->afq, frame)) < 0)
return ret; return ret;
} else {
if (!s->afq.remaining_samples || (!s->afq.frame_alloc && !s->afq.frame_count))
return 0;
} }
copy_input_samples(s, frame); copy_input_samples(s, frame);
@@ -841,9 +841,6 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
s->lambda_sum += s->lambda; s->lambda_sum += s->lambda;
s->lambda_count++; s->lambda_count++;
if (!frame)
s->last_frame++;
ff_af_queue_remove(&s->afq, avctx->frame_size, &avpkt->pts, ff_af_queue_remove(&s->afq, avctx->frame_size, &avpkt->pts,
&avpkt->duration); &avpkt->duration);

1
libavcodec/aacenc.h
View File

@@ -112,7 +112,6 @@ typedef struct AACEncContext {
struct FFPsyPreprocessContext* psypp; struct FFPsyPreprocessContext* psypp;
AACCoefficientsEncoder *coder; AACCoefficientsEncoder *coder;
int cur_channel; ///< current channel for coder context int cur_channel; ///< current channel for coder context
int last_frame;
int random_state; int random_state;
float lambda; float lambda;
int last_frame_pb_count; ///< number of bits for the previous frame int last_frame_pb_count; ///< number of bits for the previous frame