Mass indentation/whitespace cleanup.

1 files changed, 168 insertions, 80 deletions

diff --git a/dxr3pesframe.h b/dxr3pesframe.h
index 99c9b35..d4e6677 100644
--- a/dxr3pesframe.h
+++ b/dxr3pesframe.h
@@ -30,7 +30,7 @@ const int ASPECTRATIO_4_3 = 0;
 const int ASPECTRATIO_16_9 = 1;
 
 // ==================================
-enum eVideoFrameType 
+enum eVideoFrameType
 {
     I_FRAME,
     P_FRAME,
@@ -41,105 +41,194 @@ enum eVideoFrameType
 // ==================================
 // XXX: Should we use here std:vector?
 template <class T>
-class cDxr3SafeArray 
+class cDxr3SafeArray
 {
 public:
     // ==================================
-    enum eSafeArrayException 
-	{
-        SAFE_ARRAY_INDEX_OUT_OF_BOUND
+    enum eSafeArrayException
+    {
+	SAFE_ARRAY_INDEX_OUT_OF_BOUND
     };
 
-    cDxr3SafeArray(T* pBuf, uint32_t length) : m_pBuf(pBuf), m_length(length) {};
-    cDxr3SafeArray(const cDxr3SafeArray& from) : m_pBuf(from.m_pBuf), m_length(from.m_length) {};
+    cDxr3SafeArray(T* pBuf, uint32_t length) :
+	m_pBuf(pBuf), m_length(length) {};
+    cDxr3SafeArray(const cDxr3SafeArray& from) :
+	m_pBuf(from.m_pBuf), m_length(from.m_length) {};
     virtual ~cDxr3SafeArray() {};
-  
-    T& operator[](uint32_t index) throw (eSafeArrayException) { if (index >= m_length) throw(SAFE_ARRAY_INDEX_OUT_OF_BOUND); return m_pBuf[index];};
-    cDxr3SafeArray SubArray(uint32_t offset, uint32_t length) { if (offset + length > m_length) throw(SAFE_ARRAY_INDEX_OUT_OF_BOUND); return cDxr3SafeArray(m_pBuf + offset, length);};
 
-    uint32_t GetLength(void) { return m_length; };
+    T& operator[](uint32_t index) throw (eSafeArrayException)
+    {
+	if (index >= m_length)
+	    throw(SAFE_ARRAY_INDEX_OUT_OF_BOUND);
+	return m_pBuf[index];
+    };
+    cDxr3SafeArray SubArray(uint32_t offset, uint32_t length)
+    {
+	if (offset + length > m_length)
+	    throw(SAFE_ARRAY_INDEX_OUT_OF_BOUND);
+	return cDxr3SafeArray(m_pBuf + offset, length);
+    };
+
+    uint32_t GetLength(void)
+    {
+	return m_length;
+    };
+
 protected:
     T* m_pBuf;
     uint32_t m_length;
 
 private:
-    cDxr3SafeArray(); // no standard constructor        
+    cDxr3SafeArray(); // no standard constructor
 };
 
 
 // ==================================
 // pes - packetized elementary stream
-class cDxr3PesFrame 
+class cDxr3PesFrame
 {
 public:
 
-	// ==================================
-    enum ePesDataType 
-	{
-        PES_AUDIO_DATA,
-        PES_VIDEO_DATA,
-        PES_PRIVATE_DATA,
-        PES_UNKNOWN_DATA
-    };
-
-	// ==================================
-    enum ePesFrameError 
-	{
-        PES_GENERAL_ERROR
-    };    
-    
-public:    
-    cDxr3PesFrame() : m_pesDataType(PES_UNKNOWN_DATA), m_bValid(false), m_pPesStart(0), m_pEsStart(0)
-    , m_esLength(0), m_pts(0), m_videoFrameType(UNKNOWN_FRAME), m_aspectRatio(m_staticAspectRatio)
-    , m_horizontalSize(m_staticHorizontalSize), m_verticalSize(m_staticVerticalSize), m_streamId(0), m_pNextStart(0), m_remainingLength(0)
-    , m_offset(0) {};
-    
-    virtual ~cDxr3PesFrame()	{}
-    
-    bool ExtractNextFrame(const uint8_t* pBuf, uint32_t length) throw (ePesFrameError);
-    
-    ePesDataType GetPesDataType(void) const		{ assert(m_bValid); return m_pesDataType; };
-    const uint8_t* GetPesStart(void) const		{ assert(m_bValid); return m_pPesStart; };    
-    const uint8_t* GetEsStart(void) const		{ assert(m_bValid); return m_pEsStart; };
-    uint32_t GetEsLength(void) const			{ assert(m_bValid); return m_esLength; };
-
-    const uint8_t* GetNextStart(void) const		{ return m_pNextStart;};
-    uint32_t GetRemainingLength(void) const		{ return m_remainingLength;};
-
-    uint32_t GetPts(void) const					{ assert(m_bValid); return m_pts; };
-
-    eVideoFrameType GetFrameType(void) const	{ assert(m_bValid); assert(m_pesDataType == PES_VIDEO_DATA); return m_videoFrameType;};
-    uint32_t GetAspectRatio(void) const			{ assert(m_bValid); assert(m_pesDataType == PES_VIDEO_DATA); return m_aspectRatio;};
-    uint32_t GetHorizontalSize(void) const		{ assert(m_bValid); assert(m_pesDataType == PES_VIDEO_DATA); return m_horizontalSize;};
-    uint32_t GetVerticalSize(void) const		{ assert(m_bValid); assert(m_pesDataType == PES_VIDEO_DATA); return m_verticalSize;};
-    uint8_t GetStreamId(void) const				{ assert(m_bValid); assert(m_pesDataType == PES_VIDEO_DATA); return m_streamId;};
-    int GetOffset(void) const					{ assert(m_bValid); return m_offset;};
-
-    bool IsValid(void)							{ return m_bValid; };
-    
+    // ==================================
+    enum ePesDataType
+    {
+	PES_AUDIO_DATA,
+	PES_VIDEO_DATA,
+	PES_PRIVATE_DATA,
+	PES_UNKNOWN_DATA
+    };
+
+    // ==================================
+    enum ePesFrameError
+    {
+	PES_GENERAL_ERROR
+    };
+
+public:
+    cDxr3PesFrame() :
+	m_pesDataType(PES_UNKNOWN_DATA),
+	m_bValid(false),
+	m_pPesStart(0),
+	m_pEsStart(0),
+	m_esLength(0),
+	m_pts(0),
+	m_videoFrameType(UNKNOWN_FRAME),
+	m_aspectRatio(m_staticAspectRatio),
+	m_horizontalSize(m_staticHorizontalSize),
+	m_verticalSize(m_staticVerticalSize),
+	m_streamId(0),
+	m_pNextStart(0),
+	m_remainingLength(0),
+	m_offset(0) {};
+
+    virtual ~cDxr3PesFrame() {}
+
+    bool ExtractNextFrame(const uint8_t* pBuf, uint32_t length)
+	throw (ePesFrameError);
+
+    ePesDataType GetPesDataType(void) const
+    {
+	assert(m_bValid);
+	return m_pesDataType;
+    };
+    const uint8_t* GetPesStart(void) const
+    {
+	assert(m_bValid);
+	return m_pPesStart;
+    };
+    const uint8_t* GetEsStart(void) const
+    {
+	assert(m_bValid);
+	return m_pEsStart;
+    };
+    uint32_t GetEsLength(void) const
+    {
+	assert(m_bValid);
+	return m_esLength;
+    };
+
+    const uint8_t* GetNextStart(void) const
+    {
+	return m_pNextStart;
+    };
+    uint32_t GetRemainingLength(void) const
+    {
+	return m_remainingLength;
+    };
+
+    uint32_t GetPts(void) const
+    {
+	assert(m_bValid);
+	return m_pts;
+    };
+
+    eVideoFrameType GetFrameType(void) const
+    {
+	assert(m_bValid);
+	assert(m_pesDataType == PES_VIDEO_DATA);
+	return m_videoFrameType;
+    };
+    uint32_t GetAspectRatio(void) const
+    {
+	assert(m_bValid);
+	assert(m_pesDataType == PES_VIDEO_DATA);
+	return m_aspectRatio;
+    };
+    uint32_t GetHorizontalSize(void) const
+    {
+	assert(m_bValid);
+	assert(m_pesDataType == PES_VIDEO_DATA);
+	return m_horizontalSize;
+    };
+    uint32_t GetVerticalSize(void) const
+    {
+	assert(m_bValid);
+	assert(m_pesDataType == PES_VIDEO_DATA);
+	return m_verticalSize;
+    };
+    uint8_t GetStreamId(void) const
+    {
+	assert(m_bValid);
+	assert(m_pesDataType == PES_VIDEO_DATA);
+	return m_streamId;
+    };
+    int GetOffset(void) const
+    {
+	assert(m_bValid);
+	return m_offset;
+    };
+
+    bool IsValid(void)
+    {
+	return m_bValid;
+    };
+
 protected:
-    bool IsPesHeader(cDxr3SafeArray<uint8_t> header) throw (cDxr3SafeArray<uint8_t>::eSafeArrayException);
-    void ExtractPts(cDxr3SafeArray<uint8_t> ptsData) throw (cDxr3SafeArray<uint8_t>::eSafeArrayException);
-    int ExtractVideoData(cDxr3SafeArray<uint8_t> esFrame) throw (cDxr3SafeArray<uint8_t>::eSafeArrayException);
-
-    void InitData(void) 
-	{ 
-		m_pesDataType = PES_UNKNOWN_DATA; 
-		m_bValid = false;
-		m_pPesStart = 0; 
-		m_pEsStart = 0;
-		m_esLength = 0; 
-		m_pts = 0; 
-		m_videoFrameType = UNKNOWN_FRAME; 
-		m_aspectRatio = m_staticAspectRatio;
-		m_horizontalSize = m_staticHorizontalSize; 
-		m_verticalSize = m_staticVerticalSize;
-		m_streamId = 0; 
-		m_pNextStart = 0; 
-		m_remainingLength = 0;
-		m_offset = 0;
-	}
-           
+    bool IsPesHeader(cDxr3SafeArray<uint8_t> header)
+	throw (cDxr3SafeArray<uint8_t>::eSafeArrayException);
+    void ExtractPts(cDxr3SafeArray<uint8_t> ptsData)
+	throw (cDxr3SafeArray<uint8_t>::eSafeArrayException);
+    int ExtractVideoData(cDxr3SafeArray<uint8_t> esFrame)
+	throw (cDxr3SafeArray<uint8_t>::eSafeArrayException);
+
+    void InitData(void)
+    {
+	m_pesDataType = PES_UNKNOWN_DATA;
+	m_bValid = false;
+	m_pPesStart = 0;
+	m_pEsStart = 0;
+	m_esLength = 0;
+	m_pts = 0;
+	m_videoFrameType = UNKNOWN_FRAME;
+	m_aspectRatio = m_staticAspectRatio;
+	m_horizontalSize = m_staticHorizontalSize;
+	m_verticalSize = m_staticVerticalSize;
+	m_streamId = 0;
+	m_pNextStart = 0;
+	m_remainingLength = 0;
+	m_offset = 0;
+    }
+
     ePesDataType m_pesDataType;
     bool m_bValid;
     const uint8_t* m_pPesStart;
@@ -169,7 +258,6 @@ private:
 
 };
 
-
 #endif /*_DXR3PESFRAME_H_*/
 
 // Local variables: