Format changes

Author: Per Moberg

mpegts/ts_packet.cpp

@@ -1,5 +1,4 @@
 #include "ts_packet.h"
-#include "simple_buffer.h"
 
 #include <iostream>
 
@@ -31,7 +30,7 @@ TsHeader::TsHeader() = default;
 
 TsHeader::~TsHeader() = default;
 
-void TsHeader::encode(SimpleBuffer &rSb) {
+void TsHeader::encode(SimpleBuffer& rSb) {
     rSb.write1Byte(mSyncByte);
 
     uint16_t lB1b2 = mPid & 0x1FFF;
@@ -46,7 +45,7 @@ void TsHeader::encode(SimpleBuffer &rSb) {
     rSb.write1Byte(lB3);
 }
 
-void TsHeader::decode(SimpleBuffer &rSb) {
+void TsHeader::decode(SimpleBuffer& rSb) {
     mSyncByte = rSb.read1Byte();
 
     uint16_t lB1b2 = rSb.read2Bytes();
@@ -65,7 +64,7 @@ PATHeader::PATHeader() = default;
 
 PATHeader::~PATHeader() = default;
 
-void PATHeader::encode(SimpleBuffer &rSb) {
+void PATHeader::encode(SimpleBuffer& rSb) {
     rSb.write1Byte(mTableId);
 
     uint16_t lB1b2 = mSectionLength & 0x0FFF;
@@ -85,7 +84,7 @@ void PATHeader::encode(SimpleBuffer &rSb) {
     rSb.write1Byte(mLastSectionNumber);
 }
 
-void PATHeader::decode(SimpleBuffer &rSb) {
+void PATHeader::decode(SimpleBuffer& rSb) {
     mTableId = rSb.read1Byte();
 
     uint16_t lB1b2 = rSb.read2Bytes();
@@ -132,7 +131,7 @@ PMTElementInfo::PMTElementInfo()
 
 PMTElementInfo::~PMTElementInfo() = default;
 
-void PMTElementInfo::encode(SimpleBuffer &rSb) {
+void PMTElementInfo::encode(SimpleBuffer& rSb) {
     rSb.write1Byte(mStreamType);
 
     uint16_t lB1b2 = mElementaryPid & 0x1FFF;
@@ -148,7 +147,7 @@ void PMTElementInfo::encode(SimpleBuffer &rSb) {
     }
 }
 
-void PMTElementInfo::decode(SimpleBuffer &rSb) {
+void PMTElementInfo::decode(SimpleBuffer& rSb) {
     mStreamType = rSb.read1Byte();
 
     uint16_t lB1b2 = rSb.read2Bytes();
@@ -183,7 +182,7 @@ PMTHeader::PMTHeader() = default;
 
 PMTHeader::~PMTHeader() = default;
 
-void PMTHeader::encode(SimpleBuffer &rSb) {
+void PMTHeader::encode(SimpleBuffer& rSb) {
     rSb.write1Byte(mTableId);
 
     uint16_t lB1b2 = mSectionLength & 0xFFFF;
@@ -210,12 +209,12 @@ void PMTHeader::encode(SimpleBuffer &rSb) {
     lB10b11 |= (mReserved3 << 12) & 0xF000;
     rSb.write2Bytes(lB10b11);
 
-    for (int lI = 0; lI < static_cast<int>(mInfos.size()); lI++) {
-        mInfos[lI]->encode(rSb);
+    for (auto& mInfo : mInfos) {
+        mInfo->encode(rSb);
     }
 }
 
-void PMTHeader::decode(SimpleBuffer &rSb) {
+void PMTHeader::decode(SimpleBuffer& rSb) {
     mTableId = rSb.read1Byte();
 
     uint16_t lB1b2 = rSb.read2Bytes();
@@ -257,8 +256,8 @@ void PMTHeader::decode(SimpleBuffer &rSb) {
 
 uint16_t PMTHeader::size() {
     uint16_t lRet = 12;
-    for (int lI = 0; lI < static_cast<int>(mInfos.size()); lI++) {
-        lRet += mInfos[lI]->size();
+    for (auto& mInfo : mInfos) {
+        lRet += mInfo->size();
     }
 
     return lRet;
@@ -291,7 +290,7 @@ AdaptationFieldHeader::AdaptationFieldHeader() = default;
 
 AdaptationFieldHeader::~AdaptationFieldHeader() = default;
 
-void AdaptationFieldHeader::encode(SimpleBuffer &rSb) {
+void AdaptationFieldHeader::encode(SimpleBuffer& rSb) {
     rSb.write1Byte(mAdaptationFieldLength);
     if (mAdaptationFieldLength != 0) {
         uint8_t lVal = mAdaptationFieldExtensionFlag & 0x01;
@@ -306,7 +305,7 @@ void AdaptationFieldHeader::encode(SimpleBuffer &rSb) {
     }
 }
 
-void AdaptationFieldHeader::decode(SimpleBuffer &rSb) {
+void AdaptationFieldHeader::decode(SimpleBuffer& rSb) {
     mAdaptationFieldLength = rSb.read1Byte();
     if (mAdaptationFieldLength != 0) {
         uint8_t lVal = rSb.read1Byte();
@@ -325,7 +324,7 @@ PESHeader::PESHeader() = default;
 
 PESHeader::~PESHeader() = default;
 
-void PESHeader::encode(SimpleBuffer &rSb) {
+void PESHeader::encode(SimpleBuffer& rSb) {
     uint32_t lB0b1b2b3 = (mPacketStartCode << 8) & 0xFFFFFF00;
     lB0b1b2b3 |= mStreamId & 0xFF;
     rSb.write4Bytes(lB0b1b2b3);
@@ -352,7 +351,7 @@ void PESHeader::encode(SimpleBuffer &rSb) {
     rSb.write1Byte(mHeaderDataLength);
 }
 
-void PESHeader::decode(SimpleBuffer &rSb) {
+void PESHeader::decode(SimpleBuffer& rSb) {
     uint32_t lB0b1b2b3 = rSb.read4Bytes();
     mPacketStartCode = (lB0b1b2b3 >> 8) & 0x00FFFFFF;
     mStreamId = (lB0b1b2b3) & 0xFF;