Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

cosmetics: Fix indentation.

Browse Source 
Originally committed as revision 8622 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Diego Biurrun 18 years ago
parent 8896cdd379
commit e7b85a15c8
1 changed files with 50 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 100
      libavcodec/amr.c

100
libavcodec/amr.c
Unescape View File

@ -260,68 +260,68 @@ static int amr_nb_decode_frame(AVCodecContext * avctx,
synth=data; synth=data;
toc=amrData[offset]; toc=amrData[offset];
/* read rest of the frame based on ToC byte */ /* read rest of the frame based on ToC byte */
q = (toc >> 2) & 0x01; q = (toc >> 2) & 0x01;
ft = (toc >> 3) & 0x0F; ft = (toc >> 3) & 0x0F;
//printf("offset=%d, packet_size=%d amrData= 0x%X %X %X %X\n",offset,packed_size[ft],amrData[offset],amrData[offset+1],amrData[offset+2],amrData[offset+3]); //printf("offset=%d, packet_size=%d amrData= 0x%X %X %X %X\n",offset,packed_size[ft],amrData[offset],amrData[offset+1],amrData[offset+2],amrData[offset+3]);
offset++; offset++;
packed_bits=amrData+offset; packed_bits=amrData+offset;
offset+=packed_size[ft]; offset+=packed_size[ft];
//Unsort and unpack bits //Unsort and unpack bits
s->rx_type = UnpackBits(q, ft, packed_bits, &s->mode, &serial[1]); s->rx_type = UnpackBits(q, ft, packed_bits, &s->mode, &serial[1]);
//We have a new frame //We have a new frame
s->frameCount++; s->frameCount++;
if (s->rx_type == RX_NO_DATA) if (s->rx_type == RX_NO_DATA)
{ {
s->mode = s->speech_decoder_state->prev_mode; s->mode = s->speech_decoder_state->prev_mode;
} }
else { else {
s->speech_decoder_state->prev_mode = s->mode; s->speech_decoder_state->prev_mode = s->mode;
} }
/* if homed: check if this frame is another homing frame */ /* if homed: check if this frame is another homing frame */
if (s->reset_flag_old == 1) if (s->reset_flag_old == 1)
{ {
/* only check until end of first subframe */ /* only check until end of first subframe */
s->reset_flag = decoder_homing_frame_test_first(&serial[1], s->mode); s->reset_flag = decoder_homing_frame_test_first(&serial[1], s->mode);
} }
/* produce encoder homing frame if homed & input=decoder homing frame */ /* produce encoder homing frame if homed & input=decoder homing frame */
if ((s->reset_flag != 0) && (s->reset_flag_old != 0)) if ((s->reset_flag != 0) && (s->reset_flag_old != 0))
{ {
for (i = 0; i < L_FRAME; i++) for (i = 0; i < L_FRAME; i++)
{
synth[i] = EHF_MASK;
}
}
else
{ {
/* decode frame */ synth[i] = EHF_MASK;
Speech_Decode_Frame(s->speech_decoder_state, s->mode, &serial[1], s->rx_type, synth);
} }
}
else
{
/* decode frame */
Speech_Decode_Frame(s->speech_decoder_state, s->mode, &serial[1], s->rx_type, synth);
}
//Each AMR-frame results in 160 16-bit samples //Each AMR-frame results in 160 16-bit samples
*data_size+=160*2; *data_size+=160*2;
/* if not homed: check whether current frame is a homing frame */ /* if not homed: check whether current frame is a homing frame */
if (s->reset_flag_old == 0) if (s->reset_flag_old == 0)
{ {
/* check whole frame */ /* check whole frame */
s->reset_flag = decoder_homing_frame_test(&serial[1], s->mode); s->reset_flag = decoder_homing_frame_test(&serial[1], s->mode);
} }
/* reset decoder if current frame is a homing frame */ /* reset decoder if current frame is a homing frame */
if (s->reset_flag != 0) if (s->reset_flag != 0)
{ {
Speech_Decode_Frame_reset(s->speech_decoder_state); Speech_Decode_Frame_reset(s->speech_decoder_state);
} }
s->reset_flag_old = s->reset_flag; s->reset_flag_old = s->reset_flag;
return offset; return offset;
} }

Write Preview
Loading…
Cancel
Save