virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

libopencore-amr: Cosmetics: Rewrap and align

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2011-04-13 00:25:43 +03:00
parent 02c63a109f
commit 882221afde
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/libopencore-amr.c
View File

@ -53,14 +53,10 @@ typedef struct AMR_bitrates {
static int get_bitrate_mode(int bitrate) static int get_bitrate_mode(int bitrate)
{ {
/* make the correspondance between bitrate and mode */ /* make the correspondance between bitrate and mode */
static const AMR_bitrates rates[] = {{ 4750, MR475}, static const AMR_bitrates rates[] = {
{ 5150, MR515}, { 4750, MR475 }, { 5150, MR515 }, { 5900, MR59 }, { 6700, MR67 },
{ 5900, MR59}, { 7400, MR74 }, { 7950, MR795 }, { 10200, MR102 }, { 12200, MR122 }
{ 6700, MR67}, };
{ 7400, MR74},
{ 7950, MR795},
{10200, MR102},
{12200, MR122}, };
int i; int i;
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
@ -79,7 +75,7 @@ typedef struct AMRContext {
static av_cold int amr_nb_decode_init(AVCodecContext *avctx) static av_cold int amr_nb_decode_init(AVCodecContext *avctx)
{ {
AMRContext *s = avctx->priv_data; AMRContext *s = avctx->priv_data;
s->frame_count = 0; s->frame_count = 0;
s->dec_state = Decoder_Interface_init(); s->dec_state = Decoder_Interface_init();
@ -111,7 +107,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
AMRContext *s = avctx->priv_data; AMRContext *s = avctx->priv_data;
static const uint8_t block_size[16] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 }; static const uint8_t block_size[16] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };
enum Mode dec_mode; enum Mode dec_mode;
int packet_size; int packet_size;
@ -119,7 +115,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,
av_dlog(avctx, "amr_decode_frame buf=%p buf_size=%d frame_count=%d!!\n", av_dlog(avctx, "amr_decode_frame buf=%p buf_size=%d frame_count=%d!!\n",
buf, buf_size, s->frame_count); buf, buf_size, s->frame_count);
dec_mode = (buf[0] >> 3) & 0x000F; dec_mode = (buf[0] >> 3) & 0x000F;
packet_size = block_size[dec_mode] + 1; packet_size = block_size[dec_mode] + 1;
if (packet_size > buf_size) { if (packet_size > buf_size) {
@ -241,7 +237,7 @@ static av_cold int amr_wb_decode_init(AVCodecContext *avctx)
{ {
AMRWBContext *s = avctx->priv_data; AMRWBContext *s = avctx->priv_data;
s->state = D_IF_init(); s->state = D_IF_init();
amr_decode_fix_avctx(avctx); amr_decode_fix_avctx(avctx);
@ -258,7 +254,7 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data,
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
AMRWBContext *s = avctx->priv_data; AMRWBContext *s = avctx->priv_data;
int mode; int mode;
int packet_size; int packet_size;
static const uint8_t block_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1}; static const uint8_t block_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1};
@ -267,7 +263,7 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data,
/* nothing to do */ /* nothing to do */
return 0; return 0;
mode = (buf[0] >> 3) & 0x000F; mode = (buf[0] >> 3) & 0x000F;
packet_size = block_size[mode]; packet_size = block_size[mode];
if (packet_size > buf_size) { if (packet_size > buf_size) {