[FFmpeg-cvslog] r19169 - trunk/libavcodec/wma.c
faust3
subversion
Fri Jun 12 17:38:11 CEST 2009
Author: faust3
Date: Fri Jun 12 17:38:11 2009
New Revision: 19169
Log:
Add additional sample rates to the frame len bits calculation code
Modified:
trunk/libavcodec/wma.c
Modified: trunk/libavcodec/wma.c
==============================================================================
--- trunk/libavcodec/wma.c Fri Jun 12 17:27:10 2009 (r19168)
+++ trunk/libavcodec/wma.c Fri Jun 12 17:38:11 2009 (r19169)
@@ -80,8 +80,24 @@ int av_cold ff_wma_get_frame_len_bits(in
else if (sample_rate <= 22050 ||
(sample_rate <= 32000 && version == 1))
frame_len_bits = 10;
- else
+ else if (sample_rate <= 48000) {
frame_len_bits = 11;
+ } else if (sample_rate <= 96000) {
+ frame_len_bits = 12;
+ } else {
+ frame_len_bits = 13;
+ }
+
+ if (version == 3) {
+ int tmp = decode_flags & 0x6;
+ if (tmp == 0x2) {
+ ++frame_len_bits;
+ } else if (tmp == 0x4) {
+ --frame_len_bits;
+ } else if (tmp == 0x6) {
+ frame_len_bits -= 2;
+ }
+ }
return frame_len_bits;
}
More information about the ffmpeg-cvslog
mailing list