Currently, any samples in the final frame are not decoded because they are only represented by one frame instead of two. So we encode two final frames to cover both the analysis delay and the MDCT delay.
Unified · Split
| @@ -510,14 +510,12 @@ static int aac_encode_frame(AVCodecContext *avctx, · 509 unmodified lines | ||
| 510 | 510 | int chan_el_counter[4]; |
| 511 | 511 | FFPsyWindowInfo windows[AAC_MAX_CHANNELS]; |
| 512 | 512 | |
| 513 | − if (s->last_frame) | |
| 513 | + if (s->last_frame == 2) | |
| 514 | 514 | return 0; |
| 515 | 515 | |
| 516 | − if (data) { | |
| 517 | − deinterleave_input_samples(s, data, avctx->frame_size); | |
| 518 | − if (s->psypp) | |
| 519 | − ff_psy_preprocess(s->psypp, s->planar_samples, s->channels); | |
| 520 | − } | |
| 516 | + deinterleave_input_samples(s, data, data ? avctx->frame_size : 0); | |
| 517 | + if (s->psypp) | |
| 518 | + ff_psy_preprocess(s->psypp, s->planar_samples, s->channels); | |
| 521 | 519 | |
| 522 | 520 | if (!avctx->frame_number) |
| 523 | 521 | return 0; |
| @@ -648,7 +646,7 @@ static int aac_encode_frame(AVCodecContext *avctx, · 124 unmodified lines | ||
| 648 | 646 | } |
| 649 | 647 | |
| 650 | 648 | if (!data) |
| 651 | − s->last_frame = 1; | |
| 649 | + s->last_frame++; | |
| 652 | 650 | |
| 653 | 651 | return put_bits_count(&s->pb)>>3; |
| 654 | 652 | } |