diff options
| author | Martin Storsjö <martin@martin.st> | 2011-04-13 00:42:24 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-04-13 11:30:38 +0300 |
| commit | 5d211e034eebbbbb006d236d810ebf0516484b51 (patch) | |
| tree | 2e8fc60cd7bd9f2c1b1f12827d41879dc7dd437b /libavcodec/libvo-amrwbenc.c | |
| parent | 0e03f94d61dbfc8b4a33eef1f0227ec791abb5fe (diff) | |
libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table
The bitrate modes are equal to the array indices.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/libvo-amrwbenc.c')
| -rw-r--r-- | libavcodec/libvo-amrwbenc.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index 8ef4f81638..aa89b7fe05 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 getWBBitrateMode(int bitrate) { /* make the correspondance between bitrate and mode */ - static const 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; } |