Merge "Fix RtpStack static analysis Cppcheck - constVariable"

2 files changed, 32 insertions, 33 deletions

diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPacketTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPacketTest.cpp
index cc725024..e7571405 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPacketTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPacketTest.cpp
@@ -33,26 +33,24 @@ TEST(RtpPacketTest, TestGetSets)
 
     uint8_t pRtpPayLoad[] = {0x67, 0x42, 0xc0, 0x0c, 0xda, 0x0f, 0x0a, 0x69, 0xa8, 0x10, 0x10, 0x10,
             0x3c, 0x58, 0xba, 0x80};
-    const RtpDt_UInt32 uiLength = sizeof(pRtpPayLoad) / sizeof(pRtpPayLoad[0]);
 
-    RtpBuffer* rtpPayloadBuffer = new RtpBuffer(uiLength, pRtpPayLoad);
+    RtpBuffer* rtpPayloadBuffer = new RtpBuffer(sizeof(pRtpPayLoad), pRtpPayLoad);
     rtpPacket.setRtpPayload(rtpPayloadBuffer);
     RtpBuffer* pobjRtpBuffer = rtpPacket.getRtpPayload();
     ASSERT_TRUE(pobjRtpBuffer != NULL);
 
-    EXPECT_EQ(memcmp(pRtpPayLoad, pobjRtpBuffer->getBuffer(), uiLength), 0);
-    EXPECT_EQ(pobjRtpBuffer->getLength(), uiLength);
+    EXPECT_EQ(memcmp(pRtpPayLoad, pobjRtpBuffer->getBuffer(), sizeof(pRtpPayLoad)), 0);
+    EXPECT_EQ(pobjRtpBuffer->getLength(), sizeof(pRtpPayLoad));
 
     uint8_t pRtpExtHdr[] = {0x41, 0x00, 0x00};
-    const RtpDt_UInt32 uiExtLength = sizeof(pRtpExtHdr) / sizeof(pRtpExtHdr[0]);
 
-    RtpBuffer* rtpExtBuffer = new RtpBuffer(uiExtLength, pRtpExtHdr);
+    RtpBuffer* rtpExtBuffer = new RtpBuffer(sizeof(pRtpExtHdr), pRtpExtHdr);
     rtpPacket.setExtHeader(rtpExtBuffer);
     RtpBuffer* pobjRtpExtHdr = rtpPacket.getExtHeader();
 
     ASSERT_TRUE(pobjRtpBuffer != NULL);
-    EXPECT_EQ(memcmp(pRtpExtHdr, pobjRtpExtHdr->getBuffer(), uiExtLength), 0);
-    EXPECT_EQ(pobjRtpExtHdr->getLength(), uiExtLength);
+    EXPECT_EQ(memcmp(pRtpExtHdr, pobjRtpExtHdr->getBuffer(), sizeof(pRtpExtHdr)), 0);
+    EXPECT_EQ(pobjRtpExtHdr->getLength(), sizeof(pRtpExtHdr));
 }
 
 TEST(RtpPacketTest, TestDecodePacket)
@@ -135,7 +133,7 @@ TEST(RtpPacketTest, TestDecodePacketWithWrongRtpVersion)
             0x02, 0xbe, 0xde, 0x00, 0x01, 0x41, 0x78, 0x42, 0x00, 0x67, 0x42, 0xc0, 0x0c, 0xda,
             0x0f, 0x0a, 0x69, 0xa8, 0x10, 0x10, 0x10, 0x3c, 0x58, 0xba, 0x80};
 
-    RtpBuffer rtpBuffer(sizeof(pobjRtpPktBuf) / sizeof(pobjRtpPktBuf[0]), pobjRtpPktBuf);
+    RtpBuffer rtpBuffer(sizeof(pobjRtpPktBuf), pobjRtpPktBuf);
     eRtp_Bool eResult = rtpPacket.decodePacket(&rtpBuffer);
 
     // check for failure as Rtp version is wrong.
@@ -169,7 +167,7 @@ TEST(RtpPacketTest, TestDecodePacketWithWrongExtLength)
     uint8_t pobjRtpPktBuf[] = {0x50, 0xe3, 0xa5, 0x83, 0x00, 0x00, 0xe1, 0xc8, 0x92, 0x7d, 0xcd,
             0x02, 0xbe, 0xde, 0x00, 0x02, 0x41, 0x78, 0x42, 0x00};
 
