Browse Source

del is_realtime 部分代码

DevYK 3 years ago
parent
commit
bac6f30522
2 changed files with 8 additions and 7 deletions
  1. 3 2
      scp.sh
  2. 5 5
      src/ffmpeg/av_decode.cpp

+ 3 - 2
scp.sh

@@ -4,7 +4,7 @@ cd ~/.ssh
 #scp -i stuuudy.pem root@192.168.202.43:/data/media/normal/video/E4098FAAAC8FB17391BB5666C674233F.mp4 /Users/devyk/Data/Project/piaoquan/PQMedia/temp/
 #scp -i stuuudy.pem root@192.168.202.43:/data/media/normal/video/53F21A4848B76E728F53664EA6956DA2.mp4 /Users/devyk/Data/Project/piaoquan/PQMedia/temp/
 #scp -i stuuudy.pem root@192.168.202.43:/data/media/normal/video/ADD7219E9901940130FC3BA9428E2D66.mp4 /Users/devyk/Data/Project/piaoquan/PQMedia/temp/
-#scp -i stuuudy.pem root@192.168.204.177:/home/docker/video-dna/prod/videoDNA-server.jar /Users/devyk/Data/Project/piaoquan/OpenCVSample/temp
+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/
@@ -15,4 +15,5 @@ cd ~/.ssh
 #scp -i stuuudy.pem root@192.168.205.54:/home/libpq-video-edit.so /Users/devyk/Data/Project/piaoquan/PQMedia/temp/
 #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/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.202.43:/home/

+ 5 - 5
src/ffmpeg/av_decode.cpp

@@ -285,11 +285,11 @@ static int is_realtime(AVFormatContext *s) {
             )
         return 1;
 
-    if (s->pb && (!strncmp(s->url, "rtp:", 4)
-                  || !strncmp(s->url, "udp:", 4)
-    )
-            )
-        return 1;
+//    if (s->pb && (!strncmp(s->url, "rtp:", 4)
+//                  || !strncmp(s->url, "udp:", 4)
+//    )
+//            )
+//        return 1;
     return 0;
 }