Merge pull request #1318 from CastagnaIT/cleanup_data

[Cleanup] Use vector uint8_t to store data

src/Iaes_decrypter.h

@@ -12,6 +12,7 @@
 
 #include <cstdint>
 #include <string>
+#include <vector>
 
 class IAESDecrypter
 {
@@ -21,7 +22,7 @@ class IAESDecrypter
   virtual void decrypt(const AP4_UI08* aes_key,
                        const AP4_UI08* aes_iv,
                        const AP4_UI08* src,
-                       std::string& dst,
+                       std::vector<uint8_t>& dst,
                        size_t dstOffset,
                        size_t& dataSize,
                        bool lastChunk) = 0;

src/aes_decrypter.cpp

@@ -15,7 +15,7 @@
 void AESDecrypter::decrypt(const AP4_UI08* aes_key,
                            const AP4_UI08* aes_iv,
                            const AP4_UI08* src,
-                           std::string& dst,
+                           std::vector<uint8_t>& dst,
                            size_t dstOffset,
                            size_t& dataSize,
                            bool lastChunk)

src/aes_decrypter.h

@@ -13,6 +13,7 @@
 #include <bento4/Ap4Types.h>
 
 #include <string>
+#include <vector>
 
 #ifdef INPUTSTREAM_TEST_BUILD
 #include "test/KodiStubs.h"
@@ -29,7 +30,7 @@ class ATTR_DLL_LOCAL AESDecrypter : public IAESDecrypter
   void decrypt(const AP4_UI08* aes_key,
                const AP4_UI08* aes_iv,
                const AP4_UI08* src,
-               std::string& dst,
+               std::vector<uint8_t>& dst,
                size_t dstOffset,
                size_t& dataSize,
                bool lastChunk);

src/common/AdaptiveStream.cpp

@@ -105,7 +105,8 @@ void adaptive::AdaptiveStream::DeallocateSegmentBuffers()
   }
 }
 
-bool adaptive::AdaptiveStream::Download(const DownloadInfo& downloadInfo, std::string& data)
+bool adaptive::AdaptiveStream::Download(const DownloadInfo& downloadInfo,
+                                        std::vector<uint8_t>& data)
 {
   return DownloadImpl(downloadInfo, &data);
 }
