[11/12] libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table

Message ID 1302645498-12642-11-git-send-email-martin@martin.st
State Committed
Headers show

Commit Message

Martin Storsjö April 12, 2011, 9:58 p.m.
The bitrate modes are equal to the array indices.
---
 libavcodec/libvo-amrwbenc.c |   20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)

Comments

Ronald Bultje April 12, 2011, 11:41 p.m. | #1
Hi,

On Tue, Apr 12, 2011 at 5:58 PM, Martin Storsjö <martin@martin.st> wrote:
> The bitrate modes are equal to the array indices.
> ---
>  libavcodec/libvo-amrwbenc.c |   20 ++++----------------
>  1 files changed, 4 insertions(+), 16 deletions(-)

OK.

Ronald

Patch

diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c
index cfd1bac..e55fdc6 100644
--- a/libavcodec/libvo-amrwbenc.c
+++ b/libavcodec/libvo-amrwbenc.c
@@ -27,11 +27,6 @@  static const char wb_bitrate_unsupported[] =
     "bitrate not supported: use one of 6.6k, 8.85k, 12.65k, 14.25k, 15.85k, "
     "18.25k, 19.85k, 23.05k, or 23.85k\n";
 
-typedef struct AMRWB_bitrates {
-    int rate;
-    int mode;
-} AMRWB_bitrates;
-
 typedef struct AMRWBContext {
     void  *state;
     int    mode;
@@ -41,20 +36,13 @@  typedef struct AMRWBContext {
 static int get_wb_bitrate_mode(int bitrate)
 {
     /* make the correspondance between bitrate and mode */
-    AMRWB_bitrates rates[] = { { 6600, 0},
-                               { 8850, 1},
-                               {12650, 2},
-                               {14250, 3},
-                               {15850, 4},
-                               {18250, 5},
-                               {19850, 6},
-                               {23050, 7},
-                               {23850, 8}, };
+    static const int rates[] = {  6600,  8850, 12650, 14250, 15850, 18250,
+                                 19850, 23050, 23850 };
     int i;
 
     for (i = 0; i < 9; i++)
-        if (rates[i].rate == bitrate)
-            return rates[i].mode;
+        if (rates[i] == bitrate)
+            return i;
     /* no bitrate matching, return an error */
     return -1;
 }