Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table

Browse source 
The bitrate modes are equal to the array indices.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2011-04-13 00:42:24 +03:00
parent 0e03f94d61
commit 5d211e034e
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libavcodec/libvo-amrwbenc.c
View file

@ -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, " "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"; "18.25k, 19.85k, 23.05k, or 23.85k\n";
typedef struct AMRWB_bitrates {
int rate;
int mode;
} AMRWB_bitrates;
typedef struct AMRWBContext { typedef struct AMRWBContext {
void *state; void *state;
int mode; int mode;
@ -41,20 +36,13 @@ typedef struct AMRWBContext {
static int getWBBitrateMode(int bitrate) static int getWBBitrateMode(int bitrate)
{ {
/* make the correspondance between bitrate and mode */ /* make the correspondance between bitrate and mode */
static const AMRWB_bitrates rates[] = { { 6600, 0}, static const int rates[] = { 6600, 8850, 12650, 14250, 15850, 18250,
{ 8850, 1}, 19850, 23050, 23850 };
{12650, 2},
{14250, 3},
{15850, 4},
{18250, 5},
{19850, 6},
{23050, 7},
{23850, 8}, };
int i; int i;
for (i = 0; i < 9; i++) for (i = 0; i < 9; i++)
if (rates[i].rate == bitrate) if (rates[i] == bitrate)
return rates[i].mode; return i;
/* no bitrate matching, return an error */ /* no bitrate matching, return an error */
return -1; return -1;
} }