give video frame PTS to client, if callback is registered per API

Author: zoff99

toxav/codecs/h264/codec.c

@@ -1686,12 +1686,32 @@ void decode_frame_h264(VCSession *vc, Tox *tox, uint8_t skip_video_flag, uint64_
 // -------- DEBUG:AUDIO/VIDEO DELAY/LATENCY --------
 // -------- DEBUG:AUDIO/VIDEO DELAY/LATENCY --------
 
-                vc->vcb(vc->av, vc->friend_number, frame->width, frame->height,
-                        (const uint8_t *)frame->data[0],
-                        (const uint8_t *)frame->data[1],
-                        (const uint8_t *)frame->data[2],
-                        frame->linesize[0], frame->linesize[1],
-                        frame->linesize[2], vc->vcb_user_data);
+                if (vc->vcb_pts)
+                {
+                    uint64_t pts_for_client = h_frame_record_timestamp;
+                    int32_t delta_check = (int32_t)(h_frame_record_timestamp - frame->pkt_pts);
+                    if ((delta_check >= 0) && (delta_check <= 100))
+                    {
+                        pts_for_client = frame->pkt_pts;
+                    }
+
+                    vc->vcb_pts(vc->av, vc->friend_number, frame->width, frame->height,
+                            (const uint8_t *)frame->data[0],
+                            (const uint8_t *)frame->data[1],
+                            (const uint8_t *)frame->data[2],
+                            frame->linesize[0], frame->linesize[1],
+                            frame->linesize[2], vc->vcb_pts_user_data,
+                            pts_for_client);
+                }
+                else
+                {
+                    vc->vcb(vc->av, vc->friend_number, frame->width, frame->height,
+                            (const uint8_t *)frame->data[0],
+                            (const uint8_t *)frame->data[1],
+                            (const uint8_t *)frame->data[2],
+                            frame->linesize[0], frame->linesize[1],
+                            frame->linesize[2], vc->vcb_user_data);
+                }
             }
 
             // end_time_ms = current_time_monotonic(vc->av->toxav_mono_time);

toxav/tox_generic.h

@@ -160,6 +160,8 @@ struct ToxAV {
     /* Video frame receive callback */
     toxav_video_receive_frame_cb *vcb;
     void *vcb_user_data;
+    toxav_video_receive_frame_pts_cb *vcb_pts;
+    void *vcb_pts_user_data;
     toxav_video_receive_frame_h264_cb *vcb_h264;
     void *vcb_h264_user_data;
     /* Bit rate control callback */

toxav/toxav.c

@@ -1998,6 +1998,14 @@ void toxav_callback_video_receive_frame(ToxAV *av, toxav_video_receive_frame_cb
     pthread_mutex_unlock(av->mutex);
 }
 
+void toxav_callback_video_receive_frame_pts(ToxAV *av, toxav_video_receive_frame_pts_cb *callback, void *user_data)
+{
+    pthread_mutex_lock(av->mutex);
+    av->vcb_pts = callback;
+    av->vcb_pts_user_data = user_data;
+    pthread_mutex_unlock(av->mutex);
+}
+
 void toxav_callback_video_receive_frame_h264(ToxAV *av, toxav_video_receive_frame_h264_cb *callback, void *user_data)
 {
     pthread_mutex_lock(av->mutex);

toxav/toxav.h

@@ -826,6 +826,14 @@ void toxav_callback_video_receive_frame(ToxAV *av, toxav_video_receive_frame_cb
 
 
 
+typedef void toxav_video_receive_frame_pts_cb(ToxAV *av, uint32_t friend_number, uint16_t width, uint16_t height,
+        const uint8_t *y, const uint8_t *u, const uint8_t *v, int32_t ystride, int32_t ustride, int32_t vstride,
+        void *user_data, uint64_t pts);
+
+void toxav_callback_video_receive_frame_pts(ToxAV *av, toxav_video_receive_frame_pts_cb *callback, void *user_data);
+
+
+
 
 
 typedef void toxav_video_receive_frame_h264_cb(ToxAV *av, uint32_t friend_number,
@@ -839,8 +847,6 @@ typedef void toxav_video_receive_frame_h264_cb(ToxAV *av, uint32_t friend_number
 void toxav_callback_video_receive_frame_h264(ToxAV *av, toxav_video_receive_frame_h264_cb *callback, void *user_data);
 
 
-
-
 /**
  * NOTE Compatibility with old toxav group calls. TODO(iphydf): remove
  *

toxav/video.c

@@ -179,6 +179,11 @@ VCSession *vc_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t f
     vc->vcb_h264 = av->vcb_h264;
     vc->vcb_h264_user_data = av->vcb_h264_user_data;
 
+    // set pts callback
+    vc->vcb_pts = av->vcb_pts;
+    vc->vcb_pts_user_data = av->vcb_pts_user_data;
+
+
     for (int i = 0; i < VIDEO_INCOMING_FRAMES_GAP_MS_ENTRIES; i++) {
         vc->incoming_video_frames_gap_ms[i] = 0;
     }

toxav/video.h

@@ -287,6 +287,8 @@ typedef struct VCSession_s {
     /* Video frame receive callback */
     toxav_video_receive_frame_cb *vcb;
     void *vcb_user_data;
+    toxav_video_receive_frame_pts_cb *vcb_pts;
+    void *vcb_pts_user_data;
     toxav_video_receive_frame_h264_cb *vcb_h264;
     void *vcb_h264_user_data;