generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ff_get_audio_frame_size: try to fix wma in wav

Browse Source 
Fixes Ticket1905, Ticket2114

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2713e43ac8)
This commit is contained in:
Michael Niedermayer
2013-01-06 19:15:16 +01:00
committed by Carl Eugen Hoyos
parent 10ac44198d
commit 302d2591dc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/utils.c
View File

@@ -846,6 +846,13 @@ static int get_audio_frame_size(AVCodecContext *enc, int size, int mux)
if (enc->frame_size > 1) if (enc->frame_size > 1)
return enc->frame_size; return enc->frame_size;
//For WMA we currently have no other means to calculate duration thus we
//do it here by assuming CBR, which is true for all known cases.
if(!mux && enc->bit_rate>0 && size>0 && enc->sample_rate>0 && enc->block_align>1) {
if (enc->codec_id == AV_CODEC_ID_WMAV1 || enc->codec_id == AV_CODEC_ID_WMAV2)
return ((int64_t)size * 8 * enc->sample_rate) / enc->bit_rate;
}
return -1; return -1;
} }