[FFmpeg-soc] [soc]: r1115 - qcelp/qcelpdec.c

[reynaldo]

Author: reynaldo
Date: Tue Aug 21 04:49:50 2007
New Revision: 1115

Log:
TRIVIAL: Tying up some loose ends, a comment got moved too

Modified:
   qcelp/qcelpdec.c

Modified: qcelp/qcelpdec.c
==============================================================================
--- qcelp/qcelpdec.c	(original)
+++ qcelp/qcelpdec.c	Tue Aug 21 04:49:50 2007
@@ -364,6 +364,9 @@ static void qcelp_get_gain_scalefactors(
                                qcelp_compute_subframe_energy(out, i));
 }
 
+/**
+ * TIA/EIA/IS-733 2.4.8.6-6
+ */
 static void qcelp_apply_gain_ctrl(int do_iirf, const float *in, float *out)
 {
     int i;
@@ -371,8 +374,6 @@ static void qcelp_apply_gain_ctrl(int do
 
     qcelp_get_gain_scalefactors(in, out, scalefactors);
 
-    /* TIA/EIA/IS-733 2.4.8.6-6 */
-
     if(do_iirf)
     {
         scalefactors[0]*=0.0625;
@@ -732,9 +733,10 @@ static int qcelp_decode_frame(AVCodecCon
             order = NULL;
             break;
         default:
-            q->frame->rate = RATE_UNKNOWN;
-            q->frame->bits = 0;
-            av_log(avctx, AV_LOG_ERROR, "UNKNOWN PACKET RATE\n");
+            av_log(avctx, AV_LOG_ERROR, "Error decoding frame"
+                   " -- Unknown framerate, unsupported size: %d\n",
+                   buf_size);
+            return -1;
     }
 
     if(is_codecframe_fmt)
@@ -747,7 +749,7 @@ static int qcelp_decode_frame(AVCodecCon
            (claimed_rate ==  3 && q->frame->rate != RATE_HALF   ) ||
            (claimed_rate ==  4 && q->frame->rate != RATE_FULL   ))
         {
-           av_log(avctx, AV_LOG_ERROR,
+           av_log(avctx, AV_LOG_WARNING,
                   "Claimed rate and buffer size missmatch\n");
            is_ifq=1;
         }