Convert to std::array and std::string. (libmythtv/mpeg 1)

These are mostly trivial changes from C arrays to C+++ arrays.
MythTV · Aug 28, 2020 · 0237257 · 0237257
1 parent 3ead301
commit 0237257
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/mythtv/libs/libmythtv/mpeg/AVCParser.cpp b/mythtv/libs/libmythtv/mpeg/AVCParser.cpp
@@ -96,8 +96,7 @@ void AVCParser::Reset(void)
     m_bottomFieldFlag     = -1;
     m_deltaPicOrderAlwaysZeroFlag = 0;
     m_deltaPicOrderCntBottom     = 0;
-    m_deltaPicOrderCnt[0]     = 0;
-    m_deltaPicOrderCnt[1]     = 0;
+    m_deltaPicOrderCnt.fill(0);
     m_fieldPicFlag     = -1;
     m_frameMbsOnlyFlag = -1;
     m_frameNum = -1;
@@ -114,8 +113,7 @@ void AVCParser::Reset(void)
     m_picParameterSetId = -1;
     m_prevBottomFieldFlag = -1;
     m_prevDeltaPicOrderCntBottom = 0;
-    m_prevDeltaPicOrderCnt[0] = 0;
-    m_prevDeltaPicOrderCnt[1] = 0;
+    m_prevDeltaPicOrderCnt.fill(0);
     m_prevFieldPicFlag = -1;
     m_prevFrameNum = -1;
     m_prevIdrPicId = 65536;

diff --git a/mythtv/libs/libmythtv/mpeg/AVCParser.h b/mythtv/libs/libmythtv/mpeg/AVCParser.h
@@ -23,6 +23,7 @@
 #ifndef AVCPARSER_H
 #define AVCPARSER_H
 
+#include <array>
 #include <H2645Parser.h>
 
 class AVCParser : public H2645Parser
@@ -137,12 +138,12 @@ class AVCParser : public H2645Parser
 
 
     int        m_deltaPicOrderCntBottom      {0};
-    int        m_deltaPicOrderCnt[2]         {0};
+    std::array<int,2> m_deltaPicOrderCnt     {0};
     int        m_frameNum                    {-1};
     int        m_picOrderCntLsb              {0};
     int        m_picParameterSetId           {-1};
     int        m_prevDeltaPicOrderCntBottom  {0};
-    int        m_prevDeltaPicOrderCnt[2]     {0};
+    std::array<int,2> m_prevDeltaPicOrderCnt {0};
     int        m_prevFrameNum                {-1};
     int        m_prevPicOrderCntLsb          {0};
     int        m_prevPicParameterSetId       {-1};

diff --git a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
@@ -2834,7 +2834,7 @@ class DVBContentIdentifierDescriptor : public MPEGDescriptor
     {
         size_t count  = 0;
 
-        memset ((void *) m_crid, 0, sizeof(m_crid));
+        m_crid.fill(nullptr);
 
         if (IsValid())
         {
@@ -2879,7 +2879,7 @@ class DVBContentIdentifierDescriptor : public MPEGDescriptor
 
   private:
     size_t m_cridCount;
-    const uint8_t *m_crid[8] {};
+    std::array<const uint8_t*,8> m_crid {};
 };
 
 // ETSI TS 102 323 (TV Anytime)

diff --git a/mythtv/libs/libmythtv/mpeg/pespacket.h b/mythtv/libs/libmythtv/mpeg/pespacket.h
@@ -238,7 +238,7 @@ class SequenceHeader
     SequenceHeader() {;} // only used via reinterpret cast
     ~SequenceHeader() {;}
 
-    unsigned char m_data[11] {};
+    std::array<unsigned char,11> m_data {};
     static const AspectArray kMpeg1Aspect;
     static const AspectArray kMpeg2Aspect;
     static const AspectArray kMpeg2Fps;

diff --git a/mythtv/libs/libmythtv/mpeg/splicedescriptors.h b/mythtv/libs/libmythtv/mpeg/splicedescriptors.h
@@ -160,7 +160,7 @@ class SegmentationDescriptor : public SpliceDescriptor
     explicit SegmentationDescriptor(const unsigned char *data, int len = 300) :
         SpliceDescriptor(data, len, SpliceDescriptorID::segmentation)
     {
-        _ptrs[2] = _ptrs[1] = _ptrs[0] = nullptr;
+        _ptrs.fill(nullptr);
         if (m_data && !SegmentationDescriptor::Parse())
             m_data = nullptr;
     }
@@ -280,5 +280,5 @@ class SegmentationDescriptor : public SpliceDescriptor
     // _ptrs[0] = program_segmentation_flag ? 12 : 13 + component_count * 6
     // _ptrs[1] = _ptrs[0] + HasSegmentationDuration() ? 5 : 0
     // _ptrs[2] = _ptrs[1] + 2 + SegmentationUPIDLength()
-    unsigned char const * _ptrs[3] {};
+    std::array<unsigned char const *,3> _ptrs {};
 };