refine

Author: r-wu-ant

include/moq/xqc_moq.h

@@ -21,7 +21,6 @@ typedef struct {
     uint64_t                        timestamp_us;
     uint8_t                         *video_data;
     uint64_t                        video_len;
-    /* Optional: Reversed for extension data */
     const uint8_t                   *ext_headers;
     uint64_t                        ext_headers_len;
 } xqc_moq_video_frame_t;
@@ -31,7 +30,6 @@ typedef struct {
     uint64_t                        timestamp_us;
     uint8_t                         *audio_data;
     uint64_t                        audio_len;
-    /* Optional: Reversed for extension data */
     const uint8_t                   *ext_headers;
     uint64_t                        ext_headers_len;
 } xqc_moq_audio_frame_t;

moq/demo/xqc_moq_demo_client.c

@@ -636,9 +636,10 @@ xqc_app_send_callback(int fd, short what, void* arg)
         audio_frame.audio_len = 1024;
         audio_frame.audio_data = payload_audio;
 
-        static uint8_t ext_data1[] = "test_ext_data";
-        audio_frame.ext_headers = ext_data1;
-        audio_frame.ext_headers_len = sizeof(ext_data1) - 1;
+        static uint8_t test_ext_data[] = "X test_ext_data";
+        test_ext_data[0] = '0' + (uint8_t) (user_conn->countdown & 0xFF);
+        audio_frame.ext_headers = test_ext_data;
+        audio_frame.ext_headers_len = sizeof(test_ext_data) - 1;
         ret = xqc_moq_write_audio_frame(user_conn->moq_session, user_conn->audio_subscribe_id, user_conn->audio_track, &audio_frame);
         if (ret < 0) {
             printf("xqc_moq_write_audio_frame error\n");

moq/moq_media/xqc_moq_media_track.c

@@ -37,6 +37,19 @@ static void xqc_moq_media_cancel_write(xqc_moq_session_t *session, xqc_moq_track
 static xqc_bool_t xqc_moq_media_maybe_cancel_write(xqc_moq_session_t *session, uint64_t subscribe_id,
     xqc_moq_track_t *track, xqc_moq_video_frame_t *video_frame);
 
+static void xqc_init_moq_object_ext_with_object(xqc_moq_object_stream_msg_ext_t *obj_ext,
+                                                xqc_moq_object_stream_msg_t *object) {
+    xqc_memset(obj_ext, 0, sizeof(*obj_ext));
+    obj_ext->subscribe_id = object->subscribe_id;
+    obj_ext->track_alias = object->track_alias;
+    obj_ext->group_id = object->group_id;
+    obj_ext->object_id = object->object_id;
+    obj_ext->send_order = object->send_order;
+    obj_ext->status = object->status;
+    obj_ext->payload = object->payload;
+    obj_ext->payload_len = object->payload_len;
+}
+
 xqc_int_t
 xqc_moq_write_video_frame(xqc_moq_session_t *session, uint64_t subscribe_id,
     xqc_moq_track_t *track, xqc_moq_video_frame_t *video_frame)
@@ -92,15 +105,7 @@ xqc_moq_write_video_frame(xqc_moq_session_t *session, uint64_t subscribe_id,
 
     if (video_frame->ext_headers != NULL && video_frame->ext_headers_len > 0) {
         xqc_moq_object_stream_msg_ext_t obj_ext;
-        xqc_memset(&obj_ext, 0, sizeof(obj_ext));
-        obj_ext.subscribe_id = object.subscribe_id;
-        obj_ext.track_alias = object.track_alias;
-        obj_ext.group_id = object.group_id;
-        obj_ext.object_id = object.object_id;
-        obj_ext.send_order = object.send_order;
-        obj_ext.status = object.status;
-        obj_ext.payload = object.payload;
-        obj_ext.payload_len = object.payload_len;
+        xqc_init_moq_object_ext_with_object(&obj_ext, &object);
         obj_ext.extension_header_len = video_frame->ext_headers_len;
         obj_ext.extension_header = (uint8_t *)video_frame->ext_headers;
         ret = xqc_moq_write_object_stream_msg_ext(session, stream, &obj_ext);
@@ -175,15 +180,7 @@ xqc_moq_write_audio_frame(xqc_moq_session_t *session, uint64_t subscribe_id,
 
     if (audio_frame->ext_headers != NULL && audio_frame->ext_headers_len > 0) {
         xqc_moq_object_stream_msg_ext_t obj_ext;
-        xqc_memset(&obj_ext, 0, sizeof(obj_ext));
-        obj_ext.subscribe_id = object.subscribe_id;
-        obj_ext.track_alias = object.track_alias;
-        obj_ext.group_id = object.group_id;
-        obj_ext.object_id = object.object_id;
-        obj_ext.send_order = object.send_order;
-        obj_ext.status = object.status;
-        obj_ext.payload = object.payload;
-        obj_ext.payload_len = object.payload_len;
+        xqc_init_moq_object_ext_with_object(&obj_ext, &object);
         obj_ext.extension_header_len = audio_frame->ext_headers_len;
         obj_ext.extension_header = (uint8_t *)audio_frame->ext_headers;
         ret = xqc_moq_write_object_stream_msg_ext(session, stream, &obj_ext);