Use av::CodecParametersView

Author: h4tr3d

src/codeccontext.cpp

@@ -9,6 +9,7 @@
 #include "packet.h"
 #include "dictionary.h"
 #include "codec.h"
+#include "codecparameters.h"
 
 #include "codeccontext.h"
 
@@ -311,7 +312,7 @@ CodecContext2::CodecContext2(const Stream &st, const Codec &codec, Direction dir
 #else
     m_raw = avcodec_alloc_context3(c.raw());
     if (m_raw) {
-        avcodec_parameters_to_context(m_raw, st.raw()->codecpar);
+        st.codecParameters().copyTo(*this);
     }
 #endif
 
@@ -397,8 +398,9 @@ void CodecContext2::setCodec(const Codec &codec, bool resetDefaults, Direction d
     FF_ENABLE_DEPRECATION_WARNINGS
 #else
     // TBD: need a check
-    if (m_stream.isValid())
-        avcodec_parameters_from_context(m_stream.raw()->codecpar, m_raw);
+    if (m_stream.isValid()) {
+        m_stream.codecParameters().copyFrom(*this);
+    }
 #endif
 }
 
@@ -507,9 +509,9 @@ void CodecContext2::copyContextFrom(const CodecContext2 &other, OptionalErrorCod
         throws_if(ec, stat, ffmpeg_category());
     FF_ENABLE_DEPRECATION_WARNINGS
 #else
-    AVCodecParameters params{};
-    avcodec_parameters_from_context(&params, other.m_raw);
-    avcodec_parameters_to_context(m_raw, &params);
+    CodecParameters params;
+    params.copyFrom(other);
+    params.copyTo(*this);
 #endif
     m_raw->codec_tag = 0;
 }

src/codecparameters.h

@@ -31,7 +31,7 @@ class CodecParametersView : public FFWrapperPtr<AVCodecParameters>
     int getAudioFrameDuration(int frame_bytes) const;
 };
 
-class CodecParameters : CodecParametersView, public noncopyable
+class CodecParameters : public CodecParametersView, public noncopyable
 {
 public:
     CodecParameters();

src/formatcontext.cpp

@@ -7,6 +7,7 @@
 
 #include "formatcontext.h"
 #include "codeccontext.h"
+#include "codecparameters.h"
 
 using namespace std;
 
@@ -901,12 +902,10 @@ Stream FormatContext::addStream(const CodecContext2 &ctx, OptionalErrorCode ec)
         return Stream();
     }
 
-    auto ret = avcodec_parameters_from_context(st->codecpar, ctx.raw());
-    if (ret < 0) {
-        throws_if(ec, ret, ffmpeg_category());
-    }
+    auto stream = Stream(m_monitor, st, Direction::Encoding);
+    stream.codecParameters().copyFrom(ctx, ec);
 
-    return Stream(m_monitor, st, Direction::Encoding);
+    return stream;
 }
 
 void FormatContext::writeTrailer(OptionalErrorCode ec)

src/stream.cpp

@@ -122,6 +122,18 @@ void Stream::setAverageFrameRate(const Rational &frameRate)
     RAW_SET2(isValid(), avg_frame_rate, frameRate.getValue());
 }
 
+CodecParametersView Stream::codecParameters() const
+{
+    return m_raw ? m_raw->codecpar : nullptr;
+}
+
+void Stream::setCodecParameters(CodecParametersView codecpar, OptionalErrorCode ec)
+{
+    if (m_raw && m_raw->codecpar) {
+        codecpar.copyTo(m_raw->codecpar, ec);
+    }
+}
+
 int Stream::eventFlags() const noexcept
 {
     if (!isValid() || m_direction != Direction::Decoding)
@@ -153,7 +165,7 @@ void Stream::setupEncodingParameters(const VideoEncoderContext &ctx, OptionalErr
         return;
     }
 
-    avcodec_parameters_from_context(m_raw->codecpar, ctx.raw());
+    codecParameters().copyFrom(ctx);
 }
 
 } // ::av

src/stream.h

@@ -6,6 +6,7 @@
 #include "ffmpeg.h"
 #include "rational.h"
 #include "timestamp.h"
+#include "codecparameters.h"
 
 namespace av
 {
@@ -56,6 +57,9 @@ class Stream : public FFWrapperPtr<AVStream>
     void setSampleAspectRatio(const Rational &aspectRatio);
     void setAverageFrameRate(const Rational &frameRate);
 
+    CodecParametersView codecParameters() const;
+    void setCodecParameters(CodecParametersView codecpar, OptionalErrorCode ec = throws());
+
     /**
      * Flags to the user to detect events happening on the stream.
      * A combination of AVSTREAM_EVENT_FLAG_*. Must be cleared by the user.