Explorar o código

fix only audio stream

DevYK %!s(int64=3) %!d(string=hai) anos
pai
achega
85a897392f
Modificáronse 4 ficheiros con 11 adicións e 7 borrados
  1. 2 2
      scp.sh
  2. 8 2
      src/ffmpeg/av_decode.cpp
  3. 0 1
      src/utils/video_similarity.cpp
  4. 1 2
      src/video_similarity_comparison.cpp

+ 2 - 2
scp.sh

@@ -7,7 +7,7 @@ cd ~/.ssh
 #scp -i stuuudy.pem root@192.168.204.177:/home/libpiaoquan_java_opencv.so root@192.168.202.43:/home/
 
 
-#scp -i stuuudy.pem root@192.168.204.102:/datalog/ffmpeg_opencv/ /Users/devyk/Data/Project/sample/github_code/OpenCVSample/temp/
+scp -i stuuudy.pem root@192.168.204.102:/datalog/hs_error.log /Users/devyk/Data/Project/piaoquan/OpenCVSample/temp
 #scp -i stuuudy.pem root@192.168.202.43:/data/media/normal/subtitle/04926EF1D22351B109135FF28CFC11DF /Users/devyk/Data/Project/piaoquan/PQMedia/temp/
 #scp -i stuuudy.pem root@192.168.202.43:/data/media/normal/image/36934CCA1648AF86F3DC07E8796C77F3 /Users/devyk/Data/Project/piaoquan/PQMedia/temp/
 #scp -i stuuudy.pem root@192.168.202.43:/data/media/normal/image/CBA07E563326ECB56FC49E18615E3F63 /Users/devyk/Data/Project/piaoquan/PQMedia/temp/
@@ -16,5 +16,5 @@ cd ~/.ssh
 #scp -i stuuudy.pem /Users/devyk/Data/Project/piaoquan/PQMedia/temp/1A807070C35A114262043023A7122D58.mp4 root@192.168.202.43:/root/wzh264/wz264_linux_shared_release_wzauth-56023e45/linux_shared_release_wzauth/bin
 
 #scp -i stuuudy.pem /Users/devyk/Data/Project/piaoquan/OpenCVSample/java/out/artifacts/OpenCVSample_jar/OpenCVSample.jar root@192.168.204.177:/home/docker/video-dna/prod/
-scp -i stuuudy.pem /Users/devyk/Data/Project/piaoquan/videoDNA/videoDNA-server/target/videoDNA-server.jar root@192.168.204.177:/home/docker/video-dna/prod/
+#scp -i stuuudy.pem /Users/devyk/Data/Project/piaoquan/videoDNA/videoDNA-server/target/videoDNA-server.jar root@192.168.204.177:/home/docker/video-dna/prod/
 #scp -i stuuudy.pem /Users/devyk/Data/Project/piaoquan/videoDNA/videoDNA-server/target/videoDNA-server.jar root@192.168.202.43:/home/

+ 8 - 2
src/ffmpeg/av_decode.cpp

@@ -194,6 +194,13 @@ long initDecoder(const char *url, int force_Iframe, DisableMediaType disableMedi
 
         }
     }
+
+    if (dctx->st_index[AVMEDIA_TYPE_VIDEO] <0)
+    {
+        LOGE("video stream not found.");
+//        return -1;
+    }
+
     dctx->st_index[AVMEDIA_TYPE_AUDIO] = av_find_best_stream(dctx->avformatContext,
                                                              AVMEDIA_TYPE_AUDIO,
                                                              -1,
@@ -276,9 +283,8 @@ long initDecoder(const char *url, int force_Iframe, DisableMediaType disableMedi
             return ret;
         }
 //        dctx->audio_queue = new BlockQueue<AVFrame *>(dctx->fps);
-        dctx->video_queue = new BlockQueue<AVFrame *>(MAX(10,dctx->fps));
     }
-
+    dctx->video_queue = new BlockQueue<AVFrame *>(MAX(10,dctx->fps));
     seekToMs(dctx, dctx->offset);
     return ret == 0 ? (long) dctx : ret;
 }

+ 0 - 1
src/utils/video_similarity.cpp

