BUILD: replace codecParams->ch_layout.nb_channels by codecParams->channels, it...

BUILD: replace codecParams->ch_layout.nb_channels by codecParams->channels, it seems the old way of doing things no longer compiles...

src/Lib/AbstractMediaContext.hh

@@ -84,7 +84,7 @@ protected:
         VIVY_LOG_CTOR() << "Codec: " << VIVY_LOG_QUOTED(codec->name) << ", id: " << codecId;
         VIVY_LOG_CTOR() << "Sample rate: " << codecParams->sample_rate;
         VIVY_LOG_CTOR() << "Bit rate: " << codecParams->bit_rate;
-        VIVY_LOG_CTOR() << "Channels: " << codecParams->ch_layout.nb_channels;
+        VIVY_LOG_CTOR() << "Channels: " << codecParams->channels;
     }
 
 public:

src/Lib/Audio.cc

@@ -31,7 +31,7 @@ AudioStream::AudioStream(const AVCodec *streamCodec, AVFormatContext *formatPtr,
     : Super(streamCodec, formatPtr, streamArg, index)
 {
     SwrContext *s = dataSwrContext.get();
-    av_opt_set_int(s, "in_channel_count", codecContext->ch_layout.nb_channels, 0);
+    av_opt_set_int(s, "in_channel_count", codecContext->channels, 0);
     av_opt_set_int(s, "out_channel_count", 1, 0);
     av_opt_set_int(s, "out_channel_layout", AV_CH_LAYOUT_MONO, 0);
     av_opt_set_int(s, "in_sample_rate", codecContext->sample_rate, 0);
@@ -58,7 +58,7 @@ AudioStream::getProperties() const noexcept
     QJsonObject ret = Super::getProperties();
     ret.insert("Sample rate", codecParams->sample_rate);
     ret.insert("Bit rate", static_cast<int>(codecParams->bit_rate));
-    ret.insert("Channels", codecParams->ch_layout.nb_channels);
+    ret.insert("Channels", codecParams->channels);
     return ret;
 }
 
@@ -128,7 +128,7 @@ AudioStream::decodeData()
                 dataPtr                  = reinterpret_cast<double *>(
                     realloc(dataPtr, (dataSize + static_cast<size_t>(dataFrame->nb_samples)) *
                                                           sizeof(double)));
-                memcpy(dataPtr + dataSize, buffer, frame_count * sizeof(double));
+                memcpy(&dataPtr[dataSize], buffer, frame_count * sizeof(double));
                 dataSize += frame_count;
             }
         }
@@ -154,7 +154,7 @@ AudioStream::cleanUpData() noexcept
 int
 AudioStream::getChannels() const noexcept
 {
-    return codecContext->ch_layout.nb_channels;
+    return codecContext->channels;
 }
 
 // Get the sample rate