-    RtpBuffer rtpBuffer(sizeof(pobjRtpPktBuf) / sizeof(pobjRtpPktBuf[0]), pobjRtpPktBuf);
+    RtpBuffer rtpBuffer(sizeof(pobjRtpPktBuf), pobjRtpPktBuf);
     eRtp_Bool eResult = rtpPacket.decodePacket(&rtpBuffer);
 
     // check for failure as Extension length is wrong.
@@ -205,7 +203,7 @@ TEST(RtpPacketTest, TestDecodePacketWithPadding)
             0x02, 0xbe, 0xde, 0x00, 0x01, 0x41, 0x78, 0x42, 0x00, 0x67, 0x42, 0xc0, 0x0c, 0xda,
             0x0f, 0x0a, 0x69, 0xa8, 0x10, 0x10, 0x10, 0x3c, 0x58, 0xba, 0x80, 0x00, 0x02};
 
-    RtpBuffer rtpBuffer(sizeof(pobjRtpPktBuf) / sizeof(pobjRtpPktBuf[0]), pobjRtpPktBuf);
+    RtpBuffer rtpBuffer(sizeof(pobjRtpPktBuf), pobjRtpPktBuf);
     eRtp_Bool eResult = rtpPacket.decodePacket(&rtpBuffer);
 
     // check for padding.
@@ -216,11 +214,10 @@ TEST(RtpPacketTest, TestDecodePacketWithPadding)
     RtpBuffer* pobjRtpBuffer = rtpPacket.getRtpPayload();
     uint8_t pRtpPayLoad[] = {0x67, 0x42, 0xc0, 0x0c, 0xda, 0x0f, 0x0a, 0x69, 0xa8, 0x10, 0x10, 0x10,
             0x3c, 0x58, 0xba, 0x80};
-    const RtpDt_UInt32 uiLength = sizeof(pRtpPayLoad) / sizeof(pRtpPayLoad[0]);
 
     ASSERT_TRUE(pobjRtpBuffer != NULL);
-    EXPECT_EQ(memcmp(pRtpPayLoad, pobjRtpBuffer->getBuffer(), uiLength), 0);
-    EXPECT_EQ(pobjRtpBuffer->getLength(), uiLength);
+    EXPECT_EQ(memcmp(pRtpPayLoad, pobjRtpBuffer->getBuffer(), sizeof(pRtpPayLoad)), 0);
+    EXPECT_EQ(pobjRtpBuffer->getLength(), sizeof(pRtpPayLoad));
 }
 
 TEST(RtpPacketTest, TestFormPacketwithoutExtension)
@@ -241,14 +238,14 @@ TEST(RtpPacketTest, TestFormPacketwithoutExtension)
     // set RtpPayload
     uint8_t pRtpPayLoad[] = {0x67, 0x42, 0xc0, 0x0c, 0xda, 0x0f, 0x0a, 0x69, 0xa8, 0x10, 0x10, 0x10,
             0x3c, 0x58, 0xba, 0x80};
-    const RtpDt_UInt32 uiRtpPayLoadLength = sizeof(pRtpPayLoad) / sizeof(pRtpPayLoad[0]);
+
     RtpBuffer* pobjRtpPayloadBuf = new RtpBuffer();
-    RtpDt_UChar* pucRtpPayLoadBuffer = new RtpDt_UChar[uiRtpPayLoadLength];
-    memcpy(pucRtpPayLoadBuffer, pRtpPayLoad, uiRtpPayLoadLength);
-    pobjRtpPayloadBuf->setBufferInfo(uiRtpPayLoadLength, pucRtpPayLoadBuffer);
+    RtpDt_UChar* pucRtpPayLoadBuffer = new RtpDt_UChar[sizeof(pRtpPayLoad)];
+    memcpy(pucRtpPayLoadBuffer, pRtpPayLoad, sizeof(pRtpPayLoad));
+    pobjRtpPayloadBuf->setBufferInfo(sizeof(pRtpPayLoad), pucRtpPayLoadBuffer);
     rtpPacket.setRtpPayload(pobjRtpPayloadBuf);
 
