init

opencv-motion-detect/evpusher.cpp

@@ -150,8 +150,11 @@ protected:
         bool bStopSig = false;
         zmq_msg_t msg;
         av_log_set_level(AV_LOG_DEBUG);
-        int pktCnt = 0;
+        bool firstPkt = true;
+        double oldPos = 0;
         AVPacket packet;
+        uint64_t pktCnt = 0;
+        int64_t start_time = av_gettime();
         while (true) {
             if(checkStop() == true) {
                 bStopSig = true;
@@ -170,7 +173,7 @@ protected:
             }
 
             av_log(NULL, AV_LOG_DEBUG, "msg size: %d, %d\n", ret, zmq_msg_size(&msg));
-            // deserialize the packet
+            // decode
             pktCnt++;
             ret = PacketSerializer::decode((char*)zmq_msg_data(&msg), ret, &packet); {
                 if (ret < 0) {
@@ -184,11 +187,65 @@ protected:
             in_stream  = pAVFormatInput->streams[packet.stream_index];
             packet.stream_index = streamList[packet.stream_index];
             out_stream = pAVFormatRemux->streams[packet.stream_index];
-            /* copy packet */
-            packet.pts = av_rescale_q_rnd(packet.pts, in_stream->time_base, out_stream->time_base, AVRounding(AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX));
-            packet.dts = av_rescale_q_rnd(packet.dts, in_stream->time_base, out_stream->time_base, AVRounding(AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX));
-            packet.duration = av_rescale_q(packet.duration, in_stream->time_base, out_stream->time_base);
-            packet.pos = -1;
+
+            {
+                //Simple Write PTS
+                if (packet.pts == AV_NOPTS_VALUE) {
+                    //Write PTS
+                    AVRational time_base1 = pAVFormatInput->streams[packet.stream_index]->time_base;
+                    //Duration between 2 frames (us)
+                    int64_t calc_duration = (double)AV_TIME_BASE / av_q2d(pAVFormatInput->streams[packet.stream_index]->r_frame_rate);
+                    //Parameters
+                    packet.pts = (double)(pktCnt*calc_duration) / (double)(av_q2d(time_base1)*AV_TIME_BASE);
+                    packet.dts = packet.pts;
+                    packet.duration = (double)calc_duration / (double)(av_q2d(time_base1)*AV_TIME_BASE);
+                }
+                //Important:Delay
+                if (packet.stream_index == packet.stream_index)
+                {
+                    AVRational time_base = pAVFormatInput->streams[packet.stream_index]->time_base;
+                    AVRational time_base_q = { 1,AV_TIME_BASE };
+                    int64_t pts_time = av_rescale_q(packet.dts, time_base, time_base_q);
+                    int64_t now_time = av_gettime() - start_time;
+                    if (pts_time > now_time)
+                        av_usleep(pts_time - now_time);
+                }
+                else
+                {
+                    AVRational time_base1 = pAVFormatInput->streams[packet.stream_index]->time_base;
+                    AVRational time_base_q = { 1, AV_TIME_BASE };
+                    double frame_size = pAVFormatInput->streams[packet.stream_index]->codec->frame_size;
+                    double sample_rate = pAVFormatInput->streams[packet.stream_index]->codec->sample_rate;
+                    //Duration between 2 frames (us)  
+                    int64_t calc_duration = (double)(AV_TIME_BASE) * (frame_size / sample_rate);
+                    packet.pts = av_rescale_q(pktCnt*calc_duration, time_base_q, time_base1);
+                    packet.dts = packet.pts;
+                    packet.duration = av_rescale_q(calc_duration, time_base_q, time_base1);
+                    packet.pos = -1;
+
+                    //_sleep(26);
+                    //AVRational time_base1 = pAVFormatInput->streams[packet.stream_index]->time_base;
+                    double currentPos = packet.pts * av_q2d(time_base1);
+                    if (firstPkt == true)
+                    {
+                        oldPos = currentPos;
+                        firstPkt = false;
+                    }
+                    double duration = currentPos - oldPos;
+                    oldPos = currentPos;
+                    cout << duration << endl;
+                    av_usleep(duration * 1000 * 1000);
+                }
+
+                in_stream = pAVFormatInput->streams[packet.stream_index];
+                out_stream = pAVFormatRemux->streams[packet.stream_index];
+                /* copy packet */
+                //转换PTS/DTS（Convert PTS/DTS）
+                packet.pts = av_rescale_q_rnd(packet.pts, in_stream->time_base, out_stream->time_base, (AVRounding)(AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX));
+                packet.dts = av_rescale_q_rnd(packet.dts, in_stream->time_base, out_stream->time_base, (AVRounding)(AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX));
+                packet.duration = av_rescale_q(packet.duration, in_stream->time_base, out_stream->time_base);
+                packet.pos = -1;
+            }
             
             //av_log(NULL, AV_LOG_WARNING, "chkpt1: %d\n", pktCnt);
             ret = av_interleaved_write_frame(pAVFormatRemux, &packet);

opencv-motion-detect/inc/common.hpp

@@ -2,8 +2,10 @@
 #define __COMMON_H__
 extern "C" {
 #include <libavformat/avformat.h>
+#include <libavutil/time.h>
 }
 #include <libavutil/timestamp.h>
+
 #undef av_err2str
 #define av_err2str(errnum) av_make_error_string((char*)__builtin_alloca(AV_ERROR_MAX_STRING_SIZE), AV_ERROR_MAX_STRING_SIZE, errnum)