get rid of IsValid from cDxr3PesFrame

3 files changed, 2 insertions, 27 deletions

diff --git a/dxr3demuxdevice.c b/dxr3demuxdevice.c
index b711c6c..4c67685 100644
--- a/dxr3demuxdevice.c
+++ b/dxr3demuxdevice.c
@@ -242,9 +242,7 @@ int cDxr3DemuxDevice::DemuxPes(const uint8_t* buf, int length, bool bAc3Dts)
     {
         cDxr3PesFrame pesFrame;
 
-        pesFrame.parse(buf, length);
-
-        if (!pesFrame.IsValid()) {
+        if (!pesFrame.parse(buf, length)) {
             return -1;
         }
 
@@ -513,13 +511,10 @@ int cDxr3DemuxDevice::DemuxAudioPes(const uint8_t* buf, int length)
     {
         cDxr3PesFrame pesFrame;
 
-        pesFrame.parse(buf, length);
-
-        if (!pesFrame.IsValid()) {
+        if (!pesFrame.parse(buf, length)) {
             return -1;
         }
 
-
         if (pesFrame.GetPesDataType() == cDxr3PesFrame::PES_PRIVATE_DATA) {
             if (m_synchState != DXR3_DEMUX_AUDIO_SYNCHED &&
                 syncCounter > 2) {
diff --git a/dxr3pesframe.c b/dxr3pesframe.c
index 6077de0..0edfe41 100644
--- a/dxr3pesframe.c
+++ b/dxr3pesframe.c
@@ -38,8 +38,6 @@ bool cDxr3PesFrame::parse(const uint8_t *pes, uint32_t length)
         return false;
     }
 
-    m_bValid = true;
-
     // handle stream id
     switch (pes[3]) {
     case 0xBD: // private stream 1
diff --git a/dxr3pesframe.h b/dxr3pesframe.h
index 345f184..50f30d8 100644
--- a/dxr3pesframe.h
+++ b/dxr3pesframe.h
@@ -103,7 +103,6 @@ public:
 public:
     cDxr3PesFrame() :
 	m_pesDataType(PES_UNKNOWN_DATA),
-	m_bValid(false),
 	m_pPesStart(0),
 	m_payload(0),
 	m_payloadLength(0),
@@ -122,78 +121,62 @@ public:
 
     ePesDataType GetPesDataType() const
     {
-        assert(m_bValid);
         return m_pesDataType;
     }
 
     const uint8_t* GetPesStart() const
     {
-        assert(m_bValid);
         return m_pPesStart;
     }
 
     const uint8_t* GetPayload() const
     {
-        assert(m_bValid);
         return m_payload;
     }
 
     uint32_t GetPayloadLength() const
     {
-        assert(m_bValid);
         return m_payloadLength;
     }
 
     uint32_t GetPts() const
     {
-        assert(m_bValid);
         return m_pts;
     }
 
     eVideoFrameType GetFrameType() const
     {
-        assert(m_bValid);
         assert(m_pesDataType == PES_VIDEO_DATA);
         return m_videoFrameType;
     }
 
     uint32_t GetAspectRatio() const
     {
-        assert(m_bValid);
         assert(m_pesDataType == PES_VIDEO_DATA);
         return m_aspectRatio;
     }
 
     uint32_t GetHorizontalSize() const
     {
-        assert(m_bValid);
         assert(m_pesDataType == PES_VIDEO_DATA);
         return m_horizontalSize;
     }
 
     uint32_t GetVerticalSize() const
     {
-        assert(m_bValid);
         assert(m_pesDataType == PES_VIDEO_DATA);
         return m_verticalSize;
     }
 
     int GetOffset() const
     {
-        assert(m_bValid);
         return m_offset;
     }
 
-    bool IsValid()
-    {
-        return m_bValid;
-    }
-
 protected:
     void InitData()
     {
         m_pesDataType = PES_UNKNOWN_DATA;
-        m_bValid = false;
         m_pPesStart = 0;
         m_payload = 0;
         m_payloadLength = 0;
@@ -208,7 +191,6 @@ protected:
     }
 
     ePesDataType m_pesDataType;
-    bool m_bValid;
     const uint8_t* m_pPesStart;
     const uint8_t* m_payload;
     uint32_t m_payloadLength;