Some fixes regarding snapshots on Rockchip, RTP fragmented unit packets

Author: wberube

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
 
       - name: Build
         run: |
-          list="arm-glibc arm-musl3 arm-musl4 arm9-musl3 arm9-musl4 arm9-uclibc armhf-glibc armhf-musl mips-musl"
+          list="arm-glibc arm-musl3 arm-musl4 arm9-musl3 arm9-musl4 arm9-uclibc armhf-glibc armhf-musl armhf-uclibc mips-musl"
           for lib in $list; do
             sh build.sh $lib
             zip $lib divinus*

src/compat.c

@@ -55,7 +55,7 @@ float __expf_finite(float x) { return expf(x); }
 int __fgetc_unlocked(FILE *stream) { return fgetc(stream); }
 double __log_finite(double x) { return log(x); }
 
-#if !defined(__riscv) || !defined(__riscv__)
+#if !defined(__riscv) && !defined(__riscv__)
 void *mmap(void *start, size_t len, int prot, int flags, int fd, uint32_t off) {
     return (void*)syscall(SYS_mmap2, start, len, prot, flags, fd, off >> 12);
 }

src/hal/plus/rk_hal.c

@@ -614,15 +614,15 @@ int rk_video_snapshot_grab(char index, hal_jpegdata *jpeg)
 {
     int ret;
 
-    if (ret = rk_channel_bind(index)) {
-        HAL_DANGER("rk_venc", "Binding the encoder channel "
+    unsigned int count = 1;
+    if (rk_venc.fnStartReceivingEx(index, &count)) {
+        HAL_DANGER("rk_venc", "Requesting one frame "
             "%d failed with %#x!\n", index, ret);
         goto abort;
     }
 
-    unsigned int count = 1;
-    if (rk_venc.fnStartReceivingEx(index, &count)) {
-        HAL_DANGER("rk_venc", "Requesting one frame "
+    if (ret = rk_channel_bind(index)) {
+        HAL_DANGER("rk_venc", "Binding the encoder channel "
             "%d failed with %#x!\n", index, ret);
         goto abort;
     }
@@ -644,7 +644,7 @@ int rk_video_snapshot_grab(char index, hal_jpegdata *jpeg)
 
     if (FD_ISSET(fd, &readFds)) {
         rk_venc_stat stat;
-        if (rk_venc.fnQuery(index, &stat)) {
+        /*if (rk_venc.fnQuery(index, &stat)) {
             HAL_DANGER("rk_venc", "Querying the encoder channel "
                 "%d failed with %#x!\n", index, ret);
             goto abort;
@@ -653,7 +653,7 @@ int rk_video_snapshot_grab(char index, hal_jpegdata *jpeg)
         if (!stat.curPacks) {
             HAL_DANGER("rk_venc", "Current frame is empty, skipping it!\n");
             goto abort;
-        }
+        }*/stat.curPacks = 1;
 
         rk_venc_strm strm;
         memset(&strm, 0, sizeof(strm));
@@ -667,8 +667,6 @@ int rk_video_snapshot_grab(char index, hal_jpegdata *jpeg)
         if (ret = rk_venc.fnGetStream(index, &strm, 40)) {
             HAL_DANGER("rk_venc", "Getting the stream on "
                 "channel %d failed with %#x!\n", index, ret);
-            free(strm.packet);
-            strm.packet = NULL;
             goto abort;
         }
 
@@ -689,16 +687,20 @@ int rk_video_snapshot_grab(char index, hal_jpegdata *jpeg)
             }
         }
 
-abort:
         rk_venc.fnFreeStream(index, &strm);
+    abort:
+        if (strm.packet) {
+            free(strm.packet);
+            strm.packet = NULL;
+        }
     }
 
     rk_venc.fnFreeDescriptor(index);
 
-    rk_venc.fnStopReceiving(index);
-
     rk_channel_unbind(index);
 
+    rk_venc.fnStopReceiving(index);
+
     return ret;
 }
 
@@ -823,8 +825,10 @@ void *rk_video_thread(void)
                             "channel %d failed with %#x!\n", i, ret);
                     }
 free:
-                    free(stream.packet);
-                    stream.packet = NULL;
+                    if (stream.packet) {
+                        free(stream.packet);
+                        stream.packet = NULL;
+                    }
                 }
             }
         }

src/jpeg.c

@@ -41,6 +41,7 @@ int jpeg_init() {
             case HAL_PLATFORM_I6:  ret = i6_video_create(jpeg_index, &config); break;
             case HAL_PLATFORM_I6C: ret = i6c_video_create(jpeg_index, &config); break;
             case HAL_PLATFORM_M6:  ret = m6_video_create(jpeg_index, &config); break;
+            case HAL_PLATFORM_RK:  ret = rk_video_create(jpeg_index, &config); break;
 #elif defined(__ARM_PCS)
             case HAL_PLATFORM_V1:  ret = v1_video_create(jpeg_index, &config); break;
             case HAL_PLATFORM_V2:  ret = v2_video_create(jpeg_index, &config); break;
@@ -79,6 +80,7 @@ void jpeg_deinit() {
         case HAL_PLATFORM_I6:  i6_video_destroy(jpeg_index); break;
         case HAL_PLATFORM_I6C: i6c_video_destroy(jpeg_index); break;
         case HAL_PLATFORM_M6:  m6_video_destroy(jpeg_index); break;
+        case HAL_PLATFORM_RK:  rk_video_destroy(jpeg_index); break;
 #elif defined(__ARM_PCS)
         case HAL_PLATFORM_GM:  goto active;
         case HAL_PLATFORM_V1:  v1_video_destroy(jpeg_index); break;
@@ -118,6 +120,7 @@ int jpeg_get(short width, short height, char quality, char grayscale,
         case HAL_PLATFORM_I6:  ret = i6_video_snapshot_grab(jpeg_index, quality, jpeg); break;
         case HAL_PLATFORM_I6C: ret = i6c_video_snapshot_grab(jpeg_index, quality, jpeg); break;
         case HAL_PLATFORM_M6:  ret = m6_video_snapshot_grab(jpeg_index, quality, jpeg); break;
+        case HAL_PLATFORM_RK:  ret = rk_video_snapshot_grab(jpeg_index, jpeg); break;
 #elif defined(__ARM_PCS)
         case HAL_PLATFORM_GM:  ret = gm_video_snapshot_grab(width, height, quality, jpeg); break;
         case HAL_PLATFORM_V1:  ret = v1_video_snapshot_grab(jpeg_index, jpeg); break;
@@ -131,9 +134,8 @@ int jpeg_get(short width, short height, char quality, char grayscale,
         case HAL_PLATFORM_CVI: ret = cvi_video_snapshot_grab(jpeg_index, jpeg); break;
 #endif
     }
-    if (ret) {
-        if (jpeg->data)
-            free(jpeg->data);
+    if (ret && jpeg->data) { 
+        free(jpeg->data);
         jpeg->data = NULL;
     }
 

src/rtsp/rtp.c

@@ -116,7 +116,7 @@ static inline int __transfer_nal_h26x(struct list_head_t *trans_list, unsigned c
         /* intended xor. blame vim :( */
         payload[head - 1] &= 0xFF ^ (1<<7);
 
-        rtp.rtpsize = nalsize + sizeof(rtp_hdr_t);
+        rtp.rtpsize = nalsize + sizeof(rtp_hdr_t) + head;
 
         memcpy(&(payload[head]), nalptr, nalsize);