Author: faust3
Date: Tue Mar 3 21:57:40 2009
New Revision: 4152
Log:
moved bitstream reader context to the decoder context and its init to wma_decode_frame
Modified:
wmapro/wma3.h
wmapro/wma3dec.c
Modified: wmapro/wma3.h
==============================================================================
--- wmapro/wma3.h Tue Mar 3 21:25:50 2009 (r4151)
+++ wmapro/wma3.h Tue Mar 3 21:57:40 2009 (r4152)
@@ -132,7 +132,7 @@ typedef struct WMA3DecodeContext {
/** frame decode state */
unsigned int frame_num; //< current frame number
- GetBitContext* getbit; //< bitstream reader context
+ GetBitContext getbit; //< bitstream reader context
int buf_bit_size; //< buffer size in bits
int16_t* samples; //< current samplebuffer pointer
int16_t* samples_end; //< maximum samplebuffer pointer
Modified: wmapro/wma3dec.c
==============================================================================
--- wmapro/wma3dec.c Tue Mar 3 21:25:50 2009 (r4151)
+++ wmapro/wma3dec.c Tue Mar 3 21:57:40 2009 (r4152)
@@ -461,7 +461,7 @@ static int wma_decode_tilehdr(WMA3Decode
/** check if this is the start of a new frame */
if(missing_samples == s->num_channels * s->samples_per_frame){
- s->no_tiling = get_bits1(s->getbit);
+ s->no_tiling = get_bits1(&s->getbit);
}
if(s->no_tiling){
@@ -494,7 +494,7 @@ static int wma_decode_tilehdr(WMA3Decode
int num_bits = total_num_bits;
if(num_bits > 32)
num_bits = 32;
- tileinfo |= get_bits_long(s->getbit,num_bits);
+ tileinfo |= get_bits_long(&s->getbit,num_bits);
total_num_bits -= num_bits;
num_bits = total_num_bits;
tileinfo <<= (num_bits > 32)? 32 : num_bits;
@@ -507,13 +507,13 @@ static int wma_decode_tilehdr(WMA3Decode
int log2_subframe_len = 0;
/* 1 bit indicates if the subframe length is zero */
if(subframe_len_zero_bit){
- if(get_bits1(s->getbit)){
+ if(get_bits1(&s->getbit)){
log2_subframe_len =
- get_bits(s->getbit,subframe_len_bits-1);
+ get_bits(&s->getbit,subframe_len_bits-1);
++log2_subframe_len;
}
}else
- log2_subframe_len = get_bits(s->getbit,subframe_len_bits);
+ log2_subframe_len = get_bits(&s->getbit,subframe_len_bits);
if(s->lossless){
subframe_len =
@@ -600,7 +600,7 @@ static int wma_decode_channel_transform(
}else{
int remaining_channels = s->channels_for_cur_subframe;
- if(get_bits(s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
av_log(s->avctx,AV_LOG_ERROR,"unsupported channel transform bit\n");
return 0;
}
@@ -618,7 +618,7 @@ static int wma_decode_channel_transform(
for(i=0;i<s->channels_for_cur_subframe;i++){
int channel_idx = s->channel_indexes_for_cur_subframe[i];
if(!s->channel[channel_idx].grouped
- && get_bits(s->getbit,1)){
+ && get_bits(&s->getbit,1)){
++chgroup->num_channels;
s->channel[channel_idx].grouped = 1;
chgroup->use_channel[channel_idx] = 1;
@@ -643,8 +643,8 @@ static int wma_decode_channel_transform(
chgroup->decorrelation_matrix[0] = 1.0;
}else if(chgroup->num_channels == 2){
- if(get_bits(s->getbit,1)){
- if(!get_bits(s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
+ if(!get_bits(&s->getbit,1)){
chgroup->no_rotation = 1;
chgroup->transform = 2;
chgroup->decorrelation_matrix[0] = 1.0;
@@ -661,8 +661,8 @@ static int wma_decode_channel_transform(
chgroup->decorrelation_matrix[3] = 0.70703125;
}
}else{
- if(get_bits(s->getbit,1)){
- if(get_bits(s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
chgroup->no_rotation = 0;
chgroup->transform = 0;
}else{
@@ -692,10 +692,10 @@ static int wma_decode_channel_transform(
int n_offset = chgroup->num_channels * (chgroup->num_channels - 1) / 2;
int i;
for(i=0;i<n_offset;i++){
- chgroup->rotation_offset[i] = get_bits(s->getbit,6);
+ chgroup->rotation_offset[i] = get_bits(&s->getbit,6);
}
for(i=0;i<chgroup->num_channels;i++)
- chgroup->positive[i] = get_bits(s->getbit,1);
+ chgroup->positive[i] = get_bits(&s->getbit,1);
}
/* decode transform on / off */
@@ -705,11 +705,11 @@ static int wma_decode_channel_transform(
for(i=0;i<s->num_bands;i++)
chgroup->transform_band[i] = 1;
}else{
- if(get_bits(s->getbit,1) == 0){
+ if(get_bits(&s->getbit,1) == 0){
int i;
// transform works on individual scale factor bands
for(i=0;i< s->num_bands;i++){
- chgroup->transform_band[i] = get_bits(s->getbit,1);
+ chgroup->transform_band[i] = get_bits(&s->getbit,1);
}
}else{
int i;
@@ -727,16 +727,16 @@ static int wma_decode_channel_transform(
static unsigned int wma_get_large_val(WMA3DecodeContext* s)
{
int n_bits = 8;
- if(get_bits(s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
n_bits += 8;
- if(get_bits(s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
n_bits += 8;
- if(get_bits(s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
n_bits += 7;
}
}
}
- return get_bits_long(s->getbit,n_bits);
+ return get_bits_long(&s->getbit,n_bits);
}
static inline void wma_get_vec4(WMA3DecodeContext *s,int* vals,int* masks)
@@ -744,18 +744,18 @@ static inline void wma_get_vec4(WMA3Deco
unsigned int idx;
int i = 0;
// read 4 values
- idx = get_vlc2(s->getbit, s->vec4_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC4_MAXBITS+VLCBITS-1)/VLCBITS));
+ idx = get_vlc2(&s->getbit, s->vec4_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC4_MAXBITS+VLCBITS-1)/VLCBITS));
if ( idx == FF_WMA3_HUFF_VEC4_SIZE - 1 )
{
while(i < 4){
- idx = get_vlc2(s->getbit, s->vec2_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC2_MAXBITS+VLCBITS-1)/VLCBITS));
+ idx = get_vlc2(&s->getbit, s->vec2_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC2_MAXBITS+VLCBITS-1)/VLCBITS));
if ( idx == FF_WMA3_HUFF_VEC2_SIZE - 1 ){
- vals[i] = get_vlc2(s->getbit, s->vec1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC1_MAXBITS+VLCBITS-1)/VLCBITS));
+ vals[i] = get_vlc2(&s->getbit, s->vec1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC1_MAXBITS+VLCBITS-1)/VLCBITS));
if(vals[i] == FF_WMA3_HUFF_VEC1_SIZE - 1)
vals[i] += wma_get_large_val(s);
- vals[i+1] = get_vlc2(s->getbit, s->vec1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC1_MAXBITS+VLCBITS-1)/VLCBITS));
+ vals[i+1] = get_vlc2(&s->getbit, s->vec1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC1_MAXBITS+VLCBITS-1)/VLCBITS));
if(vals[i+1] == FF_WMA3_HUFF_VEC1_SIZE - 1)
vals[i+1] += wma_get_large_val(s);
}else{
@@ -774,13 +774,13 @@ static inline void wma_get_vec4(WMA3Deco
}
if(vals[0])
- masks[0] = get_bits(s->getbit,1);
+ masks[0] = get_bits(&s->getbit,1);
if(vals[1])
- masks[1] = get_bits(s->getbit,1);
+ masks[1] = get_bits(&s->getbit,1);
if(vals[2])
- masks[2] = get_bits(s->getbit,1);
+ masks[2] = get_bits(&s->getbit,1);
if(vals[3])
- masks[3] = get_bits(s->getbit,1);
+ masks[3] = get_bits(&s->getbit,1);
}
static int decode_coeffs(WMA3DecodeContext *s, int c)
@@ -797,7 +797,7 @@ static int decode_coeffs(WMA3DecodeConte
av_log(s->avctx,AV_LOG_DEBUG,"decode coefficients for channel %i\n",c);
- vlctable = get_bits(s->getbit, 1);
+ vlctable = get_bits(&s->getbit, 1);
vlc = &s->coef_vlc[vlctable];
vlcmax = s->coef_max[vlctable];
@@ -814,28 +814,28 @@ static int decode_coeffs(WMA3DecodeConte
unsigned int idx;
int mask;
int val;
- idx = get_vlc2(s->getbit, vlc->table, VLCBITS, vlcmax);
+ idx = get_vlc2(&s->getbit, vlc->table, VLCBITS, vlcmax);
if( idx == 1)
return 0;
else if( !idx ){
val = wma_get_large_val(s);
/** escape decode */
- if(get_bits(s->getbit,1)){
- if(get_bits(s->getbit,1)){
- if(get_bits(s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
av_log(s->avctx,AV_LOG_ERROR,"broken escape sequence\n");
return 0;
}else
- cur_coeff += get_bits(s->getbit,s->esc_len) + 4;
+ cur_coeff += get_bits(&s->getbit,s->esc_len) + 4;
}else
- cur_coeff += get_bits(s->getbit,2) + 1;
+ cur_coeff += get_bits(&s->getbit,2) + 1;
}
}else{
cur_coeff += run[idx];
val = level[idx];
}
- mask = get_bits(s->getbit,1) - 1;
+ mask = get_bits(&s->getbit,1) - 1;
ci->coeffs[cur_coeff] = (val^mask) - mask;
++cur_coeff;
}else{
@@ -892,7 +892,7 @@ static int wma_decode_scale_factors(WMA3
}
if(s->channel[c].cur_subframe > 0){
- s->channel[c].transmit_sf = get_bits(s->getbit,1);
+ s->channel[c].transmit_sf = get_bits(&s->getbit,1);
}else
s->channel[c].transmit_sf = 1;
@@ -901,9 +901,9 @@ static int wma_decode_scale_factors(WMA3
if(!s->channel[c].reuse_sf){
int i;
- s->channel[c].scale_factor_step = get_bits(s->getbit,2) + 1;
+ s->channel[c].scale_factor_step = get_bits(&s->getbit,2) + 1;
for(i=0;i<s->num_bands;i++){
- int val = get_vlc2(s->getbit, s->sf_vlc.table, SCALEVLCBITS, ((FF_WMA3_HUFF_SCALE_MAXBITS+SCALEVLCBITS-1)/SCALEVLCBITS)); // DPCM-coded
+ int val = get_vlc2(&s->getbit, s->sf_vlc.table, SCALEVLCBITS, ((FF_WMA3_HUFF_SCALE_MAXBITS+SCALEVLCBITS-1)/SCALEVLCBITS)); // DPCM-coded
if(!i)
s->channel[c].scale_factors[i] = 45 / s->channel[c].scale_factor_step + val - 60;
else
@@ -920,10 +920,10 @@ static int wma_decode_scale_factors(WMA3
short level_mask;
short val;
- idx = get_vlc2(s->getbit, s->sf_rl_vlc.table, VLCBITS, ((FF_WMA3_HUFF_SCALE_RL_MAXBITS+VLCBITS-1)/VLCBITS));
+ idx = get_vlc2(&s->getbit, s->sf_rl_vlc.table, VLCBITS, ((FF_WMA3_HUFF_SCALE_RL_MAXBITS+VLCBITS-1)/VLCBITS));
if( !idx ){
- uint32_t mask = get_bits(s->getbit,14);
+ uint32_t mask = get_bits(&s->getbit,14);
level_mask = mask >> 6;
val = (mask & 1) - 1;
skip = (0x3f & mask)>>1;
@@ -932,7 +932,7 @@ static int wma_decode_scale_factors(WMA3
}else{
skip = ff_wma3_scale_rl_run[idx];
level_mask = ff_wma3_scale_rl_level[idx];
- val = get_bits(s->getbit,1)-1;
+ val = get_bits(&s->getbit,1)-1;
}
i += skip;
@@ -1104,8 +1104,7 @@ static int wma_decode_subframe(WMA3Decod
int total_samples = s->samples_per_frame * s->num_channels;
int transmit_coeffs = 0;
- bitstreamcounter = get_bits_count(s->getbit);
-
+ bitstreamcounter = get_bits_count(&s->getbit);
/** reset channel context and find the next block offset and size
== the next block of the channel with the smallest number of decoded samples
@@ -1177,20 +1176,20 @@ static int wma_decode_subframe(WMA3Decod
s->esc_len = av_log2(s->subframe_len - 1) + 1;
/** skip extended header if any */
- if(get_bits(s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
int num_fill_bits;
- if(!(num_fill_bits = get_bits(s->getbit,2))){
- num_fill_bits = get_bits(s->getbit,4);
- num_fill_bits = get_bits(s->getbit,num_fill_bits) + 1;
+ if(!(num_fill_bits = get_bits(&s->getbit,2))){
+ num_fill_bits = get_bits(&s->getbit,4);
+ num_fill_bits = get_bits(&s->getbit,num_fill_bits) + 1;
}
if(num_fill_bits >= 0){
- skip_bits(s->getbit,num_fill_bits);
+ skip_bits(&s->getbit,num_fill_bits);
}
}
/** no idea for what the following bit is used */
- if(get_bits(s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
av_log(s->avctx,AV_LOG_ERROR,"reserved bit set\n");
return 0;
}
@@ -1202,7 +1201,7 @@ static int wma_decode_subframe(WMA3Decod
for(i=0;i<s->channels_for_cur_subframe;i++){
int c = s->channel_indexes_for_cur_subframe[i];
- if((s->channel[c].transmit_coefs = get_bits(s->getbit,1)))
+ if((s->channel[c].transmit_coefs = get_bits(&s->getbit,1)))
transmit_coeffs = 1;
}
@@ -1212,12 +1211,12 @@ static int wma_decode_subframe(WMA3Decod
int quant;
int sign = 1;
int large_quant = 0;
- if((get_bits(s->getbit,1))){ /** FIXME: might influence how often getvec4 may be called */
+ if((get_bits(&s->getbit,1))){ /** FIXME: might influence how often getvec4 may be called */
av_log(s->avctx,AV_LOG_ERROR,"unsupported quant step coding\n");
return 0;
}
/** decode quantization step */
- quant = get_bits(s->getbit,6);
+ quant = get_bits(&s->getbit,6);
if(quant & 0x20){
quant |= 0xFFFFFFC0u;
sign = -1;
@@ -1226,7 +1225,7 @@ static int wma_decode_subframe(WMA3Decod
if(quant <= -32 || quant > 30)
large_quant = 1;
while(large_quant){
- quant = get_bits(s->getbit,5);
+ quant = get_bits(&s->getbit,5);
if(quant != 31){
s->quant_step += quant * sign;
break;
@@ -1244,13 +1243,13 @@ static int wma_decode_subframe(WMA3Decod
if(s->channels_for_cur_subframe == 1)
s->channel[s->channel_indexes_for_cur_subframe[0]].quant_step_modifier = 0;
else{
- int modifier_len = get_bits(s->getbit,3);
+ int modifier_len = get_bits(&s->getbit,3);
for(i=0;i<s->channels_for_cur_subframe;i++){
int c = s->channel_indexes_for_cur_subframe[i];
s->channel[c].quant_step_modifier = 0;
- if(get_bits(s->getbit,1)){
+ if(get_bits(&s->getbit,1)){
if(modifier_len)
- s->channel[c].quant_step_modifier = get_bits(s->getbit,modifier_len) + 1;
+ s->channel[c].quant_step_modifier = get_bits(&s->getbit,modifier_len) + 1;
else
s->channel[c].quant_step_modifier = 1;
}else
@@ -1264,7 +1263,7 @@ static int wma_decode_subframe(WMA3Decod
return 0;
}
- av_log(s->avctx,AV_LOG_DEBUG,"BITSTREAM: subframe header length was %i\n",get_bits_count(s->getbit) - bitstreamcounter);
+ av_log(s->avctx,AV_LOG_DEBUG,"BITSTREAM: subframe header length was %i\n",get_bits_count(&s->getbit) - bitstreamcounter);
/** parse coefficients */
for(i=0;i<s->channels_for_cur_subframe;i++){
@@ -1273,7 +1272,7 @@ static int wma_decode_subframe(WMA3Decod
decode_coeffs(s,c);
}
- av_log(s->avctx,AV_LOG_DEBUG,"BITSTREAM: subframe length was %i\n",get_bits_count(s->getbit) - bitstreamcounter);
+ av_log(s->avctx,AV_LOG_DEBUG,"BITSTREAM: subframe length was %i\n",get_bits_count(&s->getbit) - bitstreamcounter);
if(transmit_coeffs){
wma_inverse_channel_transform(s);
@@ -1340,14 +1339,14 @@ static int wma_decode_subframe(WMA3Decod
*@return 0 if the trailer bit indicates that this is the last frame,
* 1 if there are more frames
*/
-static int wma_decode_frame(WMA3DecodeContext *s,GetBitContext* gb)
+static int wma_decode_frame(WMA3DecodeContext *s)
{
- unsigned int gb_start_count = get_bits_count(gb);
+ GetBitContext* gb = &s->getbit;
int more_frames = 0;
int len = 0;
int i;
- s->getbit = gb;
+ init_get_bits(&s->getbit, s->frame_data,s->prev_packet_bit_size);
/** check for potential output buffer overflow */
if(s->samples + s->num_channels * s->samples_per_frame > s->samples_end){
@@ -1455,12 +1454,12 @@ static int wma_decode_frame(WMA3DecodeCo
// FIXME: remove
- av_log(s->avctx,AV_LOG_DEBUG,"frame[%i] skipping %i bits\n",s->frame_num,len - (get_bits_count(gb) - gb_start_count) - 1);
- if(len - (get_bits_count(gb) - gb_start_count) - 1 != 1)
+ av_log(s->avctx,AV_LOG_DEBUG,"frame[%i] skipping %i bits\n",s->frame_num,len - get_bits_count(gb) - 1);
+ if(len != get_bits_count(gb) + 2)
assert(0);
/** skip the rest of the frame data */
- skip_bits_long(gb,len - (get_bits_count(gb) - gb_start_count) - 1);
+ skip_bits_long(gb,len - get_bits_count(gb) - 1);
/** decode trailer bit */
more_frames = get_bits1(gb);
@@ -1580,12 +1579,8 @@ static int wma3_decode_packet(AVCodecCon
s->prev_packet_bit_size);
/** decode the cross packet frame if it is valid */
- if(!s->packet_loss){
- GetBitContext gb_prev;
- init_get_bits(&gb_prev, s->frame_data,
- s->prev_packet_bit_size);
- wma_decode_frame(s,&gb_prev);
- }
+ if(!s->packet_loss)
+ wma_decode_frame(s);
}else if(s->prev_packet_bit_size){
av_log(avctx, AV_LOG_DEBUG, "ignoring %x previously saved bits\n",
s->prev_packet_bit_size);
@@ -1600,14 +1595,11 @@ static int wma3_decode_packet(AVCodecCon
/** there is enough data for a full frame */
if(remaining_bits(s,&gb) >= frame_size){
- GetBitContext gb_prev;
s->prev_packet_bit_size = 0;
save_bits(s,&gb,frame_size);
- init_get_bits(&gb_prev, s->frame_data,
- s->prev_packet_bit_size);
/** decode the frame */
- more_frames = wma_decode_frame(s,&gb_prev);
+ more_frames = wma_decode_frame(s);
if(!more_frames){
av_log(avctx, AV_LOG_DEBUG, "no more frames\n");
