Replace comments by error messages.

[ffmpeg] / libavcodec / ra144.c

diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index 757b8755c6f2ccd7a081bb73ebf9bdf07b83811c..95d9e70cbdd380a61e0de6e4101f2981c5f6f570 100644 (file)
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -174,7 +174,7 @@ static void final(const int16_t *i1, const int16_t *i2,
     memcpy(statbuf, work + 40, 20);
 }
 
-static unsigned int rms(const int *data, int f)
+static unsigned int rms(const int *data, int f, RA144Context *ractx)
 {
     int x;
     unsigned int res = 0x10000;
@@ -186,8 +186,10 @@ static unsigned int rms(const int *data, int f)
         if (res == 0)
             return 0;
 
-        if (res > 0x10000)
-            return 0; /* We're screwed, might as well go out with a bang. :P */
+        if (res > 0x10000) {
+            av_log(ractx, AV_LOG_ERROR, "Overflow. Broken sample?\n");
+            return 0;
+        }
 
         while (res <= 0x3fff) {
             b++;
@@ -206,7 +208,7 @@ static unsigned int rms(const int *data, int f)
 
 /* do quarter-block output */
 static void do_output_subblock(RA144Context *ractx,
-                               const uint16_t  *gsp, unsigned int gval,
+                               const uint16_t  *lpc_coefs, unsigned int gval,
                                int16_t *output_buffer, GetBitContext *gb)
 {
     uint16_t buffer_a[40];
@@ -236,17 +238,15 @@ static void do_output_subblock(RA144Context *ractx,
     add_wav(gain, cba_idx, m, buffer_a, etable1[cb1_idx], etable2[cb2_idx],
             block);
 
-    final(gsp, block, output_buffer, ractx->buffer, BLOCKSIZE);
+    final(lpc_coefs, block, output_buffer, ractx->buffer, BLOCKSIZE);
 }
 
-static int dec1(int16_t *decsp, const int *data, const int *inp, int f)
+static void int_to_int16(int16_t *decsp, const int *inp)
 {
     int i;
 
     for (i=0; i<30; i++)
         *(decsp++) = *(inp++);
-
-    return rms(data, f);
 }
 
 /**
@@ -256,7 +256,7 @@ static int dec1(int16_t *decsp, const int *data, const int *inp, int f)
  * @return 1 if one of the reflection coefficients is of magnitude greater than
  *         4095, 0 if not.
  */
-static int eval_refl(const int16_t *coefs, int *refl)
+static int eval_refl(const int16_t *coefs, int *refl, RA144Context *ractx)
 {
     int retval = 0;
     int b, c, i;
@@ -271,8 +271,10 @@ static int eval_refl(const int16_t *coefs, int *refl)
 
     u = refl[9] = bp2[9];
 
-    if (u + 0x1000 > 0x1fff)
-        return 0; /* We're screwed, might as well go out with a bang. :P */
+    if (u + 0x1000 > 0x1fff) {
+        av_log(ractx, AV_LOG_ERROR, "Overflow. Broken sample?\n");
+        return 0;
+    }
 
     for (c=8; c >= 0; c--) {
         if (u == 0x1000)
@@ -299,8 +301,8 @@ static int eval_refl(const int16_t *coefs, int *refl)
     return retval;
 }
 
-static int dec2(RA144Context *ractx, int16_t *decsp, int block_num,
-                int copynew, int f)
+static int interp(RA144Context *ractx, int16_t *decsp, int block_num,
+                  int copynew, int energy)
 {
     int work[10];
     int a = block_num + 1;
@@ -312,15 +314,18 @@ static int dec2(RA144Context *ractx, int16_t *decsp, int block_num,
     for (x=0; x<30; x++)
         decsp[x] = (a * ractx->lpc_coef[x] + b * ractx->lpc_coef_old[x])>> 2;
 
-    if (eval_refl(decsp, work)) {
+    if (eval_refl(decsp, work, ractx)) {
         // The interpolated coefficients are unstable, copy either new or old
         // coefficients
-        if (copynew)
-            return dec1(decsp, ractx->lpc_refl, ractx->lpc_coef, f);
-        else
-            return dec1(decsp, ractx->lpc_refl_old, ractx->lpc_coef_old, f);
+        if (copynew) {
+            int_to_int16(decsp, ractx->lpc_coef);
+            return rms(ractx->lpc_refl, energy, ractx);
+        } else {
+            int_to_int16(decsp, ractx->lpc_coef_old);
+            return rms(ractx->lpc_refl_old, energy, ractx);
+        }
     } else {
-        return rms(work, f);
+        return rms(work, energy, ractx);
     }
 }
 
@@ -331,7 +336,7 @@ static int ra144_decode_frame(AVCodecContext * avctx,
 {
     static const uint8_t sizes[10] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2};
     unsigned int refl_rms[4];  // RMS of the reflection coefficients
-    uint16_t gbuf2[4][30];
+    uint16_t block_coefs[4][30]; // LPC coefficients of each sub-block
     int i, c;
     int16_t *data = vdata;
     unsigned int energy;
@@ -354,15 +359,17 @@ static int ra144_decode_frame(AVCodecContext * avctx,
 
     energy = decodeval[get_bits(&gb, 5) << 1]; // Useless table entries?
 
-    refl_rms[0] = dec2(ractx, gbuf2[0], 0, 0, ractx->old_energy);
-    refl_rms[1] = dec2(ractx, gbuf2[1], 1, energy > ractx->old_energy,
+    refl_rms[0] = interp(ractx, block_coefs[0], 0, 0, ractx->old_energy);
+    refl_rms[1] = interp(ractx, block_coefs[1], 1, energy > ractx->old_energy,
                     t_sqrt(energy*ractx->old_energy) >> 12);
-    refl_rms[2] = dec2(ractx, gbuf2[2], 2, 1, energy);
-    refl_rms[3] = dec1(gbuf2[3], ractx->lpc_refl, ractx->lpc_coef, energy);
+    refl_rms[2] = interp(ractx, block_coefs[2], 2, 1, energy);
+    refl_rms[3] = rms(ractx->lpc_refl, energy, ractx);
+
+    int_to_int16(block_coefs[3], ractx->lpc_coef);
 
     /* do output */
     for (c=0; c<4; c++) {
-        do_output_subblock(ractx, gbuf2[c], refl_rms[c], data, &gb);
+        do_output_subblock(ractx, block_coefs[c], refl_rms[c], data, &gb);
 
         for (i=0; i<BLOCKSIZE; i++) {
             *data = av_clip_int16(*data << 2);