videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Float output for libavcodec Vorbis decoder 

git-svn-id: https://ffdshow-tryout.svn.sourceforge.net/svnroot/ffdshow-tryout@3771 3b938f2f-1a1a-0410-8054-a526ea5ff92c
This commit is contained in:
clsid2 2011-03-07 00:46:59 +00:00 committed by Michael Niedermayer
parent c9d6da73a8
commit ba7a28045f
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/vorbis_dec.c
View File

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