pts callback for incoming audio

Author: zoff99

toxav/audio.c

@@ -46,7 +46,8 @@ static bool reconfigure_audio_decoder(ACSession *ac, int32_t sampling_rate, int8
 
 
 ACSession *ac_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, Tox *tox, uint32_t friend_number,
-                  toxav_audio_receive_frame_cb *cb, void *cb_data)
+                  toxav_audio_receive_frame_cb *cb, void *cb_data,
+                  toxav_audio_receive_frame_pts_cb *cb_pts, void *cb_pts_data)
 {
     ACSession *ac = (ACSession *)calloc(sizeof(ACSession), 1);
 
@@ -111,9 +112,15 @@ ACSession *ac_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, Tox *tox,
     ac->av = av;
     ac->tox = tox;
     ac->friend_number = friend_number;
+
+    // set callback
     ac->acb = cb;
     ac->acb_user_data = cb_data;
 
+    // set pts callback
+    ac->acb_pts = cb_pts;
+    ac->acb_pts_user_data = cb_pts_data;
+
     return ac;
 
 DECODER_CLEANUP:
@@ -330,6 +337,7 @@ uint8_t ac_iterate(ACSession *ac, uint64_t *a_r_timestamp, uint64_t *a_l_timesta
     }
 
     uint8_t ret_value = 1;
+    uint64_t header_pts_saved = 0;
 
     pthread_mutex_lock(ac->queue_mutex);
 
@@ -432,13 +440,14 @@ uint8_t ac_iterate(ACSession *ac, uint64_t *a_r_timestamp, uint64_t *a_l_timesta
 
                 // LOGGER_ERROR(ac->log, "AUDIO:TTx: %llu %lld now=%llu", header_v3->frame_record_timestamp, (long long)*a_r_timestamp, current_time_monotonic(ac->mono_time));
                 if (header_v3->frame_record_timestamp > 0) {
+                    header_pts_saved = header_v3->frame_record_timestamp;
                     if (*a_r_timestamp < header_v3->frame_record_timestamp) {
                         // LOGGER_ERROR(ac->log, "AUDIO:TTx:2: %llu", header_v3->frame_record_timestamp);
                         *a_r_timestamp = header_v3->frame_record_timestamp;
                         *a_l_timestamp = current_time_monotonic(ac->mono_time);
                     } else {
                         // TODO: this should not happen here!
-                        LOGGER_DEBUG(ac->log, "AUDIO: remote timestamp older");
+                        LOGGER_API_DEBUG(ac->tox, "AUDIO: remote timestamp older");
                     }
                 }
 
@@ -455,11 +464,19 @@ uint8_t ac_iterate(ACSession *ac, uint64_t *a_r_timestamp, uint64_t *a_l_timesta
         }
 
         if (rc < 0) {
-            LOGGER_WARNING(ac->log, "Decoding error: %s", opus_strerror(rc));
-        } else if (ac->acb) {
-            ac->lp_frame_duration = (rc * 1000) / ac->lp_sampling_rate;
-            ac->acb(ac->av, ac->friend_number, ac->temp_audio_buffer, rc, ac->lp_channel_count,
-                    ac->lp_sampling_rate, ac->acb_user_data);
+            LOGGER_API_WARNING(ac->tox, "Decoding error: %s", opus_strerror(rc));
+        } else {
+            if (ac->acb_pts) {
+                ac->lp_frame_duration = (rc * 1000) / ac->lp_sampling_rate;
+                ac->acb_pts(ac->av, ac->friend_number, ac->temp_audio_buffer, rc, ac->lp_channel_count,
+                        ac->lp_sampling_rate, ac->acb_pts_user_data, header_pts_saved);
+                return ret_value;
+            } else if (ac->acb) {
+                ac->lp_frame_duration = (rc * 1000) / ac->lp_sampling_rate;
+                ac->acb(ac->av, ac->friend_number, ac->temp_audio_buffer, rc, ac->lp_channel_count,
+                        ac->lp_sampling_rate, ac->acb_user_data);
+                return ret_value;
+            }
         }
 
         return ret_value;

toxav/audio.h

@@ -87,10 +87,14 @@ typedef struct ACSession_s {
     /* Audio frame receive callback */
     toxav_audio_receive_frame_cb *acb;
     void *acb_user_data;
+
+    toxav_audio_receive_frame_pts_cb *acb_pts;
+    void *acb_pts_user_data;
 } ACSession;
 
 ACSession *ac_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, Tox *tox, uint32_t friend_number,
-                  toxav_audio_receive_frame_cb *cb, void *cb_data);
+                  toxav_audio_receive_frame_cb *cb, void *cb_data,
+                  toxav_audio_receive_frame_pts_cb *cb_pts, void *cb_pts_data);
 void ac_kill(ACSession *ac);
 uint8_t ac_iterate(ACSession *ac, uint64_t *a_r_timestamp, uint64_t *a_l_timestamp, uint64_t *v_r_timestamp,
                    uint64_t *v_l_timestamp,

toxav/tox_generic.h

@@ -157,6 +157,8 @@ struct ToxAV {
     /* Audio frame receive callback */
     toxav_audio_receive_frame_cb *acb;
     void *acb_user_data;
+    toxav_audio_receive_frame_pts_cb *acb_pts;
+    void *acb_pts_user_data;
     /* Video frame receive callback */
     toxav_video_receive_frame_cb *vcb;
     void *vcb_user_data;

toxav/toxav.c

@@ -1990,6 +1990,14 @@ void toxav_callback_audio_receive_frame(ToxAV *av, toxav_audio_receive_frame_cb
     pthread_mutex_unlock(av->mutex);
 }
 
+void toxav_callback_audio_receive_frame_pts(ToxAV *av, toxav_audio_receive_frame_pts_cb *callback, void *user_data)
+{
+    pthread_mutex_lock(av->mutex);
+    av->acb_pts = callback;
+    av->acb_pts_user_data = user_data;
+    pthread_mutex_unlock(av->mutex);
+}
+
 void toxav_callback_video_receive_frame(ToxAV *av, toxav_video_receive_frame_cb *callback, void *user_data)
 {
     pthread_mutex_lock(av->mutex);
@@ -2580,7 +2588,9 @@ static bool call_prepare_transmission(ToxAVCall *call)
     call->bwc = bwc_new(av->tox, av->toxav_mono_time, call->friend_number, callback_bwc, call);
 
     { /* Prepare audio */
-        call->audio = ac_new(av->toxav_mono_time, nullptr, av, av->tox, call->friend_number, av->acb, av->acb_user_data);
+        call->audio = ac_new(av->toxav_mono_time, nullptr, av, av->tox, call->friend_number,
+                                av->acb, av->acb_user_data,
+                                av->acb_pts, av->acb_pts_user_data);
 
         if (!call->audio) {
             LOGGER_API_ERROR(av->tox, "Failed to create audio codec session");

toxav/toxav.h

@@ -791,6 +791,12 @@ typedef void toxav_audio_receive_frame_cb(ToxAV *av, uint32_t friend_number, con
  */
 void toxav_callback_audio_receive_frame(ToxAV *av, toxav_audio_receive_frame_cb *callback, void *user_data);
 
+
+typedef void toxav_audio_receive_frame_pts_cb(ToxAV *av, uint32_t friend_number, const int16_t *pcm, size_t sample_count,
+        uint8_t channels, uint32_t sampling_rate, void *user_data, uint64_t pts);
+
+void toxav_callback_audio_receive_frame_pts(ToxAV *av, toxav_audio_receive_frame_pts_cb *callback, void *user_data);
+
 /**
  * The function type for the video_receive_frame callback.
  *