highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vorbisdec: allow selecting float output at runtime.

Browse Source
This commit is contained in:
Reimar Döffinger
2011-04-25 12:22:26 +02:00
parent 26d5a4b6b4
commit 5aff31b136
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/vorbisdec.c
View File

@@ -1007,12 +1007,9 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext)
avccontext->channels = vc->audio_channels; avccontext->channels = vc->audio_channels;
avccontext->sample_rate = vc->audio_samplerate; avccontext->sample_rate = vc->audio_samplerate;
avccontext->frame_size = FFMIN(vc->blocksize[0], vc->blocksize[1]) >> 2; avccontext->frame_size = FFMIN(vc->blocksize[0], vc->blocksize[1]) >> 2;
/* ffdshow custom code */ avccontext->sample_fmt =
#if CONFIG_AUDIO_FLOAT avccontext->request_sample_fmt == AV_SAMPLE_FMT_FLT ?
avccontext->sample_fmt = AV_SAMPLE_FMT_FLT; AV_SAMPLE_FMT_FLT : AV_SAMPLE_FMT_S16;
#else
avccontext->sample_fmt = AV_SAMPLE_FMT_S16;
#endif
return 0 ; return 0 ;
} }
@@ -1640,15 +1637,15 @@ static int vorbis_decode_frame(AVCodecContext *avccontext,
len * ff_vorbis_channel_layout_offsets[vc->audio_channels - 1][i]; len * ff_vorbis_channel_layout_offsets[vc->audio_channels - 1][i];
} }
/* ffdshow custom code */ *data_size = len * vc->audio_channels;
#if CONFIG_AUDIO_FLOAT if (avccontext->sample_fmt == AV_SAMPLE_FMT_FLT) {
float_interleave(data, channel_ptrs, len, vc->audio_channels); float_interleave(data, channel_ptrs, len, vc->audio_channels);
*data_size = len * sizeof(float) * vc->audio_channels; *data_size *= sizeof(float);
#else } else {
vc->fmt_conv.float_to_int16_interleave(data, channel_ptrs, len, vc->fmt_conv.float_to_int16_interleave(data, channel_ptrs, len,
vc->audio_channels); vc->audio_channels);
*data_size = len * 2 * vc->audio_channels; *data_size *= 2;
#endif }
return buf_size ; return buf_size ;
} }