atrac1: give a valid context pointer to av_log().

[ffmpeg] / libavcodec / g729dec.c

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 155bf14a5694c89b03099bec046cbe269db8c0f6..d76567974fe89d74517d369bc782997698e89442 100644 (file)
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -18,13 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include <stdlib.h>
+
 #include <inttypes.h>
-#include <limits.h>
-#include <stdio.h>
 #include <string.h>
-#include <math.h>
-#include <assert.h>
 
 #include "avcodec.h"
 #include "libavutil/avutil.h"
@@ -336,6 +332,16 @@ static int16_t g729d_voice_decision(int onset, int prev_voice_decision, const in
     return voice_decision;
 }
 
+static int32_t scalarproduct_int16_c(const int16_t * v1, const int16_t * v2, int order, int shift)
+{
+    int res = 0;
+
+    while (order--)
+        res += (*v1++ * *v2++) >> shift;
+
+    return res;
+}
+
 static av_cold int decoder_init(AVCodecContext * avctx)
 {
     G729Context* ctx = avctx->priv_data;
@@ -371,8 +377,8 @@ static av_cold int decoder_init(AVCodecContext * avctx)
     for(i=0; i<4; i++)
         ctx->quant_energy[i] = -14336; // -14 in (5.10)
 
-    avctx->dsp_mask = FF_MM_MMX | FF_MM_SSE2;
     dsputil_init(&ctx->dsp, avctx);
+    ctx->dsp.scalarproduct_int16 = scalarproduct_int16_c;
 
     return 0;
 }
@@ -384,7 +390,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     int buf_size       = avpkt->size;
     int16_t *out_frame = data;
     GetBitContext gb;
-    G729FormatDescription format;
+    const G729FormatDescription *format;
     int frame_erasure = 0;    ///< frame erasure detected during decoding
     int bad_pitch = 0;        ///< parity check failed
     int i;
@@ -412,14 +418,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
     if (buf_size == 10) {
         packet_type = FORMAT_G729_8K;
-        format = format_g729_8k;
+        format = &format_g729_8k;
         //Reset voice decision
         ctx->onset = 0;
         ctx->voice_decision = DECISION_VOICE;
         av_log(avctx, AV_LOG_DEBUG, "Packet type: %s\n", "G.729 @ 8kbit/s");
     } else if (buf_size == 8) {
         packet_type = FORMAT_G729D_6K4;
-        format = format_g729d_6k4;
+        format = &format_g729d_6k4;
         av_log(avctx, AV_LOG_DEBUG, "Packet type: %s\n", "G.729D @ 6.4kbit/s");
     } else {
         av_log(avctx, AV_LOG_ERROR, "Packet size %d is unknown.\n", buf_size);
@@ -430,7 +436,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         frame_erasure |= buf[i];
     frame_erasure = !frame_erasure;
 
-    init_get_bits(&gb, buf, buf_size);
+    init_get_bits(&gb, buf, 8*buf_size);
 
     ma_predictor     = get_bits(&gb, 1);
     quantizer_1st    = get_bits(&gb, VQ_1ST_BITS);
@@ -467,13 +473,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         uint8_t gc_1st_index;  ///< gain codebook (first stage) index
         uint8_t gc_2nd_index;  ///< gain codebook (second stage) index
 
-        ac_index      = get_bits(&gb, format.ac_index_bits[i]);
-        if(!i && format.parity_bit)
+        ac_index      = get_bits(&gb, format->ac_index_bits[i]);
+        if(!i && format->parity_bit)
             bad_pitch = get_parity(ac_index) == get_bits1(&gb);
-        fc_indexes    = get_bits(&gb, format.fc_indexes_bits);
-        pulses_signs  = get_bits(&gb, format.fc_signs_bits);
-        gc_1st_index  = get_bits(&gb, format.gc_1st_index_bits);
-        gc_2nd_index  = get_bits(&gb, format.gc_2nd_index_bits);
+        fc_indexes    = get_bits(&gb, format->fc_indexes_bits);
+        pulses_signs  = get_bits(&gb, format->fc_signs_bits);
+        gc_1st_index  = get_bits(&gb, format->gc_1st_index_bits);
+        gc_2nd_index  = get_bits(&gb, format->gc_2nd_index_bits);
 
         if (frame_erasure)
             pitch_delay_3x   = 3 * ctx->pitch_delay_int_prev;
@@ -497,7 +503,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
         if (frame_erasure) {
             ctx->rand_value = g729_prng(ctx->rand_value);
-            fc_indexes   = ctx->rand_value & ((1 << format.fc_indexes_bits) - 1);
+            fc_indexes   = ctx->rand_value & ((1 << format->fc_indexes_bits) - 1);
 
             ctx->rand_value = g729_prng(ctx->rand_value);
             pulses_signs = ctx->rand_value;
@@ -608,6 +614,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
             SUBFRAME_SIZE,
             10,
             1,
+            0,
             0x800))
             /* Overflow occured, downscale excitation signal... */
             for (j = 0; j < 2 * SUBFRAME_SIZE + PITCH_DELAY_MAX + INTERPOL_LEN; j++)
@@ -629,6 +636,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
                     SUBFRAME_SIZE,
                     10,
                     0,
+                    0,
                     0x800);
         } else {
             ff_celp_lp_synthesis_filter(
@@ -638,6 +646,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
                     SUBFRAME_SIZE,
                     10,
                     0,
+                    0,
                     0x800);
         }
         /* Save data (without postfilter) for use in next subframe. */
@@ -649,7 +658,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
             gain_before += FFABS(synth[j+10]);
 
         /* Call postfilter and also update voicing decision for use in next frame. */
-        g729_postfilter(
+        ff_g729_postfilter(
                 &ctx->dsp,
                 &ctx->ht_prev_data,
                 &is_periodic,
@@ -666,7 +675,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         for(j=0; j<SUBFRAME_SIZE; j++)
             gain_after += FFABS(synth[j+10]);
 
-        ctx->gain_coeff = g729_adaptive_gain_control(
+        ctx->gain_coeff = ff_g729_adaptive_gain_control(
                 gain_before,
                 gain_after,
                 synth+10,