From 87ae11178d05276837c3be3a2aa955e19a376011 Mon Sep 17 00:00:00 2001 From: "Xiang, Haihao" Date: Mon, 10 Oct 2011 13:13:59 +0800 Subject: [PATCH] test: use new interface for all test cases Signed-off-by: Xiang, Haihao --- test/encode/avcenc.c | 30 +++++++++++++++--------------- test/encode/h264encode_common.c | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/encode/avcenc.c b/test/encode/avcenc.c index 2ca379c..1f17175 100644 --- a/test/encode/avcenc.c +++ b/test/encode/avcenc.c @@ -88,9 +88,9 @@ static void upload_yuv_to_surface(FILE *yuv_fp, VASurfaceID surface_id); struct { - VAEncSequenceParameterBufferH264Ext seq_param; - VAEncPictureParameterBufferH264Ext pic_param; - VAEncSliceParameterBufferH264Ext slice_param[MAX_SLICES]; + VAEncSequenceParameterBufferH264 seq_param; + VAEncPictureParameterBufferH264 pic_param; + VAEncSliceParameterBufferH264 slice_param[MAX_SLICES]; VAEncH264DecRefPicMarkingBuffer dec_ref_pic_marking; VAContextID context_id; VAConfigID config_id; @@ -246,7 +246,7 @@ static void release_encode_resource() static void avcenc_update_picture_parameter(int slice_type, int frame_num, int display_num, int is_idr) { - VAEncPictureParameterBufferH264Ext *pic_param; + VAEncPictureParameterBufferH264 *pic_param; VAStatus va_status; // Picture level @@ -264,7 +264,7 @@ static void avcenc_update_picture_parameter(int slice_type, int frame_num, int d va_status = vaCreateBuffer(va_dpy, avcenc_context.context_id, - VAEncPictureParameterBufferExtType, + VAEncPictureParameterBufferType, sizeof(*pic_param), 1, pic_param, &avcenc_context.pic_param_buf_id); CHECK_VASTATUS(va_status,"vaCreateBuffer"); @@ -329,7 +329,7 @@ static void upload_yuv_to_surface(FILE *yuv_fp, VASurfaceID surface_id) static void avcenc_update_slice_parameter(int slice_type) { - VAEncSliceParameterBufferH264Ext *slice_param; + VAEncSliceParameterBufferH264 *slice_param; VAStatus va_status; int i; @@ -357,7 +357,7 @@ static void avcenc_update_slice_parameter(int slice_type) va_status = vaCreateBuffer(va_dpy, avcenc_context.context_id, - VAEncSliceParameterBufferExtType, + VAEncSliceParameterBufferType, sizeof(*slice_param), 1, slice_param, &avcenc_context.slice_param_buf_id[i]); CHECK_VASTATUS(va_status,"vaCreateBuffer");; @@ -441,10 +441,10 @@ static int begin_picture(FILE *yuv_fp, int frame_num, int display_num, int slice } /* sequence parameter set */ - VAEncSequenceParameterBufferH264Ext *seq_param = &avcenc_context.seq_param; + VAEncSequenceParameterBufferH264 *seq_param = &avcenc_context.seq_param; va_status = vaCreateBuffer(va_dpy, avcenc_context.context_id, - VAEncSequenceParameterBufferExtType, + VAEncSequenceParameterBufferType, sizeof(*seq_param), 1, seq_param, &avcenc_context.seq_param_buf_id); CHECK_VASTATUS(va_status,"vaCreateBuffer");; @@ -710,7 +710,7 @@ static void nal_header(bitstream *bs, int nal_ref_idc, int nal_unit_type) static void sps_rbsp(bitstream *bs) { - VAEncSequenceParameterBufferH264Ext *seq_param = &avcenc_context.seq_param; + VAEncSequenceParameterBufferH264 *seq_param = &avcenc_context.seq_param; bitstream_put_ui(bs, seq_param->profile_idc, 8); /* profile_idc */ bitstream_put_ui(bs, 0, 1); /* constraint_set0_flag */ @@ -775,7 +775,7 @@ static void build_nal_sps(FILE *avc_fp) static void pps_rbsp(bitstream *bs) { - VAEncPictureParameterBufferH264Ext *pic_param = &avcenc_context.pic_param; + VAEncPictureParameterBufferH264 *pic_param = &avcenc_context.pic_param; bitstream_put_ue(bs, pic_param->pic_parameter_set_id); /* pic_parameter_set_id */ bitstream_put_ue(bs, pic_param->seq_parameter_set_id); /* seq_parameter_set_id */ @@ -858,8 +858,8 @@ build_packed_seq_buffer(unsigned char **header_buffer) static void slice_header(bitstream *bs, int frame_num, int display_frame, int slice_type, int nal_ref_idc, int is_idr) { - VAEncSequenceParameterBufferH264Ext *seq_param = &avcenc_context.seq_param; - VAEncPictureParameterBufferH264Ext *pic_param = &avcenc_context.pic_param; + VAEncSequenceParameterBufferH264 *seq_param = &avcenc_context.seq_param; + VAEncPictureParameterBufferH264 *pic_param = &avcenc_context.pic_param; int is_cabac = (pic_param->pic_fields.bits.entropy_coding_mode_flag == ENTROPY_MODE_CABAC); bitstream_put_ue(bs, 0); /* first_mb_in_slice: 0 */ @@ -1111,7 +1111,7 @@ static void show_help() printf("Usage: avnenc [qp=qpvalue|fb=framebitrate] [mode=0(I frames only)/1(I and P frames)/2(I, P and B frames)\n"); } -static void avcenc_context_seq_param_init(VAEncSequenceParameterBufferH264Ext *seq_param, +static void avcenc_context_seq_param_init(VAEncSequenceParameterBufferH264 *seq_param, int width, int height) { @@ -1177,7 +1177,7 @@ static void avcenc_context_seq_param_init(VAEncSequenceParameterBufferH264Ext *s seq_param->vui_flag = 0; } -static void avcenc_context_pic_param_init(VAEncPictureParameterBufferH264Ext *pic_param) +static void avcenc_context_pic_param_init(VAEncPictureParameterBufferH264 *pic_param) { pic_param->seq_parameter_set_id = 0; pic_param->pic_parameter_set_id = 0; diff --git a/test/encode/h264encode_common.c b/test/encode/h264encode_common.c index 8765def..bcc0671 100644 --- a/test/encode/h264encode_common.c +++ b/test/encode/h264encode_common.c @@ -202,7 +202,7 @@ static int do_h264_encoding(void) CHECK_VASTATUS(va_status,"vaBeginPicture"); if (i == 0) { - VAEncSequenceParameterBufferH264Baseline seq_h264; + VAEncSequenceParameterBufferH264Baseline seq_h264 = {0}; VABufferID seq_param_buf; seq_h264.level_idc = SH_LEVEL_3; -- 2.7.4