Bugfixes for metadata (#132)

- Filler metadata pld decode.
- When pld size is 0.

Signed-off-by: Yangwoo Kim <yearly.kim@samsung.com>
Co-authored-by: Yangwoo Kim <yearly.kim@samsung.com>

Author: tuzm24

src/oapv_bs.c

@@ -305,7 +305,7 @@ u32 oapv_bsr_peek(oapv_bs_t *bs, int size)
 
 void *oapv_bsr_sink(oapv_bs_t *bs)
 {
-    oapv_assert_rv(bs->cur + BSW_GET_SINK_BYTE(bs) < bs->end, NULL);
+    oapv_assert_rv(bs->cur - BSW_GET_SINK_BYTE(bs) < bs->end, NULL);
     oapv_assert_rv((bs->leftbits & 7) == 0, NULL);
     bs->cur = bs->cur - (bs->leftbits >> 3);
     bs->code = 0;

src/oapv_metadata.c

@@ -156,6 +156,13 @@ static int meta_verify_mdp_data(int type, int size, u8 *data)
             return OAPV_ERR_MALFORMED_BITSTREAM;
         }
     }
+    else if(type == OAPV_METADATA_FILLER) {
+        for(int i = 0; i < size; i++) {
+            if(data[i] != 0xFF) {
+                return OAPV_ERR_MALFORMED_BITSTREAM;
+            }
+        }
+    }
     else {
         return OAPV_OK;
     }
@@ -182,12 +189,12 @@ int oapvm_set(oapvm_t mid, int group_id, int type, void *data, int size)
 
     oapvm_ctx_t *ctx = meta_id_to_ctx(mid);
     oapv_assert_rv(ctx, OAPV_ERR_INVALID_ARGUMENT);
-    oapv_assert_rv((data != NULL && size > 0), OAPV_ERR_INVALID_ARGUMENT);
+    oapv_assert_rv((data != NULL && size > 0) || (data == NULL && size == 0), OAPV_ERR_INVALID_ARGUMENT);
 
     ret = meta_verify_mdp_data(type, size, (u8 *)data);
     oapv_assert_rv(OAPV_SUCCEEDED(ret), ret);
 
-    if(type == OAPV_METADATA_USER_DEFINED){
+    if(type == OAPV_METADATA_USER_DEFINED) {
         uuid = (u8 *)data;
     }
 

src/oapv_vlc.c

@@ -1131,36 +1131,24 @@ int oapvd_vlc_metadata(oapv_bs_t *bs, u32 pbu_size, oapvm_t mid, int group_id)
         payload_size += t0;
         oapv_assert_gv(payload_size <= metadata_size, ret, OAPV_ERR_MALFORMED_BITSTREAM, ERR);
 
-        if(payload_size > 0) {
-            oapv_assert_gv(BSR_GET_LEFT_BYTE(bs) >= payload_size, ret, OAPV_ERR_MALFORMED_BITSTREAM, ERR);
-            payload_data = oapv_bsr_sink(bs);
-
-            if(payload_type == OAPV_METADATA_FILLER) {
-                for(int i = 0; i < payload_size; i++) {
-                    t0 = oapv_bsr_read(bs, 8);
-                    DUMP_HLS(payload_data, t0);
-                    oapv_assert_gv(t0 == 0xFF, ret, OAPV_ERR_MALFORMED_BITSTREAM, ERR);
-                }
-            }
-            else {
+        oapv_assert_gv(BSR_GET_LEFT_BYTE(bs) >= payload_size, ret, OAPV_ERR_MALFORMED_BITSTREAM, ERR);
+        payload_data = oapv_bsr_sink(bs);
 #if ENC_DEC_DUMP
-                for(int i = 0; i < payload_size; i++) {
-                    t0 = oapv_bsr_read(bs, 8);
-                    DUMP_HLS(payload_data, t0);
-                }
-#else
-                BSR_MOVE_BYTE_ALIGN(bs, payload_size);
-#endif
-            }
+        for(int i = 0; i < payload_size; i++) {
+            t0 = bs->cur[i];
+            DUMP_HLS(payload_data, t0);
         }
-        else {
+#endif
+        if (payload_size == 0) {
             payload_data = NULL;
         }
+        BSR_MOVE_BYTE_ALIGN(bs, payload_size);
         ret = oapvm_set(mid, group_id, payload_type, payload_data, payload_size);
         oapv_assert_g(OAPV_SUCCEEDED(ret), ERR);
         metadata_size -= payload_size;
     }
     const u32 target_read_size = (pbu_size - 8);
+    oapv_assert_gv(target_read_size >= (bs->cur - bs_start_pos), ret, OAPV_ERR_MALFORMED_BITSTREAM, ERR);
     ret = oapvd_vlc_filler(bs, target_read_size - (bs->cur - bs_start_pos));
     oapv_assert_g(OAPV_SUCCEEDED(ret), ERR);
     return OAPV_OK;