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

wmavoice: use init_static_data

Browse Source
This commit is contained in:
Luca Barbato 2013-06-29 03:10:59 +02:00
parent 04e9853a21
commit f5c48f5ada
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/wmavoice.c
View File

@ -304,6 +304,20 @@ typedef struct {
* @return 0 on success, <0 on error. * @return 0 on success, <0 on error.
*/ */
static av_cold int decode_vbmtree(GetBitContext *gb, int8_t vbm_tree[25]) static av_cold int decode_vbmtree(GetBitContext *gb, int8_t vbm_tree[25])
{
int cntr[8] = { 0 }, n, res;
memset(vbm_tree, 0xff, sizeof(vbm_tree[0]) * 25);
for (n = 0; n < 17; n++) {
res = get_bits(gb, 3);
if (cntr[res] > 3) // should be >= 3 + (res == 7))
return -1;
vbm_tree[res * 3 + cntr[res]++] = n;
}
return 0;
}
static av_cold void wmavoice_init_static_data(AVCodec *codec)
{ {
static const uint8_t bits[] = { static const uint8_t bits[] = {
2, 2, 2, 4, 4, 4, 2, 2, 2, 4, 4, 4,
@ -320,18 +334,9 @@ static av_cold int decode_vbmtree(GetBitContext *gb, int8_t vbm_tree[25])
0x0ffc, 0x0ffd, 0x0ffe, // 1111111111+00/01/10 0x0ffc, 0x0ffd, 0x0ffe, // 1111111111+00/01/10
0x3ffc, 0x3ffd, 0x3ffe, 0x3fff // 111111111111+xx 0x3ffc, 0x3ffd, 0x3ffe, 0x3fff // 111111111111+xx
}; };
int cntr[8] = { 0 }, n, res;
memset(vbm_tree, 0xff, sizeof(vbm_tree[0]) * 25);
for (n = 0; n < 17; n++) {
res = get_bits(gb, 3);
if (cntr[res] > 3) // should be >= 3 + (res == 7))
return -1;
vbm_tree[res * 3 + cntr[res]++] = n;
}
INIT_VLC_STATIC(&frame_type_vlc, VLC_NBITS, sizeof(bits), INIT_VLC_STATIC(&frame_type_vlc, VLC_NBITS, sizeof(bits),
bits, 1, 1, codes, 2, 2, 132); bits, 1, 1, codes, 2, 2, 132);
return 0;
} }
/** /**
@ -2052,6 +2057,7 @@ AVCodec ff_wmavoice_decoder = {
.id = AV_CODEC_ID_WMAVOICE, .id = AV_CODEC_ID_WMAVOICE,
.priv_data_size = sizeof(WMAVoiceContext), .priv_data_size = sizeof(WMAVoiceContext),
.init = wmavoice_decode_init, .init = wmavoice_decode_init,
.init_static_data = wmavoice_init_static_data,
.close = wmavoice_decode_end, .close = wmavoice_decode_end,
.decode = wmavoice_decode_packet, .decode = wmavoice_decode_packet,
.capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,