Set fixed chunksize for ASF header in MMS streams, as per MSDN documentation.

[ffmpeg] / libavcodec / sipr.c

diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c
index 2db018ce53fb7b29341bb7afb65eb0c604520745..aa798340bbac778e1a3a4860a204876654502393 100644 (file)
--- a/libavcodec/sipr.c
+++ b/libavcodec/sipr.c
@@ -51,6 +51,7 @@ typedef struct {
 
     /* bitstream parameters */
     uint8_t number_of_fc_indexes;
+    uint8_t ma_predictor_bits;  ///< size in bits of the switched MA predictor
 
     /** size in bits of the i-th stage vector of quantizer */
     uint8_t vq_indexes_bits[5];
@@ -64,6 +65,22 @@ typedef struct {
 } SiprModeParam;
 
 static const SiprModeParam modes[MODE_COUNT] = {
+    [MODE_16k] = {
+        .mode_name          = "16k",
+        .bits_per_frame     = 160,
+        .subframe_count     = SUBFRAME_COUNT_16k,
+        .frames_per_packet  = 1,
+        .pitch_sharp_factor = 0.00,
+
+        .number_of_fc_indexes = 10,
+        .ma_predictor_bits    = 1,
+        .vq_indexes_bits      = {7, 8, 7, 7, 7},
+        .pitch_delay_bits     = {9, 6},
+        .gp_index_bits        = 4,
+        .fc_index_bits        = {4, 5, 4, 5, 4, 5, 4, 5, 4, 5},
+        .gc_index_bits        = 5
+    },
+
     [MODE_8k5] = {
         .mode_name          = "8k5",
         .bits_per_frame     = 152,
@@ -72,6 +89,7 @@ static const SiprModeParam modes[MODE_COUNT] = {
         .pitch_sharp_factor = 0.8,
 
         .number_of_fc_indexes = 3,
+        .ma_predictor_bits    = 0,
         .vq_indexes_bits      = {6, 7, 7, 7, 5},
         .pitch_delay_bits     = {8, 5, 5},
         .gp_index_bits        = 0,
@@ -87,6 +105,7 @@ static const SiprModeParam modes[MODE_COUNT] = {
         .pitch_sharp_factor = 0.8,
 
         .number_of_fc_indexes = 3,
+        .ma_predictor_bits    = 0,
         .vq_indexes_bits      = {6, 7, 7, 7, 5},
         .pitch_delay_bits     = {8, 5, 5},
         .gp_index_bits        = 0,
@@ -102,6 +121,7 @@ static const SiprModeParam modes[MODE_COUNT] = {
         .pitch_sharp_factor = 0.85,
 
         .number_of_fc_indexes = 1,
+        .ma_predictor_bits    = 0,
         .vq_indexes_bits      = {6, 7, 7, 7, 5},
         .pitch_delay_bits     = {8, 5, 8, 5, 5},
         .gp_index_bits        = 0,
@@ -110,6 +130,13 @@ static const SiprModeParam modes[MODE_COUNT] = {
     }
 };
 
+const float ff_pow_0_5[] = {
+    1.0/(1 <<  1), 1.0/(1 <<  2), 1.0/(1 <<  3), 1.0/(1 <<  4),
+    1.0/(1 <<  5), 1.0/(1 <<  6), 1.0/(1 <<  7), 1.0/(1 <<  8),
+    1.0/(1 <<  9), 1.0/(1 << 10), 1.0/(1 << 11), 1.0/(1 << 12),
+    1.0/(1 << 13), 1.0/(1 << 14), 1.0/(1 << 15), 1.0/(1 << 16)
+};
+
 static void dequant(float *out, const int *idx, const float *cbs[])
 {
     int i;
@@ -157,7 +184,7 @@ static void pitch_sharpening(int pitch_lag_int, float beta,
 }
 
 /**
- * Extracts decoding parameters from the input bitstream.
+ * Extract decoding parameters from the input bitstream.
  * @param parms          parameters structure
  * @param pgb            pointer to initialized GetBitContext structure
  */
@@ -166,6 +193,8 @@ static void decode_parameters(SiprParameters* parms, GetBitContext *pgb,
 {
     int i, j;
 
+    parms->ma_pred_switch           = get_bits(pgb, p->ma_predictor_bits);
+
     for (i = 0; i < 5; i++)
         parms->vq_indexes[i]        = get_bits(pgb, p->vq_indexes_bits[i]);
 
@@ -225,7 +254,7 @@ static void sipr_decode_lp(float *lsfnew, const float *lsfold, float *Az,
 }
 
 /**
- * Evaluates the adaptative impulse response.
+ * Evaluate the adaptive impulse response.
  */
 static void eval_ir(const float *Az, int pitch_lag, float *freq,
                     float pitch_sharp_factor)
@@ -247,7 +276,7 @@ static void eval_ir(const float *Az, int pitch_lag, float *freq,
 }
 
 /**
- * Evaluates the convolution of a vector with a sparse vector.
+ * Evaluate the convolution of a vector with a sparse vector.
  */
 static void convolute_with_sparse(float *out, const AMRFixed *pulses,
                                   const float *shape, int length)
@@ -273,7 +302,7 @@ static void postfilter_5k0(SiprContext *ctx, const float *lpc, float *samples)
 
     for (i = 0; i < LP_FILTER_ORDER; i++) {
         lpc_d[i] = lpc[i] * ff_pow_0_75[i];
-        lpc_n[i] = lpc[i] *    pow_0_5 [i];
+        lpc_n[i] = lpc[i] * ff_pow_0_5 [i];
     };
 
     memcpy(pole_out - LP_FILTER_ORDER, ctx->postfilter_mem,
@@ -450,8 +479,9 @@ static void decode_frame(SiprContext *ctx, SiprParameters *params,
             float energy = ff_dot_productf(ctx->postfilter_syn5k0 + LP_FILTER_ORDER + i*SUBFR_SIZE,
                                            ctx->postfilter_syn5k0 + LP_FILTER_ORDER + i*SUBFR_SIZE,
                                            SUBFR_SIZE);
-            ff_adaptative_gain_control(&synth[i * SUBFR_SIZE], energy,
-                                       SUBFR_SIZE, 0.9, &ctx->postfilter_agc);
+            ff_adaptive_gain_control(&synth[i * SUBFR_SIZE],
+                                     &synth[i * SUBFR_SIZE], energy,
+                                     SUBFR_SIZE, 0.9, &ctx->postfilter_agc);
         }
 
         memcpy(ctx->postfilter_syn5k0, ctx->postfilter_syn5k0 + frame_size,
@@ -460,15 +490,12 @@ static void decode_frame(SiprContext *ctx, SiprParameters *params,
     memcpy(ctx->excitation, excitation - PITCH_DELAY_MAX - L_INTERPOL,
            (PITCH_DELAY_MAX + L_INTERPOL) * sizeof(float));
 
-    ff_acelp_apply_order_2_transfer_function(synth,
+    ff_acelp_apply_order_2_transfer_function(out_data, synth,
                                              (const float[2]) {-1.99997   , 1.000000000},
                                              (const float[2]) {-1.93307352, 0.935891986},
                                              0.939805806,
                                              ctx->highpass_filt_mem,
                                              frame_size);
-
-    ctx->dsp.vector_clipf(out_data, synth, -1, 32767./(1<<15), frame_size);
-
 }
 
 static av_cold int sipr_decoder_init(AVCodecContext * avctx)
@@ -483,6 +510,9 @@ static av_cold int sipr_decoder_init(AVCodecContext * avctx)
 
     av_log(avctx, AV_LOG_DEBUG, "Mode: %s\n", modes[ctx->mode].mode_name);
 
+    if (ctx->mode == MODE_16k)
+        ff_sipr_init_16k(ctx);
+
     for (i = 0; i < LP_FILTER_ORDER; i++)
         ctx->lsp_history[i] = cos((i+1) * M_PI / (LP_FILTER_ORDER + 1));
 
@@ -491,12 +521,6 @@ static av_cold int sipr_decoder_init(AVCodecContext * avctx)
 
     avctx->sample_fmt = SAMPLE_FMT_FLT;
 
-    if (ctx->mode == MODE_16k) {
-        av_log(avctx, AV_LOG_ERROR, "decoding 16kbps SIPR files is not "
-                                    "supported yet.\n");
-        return -1;
-    }
-
     dsputil_init(&ctx->dsp, avctx);
 
     return 0;
@@ -511,6 +535,7 @@ static int sipr_decode_frame(AVCodecContext *avctx, void *datap,
     const SiprModeParam *mode_par = &modes[ctx->mode];
     GetBitContext gb;
     float *data = datap;
+    int subframe_size = ctx->mode == MODE_16k ? L_SUBFR_16k : SUBFR_SIZE;
     int i;
 
     ctx->avctx = avctx;
@@ -522,7 +547,7 @@ static int sipr_decode_frame(AVCodecContext *avctx, void *datap,
         *data_size = 0;
         return -1;
     }
-    if (*data_size < SUBFR_SIZE * mode_par->subframe_count * sizeof(float)) {
+    if (*data_size < subframe_size * mode_par->subframe_count * sizeof(float)) {
         av_log(avctx, AV_LOG_ERROR,
                "Error processing packet: output buffer (%d) too small\n",
                *data_size);
@@ -535,12 +560,16 @@ static int sipr_decode_frame(AVCodecContext *avctx, void *datap,
 
     for (i = 0; i < mode_par->frames_per_packet; i++) {
         decode_parameters(&parm, &gb, mode_par);
-        decode_frame(ctx, &parm, data);
 
-        data += SUBFR_SIZE * mode_par->subframe_count;
+        if (ctx->mode == MODE_16k)
+            ff_sipr_decode_frame_16k(ctx, &parm, data);
+        else
+            decode_frame(ctx, &parm, data);
+
+        data += subframe_size * mode_par->subframe_count;
     }
 
-    *data_size = mode_par->frames_per_packet * SUBFR_SIZE *
+    *data_size = mode_par->frames_per_packet * subframe_size *
         mode_par->subframe_count * sizeof(float);
 
     return mode_par->bits_per_frame >> 3;
@@ -548,7 +577,7 @@ static int sipr_decode_frame(AVCodecContext *avctx, void *datap,
 
 AVCodec sipr_decoder = {
     "sipr",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_SIPR,
     sizeof(SiprContext),
     sipr_decoder_init,