Make ArrayView default contructable and add Packet::freeSideData()

Author: h4tr3d

src/avcpp/avutils.h

@@ -438,6 +438,7 @@ template<typename T, typename U, class Policy>
 class ArrayView : public std::ranges::view_interface<ArrayView<T, U, Policy>>
 {
 public:
+    constexpr ArrayView() = default;
     constexpr ArrayView(T *ptr, Policy policy)
         : m_ptr(ptr), m_policy(std::move(policy))
     {}

src/avcpp/frame.cpp

@@ -816,11 +816,15 @@ FrameSideData FrameCommon::allocateSideData(AVFrameSideDataType type, std::size_
 
 ArrayView<const AVFrameSideData *, FrameSideData, size_t> FrameCommon::sideData() const noexcept
 {
+    if (!m_raw) [[unlikely]]
+        return {};
     return make_array_view_size<FrameSideData>((const AVFrameSideData**)m_raw->side_data, m_raw->nb_side_data);
 }
 
 ArrayView<AVFrameSideData *, FrameSideData, size_t> FrameCommon::sideData() noexcept
 {
+    if (!m_raw) [[unlikely]]
+        return {};
     return make_array_view_size<FrameSideData>(m_raw->side_data, m_raw->nb_side_data);
 }
 

src/avcpp/packet.cpp

@@ -400,14 +400,25 @@ PacketSideData Packet::sideDataIndex(std::size_t index) noexcept
 
 ArrayView<AVPacketSideData, PacketSideData, std::size_t> Packet::sideData() noexcept
 {
+    if (!m_raw) [[unlikely]]
+        return {};
     return make_array_view_size<PacketSideData>(m_raw->side_data, m_raw->side_data_elems);
 }
 
 ArrayView<const AVPacketSideData, PacketSideData, std::size_t> Packet::sideData() const noexcept
 {
+    if (!m_raw) [[unlikely]]
+        return {};
     return make_array_view_size<PacketSideData>((const AVPacketSideData*)m_raw->side_data, m_raw->side_data_elems);
 }
 
+void Packet::freeSideData() noexcept
+{
+    if (!m_raw) [[unlikely]]
+        return;
+    av_packet_free_side_data(m_raw);
+}
+
 size_t Packet::sideDataCount() const noexcept
 {
     return m_raw ? m_raw->side_data_elems : 0;

src/avcpp/packet.h

@@ -173,6 +173,8 @@ class Packet :
     ArrayView<AVPacketSideData, PacketSideData, std::size_t> sideData() noexcept;
     ArrayView<const AVPacketSideData, PacketSideData, std::size_t> sideData() const noexcept;
 
+    void freeSideData() noexcept;
+
     /**
      * Add side data of the given type into packet. Data will be cloned.
      * @param type

tests/Frame.cpp

@@ -121,6 +121,21 @@ TEST_CASE("Core functionality", "[Frame]")
             REQUIRE(sd.empty());
         }
 
+        // Iterate on null frame
+        {
+            av::VideoFrame frame;
+            // its a hack to gen null for the nested m_raw
+            //auto ptr = frame.raw();
+            frame.reset();
+            REQUIRE(frame.raw() == nullptr);
+
+            int count{};
+            for (auto&& sd : frame.sideData()) {
+                ++count;
+            }
+            REQUIRE(count == 0);
+        }
+
         const int view_id = 31337;
         const int64_t gop_time = 11223344;
 

tests/Packet.cpp

@@ -194,6 +194,21 @@ TEST_CASE("Packet define", "[Packet][Construct]")
             REQUIRE(sd.empty());
         }
 
+        // Iterate on null packet
+        {
+            av::Packet pkt;
+            // its a hack to gen null for the nested m_raw
+            //auto ptr = frame.raw();
+            pkt.reset();
+            REQUIRE(pkt.raw() == nullptr);
+
+            int count{};
+            for (auto&& sd : pkt.sideData()) {
+                ++count;
+            }
+            REQUIRE(count == 0);
+        }
+
         std::string meta = "field=val;field2=val2";
 
         {