[FFmpeg-cvslog] r25980 - trunk/libavcodec/ac3enc.c

[jbr]

Author: jbr
Date: Tue Dec 14 15:52:25 2010
New Revision: 25980

Log:
Don't use nested loops to iterate valid sample rates.
Eliminates a goto and mirrors the bitrate validation.

Modified:
   trunk/libavcodec/ac3enc.c

Modified: trunk/libavcodec/ac3enc.c
==============================================================================
--- trunk/libavcodec/ac3enc.c	Tue Dec 14 15:52:21 2010	(r25979)
+++ trunk/libavcodec/ac3enc.c	Tue Dec 14 15:52:25 2010	(r25980)
@@ -1252,7 +1252,7 @@ static av_cold int set_channel_info(AC3E
 
 static av_cold int validate_options(AVCodecContext *avctx, AC3EncodeContext *s)
 {
-    int i, j;
+    int i;
 
     if (!avctx->channel_layout) {
         av_log(avctx, AV_LOG_WARNING, "No channel layout specified. The "
@@ -1265,16 +1265,16 @@ static av_cold int validate_options(AVCo
     }
 
     /* frequency */
-    for (i = 0; i < 3; i++) {
-        for (j = 0; j < 3; j++)
-            if ((ff_ac3_sample_rate_tab[j] >> i) == avctx->sample_rate)
-                goto found;
+    for (i = 0; i < 9; i++) {
+        if ((ff_ac3_sample_rate_tab[i / 3] >> (i % 3)) == avctx->sample_rate)
+            break;
     }
+    if (i == 9) {
     return -1;
- found:
+    }
     s->sample_rate        = avctx->sample_rate;
-    s->bit_alloc.sr_shift = i;
-    s->bit_alloc.sr_code  = j;
+    s->bit_alloc.sr_shift = i % 3;
+    s->bit_alloc.sr_code  = i / 3;
     s->bitstream_id       = 8 + s->bit_alloc.sr_shift;
     s->bitstream_mode     = 0; /* complete main audio service */