libmediaparser: parser header changes to keep consistencyandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1nougat-mr1-wear-releasen-iot-preview-2marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release

fix corruption issue for AVC baseline profile
return success when parsing SEI reserved message
add support for constrained high profile
reset VC1 parameters when ES contains config data
mpeg4 error concealment in case of vol missing
add color space info

BZ: IMINAN-37403

Change-Id: I12d7b719026de7c32cbd0ad09ed707187fad5bc6
Signed-off-by: Nana Guo <nana.n.guo@intel.com>

1 files changed, 25 insertions, 2 deletions

diff --git a/libmediaparser/mixvbp/vbp_manager/include/vbp_loader.h b/libmediaparser/mixvbp/vbp_manager/include/vbp_loader.h
index 7866b12..4ee2afe 100644
--- a/libmediaparser/mixvbp/vbp_manager/include/vbp_loader.h
+++ b/libmediaparser/mixvbp/vbp_manager/include/vbp_loader.h
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+
 #ifndef VBP_LOADER_H
 #define VBP_LOADER_H
 
@@ -75,6 +76,11 @@ typedef struct _vbp_codec_data_mp42
 
     // bit rate
     int bit_rate;
+
+    // indicate if vol is received
+    uint8 got_vol;
+    // indicate if vop is received
+    uint8 got_vop;
 } vbp_codec_data_mp42;
 
 typedef struct _vbp_slice_data_mp42
@@ -83,6 +89,11 @@ typedef struct _vbp_slice_data_mp42
     uint32 slice_offset;
     uint32 slice_size;
     VASliceParameterBufferMPEG4 slice_param;
+    uint8* cur_frame_addr;
+    uint8* forward_ref_addr;
+    uint8* backward_ref_addr;
+    uint32_t pic_stride;
+    uint32_t pic_height;
 } vbp_slice_data_mp42;
 
 typedef struct _vbp_picture_data_mp42 vbp_picture_data_mp42;
@@ -112,8 +123,8 @@ typedef struct _vbp_data_mp42
 } vbp_data_mp42;
 
 /*
- *  * MPEG2 data structure
- *   */
+ * MPEG2 data structure
+ */
 
 typedef struct _vbp_codec_data_mpeg2
 {
@@ -132,6 +143,7 @@ typedef struct _vbp_codec_data_mpeg2
 
     // a 3-bit integer, 0 for unspecified, PAL/NTSC/SECAM
     uint8 video_format;
+
     // 0 short range, 1 full range
     uint8 video_range;
 
@@ -142,6 +154,7 @@ typedef struct _vbp_codec_data_mpeg2
 
     // a 8-bit integer
     uint8  matrix_coefficients;
+
     uint8  load_intra_quantiser_matrix;
     uint8  load_non_intra_quantiser_matrix;
 
@@ -164,6 +177,7 @@ typedef struct _vbp_picture_data_mpeg2
 {
     VAPictureParameterBufferMPEG2* pic_parms;
     vbp_slice_data_mpeg2* slice_data;
+
     uint32 num_slices;
 } vbp_picture_data_mpeg2;
 
@@ -171,13 +185,16 @@ typedef struct _vbp_data_mpeg2
 {
     /* rolling counter of buffers sent by vbp_parse */
     uint32 buf_number;
+
     vbp_codec_data_mpeg2* codec_data;
     VAIQMatrixBufferMPEG2* iq_matrix_buffer;
 
     uint32 num_pictures;
+
     vbp_picture_data_mpeg2 *pic_data;
 } vbp_data_mpeg2;
 
+
 /*
  * H.264 data structure
  */
@@ -195,6 +212,7 @@ typedef struct _vbp_codec_data_h264
     uint8 constraint_set2_flag;
     uint8 constraint_set3_flag;
     uint8 constraint_set4_flag;
+    uint8 constraint_set5_flag;
 
     uint8 num_ref_frames;
     uint8 gaps_in_frame_num_value_allowed_flag;
@@ -393,6 +411,9 @@ typedef struct _vbp_codec_data_vp8
     uint8 version_num;
     int show_frame;
 
+    /* color space type specification */
+    int clr_type;
+
     uint32 frame_width;
     uint32 frame_height;
 
@@ -539,4 +560,6 @@ uint32 vbp_flush(Handle hcontent);
 uint32 vbp_update(Handle hcontext, void *newdata, uint32 size, void **data);
 #endif
 
+uint32 vbp_decode(Handle hcontext, void *picdata);
+
 #endif /* VBP_LOADER_H */