remove warning in libva
BZ: 209178
remove warning in libva
Signed-off-by: ywan171 <yi.a.wang@intel.com>
Change-Id: Iedf52607ea2a621ca064a1a1285901ffb6e70195
Signed-off-by: root <root@feijiang-desktop.(none)>
Reviewed-on: https://android.intel.com/220738
Tested-by: Fourdan, Olivier <olivier.fourdan@intel.com>
Reviewed-by: Fourdan, Olivier <olivier.fourdan@intel.com>
diff --git a/va/Android.mk b/va/Android.mk
index 18e8053..4e85217 100755
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -81,7 +81,7 @@
va_enc_mpeg2.h \
LOCAL_COPY_HEADERS_TO := libva/va
-
+LOCAL_CFLAGS += -Werror
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libva
@@ -117,7 +117,7 @@
LOCAL_COPY_HEADERS_TO := libva/va
LOCAL_COPY_HEADERS := va_android.h
-
+LOCAL_CFLAGS += -Werror
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libva-android
@@ -144,7 +144,7 @@
LOCAL_COPY_HEADERS_TO := libva/va
LOCAL_COPY_HEADERS := egl/va_egl.h egl/va_backend_egl.h
-
+LOCAL_CFLAGS += -Werror
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libva-egl
@@ -173,7 +173,7 @@
va_backend_tpi.h
LOCAL_SHARED_LIBRARIES := libva
-
+LOCAL_CFLAGS += -Werror
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libva-tpi
diff --git a/va/va.c b/va/va.c
index 0d9a597..3ea8503 100755
--- a/va/va.c
+++ b/va/va.c
@@ -249,7 +249,7 @@
{ VA_MAJOR_VERSION, VA_MINOR_VERSION },
{ 0, 33 },
{ 0, 32 },
- { -1, }
+ { -1, 0}
};
for (i = 0; compatible_versions[i].major >= 0; i++) {
@@ -1029,21 +1029,21 @@
VAStatus vaBufferInfo (
VADisplay dpy,
- VAContextID context, /* in */
+ VAContextID __maybe_unused context, /* in */
VABufferID buf_id, /* in */
VABufferType *type, /* out */
unsigned int *size, /* out */
unsigned int *num_elements /* out */
)
{
- VADriverContextP ctx;
-
- CHECK_DISPLAY(dpy);
- ctx = CTX(dpy);
+ VADriverContextP ctx;
- VA_FOOL_FUNC(va_FoolBufferInfo, dpy, buf_id, type, size, num_elements);
-
- return ctx->vtable->vaBufferInfo( ctx, buf_id, type, size, num_elements );
+ CHECK_DISPLAY(dpy);
+ ctx = CTX(dpy);
+
+ VA_FOOL_FUNC(va_FoolBufferInfo, dpy, buf_id, type, size, num_elements);
+
+ return ctx->vtable->vaBufferInfo( ctx, buf_id, type, size, num_elements );
}
VAStatus vaBeginPicture (
diff --git a/va/va.h b/va/va.h
index 4216148..e911be2 100755
--- a/va/va.h
+++ b/va/va.h
@@ -85,6 +85,12 @@
extern "C" {
#endif
+#ifdef __GNUC__
+# define __maybe_unused __attribute__((__unused__))
+#else
+# define __maybe_unused
+#endif
+
/**
* \mainpage Video Acceleration (VA) API
*
diff --git a/va/va_backend.h b/va/va_backend.h
index 09f8245..61b9d3a 100755
--- a/va/va_backend.h
+++ b/va/va_backend.h
@@ -394,7 +394,7 @@
/* DEPRECATED */
VAStatus
(*vaGetSurfaceAttributes)(
- VADriverContextP dpy,
+ VADriverContextP ctx,
VAConfigID config,
VASurfaceAttrib *attrib_list,
unsigned int num_attribs
diff --git a/va/va_backend_tpi.h b/va/va_backend_tpi.h
index d79ae2a..6b1c85a 100644
--- a/va/va_backend_tpi.h
+++ b/va/va_backend_tpi.h
@@ -36,7 +36,7 @@
struct VADriverVTableTPI
{
VAStatus (*vaCreateSurfacesWithAttribute) (
- VADisplay dpy,
+ VADriverContextP ctx,
int width,
int height,
int format,
@@ -64,7 +64,7 @@
);
VAStatus (*vaSetTimestampForSurface)(
- VADisplay dpy,
+ VADriverContextP ctx,
VASurfaceID surface,
long long timestamp
);
diff --git a/va/va_fool.c b/va/va_fool.c
index 9f7a045..1df177f 100644
--- a/va/va_fool.c
+++ b/va/va_fool.c
@@ -163,7 +163,7 @@
free(fool_ctx);
((VADisplayContextP)dpy)->vafool = NULL;
-
+
return 0;
}
@@ -171,15 +171,15 @@
VADisplay dpy,
VAProfile profile,
VAEntrypoint entrypoint,
- VAConfigAttrib *attrib_list,
- int num_attribs,
- VAConfigID *config_id /* out */
+ VAConfigAttrib __maybe_unused *attrib_list,
+ int __maybe_unused num_attribs,
+ VAConfigID __maybe_unused *config_id /* out */
)
{
DPY2FOOLCTX(dpy);
fool_ctx->entrypoint = entrypoint;
-
+
/*
* check fool_codec to align with current context
* e.g. fool_codec = decode then for encode, the
@@ -208,18 +208,17 @@
else
va_infoMessage("FOOL is not enabled for this context\n");
-
return 0; /* continue */
}
VAStatus va_FoolCreateBuffer(
VADisplay dpy,
- VAContextID context, /* in */
+ VAContextID __maybe_unused context, /* in */
VABufferType type, /* in */
unsigned int size, /* in */
unsigned int num_elements, /* in */
- void *data, /* in */
+ void __maybe_unused *data, /* in */
VABufferID *buf_id /* out */
)
{
diff --git a/va/va_trace.c b/va/va_trace.c
index 0928f19..a70091e 100755
--- a/va/va_trace.c
+++ b/va/va_trace.c
@@ -368,11 +368,12 @@
void va_TraceInitialize (
VADisplay dpy,
- int *major_version, /* out */
- int *minor_version /* out */
+ int __maybe_unused *major_version, /* out */
+ int __maybe_unused *minor_version /* out */
)
{
- DPY2TRACECTX(dpy);
+ DPY2TRACECTX(dpy);
+
TRACE_FUNCNAME(idx);
}
@@ -391,7 +392,7 @@
VAEntrypoint entrypoint,
VAConfigAttrib *attrib_list,
int num_attribs,
- VAConfigID *config_id /* out */
+ VAConfigID __maybe_unused *config_id /* out */
)
{
int i;
@@ -399,7 +400,7 @@
DPY2TRACECTX(dpy);
TRACE_FUNCNAME(idx);
-
+
va_TraceMsg(trace_ctx, "\tprofile = %d\n", profile);
va_TraceMsg(trace_ctx, "\tentrypoint = %d\n", entrypoint);
va_TraceMsg(trace_ctx, "\tnum_attribs = %d\n", num_attribs);
@@ -485,7 +486,7 @@
va_TraceMsg(trace_ctx, "\t\tvalue.value.p = %p\n", p->value.value.p);
if ((p->type == VASurfaceAttribExternalBufferDescriptor) && p->value.value.p) {
VASurfaceAttribExternalBuffers *tmp = (VASurfaceAttribExternalBuffers *) p->value.value.p;
- int j;
+ unsigned int j;
va_TraceMsg(trace_ctx, "\t\t--VASurfaceAttribExternalBufferDescriptor\n");
va_TraceMsg(trace_ctx, "\t\t pixel_format=0x%08x\n", tmp->pixel_format);
@@ -646,11 +647,11 @@
void va_TraceCreateBuffer (
VADisplay dpy,
- VAContextID context, /* in */
+ VAContextID __maybe_unused context, /* in */
VABufferType type, /* in */
unsigned int size, /* in */
unsigned int num_elements, /* in */
- void *data, /* in */
+ void __maybe_unused *data, /* in */
VABufferID *buf_id /* out */
)
{
@@ -762,7 +763,9 @@
unsigned int dump_size = 64;
DPY2TRACECTX(dpy);
-
+
+ va_TraceMsg(trace_ctx, "\t context = %d, buffer = %d, type = %d, size = %d, num_elements = %d\n",
+ context, buffer, type, size, num_elements);
va_TraceMsg(trace_ctx, "--%s\n", buffer_type_to_string(type));
if (dump_size>size)
@@ -793,18 +796,17 @@
static void va_TraceVAPictureParameterBufferMPEG2(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAPictureParameterBufferMPEG2 *p=(VAPictureParameterBufferMPEG2 *)data;
DPY2TRACECTX(dpy);
va_TraceMsg(trace_ctx,"VAPictureParameterBufferMPEG2\n");
-
va_TraceMsg(trace_ctx,"\thorizontal size= %d\n", p->horizontal_size);
va_TraceMsg(trace_ctx,"\tvertical size= %d\n", p->vertical_size);
va_TraceMsg(trace_ctx,"\tforward reference picture= %d\n", p->forward_reference_picture);
@@ -832,18 +834,17 @@
static void va_TraceVAIQMatrixBufferMPEG2(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAIQMatrixBufferMPEG2 *p=(VAIQMatrixBufferMPEG2 *)data;
DPY2TRACECTX(dpy);
va_TraceMsg(trace_ctx,"VAIQMatrixBufferMPEG2\n");
-
va_TraceMsg(trace_ctx,"\tload_intra_quantiser_matrix = %d\n", p->load_intra_quantiser_matrix);
va_TraceMsg(trace_ctx,"\tload_non_intra_quantiser_matrix = %d\n", p->load_non_intra_quantiser_matrix);
va_TraceMsg(trace_ctx,"\tload_chroma_intra_quantiser_matrix = %d\n", p->load_chroma_intra_quantiser_matrix);
@@ -860,11 +861,11 @@
static void va_TraceVASliceParameterBufferMPEG2(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VASliceParameterBufferMPEG2 *p=(VASliceParameterBufferMPEG2 *)data;
@@ -876,7 +877,6 @@
trace_ctx->trace_slice_size = p->slice_data_size;
va_TraceMsg(trace_ctx,"VASliceParameterBufferMPEG2\n");
-
va_TraceMsg(trace_ctx,"\tslice_data_size = %d\n", p->slice_data_size);
va_TraceMsg(trace_ctx,"\tslice_data_offset = %d\n", p->slice_data_offset);
va_TraceMsg(trace_ctx,"\tslice_data_flag = %d\n", p->slice_data_flag);
@@ -892,11 +892,11 @@
static void va_TraceVAPictureParameterBufferJPEG(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
int i;
@@ -917,17 +917,18 @@
static void va_TraceVAIQMatrixBufferJPEG(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
int i, j;
static char tmp[1024];
VAIQMatrixBufferJPEGBaseline *p=(VAIQMatrixBufferJPEGBaseline *)data;
DPY2TRACECTX(dpy);
+
va_TraceMsg(trace_ctx,"*VAIQMatrixParameterBufferJPEG\n");
va_TraceMsg(trace_ctx,"\tload_quantiser_table =\n");
for (i = 0; i < 4; ++i) {
@@ -945,16 +946,17 @@
static void va_TraceVASliceParameterBufferJPEG(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
int i;
VASliceParameterBufferJPEGBaseline *p=(VASliceParameterBufferJPEGBaseline *)data;
DPY2TRACECTX(dpy);
+
va_TraceMsg(trace_ctx,"*VASliceParameterBufferJPEG\n");
va_TraceMsg(trace_ctx,"\tslice_data_size = %u\n", p->slice_data_size);
va_TraceMsg(trace_ctx,"\tslice_data_offset = %u\n", p->slice_data_offset);
@@ -973,11 +975,11 @@
static void va_TraceVAHuffmanTableBufferJPEG(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
int i, j;
@@ -1019,11 +1021,11 @@
static void va_TraceVAPictureParameterBufferMPEG4(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
int i;
@@ -1079,11 +1081,11 @@
static void va_TraceVAIQMatrixBufferMPEG4(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
int i;
@@ -1108,18 +1110,17 @@
static void va_TraceVAEncSequenceParameterBufferMPEG4(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncSequenceParameterBufferMPEG4 *p = (VAEncSequenceParameterBufferMPEG4 *)data;
DPY2TRACECTX(dpy);
-
+
va_TraceMsg(trace_ctx, "\t--VAEncSequenceParameterBufferMPEG4\n");
-
va_TraceMsg(trace_ctx, "\tprofile_and_level_indication = %d\n", p->profile_and_level_indication);
va_TraceMsg(trace_ctx, "\tintra_period = %d\n", p->intra_period);
va_TraceMsg(trace_ctx, "\tvideo_object_layer_width = %d\n", p->video_object_layer_width);
@@ -1138,16 +1139,16 @@
static void va_TraceVAEncPictureParameterBufferMPEG4(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncPictureParameterBufferMPEG4 *p = (VAEncPictureParameterBufferMPEG4 *)data;
DPY2TRACECTX(dpy);
-
+
va_TraceMsg(trace_ctx, "\t--VAEncPictureParameterBufferMPEG4\n");
va_TraceMsg(trace_ctx, "\treference_picture = 0x%08x\n", p->reference_picture);
va_TraceMsg(trace_ctx, "\treconstructed_picture = 0x%08x\n", p->reconstructed_picture);
@@ -1165,11 +1166,11 @@
static void va_TraceVASliceParameterBufferMPEG4(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VASliceParameterBufferMPEG4 *p=(VASliceParameterBufferMPEG4 *)data;
@@ -1208,11 +1209,11 @@
static void va_TraceVAPictureParameterBufferH264(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
int i;
@@ -1275,7 +1276,7 @@
va_TraceMsg(trace_ctx, "\tframe_num = %d\n", p->frame_num);
va_TraceMsg(trace_ctx, "\tnum_ref_idx_l0_default_active_minus1 = %d\n", p->num_ref_idx_l0_default_active_minus1);
va_TraceMsg(trace_ctx, "\tnum_ref_idx_l1_default_active_minus1 = %d\n", p->num_ref_idx_l1_default_active_minus1);
-
+
va_TraceMsg(trace_ctx, NULL);
return;
@@ -1283,11 +1284,11 @@
static void va_TraceVASliceParameterBufferH264(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
int i;
@@ -1376,11 +1377,11 @@
static void va_TraceVAIQMatrixBufferH264(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data
)
{
@@ -1420,11 +1421,11 @@
static void va_TraceVAEncSequenceParameterBufferH264(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncSequenceParameterBufferH264 *p = (VAEncSequenceParameterBufferH264 *)data;
@@ -1483,11 +1484,11 @@
static void va_TraceVAEncPictureParameterBufferH264(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncPictureParameterBufferH264 *p = (VAEncPictureParameterBufferH264 *)data;
@@ -1546,16 +1547,16 @@
static void va_TraceVAEncSliceParameterBuffer(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncSliceParameterBuffer* p = (VAEncSliceParameterBuffer*)data;
DPY2TRACECTX(dpy);
-
+
va_TraceMsg(trace_ctx, "\t--VAEncSliceParameterBuffer\n");
va_TraceMsg(trace_ctx, "\tstart_row_number = %d\n", p->start_row_number);
@@ -1571,11 +1572,11 @@
static void va_TraceVAEncSliceParameterBufferH264(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncSliceParameterBufferH264* p = (VAEncSliceParameterBufferH264*)data;
@@ -1689,11 +1690,11 @@
static void va_TraceVAEncPackedHeaderParameterBufferType(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncPackedHeaderParameterBuffer* p = (VAEncPackedHeaderParameterBuffer*)data;
@@ -1817,9 +1818,10 @@
{
VAPictureParameterBufferVC1* p = (VAPictureParameterBufferVC1*)data;
DPY2TRACECTX(dpy);
-
+
va_TraceMsg(trace_ctx, "\t--VAPictureParameterBufferVC1\n");
-
+ va_TraceMsg(trace_ctx, "\t context = %d, buffer = %d, type = %d, size = %d, num_elements = %d\n",
+ context, buffer, type, size, num_elements);
va_TraceMsg(trace_ctx, "\tforward_reference_picture = 0x%08x\n", p->forward_reference_picture);
va_TraceMsg(trace_ctx, "\tbackward_reference_picture = 0x%08x\n", p->backward_reference_picture);
va_TraceMsg(trace_ctx, "\tinloop_decoded_picture = 0x%08x\n", p->inloop_decoded_picture);
@@ -1912,11 +1914,11 @@
static void va_TraceVASliceParameterBufferVC1(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void* data
)
{
@@ -1937,11 +1939,11 @@
static void va_TraceVAEncSequenceParameterBufferVP8(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncSequenceParameterBufferVP8 *p = (VAEncSequenceParameterBufferVP8 *)data;
@@ -1971,11 +1973,11 @@
static void va_TraceVAEncPictureParameterBufferVP8(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused uffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncPictureParameterBufferVP8 *p = (VAEncPictureParameterBufferVP8 *)data;
@@ -2041,11 +2043,11 @@
static void va_TraceVAPictureParameterBufferVP8(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
char tmp[1024];
@@ -2117,11 +2119,11 @@
static void va_TraceVASliceParameterBufferVP8(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VASliceParameterBufferVP8 *p = (VASliceParameterBufferVP8 *)data;
@@ -2146,11 +2148,11 @@
static void va_TraceVAIQMatrixBufferVP8(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
char tmp[1024];
@@ -2174,11 +2176,11 @@
}
static void va_TraceVAProbabilityBufferVP8(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
char tmp[1024];
@@ -2204,7 +2206,7 @@
void va_TraceBeginPicture(
VADisplay dpy,
- VAContextID context,
+ VAContextID __maybe_unused context,
VASurfaceID render_target
)
{
@@ -2212,7 +2214,6 @@
TRACE_FUNCNAME(idx);
- va_TraceMsg(trace_ctx, "\tcontext = 0x%08x\n", context);
va_TraceMsg(trace_ctx, "\trender_targets = 0x%08x\n", render_target);
va_TraceMsg(trace_ctx, "\tframe_count = #%d\n", trace_ctx->trace_frame_no);
va_TraceMsg(trace_ctx, NULL);
@@ -2281,11 +2282,11 @@
static void va_TraceVAEncSequenceParameterBufferH263(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncSequenceParameterBufferH263 *p = (VAEncSequenceParameterBufferH263 *)data;
@@ -2306,16 +2307,16 @@
static void va_TraceVAEncPictureParameterBufferH263(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncPictureParameterBufferH263 *p = (VAEncPictureParameterBufferH263 *)data;
DPY2TRACECTX(dpy);
-
+
va_TraceMsg(trace_ctx, "\t--VAEncPictureParameterBufferH263\n");
va_TraceMsg(trace_ctx, "\treference_picture = 0x%08x\n", p->reference_picture);
va_TraceMsg(trace_ctx, "\treconstructed_picture = 0x%08x\n", p->reconstructed_picture);
@@ -2330,16 +2331,16 @@
static void va_TraceVAEncPictureParameterBufferJPEG(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncPictureParameterBufferJPEG *p = (VAEncPictureParameterBufferJPEG *)data;
int i;
-
+
DPY2TRACECTX(dpy);
va_TraceMsg(trace_ctx, "\t--VAEncPictureParameterBufferJPEG\n");
@@ -2374,16 +2375,16 @@
static void va_TraceVAEncQMatrixBufferJPEG(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAQMatrixBufferJPEG *p = (VAQMatrixBufferJPEG *)data;
DPY2TRACECTX(dpy);
-
+
va_TraceMsg(trace_ctx, "\t--VAQMatrixBufferJPEG\n");
va_TraceMsg(trace_ctx, "\tload_lum_quantiser_matrix = %d\n", p->load_lum_quantiser_matrix);
if (p->load_lum_quantiser_matrix) {
@@ -2427,16 +2428,16 @@
static void va_TraceVAEncSliceParameterBufferJPEG(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data)
{
VAEncSliceParameterBufferJPEG *p = (VAEncSliceParameterBufferJPEG *)data;
int i;
-
+
DPY2TRACECTX(dpy);
va_TraceMsg(trace_ctx, "\t--VAEncSliceParameterBufferJPEG\n");
@@ -2457,14 +2458,16 @@
static void va_TraceH263Buf(
VADisplay dpy,
- VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VAContextID __maybe_unused context,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *pbuf
)
{
+ DPY2TRACECTX(dpy);
+
switch (type) {
case VAPictureParameterBufferType:/* print MPEG4 buffer */
va_TraceVAPictureParameterBufferMPEG4(dpy, context, buffer, type, size, num_elements, pbuf);
@@ -2828,7 +2831,7 @@
static void
va_TraceProcFilterParameterBufferDeinterlacing(
VADisplay dpy,
- VAContextID context,
+ VAContextID __maybe_unused context,
VAProcFilterParameterBufferBase *base
)
{
@@ -2844,7 +2847,7 @@
static void
va_TraceProcFilterParameterBufferColorBalance(
VADisplay dpy,
- VAContextID context,
+ VAContextID __maybe_unused context,
VAProcFilterParameterBufferBase *base
)
{
@@ -2866,7 +2869,7 @@
{
DPY2TRACECTX(dpy);
- va_TraceMsg(trace_ctx, "\t type = %d\n", base->type);
+ va_TraceMsg(trace_ctx, "\t type = %d, context = %d\n", base->type, context);
}
static void
@@ -2881,7 +2884,7 @@
unsigned int size;
unsigned int num_elements;
VAProcFilterParameterBufferBase *base_filter = NULL;
- int i;
+ unsigned int i;
DPY2TRACECTX(dpy);
@@ -2938,15 +2941,15 @@
va_TraceVAProcPipelineParameterBuffer(
VADisplay dpy,
VAContextID context,
- VABufferID buffer,
- VABufferType type,
- unsigned int size,
- unsigned int num_elements,
+ VABufferID __maybe_unused buffer,
+ VABufferType __maybe_unused type,
+ unsigned int __maybe_unused size,
+ unsigned int __maybe_unused num_elements,
void *data
)
{
VAProcPipelineParameterBuffer *p = (VAProcPipelineParameterBuffer *)data;
- int i;
+ unsigned int i;
DPY2TRACECTX(dpy);
@@ -3047,7 +3050,7 @@
void va_TraceRenderPicture(
VADisplay dpy,
- VAContextID context,
+ VAContextID __maybe_unused context,
VABufferID *buffers,
int num_buffers
)
@@ -3060,7 +3063,6 @@
TRACE_FUNCNAME(idx);
- va_TraceMsg(trace_ctx, "\tcontext = 0x%08x\n", context);
va_TraceMsg(trace_ctx, "\tnum_buffers = %d\n", num_buffers);
if (buffers == NULL)
return;
@@ -3157,8 +3159,8 @@
void va_TraceEndPicture(
VADisplay dpy,
- VAContextID context,
- int endpic_done
+ VAContextID __maybe_unused context,
+ int __maybe_unused endpic_done
)
{
int encode, decode, jpeg;
@@ -3166,7 +3168,6 @@
TRACE_FUNCNAME(idx);
- va_TraceMsg(trace_ctx, "\tcontext = 0x%08x\n", context);
va_TraceMsg(trace_ctx, "\trender_targets = 0x%08x\n", trace_ctx->trace_rendertarget);
/* avoid to create so many empty files */
@@ -3191,20 +3192,19 @@
void va_TraceSyncSurface(
VADisplay dpy,
- VASurfaceID render_target
+ VASurfaceID __maybe_unused render_target
)
{
DPY2TRACECTX(dpy);
TRACE_FUNCNAME(idx);
- va_TraceMsg(trace_ctx, "\trender_target = 0x%08x\n", render_target);
va_TraceMsg(trace_ctx, NULL);
}
void va_TraceQuerySurfaceAttributes(
VADisplay dpy,
- VAConfigID config,
+ VAConfigID __maybe_unused config,
VASurfaceAttrib *attrib_list,
unsigned int *num_attribs
)
@@ -3212,7 +3212,6 @@
DPY2TRACECTX(dpy);
TRACE_FUNCNAME(idx);
- va_TraceMsg(trace_ctx, "\tconfig = 0x%08x\n", config);
va_TraceSurfaceAttributes(trace_ctx, attrib_list, num_attribs);
va_TraceMsg(trace_ctx, NULL);
@@ -3222,7 +3221,7 @@
void va_TraceQuerySurfaceStatus(
VADisplay dpy,
- VASurfaceID render_target,
+ VASurfaceID __maybe_unused render_target,
VASurfaceStatus *status /* out */
)
{
@@ -3230,7 +3229,6 @@
TRACE_FUNCNAME(idx);
- va_TraceMsg(trace_ctx, "\trender_target = 0x%08x\n", render_target);
if (status)
va_TraceMsg(trace_ctx, "\tstatus = 0x%08x\n", *status);
va_TraceMsg(trace_ctx, NULL);
@@ -3304,14 +3302,13 @@
static void va_TraceDisplayAttributes (
VADisplay dpy,
VADisplayAttribute *attr_list,
- int num_attributes
+ int __maybe_unused num_attributes
)
{
int i;
DPY2TRACECTX(dpy);
- va_TraceMsg(trace_ctx, "\tnum_attributes = %d\n", num_attributes);
if (attr_list == NULL)
return;