Remove unused variables in tsPacket

Also use same order for class members definition and initialization.
justdan96 · Jan 11, 2022 · 3b5e847 · 3b5e847
1 parent 53f3965
commit 3b5e847
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 234 deletions.
diff --git a/tsMuxer/abstractStreamReader.h b/tsMuxer/abstractStreamReader.h
@@ -34,20 +34,21 @@ class AbstractStreamReader : public BaseAbstractStreamReader
         ctMultiH264,
         ctExternal
     };
+
     const static int NEED_MORE_DATA = 1;
     const static int INTERNAL_READ_ERROR = 2;
     AbstractStreamReader()
         : BaseAbstractStreamReader(),
           m_flags(0),
-          m_timeOffset(0),
           m_containerType(ContainerType::ctNone),
-          m_demuxMode(false),
-          m_secondary(false),
-          m_curPos(0),
+          m_timeOffset(0),
           m_buffer(0),
+          m_curPos(0),
           m_bufEnd(0),
           m_streamIndex(0),
-          m_tmpBufferLen(0)
+          m_tmpBufferLen(0),
+          m_demuxMode(false),
+          m_secondary(false)
     {
     }
     virtual ~AbstractStreamReader() {}

diff --git a/tsMuxer/avPacket.h b/tsMuxer/avPacket.h
@@ -31,7 +31,7 @@ class BaseAbstractStreamReader;
 struct AVPacket
 {
     AVPacket()
-        : pts(0), dts(0), data(0), size(0), stream_index(0), flags(0), duration(0), pos(0), pcr(0), codecID(0), codec()
+        : pts(0), dts(0), data(0), size(0), stream_index(0), flags(0), duration(0), pos(0), pcr(0), codec(), codecID(0)
     {
     }
     int64_t pts;  // presentation time stamp in time_base units

diff --git a/tsMuxer/metaDemuxer.h b/tsMuxer/metaDemuxer.h
@@ -113,7 +113,7 @@ class ContainerToReaderWrapper : public AbstractReader
     };
 
     ContainerToReaderWrapper(const METADemuxer& owner, const BufferedReaderManager& readManager)
-        : m_owner(owner), m_readManager(readManager), m_readBuffOffset(0)
+        : m_readBuffOffset(0), m_readManager(readManager), m_owner(owner)
     {
         BufferedReaderManager& brm = const_cast<BufferedReaderManager&>(readManager);
 

diff --git a/tsMuxer/nalUnits.h b/tsMuxer/nalUnits.h
@@ -78,17 +78,13 @@ class NALUnit
     const static int UNSUPPORTED_PARAM = 3;
     const static int NOT_FOUND = 4;
 
-
     NALType nal_unit_type;
     int nal_ref_idc;
 
     uint8_t* m_nalBuffer;
     int m_nalBufferLen;
 
-    NALUnit(uint8_t nalUnitType)
-        : nal_unit_type(), nal_ref_idc(0), m_nalBuffer(0), m_nalBufferLen(0), bitReader()
-    {
-    }
+    NALUnit(uint8_t nalUnitType) : nal_unit_type(), nal_ref_idc(0), m_nalBuffer(0), m_nalBufferLen(0), bitReader() {}
     NALUnit() : nal_unit_type(), nal_ref_idc(0), m_nalBuffer(0), m_nalBufferLen(0), bitReader() {}
     // NALUnit(const NALUnit& other);
     virtual ~NALUnit() { delete[] m_nalBuffer; }
@@ -144,8 +140,7 @@ class PPSUnit : public NALUnit
 {
    private:
     bool m_ready;
-    // int m_ppsLenInMbit;
-    // int entropy_coding_mode_BitPos;
+
    public:
     unsigned pic_parameter_set_id;
     unsigned seq_parameter_set_id;
@@ -155,10 +150,10 @@ class PPSUnit : public NALUnit
     PPSUnit()
         : NALUnit(),
           m_ready(false),
-          entropy_coding_mode_flag(true),
-          pic_order_present_flag(true),
           pic_parameter_set_id(0),
-          seq_parameter_set_id(0)
+          seq_parameter_set_id(0),
+          entropy_coding_mode_flag(true),
+          pic_order_present_flag(true)
     {
     }
     ~PPSUnit() override {}
@@ -278,14 +273,14 @@ class SEIUnit : public NALUnit
     SEIUnit()
         : NALUnit(),
           pic_struct(0),
-          number_of_offset_sequences(-1),
-          metadataPtsOffset(0),
-          m_mvcHeaderLen(0),
-          m_mvcHeaderStart(0),
           cpb_removal_delay(0),
           dpb_output_delay(0),
           initial_cpb_removal_delay(),
-          initial_cpb_removal_delay_offset()
+          initial_cpb_removal_delay_offset(),
+          number_of_offset_sequences(-1),
+          metadataPtsOffset(0),
+          m_mvcHeaderLen(0),
+          m_mvcHeaderStart(0)
     {
     }
     ~SEIUnit() override {}