diff options
-rw-r--r-- | va/va.h | 19 | ||||
-rwxr-xr-x | va/va_trace.c | 3 |
2 files changed, 5 insertions, 17 deletions
@@ -334,7 +334,7 @@ typedef enum VAProfileMPEG4Simple = 2, VAProfileMPEG4AdvancedSimple = 3, VAProfileMPEG4Main = 4, - VAProfileH264Baseline = 5, + VAProfileH264Baseline va_deprecated_enum = 5, VAProfileH264Main = 6, VAProfileH264High = 7, VAProfileVC1Simple = 8, @@ -2055,9 +2055,10 @@ typedef struct _VAPictureParameterBufferH264 } bits; unsigned int value; } seq_fields; - unsigned char num_slice_groups_minus1; - unsigned char slice_group_map_type; - unsigned short slice_group_change_rate_minus1; + // FMO is not supported. + va_deprecated unsigned char num_slice_groups_minus1; + va_deprecated unsigned char slice_group_map_type; + va_deprecated unsigned short slice_group_change_rate_minus1; signed char pic_init_qp_minus26; signed char pic_init_qs_minus26; signed char chroma_qp_index_offset; @@ -2089,16 +2090,6 @@ typedef struct _VAIQMatrixBufferH264 unsigned char ScalingList8x8[2][64]; } VAIQMatrixBufferH264; -/** - * H.264 Slice Group Map Buffer - * When VAPictureParameterBufferH264::num_slice_group_minus1 is not equal to 0, - * A slice group map buffer should be sent for each picture if required. The buffer - * is sent only when there is a change in the mapping values. - * The slice group map buffer map "map units" to slice groups as specified in - * section 8.2.2 of the H.264 spec. The buffer will contain one byte for each macroblock - * in raster scan order - */ - /** H.264 Slice Parameter Buffer */ typedef struct _VASliceParameterBufferH264 { diff --git a/va/va_trace.c b/va/va_trace.c index ff1769a..873b297 100755 --- a/va/va_trace.c +++ b/va/va_trace.c @@ -2670,9 +2670,6 @@ static void va_TraceVAPictureParameterBufferH264( va_TraceMsg(trace_ctx, "\tmb_adaptive_frame_field_flag = %d\n", p->seq_fields.bits.mb_adaptive_frame_field_flag); va_TraceMsg(trace_ctx, "\tdirect_8x8_inference_flag = %d\n", p->seq_fields.bits.direct_8x8_inference_flag); va_TraceMsg(trace_ctx, "\tMinLumaBiPredSize8x8 = %d\n", p->seq_fields.bits.MinLumaBiPredSize8x8); - va_TraceMsg(trace_ctx, "\tnum_slice_groups_minus1 = %d\n", p->num_slice_groups_minus1); - va_TraceMsg(trace_ctx, "\tslice_group_map_type = %d\n", p->slice_group_map_type); - va_TraceMsg(trace_ctx, "\tslice_group_change_rate_minus1 = %d\n", p->slice_group_change_rate_minus1); va_TraceMsg(trace_ctx, "\tpic_init_qp_minus26 = %d\n", p->pic_init_qp_minus26); va_TraceMsg(trace_ctx, "\tpic_init_qs_minus26 = %d\n", p->pic_init_qs_minus26); va_TraceMsg(trace_ctx, "\tchroma_qp_index_offset = %d\n", p->chroma_qp_index_offset); |