add log 2

src/ffmpeg/av_decode.cpp

@@ -106,7 +106,12 @@ static int av_decode(struct DecoderContext *pContext, AVPacket *pPacket, enum AV
             return 0;
         }
 
-//        LOGE("decode is video=%d pts=%lld \n",pPacket->stream_index == pContext->st_index[AVMEDIA_TYPE_VIDEO],pts);
+        LOGE("decode is video=%d pts=%lld \n",pPacket->stream_index == pContext->st_index[AVMEDIA_TYPE_VIDEO],pts);
+        if (pts>=14000)
+        {
+            LOGE("decode is video=%d pts=%lld \n",pPacket->stream_index == pContext->st_index[AVMEDIA_TYPE_VIDEO],pts);
+
+        }
         if (pts < pContext->start_time && pContext->start_time >= 0 && pContext->force_Iframe != 1) {
             av_frame_free(&out_frame);
             continue;
@@ -271,7 +276,7 @@ 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 *>(dctx->fps);
+        dctx->video_queue = new BlockQueue<AVFrame *>(MAX(10,dctx->fps));
     }
 
     seekToMs(dctx, dctx->offset);

src/opencv/image_fingerprint.cpp

@@ -2,9 +2,6 @@
 // Created by 阳坤 on 2022/3/2.
 //
 
-extern "C"{
-#include <libavcodec/avcodec.h>
-}
 #include "image_fingerprint.h"
 #include "../utils/yuv_convert.h"
 
@@ -14,11 +11,10 @@ int avframeToCvmat(cv::Mat &image, const AVFrame *frame) {
     int height = frame->height;
     int cvLinesizes[1];
     cvLinesizes[0] = image.step1();
-    int size = avpicture_get_size(AV_PIX_FMT_BGR24, width, height);
+    printf("cvmatToAvframe width=%d height=%d linesize[0]=%d  linesize[1]=%d  linesize[2]=%d \n",width,height,frame->linesize[0],frame->linesize[1],frame->linesize[2]);
     SwsContext *conversion = sws_getContext(width, height, (AVPixelFormat) frame->format, width, height,
                                             AVPixelFormat::AV_PIX_FMT_BGR24, SWS_FAST_BILINEAR, NULL, NULL, NULL);
-    if (conversion)
-    {
+    if (conversion) {
         sws_scale(conversion, frame->data, frame->linesize, 0, height, &image.data, cvLinesizes);
         sws_freeContext(conversion);
         conversion = NULL;
@@ -67,7 +63,6 @@ AVFrame *cvmatToAvframe(cv::Mat *image, AVFrame *frame) {
         frame = av_frame_alloc();
         av_image_alloc(frame->data, frame->linesize, width, height, AVPixelFormat::AV_PIX_FMT_YUV420P, 1);
     }
-    printf("cvmatToAvframe width=%d height=%d linesize[0]=%d  linesize[1]=%d  linesize[2]=%d \n",width,height,frame->linesize[0],frame->linesize[1],frame->linesize[2]);
     SwsContext *conversion = sws_getContext(width, height, AVPixelFormat::AV_PIX_FMT_BGR24, width, height,
                                             (AVPixelFormat) frame->format, SWS_FAST_BILINEAR, NULL, NULL, NULL);
     sws_scale(conversion, &image->data, cvLinesizes, 0, height, frame->data, frame->linesize);
@@ -87,7 +82,7 @@ int fingerprintFromFFAVFrame(FILE *file, AVFrame *frame, char buf[64]) {
     printf("fingerprintFromFFAVFrame -2\n");
     int ret = avframeToCvmat(img, frame);
     if (ret < 0) {
-        printf("sws_getContext init error .");
+        printf("sws_getContext init error .\n");
         return -1;
     }
     printf("fingerprintFromFFAVFrame -6\n");

src/video_similarity_comparison.cpp

@@ -83,7 +83,7 @@ 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/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[0] = "{\"videoPath\":\"http://rescdn.yishihui.com/longvideo/transcode/video/e6b5cfa854b24e3f87d133e3b2da0ade1530635451140-randomKgqMSnitde.mp4\",\"clips\":[{\"startTimeMs\":14000,\"endTimeMs\":15000},{\"startTimeMs\":28000,\"endTimeMs\":29000},{\"startTimeMs\":42000,\"endTimeMs\":43000},{\"startTimeMs\":56000,\"endTimeMs\":57000},{\"startTimeMs\":70000,\"endTimeMs\":71000},{\"startTimeMs\":84000,\"endTimeMs\":85000},{\"startTimeMs\":98000,\"endTimeMs\":99000},{\"startTimeMs\":112000,\"endTimeMs\":113000}]}";
 //    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}]}";