Remove misplaced Doxygen comment.

[ffmpeg] / libavcodec / ac3enc.c

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 4d51c2e187b1c49fd361c042d58012ad416af0bc..e30e1bdbb9bf33eca155c524921d629014f37303 100644 (file)
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -20,16 +20,17 @@
  */
 
 /**
- * @file libavcodec/ac3enc.c
+ * @file
  * The simplest AC-3 encoder.
  */
 //#define DEBUG
 //#define DEBUG_BITALLOC
 #include "libavutil/crc.h"
 #include "avcodec.h"
-#include "get_bits.h" // for ff_reverse
+#include "libavutil/common.h" /* for av_reverse */
 #include "put_bits.h"
 #include "ac3.h"
+#include "audioconvert.h"
 
 typedef struct AC3EncodeContext {
     PutBitContext pb;
@@ -137,7 +138,7 @@ static void fft(IComplex *z, int ln)
 
     /* reverse */
     for(j=0;j<np;j++) {
-        int k = ff_reverse[j] >> (8 - ln);
+        int k = av_reverse[j] >> (8 - ln);
         if (k < j)
             FFSWAP(IComplex, z[k], z[j]);
     }
@@ -249,9 +250,7 @@ static void compute_exp_strategy(uint8_t exp_strategy[NB_BLOCKS][AC3_MAX_CHANNEL
     exp_strategy[0][ch] = EXP_NEW;
     for(i=1;i<NB_BLOCKS;i++) {
         exp_diff = calc_exp_diff(exp[i][ch], exp[i-1][ch], N/2);
-#ifdef DEBUG
-        av_log(NULL, AV_LOG_DEBUG, "exp_diff=%d\n", exp_diff);
-#endif
+        dprintf(NULL, "exp_diff=%d\n", exp_diff);
         if (exp_diff > EXP_DIFF_THRESHOLD)
             exp_strategy[i][ch] = EXP_NEW;
         else
@@ -609,37 +608,72 @@ static int compute_bit_allocation(AC3EncodeContext *s,
     return 0;
 }
 
+static av_cold int set_channel_info(AC3EncodeContext *s, int channels,
+                                    int64_t *channel_layout)
+{
+    int ch_layout;
+
+    if (channels < 1 || channels > AC3_MAX_CHANNELS)
+        return -1;
+    if ((uint64_t)*channel_layout > 0x7FF)
+        return -1;
+    ch_layout = *channel_layout;
+    if (!ch_layout)
+        ch_layout = avcodec_guess_channel_layout(channels, CODEC_ID_AC3, NULL);
+    if (avcodec_channel_layout_num_channels(ch_layout) != channels)
+        return -1;
+
+    s->lfe = !!(ch_layout & CH_LOW_FREQUENCY);
+    s->nb_all_channels = channels;
+    s->nb_channels = channels - s->lfe;
+    s->lfe_channel = s->lfe ? s->nb_channels : -1;
+    if (s->lfe)
+        ch_layout -= CH_LOW_FREQUENCY;
+
+    switch (ch_layout) {
+    case CH_LAYOUT_MONO:           s->channel_mode = AC3_CHMODE_MONO;   break;
+    case CH_LAYOUT_STEREO:         s->channel_mode = AC3_CHMODE_STEREO; break;
+    case CH_LAYOUT_SURROUND:       s->channel_mode = AC3_CHMODE_3F;     break;
+    case CH_LAYOUT_2_1:            s->channel_mode = AC3_CHMODE_2F1R;   break;
+    case CH_LAYOUT_4POINT0:        s->channel_mode = AC3_CHMODE_3F1R;   break;
+    case CH_LAYOUT_QUAD:
+    case CH_LAYOUT_2_2:            s->channel_mode = AC3_CHMODE_2F2R;   break;
+    case CH_LAYOUT_5POINT0:
+    case CH_LAYOUT_5POINT0_BACK:   s->channel_mode = AC3_CHMODE_3F2R;   break;
+    default:
+        return -1;
+    }
+
+    s->channel_map = ff_ac3_enc_channel_map[s->channel_mode][s->lfe];
+    *channel_layout = ch_layout;
+    if (s->lfe)
+        *channel_layout |= CH_LOW_FREQUENCY;
+
+    return 0;
+}
+
 static av_cold int AC3_encode_init(AVCodecContext *avctx)
 {
     int freq = avctx->sample_rate;
     int bitrate = avctx->bit_rate;
-    int channels = avctx->channels;
     AC3EncodeContext *s = avctx->priv_data;
     int i, j, ch;
     float alpha;
     int bw_code;
-    static const uint8_t channel_mode_defs[6] = {
-        0x01, /* C */
-        0x02, /* L R */
-        0x03, /* L C R */
-        0x06, /* L R SL SR */
-        0x07, /* L C R SL SR */
-        0x07, /* L C R SL SR (+LFE) */
-    };
 
     avctx->frame_size = AC3_FRAME_SIZE;
 
     ac3_common_init();
 
-    /* number of channels */
-    if (channels < 1 || channels > 6)
+    if (!avctx->channel_layout) {
+        av_log(avctx, AV_LOG_WARNING, "No channel layout specified. The "
+                                      "encoder will guess the layout, but it "
+                                      "might be incorrect.\n");
+    }
+    if (set_channel_info(s, avctx->channels, &avctx->channel_layout)) {
+        av_log(avctx, AV_LOG_ERROR, "invalid channel layout\n");
         return -1;
-    s->channel_mode = channel_mode_defs[channels - 1];
-    s->lfe = (channels == 6) ? 1 : 0;
-    s->nb_all_channels = channels;
-    s->nb_channels = channels > 5 ? 5 : channels;
-    s->lfe_channel = s->lfe ? 5 : -1;
-    s->channel_map = ff_ac3_enc_channel_map[s->channel_mode][s->lfe];
+    }
 
     /* frequency */
     for(i=0;i<3;i++) {
@@ -1359,13 +1393,33 @@ void test_ac3(void)
 
 AVCodec ac3_encoder = {
     "ac3",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AC3,
     sizeof(AC3EncodeContext),
     AC3_encode_init,
     AC3_encode_frame,
     AC3_encode_close,
     NULL,
-    .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("ATSC A/52A (AC-3)"),
+    .channel_layouts = (const int64_t[]){
+        CH_LAYOUT_MONO,
+        CH_LAYOUT_STEREO,
+        CH_LAYOUT_2_1,
+        CH_LAYOUT_SURROUND,
+        CH_LAYOUT_2_2,
+        CH_LAYOUT_QUAD,
+        CH_LAYOUT_4POINT0,
+        CH_LAYOUT_5POINT0,
+        CH_LAYOUT_5POINT0_BACK,
+       (CH_LAYOUT_MONO     | CH_LOW_FREQUENCY),
+       (CH_LAYOUT_STEREO   | CH_LOW_FREQUENCY),
+       (CH_LAYOUT_2_1      | CH_LOW_FREQUENCY),
+       (CH_LAYOUT_SURROUND | CH_LOW_FREQUENCY),
+       (CH_LAYOUT_2_2      | CH_LOW_FREQUENCY),
+       (CH_LAYOUT_QUAD     | CH_LOW_FREQUENCY),
+       (CH_LAYOUT_4POINT0  | CH_LOW_FREQUENCY),
+        CH_LAYOUT_5POINT1,
+        CH_LAYOUT_5POINT1_BACK,
+        0 },
 };