@@ -121,7 +122,7 @@ bool adaptive::AdaptiveStream::DownloadSegment(const DownloadInfo& downloadInfo)
 }
 
 bool adaptive::AdaptiveStream::DownloadImpl(const DownloadInfo& downloadInfo,
-                                            std::string* downloadData)
+                                            std::vector<uint8_t>* downloadData)
 {
   if (downloadInfo.m_url.empty())
     return false;
@@ -153,7 +154,7 @@ bool adaptive::AdaptiveStream::DownloadImpl(const DownloadInfo& downloadInfo,
 
     while (downloadStatus == CURL::ReadStatus::CHUNK_READ)
     {
-      std::vector<char> bufferData(CURL::BUFFER_SIZE_32);
+      std::vector<uint8_t> bufferData(CURL::BUFFER_SIZE_32);
       size_t bytesRead{0};
 
       downloadStatus = curl.ReadChunk(bufferData.data(), CURL::BUFFER_SIZE_32, bytesRead);
@@ -162,7 +163,7 @@ bool adaptive::AdaptiveStream::DownloadImpl(const DownloadInfo& downloadInfo,
       {
         if (downloadData) // Write the data in to the string
         {
-          downloadData->append(bufferData.data(), bytesRead);
+          downloadData->insert(downloadData->end(), bufferData.begin(), bufferData.end());
         }
         else // Write the data to the segment buffer
         {
@@ -177,7 +178,7 @@ bool adaptive::AdaptiveStream::DownloadImpl(const DownloadInfo& downloadInfo,
             if (state_ == STOPPED)
               break;
 
-            std::string& segmentBuffer = downloadInfo.m_segmentBuffer->buffer;
+            std::vector<uint8_t>& segmentBuffer = downloadInfo.m_segmentBuffer->buffer;
 
             tree_.OnDataArrived(downloadInfo.m_segmentBuffer->segment_number,
                                 downloadInfo.m_segmentBuffer->segment.pssh_set_, m_decrypterIv,
@@ -436,7 +437,8 @@ int AdaptiveStream::SecondsSinceUpdate() const
           .count());
 }
 
-bool AdaptiveStream::parseIndexRange(PLAYLIST::CRepresentation* rep, const std::string& buffer)
+bool AdaptiveStream::parseIndexRange(PLAYLIST::CRepresentation* rep,
+                                     const std::vector<uint8_t>& buffer)
 {
 #ifndef INPUTSTREAM_TEST_BUILD
   LOG::Log(LOGDEBUG, "[AS-%u] Build segments from SIDX atom...", clsId);
@@ -1226,7 +1228,7 @@ bool AdaptiveStream::ResolveSegmentBase(PLAYLIST::CRepresentation* rep)
   else
     return false;
 
-  std::string sidxBuffer;
+  std::vector<uint8_t> sidxBuffer;
   DownloadInfo downloadInfo;
   // We assume mutex_dl is locked so we can safely call prepare_download
   if (PrepareDownload(rep, seg, downloadInfo) && Download(downloadInfo, sidxBuffer) &&

src/common/AdaptiveStream.h

@@ -89,7 +89,8 @@ class AdaptiveStream;
     bool StreamChanged() { return stream_changed_; }
 
   protected:
-    virtual bool parseIndexRange(PLAYLIST::CRepresentation* rep, const std::string& buffer);
+    virtual bool parseIndexRange(PLAYLIST::CRepresentation* rep,
+                                 const std::vector<uint8_t>& buffer);
 
     virtual void SetLastUpdated(const std::chrono::system_clock::time_point tm) {}
     std::chrono::time_point<std::chrono::system_clock> lastUpdated_;
@@ -105,7 +106,7 @@ class AdaptiveStream;
 
     struct SEGMENTBUFFER
     {
-      std::string buffer;
+      std::vector<uint8_t> buffer;
       PLAYLIST::CSegment segment;
       uint64_t segment_number{0};
       PLAYLIST::CRepresentation* rep{nullptr};
@@ -132,7 +133,7 @@ class AdaptiveStream;
     * \param data[OUT] The downloaded data
     * \return Return true if success, otherwise false
     */
-    virtual bool Download(const DownloadInfo& downloadInfo, std::string& data);
+    virtual bool Download(const DownloadInfo& downloadInfo, std::vector<uint8_t>& data);
 
    /*!
     * \brief Download a segment file in chunks, the data could be also decrypted by the manifest parser,
@@ -151,7 +152,7 @@ class AdaptiveStream;
     *                  will be stored to the segment buffer and could be decrypted by the manifest parser.
     * \return Return true if success, otherwise false
     */
-    bool DownloadImpl(const DownloadInfo& downloadInfo, std::string* data);
+    bool DownloadImpl(const DownloadInfo& downloadInfo, std::vector<uint8_t>* data);
 
     bool PrepareNextDownload(DownloadInfo& downloadInfo);
     bool PrepareDownload(const PLAYLIST::CRepresentation* rep,

src/common/AdaptiveTree.cpp

@@ -174,13 +174,13 @@ namespace adaptive
   void AdaptiveTree::OnDataArrived(uint64_t segNum,
                                    uint16_t psshSet,
                                    uint8_t iv[16],
-                                   const char* srcData,
+                                   const uint8_t* srcData,
                                    size_t srcDataSize,
-                                   std::string& segBuffer,
+                                   std::vector<uint8_t>& segBuffer,
                                    size_t segBufferSize,
                                    bool isLastChunk)
   {
-    segBuffer.append(srcData, srcDataSize);
+    segBuffer.insert(segBuffer.end(), srcData, srcData + srcDataSize);
   }
 
   uint16_t AdaptiveTree::InsertPsshSet(PLAYLIST::StreamType streamType,

src/common/AdaptiveTree.h

@@ -118,9 +118,9 @@ class ATTR_DLL_LOCAL AdaptiveTree
   virtual void OnDataArrived(uint64_t segNum,
                              uint16_t psshSet,
                              uint8_t iv[16],
-                             const char* srcData,
+                             const uint8_t* srcData,
                              size_t srcDataSize,
-                             std::string& segBuffer,
+                             std::vector<uint8_t>& segBuffer,
                              size_t segBufferSize,
                              bool isLastChunk);
 

src/parser/HLSTree.cpp

@@ -619,9 +619,9 @@ PLAYLIST::PrepareRepStatus adaptive::CHLSTree::prepareRepresentation(PLAYLIST::C
 void adaptive::CHLSTree::OnDataArrived(uint64_t segNum,
                                        uint16_t psshSet,
                                        uint8_t iv[16],
-                                       const char* srcData,
+                                       const uint8_t* srcData,
                                        size_t srcDataSize,
-                                       std::string& segBuffer,
+                                       std::vector<uint8_t>& segBuffer,
                                        size_t segBufferSize,
                                        bool isLastChunk)
 {
@@ -684,7 +684,7 @@ void adaptive::CHLSTree::OnDataArrived(uint64_t segNum,
     }
     if (pssh.defaultKID_ == "0")
     {
-      segBuffer.insert(segBufferSize, srcDataSize, 0);
+      segBuffer.resize(segBufferSize + srcDataSize, 0);
       return;
     }
     else if (!segBufferSize)
@@ -698,7 +698,7 @@ void adaptive::CHLSTree::OnDataArrived(uint64_t segNum,
       }
     }
 
-    // Decrypter needs preallocated string data
+    // Decrypter needs preallocated data
     segBuffer.resize(segBufferSize + srcDataSize);
 
     m_decrypter->decrypt(reinterpret_cast<const uint8_t*>(pssh.defaultKID_.data()), iv,

src/parser/HLSTree.h

@@ -45,9 +45,9 @@ class ATTR_DLL_LOCAL CHLSTree : public AdaptiveTree
   virtual void OnDataArrived(uint64_t segNum,
                              uint16_t psshSet,
                              uint8_t iv[16],
-                             const char* srcData,
+                             const uint8_t* srcData,
                              size_t srcDataSize,
-                             std::string& segBuffer,
+                             std::vector<uint8_t>& segBuffer,
                              size_t segBufferSize,
                              bool isLastChunk) override;
 

src/test/TestHelper.cpp

@@ -89,11 +89,11 @@ bool TestAdaptiveStream::DownloadSegment(const DownloadInfo& downloadInfo)
   if (downloadInfo.m_url.empty())
     return false;
 
-  std::string& segmentBuffer = downloadInfo.m_segmentBuffer->buffer;
+  std::vector<uint8_t>& segmentBuffer = downloadInfo.m_segmentBuffer->buffer;
   std::stringstream sampleData("Sixteen bytes!!!");
 
   const size_t bufferSize = 8;
-  char bufferData[bufferSize];
+  uint8_t bufferData[bufferSize];
   size_t totalByteRead = 0;
 
   sampleData.clear();
@@ -108,7 +108,7 @@ bool TestAdaptiveStream::DownloadSegment(const DownloadInfo& downloadInfo)
       if (state_ == STOPPED)
         break;
 
-      sampleData.read(bufferData, bufferSize);
+      sampleData.read(reinterpret_cast<char*>(bufferData), bufferSize);
       size_t bytesRead = sampleData.gcount();
 
       if (bytesRead == 0) // EOF
@@ -134,16 +134,17 @@ bool TestAdaptiveStream::DownloadSegment(const DownloadInfo& downloadInfo)
   return true;
 }
 
-bool TestAdaptiveStream::Download(const DownloadInfo& downloadInfo, std::string& data)
+bool TestAdaptiveStream::Download(const DownloadInfo& downloadInfo, std::vector<uint8_t>& data)
 {
-  data = "Sixteen bytes!!!";
+  const char* dataStr = "Sixteen bytes!!!";
+  data.insert(data.end(), dataStr, dataStr + 16);
   return true;
 }
 
 void AESDecrypter::decrypt(const AP4_UI08* aes_key,
                            const AP4_UI08* aes_iv,
                            const AP4_UI08* src,
-                           std::string& dst,
+                           std::vector<uint8_t>& dst,
                            size_t dstOffset,
                            size_t& dataSize,
                            bool lastChunk)

src/test/TestHelper.h

@@ -75,7 +75,7 @@ class TestAdaptiveStream : public adaptive::AdaptiveStream
   virtual bool DownloadSegment(const DownloadInfo& downloadInfo) override;
 
 protected:
-  virtual bool Download(const DownloadInfo& downloadInfo, std::string& data) override;
+  virtual bool Download(const DownloadInfo& downloadInfo, std::vector<uint8_t>& data) override;
 };
 
 class AESDecrypter : public IAESDecrypter
@@ -87,7 +87,7 @@ class AESDecrypter : public IAESDecrypter
   void decrypt(const AP4_UI08* aes_key,
                const AP4_UI08* aes_iv,
                const AP4_UI08* src,
-               std::string& dst,
+               std::vector<uint8_t>& dst,
                size_t dstOffset,
                size_t& dataSize,
                bool lastChunk);