[FFmpeg-cvslog] avcodec/pcm-blurayenc: fix flawed logic in previous change

Paul B Mahol git at videolan.org
Mon May 2 20:36:29 EEST 2022


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon May  2 19:35:35 2022 +0200| [a84b95dc08da1174b4477e6250077bf22bb543b0] | committer: Paul B Mahol

avcodec/pcm-blurayenc: fix flawed logic in previous change

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

 libavcodec/pcm-blurayenc.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavcodec/pcm-blurayenc.c b/libavcodec/pcm-blurayenc.c
index 62c5dacdec..a139b54fe0 100644
--- a/libavcodec/pcm-blurayenc.c
+++ b/libavcodec/pcm-blurayenc.c
@@ -38,11 +38,11 @@ static av_cold int pcm_bluray_encode_init(AVCodecContext *avctx)
     switch (avctx->sample_fmt) {
     case AV_SAMPLE_FMT_S16:
         avctx->bits_per_coded_sample = 16;
-        frame_size = 120;
+        frame_size = 240;
         quant = 1;
         break;
     case AV_SAMPLE_FMT_S32:
-        frame_size = 180;
+        frame_size = 360;
         avctx->bits_per_coded_sample = 24;
         quant = 3;
         break;
@@ -55,19 +55,15 @@ static av_cold int pcm_bluray_encode_init(AVCodecContext *avctx)
         freq = 1;
         break;
     case 96000:
-        frame_size *= 2;
         freq = 4;
         break;
     case 192000:
-        frame_size *= 4;
         freq = 5;
         break;
     default:
         return AVERROR_BUG;
     }
 
-    frame_size *= avctx->ch_layout.nb_channels;
-
     switch (avctx->ch_layout.u.mask) {
     case AV_CH_LAYOUT_MONO:
         ch_layout = 1;



More information about the ffmpeg-cvslog mailing list