xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-06 12:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

av_get_audio_frame_duration: fix ra144

Browse Source 
Fixes Ticket1612

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-16 02:57:11 +02:00
parent 6ecf1eb0dd
commit 747774ece9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/utils.c
View File

@ -2187,7 +2187,6 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
case AV_CODEC_ID_AMR_NB: case AV_CODEC_ID_AMR_NB:
case AV_CODEC_ID_GSM: case AV_CODEC_ID_GSM:
case AV_CODEC_ID_QCELP: case AV_CODEC_ID_QCELP:
case AV_CODEC_ID_RA_144:
case AV_CODEC_ID_RA_288: return 160; case AV_CODEC_ID_RA_288: return 160;
case AV_CODEC_ID_IMC: return 256; case AV_CODEC_ID_IMC: return 256;
case AV_CODEC_ID_AMR_WB: case AV_CODEC_ID_AMR_WB:
@ -2235,6 +2234,8 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
return 240 * (frame_bytes / 32); return 240 * (frame_bytes / 32);
if (id == AV_CODEC_ID_NELLYMOSER) if (id == AV_CODEC_ID_NELLYMOSER)
return 256 * (frame_bytes / 64); return 256 * (frame_bytes / 64);
if (id == AV_CODEC_ID_RA_144)
return 160 * (frame_bytes / 20);
if (bps > 0) { if (bps > 0) {
/* calc from frame_bytes and bits_per_coded_sample */ /* calc from frame_bytes and bits_per_coded_sample */