[FFmpeg-cvslog] avcodec/utils: unbreak BINKAUDIO_DCT duration calculation

Paul B Mahol git at videolan.org
Thu Feb 4 18:55:08 EET 2021


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Feb  3 01:37:21 2021 +0100| [89e2fbceee0b7b71d86dc32b0f3dad1864fa018f] | committer: Paul B Mahol

avcodec/utils: unbreak BINKAUDIO_DCT duration calculation

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89e2fbceee0b7b71d86dc32b0f3dad1864fa018f
---

 libavcodec/utils.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a1ae9cab18..4d1909b581 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1668,14 +1668,10 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba,
             return 256 * sr / 245;
         else if (id == AV_CODEC_ID_DST)
             return 588 * sr / 44100;
-
-        if (ch > 0) {
-            /* calc from sample rate and channels */
-            if (id == AV_CODEC_ID_BINKAUDIO_DCT) {
-                if (sr / 22050 > 22)
-                    return 0;
-                return (480 << (sr / 22050)) / ch;
-            }
+        else if (id == AV_CODEC_ID_BINKAUDIO_DCT) {
+            if (sr / 22050 > 22)
+                return 0;
+            return (480 << (sr / 22050));
         }
 
         if (id == AV_CODEC_ID_MP3)



More information about the ffmpeg-cvslog mailing list