diff mbox series

[FFmpeg-devel,146/281] smacker: convert to new channel layout API

Message ID 20220113015806.519-28-jamrial@gmail.com
State Accepted
Commit 677fea79b794236a3d791120d0ba3c832caedb17
Headers show
Series New channel layout API | expand

Commit Message

James Almer Jan. 13, 2022, 1:58 a.m. UTC 
From: Vittorio Giovara <vittorio.giovara@gmail.com>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/smacker.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 98436bd708..80d36f2f40 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -186,13 +186,8 @@  static int smacker_read_header(AVFormatContext *s)
             } else {
                 par->codec_id  = AV_CODEC_ID_PCM_U8;
             }
-            if (aflag & SMK_AUD_STEREO) {
-                par->channels       = 2;
-                par->channel_layout = AV_CH_LAYOUT_STEREO;
-            } else {
-                par->channels       = 1;
-                par->channel_layout = AV_CH_LAYOUT_MONO;
-            }
+            av_channel_layout_default(&par->ch_layout,
+                                      !!(aflag & SMK_AUD_STEREO) + 1);
             par->sample_rate = rate;
             par->bits_per_coded_sample = (aflag & SMK_AUD_16BITS) ? 16 : 8;
             if (par->bits_per_coded_sample == 16 &&
@@ -200,7 +195,7 @@  static int smacker_read_header(AVFormatContext *s)
                 par->codec_id = AV_CODEC_ID_PCM_S16LE;
             else
                 smk->duration_size[i] = 4;
-            avpriv_set_pts_info(ast, 64, 1, par->sample_rate * par->channels
+            avpriv_set_pts_info(ast, 64, 1, par->sample_rate * par->ch_layout.nb_channels
                                             * par->bits_per_coded_sample / 8);
         }
     }