add signature syntax for android 16 25q2

Signed-off-by: [email protected] <[email protected]>

Author: kpchoi

src/oapv.c

@@ -1301,6 +1301,8 @@ int oapve_encode(oapve_t eid, oapv_frms_t *ifrms, oapvm_t mid, oapv_bitb_t *bitb
     oapv_bs_t bs_pbu_beg;
     oapv_bsw_write(bs, 0, 32);
 
+    oapv_bsw_write(bs, 0x61507631, 32); // signature ('aPv1')
+
     for(i = 0; i < ifrms->num_frms; i++) {
         frm = &ifrms->frm[i];
 
@@ -1953,6 +1955,13 @@ int oapvd_decode(oapvd_t did, oapv_bitb_t *bitb, oapv_frms_t *ofrms, oapvm_t mid
     ctx = dec_id_to_ctx(did);
     oapv_assert_rv(ctx, OAPV_ERR_INVALID_ARGUMENT);
 
+    // read signature ('aPv1')
+    oapv_assert_rv(bitb->ssize > 4, OAPV_ERR_MALFORMED_BITSTREAM);
+    u32 signature = oapv_bsr_read_direct(bitb->addr, 32);
+    oapv_assert_rv(signature == 0x61507631, OAPV_ERR_MALFORMED_BITSTREAM);
+    cur_read_size += 4;
+    stat->read += 4;
+
     do {
         u32 remain = bitb->ssize - cur_read_size;
         oapv_assert_gv((remain >= 8), ret, OAPV_ERR_MALFORMED_BITSTREAM, ERR);
@@ -2065,6 +2074,12 @@ int oapvd_info(void *au, int au_size, oapv_au_info_t *aui)
 
     DUMP_SET(0);
 
+    // read signature ('aPv1')
+    oapv_assert_rv(au_size > 4, OAPV_ERR_MALFORMED_BITSTREAM);
+    u32 signature = oapv_bsr_read_direct(au, 32);
+    oapv_assert_rv(signature == 0x61507631, OAPV_ERR_MALFORMED_BITSTREAM);
+    cur_read_size += 4;
+
     /* 'au' address contains series of PBU */
     do {
         oapv_bs_t bs;

src/oapv_bs.c

@@ -370,6 +370,26 @@ int oapv_bsr_read1(oapv_bs_t *bs)
     return code;
 }
 
+u32 oapv_bsr_read_direct(void *addr, int len)
+{
+    u32 code = 0;
+    int shift = 24;
+    u8 *p = (u8 *)addr;
+    int byte = (len + 7) >> 3;
+
+    oapv_assert(len <= 32);
+
+    while(byte) {
+        code |= *(p) << shift;
+        shift -= 8;
+        byte--;
+        p++;
+    }
+    code = code >> (32 - len);
+    return code;
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////
 // end of decoder code
 #endif // ENABLE_DECODER

src/oapv_bs.h

@@ -139,6 +139,7 @@ void *oapv_bsr_sink(oapv_bs_t *bs);
 void oapv_bsr_move(oapv_bs_t *bs, u8 *pos);
 u32 oapv_bsr_read(oapv_bs_t *bs, int size);
 int oapv_bsr_read1(oapv_bs_t *bs);
+u32 oapv_bsr_read_direct(void *addr, int len);
 
 ///////////////////////////////////////////////////////////////////////////////
 // end of decoder code

util/apv.hexpat

@@ -207,6 +207,8 @@ struct AccessUnit {
     au_end = $ + au_size;
 
     pbu_count = 0; // reset number of PBU
+
+    char signature[4]; // 'aPv1'
     PBU pbu[while($ < au_end)] [[inline]];
 };
 

version.txt

@@ -1 +1 @@
-v0.1.11.1
+v0.1.11.3.1