bugfix: correctly handling video streams with extra data

opencv-motion-detect/evpuller.cpp

@@ -369,16 +369,18 @@ protected:
 
         // find all video & audio streams for remuxing
         int i = 0, streamIdx = 0;
+        vector<int> ids;
         for (; i < pAVFormatInput->nb_streams; i++) {
             AVStream *in_stream = pAVFormatInput->streams[i];
             AVCodecParameters *in_codecpar = in_stream->codecpar;
             if (in_codecpar->codec_type != AVMEDIA_TYPE_AUDIO &&
-                    in_codecpar->codec_type != AVMEDIA_TYPE_VIDEO &&
-                    in_codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) {
+                    in_codecpar->codec_type != AVMEDIA_TYPE_VIDEO /* &&
+                    in_codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE */) {
                 streamList[i] = -1;
                 continue;
             }
             streamList[i] = streamIdx++;
+            ids.push_back(i);
         }
 
         bool bStopSig = false;
@@ -423,7 +425,7 @@ protected:
                     // be attention to the scope of lock guard!
                     {
                         lock_guard<mutex> lock(this->mutMsg);
-                        lenAVFmtCtxBytes = AVFormatCtxSerializer::encode(pAVFormatInput, &pAVFmtCtxBytes);
+                        lenAVFmtCtxBytes = AVFormatCtxSerializer::encode(pAVFormatInput, &pAVFmtCtxBytes, ids);
                         if(lenAVFmtCtxBytes <= 0 || pAVFmtCtxBytes == nullptr) {
                             spdlog::error("evpuller {} failed to pull packet from {}. exiting...", selfId, urlIn);
                             // TODO: message report to cloud

opencv-motion-detect/inc/av_common.hpp

@@ -205,7 +205,7 @@ namespace AVFormatCtxSerializer
  * */
 
 
-int encode(AVFormatContext *ctx, char **bytes)
+int encode(AVFormatContext *ctx, char **bytes, vector<int> ids = vector<int>())
 {
     int wholeSize = 0;
     int got = 0;
@@ -214,7 +214,16 @@ int encode(AVFormatContext *ctx, char **bytes)
     // num streams
     wholeSize += sizeof(ctx->nb_streams);
     spdlog::debug("encode num of streams: {:d}", ctx->nb_streams);
-    for (int i = 0; i < ctx->nb_streams; i++)
+    int numStreams = ctx->nb_streams;
+    if(ids.size() != 0) {
+      numStreams = ids.size();
+    }else{
+      for(int i = 0; i < numStreams; i++){
+        ids.push_back(i);
+      }
+    }
+
+    for (int i = 0; i < numStreams; i++)
     {
         wholeSize += sizeof(AVStream);
         wholeSize += sizeof(AVCodecParameters);
@@ -232,9 +241,9 @@ int encode(AVFormatContext *ctx, char **bytes)
     // populate
     memcpy((*bytes) + got, PS_MARK_S, strlen(PS_MARK_S));
     got += strlen(PS_MARK_S);
-    memcpy((*bytes) + got, (void *)&(ctx->nb_streams), sizeof(ctx->nb_streams));
+    memcpy((*bytes) + got, (void *)&(numStreams), sizeof(ctx->nb_streams));
     got += sizeof(ctx->nb_streams);
-    for (int i = 0; i < ctx->nb_streams; i++)
+    for (auto i: ids)
     {
         //
         memcpy((*bytes) + got, ctx->streams[i], sizeof(AVStream));