RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Store the frame size in the LibSpeexContext in case the header does not exist. 

Originally committed as revision 19741 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2009-08-29 21:04:18 +00:00
parent e78516c6d8
commit 6833385d30
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/libspeexdec.c
View File

@ -29,6 +29,7 @@ typedef struct {
SpeexStereoState stereo; SpeexStereoState stereo;
void *dec_state; void *dec_state;
SpeexHeader *header; SpeexHeader *header;
int frame_size;
} LibSpeexContext; } LibSpeexContext;
@ -52,7 +53,7 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
if (s->header) { if (s->header) {
avctx->sample_rate = s->header->rate; avctx->sample_rate = s->header->rate;
avctx->channels = s->header->nb_channels; avctx->channels = s->header->nb_channels;
avctx->frame_size = s->header->frame_size; avctx->frame_size = s->frame_size = s->header->frame_size;
if (s->header->frames_per_packet) if (s->header->frames_per_packet)
avctx->frame_size *= s->header->frames_per_packet; avctx->frame_size *= s->header->frames_per_packet;
@ -76,8 +77,10 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
return -1; return -1;
} }
if (!s->header) if (!s->header) {
speex_decoder_ctl(s->dec_state, SPEEX_GET_FRAME_SIZE, &avctx->frame_size); speex_decoder_ctl(s->dec_state, SPEEX_GET_FRAME_SIZE, &avctx->frame_size);
s->frame_size = avctx->frame_size;
}
if (avctx->channels == 2) { if (avctx->channels == 2) {
SpeexCallback callback; SpeexCallback callback;
@ -100,7 +103,7 @@ static int libspeex_decode_frame(AVCodecContext *avctx,
int16_t *output = data, *end; int16_t *output = data, *end;
int i, num_samples; int i, num_samples;
num_samples = s->header->frame_size * avctx->channels; num_samples = s->frame_size * avctx->channels;
end = output + *data_size / sizeof(*output); end = output + *data_size / sizeof(*output);
speex_bits_read_from(&s->bits, buf, buf_size); speex_bits_read_from(&s->bits, buf, buf_size);
@ -115,12 +118,12 @@ static int libspeex_decode_frame(AVCodecContext *avctx,
break; break;
if (avctx->channels == 2) if (avctx->channels == 2)
speex_decode_stereo_int(output, s->header->frame_size, &s->stereo); speex_decode_stereo_int(output, s->frame_size, &s->stereo);
output += num_samples; output += num_samples;
} }
avctx->frame_size = s->header->frame_size * i; avctx->frame_size = s->frame_size * i;
*data_size = avctx->channels * avctx->frame_size * sizeof(*output); *data_size = avctx->channels * avctx->frame_size * sizeof(*output);
return buf_size; return buf_size;
} }