-    const RtpDt_UInt32 uiRtpLength = RTP_FIXED_HDR_LEN + uiRtpPayLoadLength;
+    const RtpDt_UInt32 uiRtpLength = RTP_FIXED_HDR_LEN + sizeof(pRtpPayLoad);
 
     // define expected Rtp packet.
     uint8_t pExpectedBuffer[uiRtpLength] = {0x80, 0x7f, 0xb0, 0x45, 0x00, 0x01, 0x36, 0x6a, 0xae,
@@ -303,24 +300,25 @@ TEST(RtpPacketTest, TestFormPacketwithExtension)
 
     // set RtpExtension
     uint8_t pRtpExtension[] = {0xbe, 0xde, 0x00, 0x01, 0x41, 0x78, 0x42, 0x00};
-    const RtpDt_UInt32 uiRtpExtensionLength = sizeof(pRtpExtension) / sizeof(pRtpExtension[0]);
+
     RtpBuffer* pobjpRtpExtensionBuf = new RtpBuffer();
-    RtpDt_UChar* pucRtpExtensionBuffer = new RtpDt_UChar[uiRtpExtensionLength];
-    memcpy(pucRtpExtensionBuffer, pRtpExtension, uiRtpExtensionLength);
-    pobjpRtpExtensionBuf->setBufferInfo(uiRtpExtensionLength, pucRtpExtensionBuffer);
+    RtpDt_UChar* pucRtpExtensionBuffer = new RtpDt_UChar[sizeof(pRtpExtension)];
+    memcpy(pucRtpExtensionBuffer, pRtpExtension, sizeof(pRtpExtension));
+    pobjpRtpExtensionBuf->setBufferInfo(sizeof(pRtpExtension), pucRtpExtensionBuffer);
     rtpPacket.setExtHeader(pobjpRtpExtensionBuf);
 
     // set RtpPayload
     uint8_t pRtpPayLoad[] = {0x67, 0x42, 0xc0, 0x0c, 0xda, 0x0f, 0x0a, 0x69, 0xa8, 0x10, 0x10, 0x10,
             0x3c, 0x58, 0xba, 0x80};
-    const RtpDt_UInt32 uiRtpPayLoadLength = sizeof(pRtpPayLoad) / sizeof(pRtpPayLoad[0]);
+
     RtpBuffer* pobjRtpPayloadBuf = new RtpBuffer();
-    RtpDt_UChar* pucRtpPayLoadBuffer = new RtpDt_UChar[uiRtpPayLoadLength];
-    memcpy(pucRtpPayLoadBuffer, pRtpPayLoad, uiRtpPayLoadLength);
-    pobjRtpPayloadBuf->setBufferInfo(uiRtpPayLoadLength, pucRtpPayLoadBuffer);
+    RtpDt_UChar* pucRtpPayLoadBuffer = new RtpDt_UChar[sizeof(pRtpPayLoad)];
+    memcpy(pucRtpPayLoadBuffer, pRtpPayLoad, sizeof(pRtpPayLoad));
+    pobjRtpPayloadBuf->setBufferInfo(sizeof(pRtpPayLoad), pucRtpPayLoadBuffer);
     rtpPacket.setRtpPayload(pobjRtpPayloadBuf);
 
-    const RtpDt_UInt32 uiRtpLength = RTP_FIXED_HDR_LEN + uiRtpExtensionLength + uiRtpPayLoadLength;
+    const RtpDt_UInt32 uiRtpLength =
+            RTP_FIXED_HDR_LEN + sizeof(pRtpExtension) + sizeof(pRtpPayLoad);
 
     // define expected Rtp packet output.
     uint8_t pExpectedBuffer[] = {0x90, 0xe3, 0xa5, 0x83, 0x00, 0x00, 0xe1, 0xc8, 0x92, 0x7d, 0xcd,
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/utils/RtpBufferTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/utils/RtpBufferTest.cpp
index 38a974db..9a4c80e7 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/utils/RtpBufferTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/utils/RtpBufferTest.cpp
@@ -56,11 +56,12 @@ TEST_F(RtpBufferTest, SetLengthTest)
 
 TEST_F(RtpBufferTest, SetBufferInfoTest)
 {
-    RtpDt_UChar* pBuf = new RtpDt_UChar[8];
-    memcpy(pBuf, (RtpDt_UChar[]){0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}, sizeof pBuf);
-    testBuf->setBufferInfo(sizeof pBuf, pBuf);
-    EXPECT_EQ(8, testBuf->getLength());
-    EXPECT_EQ(0, memcmp(testBuf->getBuffer(), pBuf, 8));
+    RtpDt_UChar* pBuf = new RtpDt_UChar[7];
+    uint8_t expectedBuf[] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
+    memcpy(pBuf, expectedBuf, sizeof(expectedBuf));
+    testBuf->setBufferInfo(sizeof(expectedBuf), pBuf);
+    EXPECT_EQ(7, testBuf->getLength());
+    EXPECT_EQ(0, memcmp(testBuf->getBuffer(), pBuf, 7));
 }
 
 }  // namespace android