]> git.sesse.net Git - ffmpeg/blobdiff - libavcodec/aacenc.c
Set cur_channel in the AAC encoder context where needed.
[ffmpeg] / libavcodec / aacenc.c
index 93dbadc2bf11425f7ff49fbba66e55dbb92e11ce..938df344bbdd117c7a682bec40b560f090c53eed 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavcodec/aacenc.c
+ * @file
  * AAC encoder
  */
 
@@ -170,6 +170,14 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
         av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %d\n", avctx->channels);
         return -1;
     }
+    if (avctx->profile != FF_PROFILE_UNKNOWN && avctx->profile != FF_PROFILE_AAC_LOW) {
+        av_log(avctx, AV_LOG_ERROR, "Unsupported profile %d\n", avctx->profile);
+        return -1;
+    }
+    if (1024.0 * avctx->bit_rate / avctx->sample_rate > 6144 * avctx->channels) {
+        av_log(avctx, AV_LOG_ERROR, "Too many bits per frame requested\n");
+        return -1;
+    }
     s->samplerate_index = i;
 
     dsputil_init(&s->dsp, avctx);
@@ -178,8 +186,8 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
     // window init
     ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024);
     ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128);
-    ff_sine_window_init(ff_sine_1024, 1024);
-    ff_sine_window_init(ff_sine_128, 128);
+    ff_init_ff_sine_windows(10);
+    ff_init_ff_sine_windows(7);
 
     s->samples            = av_malloc(2 * 1024 * avctx->channels * sizeof(s->samples[0]));
     s->cpe                = av_mallocz(sizeof(ChannelElement) * aac_chan_configs[avctx->channels-1][0]);
@@ -540,51 +548,63 @@ static int aac_encode_frame(AVCodecContext *avctx,
         }
         start_ch += chans;
     }
-    init_put_bits(&s->pb, frame, buf_size*8);
-    if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT))
-        put_bitstream_info(avctx, s, LIBAVCODEC_IDENT);
-    start_ch = 0;
-    memset(chan_el_counter, 0, sizeof(chan_el_counter));
-    for (i = 0; i < chan_map[0]; i++) {
-        FFPsyWindowInfo* wi = windows + start_ch;
-        tag      = chan_map[i+1];
-        chans    = tag == TYPE_CPE ? 2 : 1;
-        cpe      = &s->cpe[i];
-        for (j = 0; j < chans; j++) {
-            s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda);
-        }
-        cpe->common_window = 0;
-        if (chans > 1
-            && wi[0].window_type[0] == wi[1].window_type[0]
-            && wi[0].window_shape   == wi[1].window_shape) {
-
-            cpe->common_window = 1;
-            for (j = 0; j < wi[0].num_windows; j++) {
-                if (wi[0].grouping[j] != wi[1].grouping[j]) {
-                    cpe->common_window = 0;
-                    break;
+    do {
+        int frame_bits;
+        init_put_bits(&s->pb, frame, buf_size*8);
+        if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT))
+            put_bitstream_info(avctx, s, LIBAVCODEC_IDENT);
+        start_ch = 0;
+        memset(chan_el_counter, 0, sizeof(chan_el_counter));
+        for (i = 0; i < chan_map[0]; i++) {
+            FFPsyWindowInfo* wi = windows + start_ch;
+            tag      = chan_map[i+1];
+            chans    = tag == TYPE_CPE ? 2 : 1;
+            cpe      = &s->cpe[i];
+            for (j = 0; j < chans; j++) {
+                s->cur_channel = start_ch + j;
+                s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda);
+            }
+            cpe->common_window = 0;
+            if (chans > 1
+                && wi[0].window_type[0] == wi[1].window_type[0]
+                && wi[0].window_shape   == wi[1].window_shape) {
+
+                cpe->common_window = 1;
+                for (j = 0; j < wi[0].num_windows; j++) {
+                    if (wi[0].grouping[j] != wi[1].grouping[j]) {
+                        cpe->common_window = 0;
+                        break;
+                    }
                 }
             }
-        }
-        if (cpe->common_window && s->coder->search_for_ms)
-            s->coder->search_for_ms(s, cpe, s->lambda);
-        adjust_frame_information(s, cpe, chans);
-        put_bits(&s->pb, 3, tag);
-        put_bits(&s->pb, 4, chan_el_counter[tag]++);
-        if (chans == 2) {
-            put_bits(&s->pb, 1, cpe->common_window);
-            if (cpe->common_window) {
-                put_ics_info(s, &cpe->ch[0].ics);
-                encode_ms_info(&s->pb, cpe);
+            s->cur_channel = start_ch;
+            if (cpe->common_window && s->coder->search_for_ms)
+                s->coder->search_for_ms(s, cpe, s->lambda);
+            adjust_frame_information(s, cpe, chans);
+            put_bits(&s->pb, 3, tag);
+            put_bits(&s->pb, 4, chan_el_counter[tag]++);
+            if (chans == 2) {
+                put_bits(&s->pb, 1, cpe->common_window);
+                if (cpe->common_window) {
+                    put_ics_info(s, &cpe->ch[0].ics);
+                    encode_ms_info(&s->pb, cpe);
+                }
             }
+            for (j = 0; j < chans; j++) {
+                s->cur_channel = start_ch + j;
+                ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]);
+                encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window);
+            }
+            start_ch += chans;
         }
-        for (j = 0; j < chans; j++) {
-            s->cur_channel = start_ch + j;
-            ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]);
-            encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window);
-        }
-        start_ch += chans;
-    }
+
+        frame_bits = put_bits_count(&s->pb);
+        if (frame_bits <= 6144 * avctx->channels - 3)
+            break;
+
+        s->lambda *= avctx->bit_rate * 1024.0f / avctx->sample_rate / frame_bits;
+
+    } while (1);
 
     put_bits(&s->pb, 3, TYPE_END);
     flush_put_bits(&s->pb);
@@ -594,13 +614,9 @@ static int aac_encode_frame(AVCodecContext *avctx,
     if (!(avctx->flags & CODEC_FLAG_QSCALE)) {
         float ratio = avctx->bit_rate * 1024.0f / avctx->sample_rate / avctx->frame_bits;
         s->lambda *= ratio;
-        s->lambda = fminf(s->lambda, 65536.f);
+        s->lambda = FFMIN(s->lambda, 65536.f);
     }
 
-    if (avctx->frame_bits > 6144*avctx->channels)
-        av_log(avctx, AV_LOG_ERROR, "input buffer violation %d > %d.\n",
-               avctx->frame_bits, 6144*avctx->channels);
-
     if (!data)
         s->last_frame = 1;
     memcpy(s->samples, s->samples + 1024 * avctx->channels,
@@ -623,13 +639,13 @@ static av_cold int aac_encode_end(AVCodecContext *avctx)
 
 AVCodec aac_encoder = {
     "aac",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AAC,
     sizeof(AACEncContext),
     aac_encode_init,
     aac_encode_frame,
     aac_encode_end,
     .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
-    .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"),
 };