@@ -40,7 +40,6 @@ int video_similarity_detection_start(long id, int force_keyframe,
     if (id <= 0)return -1;
     auto *ctx = (VideoSimilarityContext *) id;
     long d_id = initDecoder(ctx->video_path, force_keyframe, disableMediaType);
-
     ctx->decode_obj_id = d_id;
     if (ctx->decode_obj_id <= 0)return ctx->decode_obj_id;
     int exit = 0, ret = 0;

+ 1 - 2
src/video_similarity_comparison.cpp

@@ -83,11 +83,10 @@ int main(int argc, char *argv[]) {
     int threads = 1;
     const char *inputs[1];
 //    inputs[0] =  "{\"videoPath\":\"http://rescdn.yishihui.com/longvideo/transcode/video/b46fd76f98364b3abad8c1297a868f82-1526976612340.m3u8\",\"clips\":[{\"startTimeMs\":3000,\"endTimeMs\":4000},{\"startTimeMs\":6000,\"endTimeMs\":7000},{\"startTimeMs\":9000,\"endTimeMs\":10000},{\"startTimeMs\":12000,\"endTimeMs\":13000},{\"startTimeMs\":15000,\"endTimeMs\":16000},{\"startTimeMs\":18000,\"endTimeMs\":19000},{\"startTimeMs\":21000,\"endTimeMs\":22000},{\"startTimeMs\":24000,\"endTimeMs\":25000}]}";
-    inputs[0] = "{\"videoPath\":\"http://rescdn.yishihui.com/longvideo/transcode/video/9aae21301df54dcab9e57c50494302741530678399256.m3u8\",\"clips\":[{\"startTimeMs\":3200,\"endTimeMs\":4200},{\"startTimeMs\":6400,\"endTimeMs\":7400},{\"startTimeMs\":9600,\"endTimeMs\":10600},{\"startTimeMs\":12800,\"endTimeMs\":13800},{\"startTimeMs\":16000,\"endTimeMs\":17000},{\"startTimeMs\":19200,\"endTimeMs\":20200},{\"startTimeMs\":22400,\"endTimeMs\":23400},{\"startTimeMs\":25600,\"endTimeMs\":26600}]}";
+    inputs[0] = "{\"videoPath\":\"http://rescdn.yishihui.com/longvideo/transcode/video/020384682f444a9c86ce2613d01b2cf1_1528433642881.m3u8\",\"clips\":[{\"startTimeMs\":5900,\"endTimeMs\":6900},{\"startTimeMs\":11800,\"endTimeMs\":12800},{\"startTimeMs\":17700,\"endTimeMs\":18700},{\"startTimeMs\":23600,\"endTimeMs\":24600},{\"startTimeMs\":29500,\"endTimeMs\":30500},{\"startTimeMs\":35400,\"endTimeMs\":36400},{\"startTimeMs\":41300,\"endTimeMs\":42300},{\"startTimeMs\":47200,\"endTimeMs\":48200}]}";
 //    inputs[2] = "{\"videoPath\":\"http://rescdn.yishihui.com/longvideo/transcode/video/3dbf36e8ec27479581514b8b7b4c8034-1526924772832-safe1594892815.m3u8\",\"clips\":[{\"startTimeMs\":6000,\"endTimeMs\":7000},{\"startTimeMs\":12000,\"endTimeMs\":13000},{\"startTimeMs\":18000,\"endTimeMs\":19000},{\"startTimeMs\":24000,\"endTimeMs\":25000},{\"startTimeMs\":30000,\"endTimeMs\":31000},{\"startTimeMs\":36000,\"endTimeMs\":37000},{\"startTimeMs\":42000,\"endTimeMs\":43000},{\"startTimeMs\":48000,\"endTimeMs\":49000}]}";
 //    inputs[3] = "{\"videoPath\":\"http://rescdn.yishihui.com/longvideo/transcode/video/3dbf36e8ec27479581514b8b7b4c8034-1526924772832-safe1594892815.m3u8\",\"clips\":[{\"startTimeMs\":6000,\"endTimeMs\":7000},{\"startTimeMs\":12000,\"endTimeMs\":13000},{\"startTimeMs\":18000,\"endTimeMs\":19000},{\"startTimeMs\":24000,\"endTimeMs\":25000},{\"startTimeMs\":30000,\"endTimeMs\":31000},{\"startTimeMs\":36000,\"endTimeMs\":37000},{\"startTimeMs\":42000,\"endTimeMs\":43000},{\"startTimeMs\":48000,\"endTimeMs\":49000}]}";
 
-
 //    for (;;) {
         CountDownLatch *countDownLatch = new CountDownLatch(threads);
         for (int i = 0; i < threads; ++i) {