From 1a98ba56da8ba7cebf136922fcf7006cd4c9d51f Mon Sep 17 00:00:00 2001 From: Jiajian Wu Date: Tue, 11 Oct 2022 09:21:10 +0800 Subject: [PATCH 14/14] riff: Fix bps caculation error for ADPCM The bps shall be caculated according to: ADPCM: rate * blockalign / ((blockalign - ch * 7) / ch * 2) DVI ADPCM: rate * blockalign / ((blockalign - ch * 4) / ch * 2) cus the sample size is 4bit in ADPCM witch is half of raw pcm. Signed-off-by: Jiajian Wu --- gst-libs/gst/riff/riff-media.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 74f99d6..6298884 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -1310,7 +1310,7 @@ gst_riff_create_audio_caps (guint16 codec_id, * would probably confuse timing */ strf->av_bps = 0; if (strf->channels != 0 && strf->rate != 0 && strf->blockalign != 0) { - int spb = ((strf->blockalign - strf->channels * 7) / 2) * 2; + int spb = ((strf->blockalign - strf->channels * 7) / strf->channels) * 2; strf->av_bps = gst_util_uint64_scale_int (strf->rate, strf->blockalign, spb); GST_DEBUG ("fixing av_bps to calculated value %d of MS ADPCM", @@ -1432,7 +1432,7 @@ gst_riff_create_audio_caps (guint16 codec_id, * as this would probably confuse timing */ strf->av_bps = 0; if (strf->channels != 0 && strf->rate != 0 && strf->blockalign != 0) { - int spb = ((strf->blockalign - strf->channels * 4) / 2) * 2; + int spb = ((strf->blockalign - strf->channels * 4) / strf->channels) * 2; strf->av_bps = gst_util_uint64_scale_int (strf->rate, strf->blockalign, spb); GST_DEBUG ("fixing av_bps to calculated value %d of IMA DVI ADPCM", -- 2.20.1