(Continued)

OpenIPC · Jun 5, 2024 · 3d4f38b · 3d4f38b
1 parent 978612a
commit 3d4f38b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/hal/hisi/v3_hal.c b/src/hal/hisi/v3_hal.c
@@ -755,6 +755,8 @@ void *v3_video_thread(void)
                         outStrm.seq = stream.sequence;
                         for (int j = 0; j < stream.count; j++) {
                             v3_venc_pack *pack = &stream.packet[j];
+                            outPack[j].data = pack->data;
+                            outPack[j].length = pack->length;
                             outPack[j].naluCnt = 1;
                             outPack[j].nalu[0].length = pack->length;
                             outPack[j].nalu[0].offset = pack->offset;
@@ -766,8 +768,6 @@ void *v3_video_thread(void)
                                     outPack[j].nalu[0].type = pack->naluType.h265Nalu;
                                     break;
                             }
-                            outPack[j].data = pack->data;
-                            outPack[j].length = pack->length;
                             outPack[j].offset = pack->offset;
                             outPack[j].timestamp = pack->timestamp;
                         }

diff --git a/src/hal/hisi/v4_hal.c b/src/hal/hisi/v4_hal.c
@@ -810,6 +810,8 @@ void *v4_video_thread(void)
                         outStrm.seq = stream.sequence;
                         for (int j = 0; j < stream.count; j++) {
                             v4_venc_pack *pack = &stream.packet[j];
+                            outPack[j].data = pack->data;
+                            outPack[j].length = pack->length;
                             outPack[j].naluCnt = 1;
                             outPack[j].nalu[0].length = pack->length;
                             outPack[j].nalu[0].offset = pack->offset;
@@ -821,8 +823,6 @@ void *v4_video_thread(void)
                                     outPack[j].nalu[0].type = pack->naluType.h265Nalu;
                                     break;
                             }
-                            outPack[j].data = pack->data;
-                            outPack[j].length = pack->length;
                             outPack[j].offset = pack->offset;
                             outPack[j].timestamp = pack->timestamp;
                         }

diff --git a/src/hal/inge/t31_hal.c b/src/hal/inge/t31_hal.c
@@ -467,8 +467,6 @@ void *t31_video_thread(void)
                         for (int j = 0; j < stream.count; j++) {
                             t31_venc_pack *pack = &stream.packet[j];
                             if (!pack->length) continue;
-                            outPack[j].offset = 0;
-                            outPack[j].timestamp = pack->timestamp;
                             unsigned int remain = stream.length - pack->offset;
                             if (remain < pack->length) {
                                 outPack[j].data = (unsigned char*)(stream.addr);
@@ -479,7 +477,7 @@ void *t31_video_thread(void)
                             }
                             outPack[j].naluCnt = 1;
                             outPack[j].nalu[0].length = outPack[j].length;
-                            outPack[j].nalu[0].offset = outPack[j].offset;
+                            outPack[j].nalu[0].offset = 0;
                             switch (t31_state[i].payload) {
                                 case HAL_VIDCODEC_H264:
                                     outPack[j].nalu[0].type = pack->naluType.h264Nalu;
@@ -488,6 +486,8 @@ void *t31_video_thread(void)
                                     outPack[j].nalu[0].type = pack->naluType.h265Nalu;
                                     break;
                             }
+                            outPack[j].offset = 0;
+                            outPack[j].timestamp = pack->timestamp;
                         }
                         outStrm.pack = outPack;
                         (*t31_venc_cb)(i, &outStrm);