OSDN Git Service

va_trace: avoid to dereference a NULL pointer
[android-x86/hardware-intel-common-libva.git] / va / va_trace.c
index 17dc2f8..5c4b468 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Intel Corporation. All Rights Reserved.
+ * Copyright (c) 2009-2011 Intel Corporation. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
 
 #define _GNU_SOURCE 1
 #include "va.h"
+#include "va_enc_h264.h"
 #include "va_backend.h"
 #include "va_trace.h"
-
+#include "va_enc_h264.h"
+#include "va_dec_jpeg.h"
 #include <assert.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <dlfcn.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <time.h>
+#include <errno.h>
+
+/*
+ * Env. to debug some issue, e.g. the decode/encode issue in a video conference scenerio:
+ * .LIBVA_TRACE=log_file: general VA parameters saved into log_file
+ * .LIBVA_TRACE_BUFDATA: dump VA buffer data into log_file (if not set, just calculate a checksum)
+ * .LIBVA_TRACE_CODEDBUF=coded_clip_file: save the coded clip into file coded_clip_file
+ * .LIBVA_TRACE_SURFACE=yuv_file: save surface YUV into file yuv_file. Use file name to determine
+ *                                decode/encode or jpeg surfaces
+ * .LIBVA_TRACE_SURFACE_GEOMETRY=WIDTHxHEIGHT+XOFF+YOFF: only save part of surface context into file
+ *                                due to storage bandwidth limitation
+ * .LIBVA_TRACE_LOGSIZE=numeric number: truncate the log_file or coded_clip_file, or decoded_yuv_file
+ *                                      when the size is bigger than the number
+ */
+
+/* global settings */
+
+/* LIBVA_TRACE */
+int trace_flag = 0;
+
+/* LIBVA_TRACE_LOGSIZE */
+static unsigned int trace_logsize = 0xffffffff; /* truncate the log when the size is bigger than it */
 
-unsigned int trace_flag = 0;
+#define TRACE_CONTEXT_MAX 4
+/* per context settings */
+static struct _trace_context {
+    VADisplay dpy; /* should use context as the key */
+    
+    /* LIBVA_TRACE */
+    FILE *trace_fp_log; /* save the log into a file */
+    char *trace_log_fn; /* file name */
+    
+    /* LIBVA_TRACE_CODEDBUF */
+    FILE *trace_fp_codedbuf; /* save the encode result into a file */
+    char *trace_codedbuf_fn; /* file name */
+    
+    /* LIBVA_TRACE_SURFACE */
+    FILE *trace_fp_surface; /* save the surface YUV into a file */
+    char *trace_surface_fn; /* file name */
+
+    VAContextID  trace_context; /* current context */
+    
+    VASurfaceID  trace_rendertarget; /* current render target */
+    VAProfile trace_profile; /* current profile for buffers */
+    VAEntrypoint trace_entrypoint; /* current entrypoint */
+    VABufferID trace_codedbuf;
+    
+    unsigned int trace_frame_no; /* current frame NO */
+    unsigned int trace_slice_no; /* current slice NO */
+    unsigned int trace_slice_size; /* current slice buffer size */
+
+    unsigned int trace_surface_width; /* surface dumping geometry */
+    unsigned int trace_surface_height;
+    unsigned int trace_surface_xoff;
+    unsigned int trace_surface_yoff;
+
+    unsigned int trace_frame_width; /* current frame width */
+    unsigned int trace_frame_height; /* current frame height */
+    unsigned int trace_sequence_start; /* get a new sequence for encoding or not */
+} trace_context[TRACE_CONTEXT_MAX]; /* trace five context at the same time */
+
+#define DPY2INDEX(dpy)                                  \
+    int idx;                                            \
+                                                        \
+    for (idx = 0; idx < TRACE_CONTEXT_MAX; idx++)       \
+        if (trace_context[idx].dpy == dpy)              \
+            break;                                      \
+                                                        \
+    if (idx == TRACE_CONTEXT_MAX)                       \
+        return;
 
-static const char *trace_file = 0;
-static FILE *trace_fp = 0;
+#define TRACE_FUNCNAME(idx)    va_TraceMsg(idx, "==========%s\n", __func__); 
 
-static VASurfaceID  trace_rendertarget; /* current render target */
-static VAProfile trace_profile; /* current entrypoint for buffers */
+/* Prototype declarations (functions defined in va.c) */
 
-static unsigned int trace_frame;
-static unsigned int trace_slice;
+void va_errorMessage(const char *msg, ...);
+void va_infoMessage(const char *msg, ...);
 
-static unsigned int trace_width;
-static unsigned int trace_height;
+int va_parseConfig(char *env, char *env_value);
 
-/* Prototypes (functions defined in va.c) */
-VAStatus vaBufferInfo (
+VAStatus vaBufferInfo(
     VADisplay dpy,
-    VAContextID context,       /* in */
-    VABufferID buf_id,         /* in */
-    VABufferType *type,                /* out */
-    unsigned int *size,                /* out */
-    unsigned int *num_elements /* out */
-);
+    VAContextID context,        /* in */
+    VABufferID buf_id,          /* in */
+    VABufferType *type,         /* out */
+    unsigned int *size,         /* out */
+    unsigned int *num_elements  /* out */
+    );
 
 VAStatus vaLockSurface(VADisplay dpy,
-    VASurfaceID surface,
-    unsigned int *fourcc, /* following are output argument */
-    unsigned int *luma_stride,
-    unsigned int *chroma_u_stride,
-    unsigned int *chroma_v_stride,
-    unsigned int *luma_offset,
-    unsigned int *chroma_u_offset,
-    unsigned int *chroma_v_offset,
-    unsigned int *buffer_name,
-    void **buffer 
-);
+                       VASurfaceID surface,
+                       unsigned int *fourcc, /* following are output argument */
+                       unsigned int *luma_stride,
+                       unsigned int *chroma_u_stride,
+                       unsigned int *chroma_v_stride,
+                       unsigned int *luma_offset,
+                       unsigned int *chroma_u_offset,
+                       unsigned int *chroma_v_offset,
+                       unsigned int *buffer_name,
+                       void **buffer 
+                       );
 
 VAStatus vaUnlockSurface(VADisplay dpy,
-    VASurfaceID surface
-);
-
-void va_TraceInit(void)
+                         VASurfaceID surface
+                         );
+
+#define FILE_NAME_SUFFIX(env_value)                      \
+do {                                                    \
+    int tmp = strnlen(env_value, sizeof(env_value));    \
+    int left = sizeof(env_value) - tmp;                 \
+                                                        \
+    snprintf(env_value+tmp,                             \
+             left,                                      \
+             ".%04d.%05d",                              \
+             trace_index,                               \
+             suffix);                                   \
+} while (0)
+
+void va_TraceInit(VADisplay dpy)
 {
-    trace_file = (const char *)getenv("LIBVA_TRACE");
-    if (trace_file) {
-       trace_fp = fopen(trace_file, "w");
-        if (trace_fp)
-            trace_flag = 1;
+    char env_value[1024];
+    unsigned short suffix = 0xffff & ((unsigned int)time(NULL));
+    int trace_index = 0;
+    FILE *tmp;    
+    
+    for (trace_index = 0; trace_index < TRACE_CONTEXT_MAX; trace_index++)
+        if (trace_context[trace_index].dpy == 0)
+            break;
+
+    if (trace_index == TRACE_CONTEXT_MAX)
+        return;
+
+    memset(&trace_context[trace_index], 0, sizeof(struct _trace_context));
+    if (va_parseConfig("LIBVA_TRACE", &env_value[0]) == 0) {
+        FILE_NAME_SUFFIX(env_value);
+        trace_context[trace_index].trace_log_fn = strdup(env_value);
+        
+        tmp = fopen(env_value, "w");
+        if (tmp) {
+            trace_context[trace_index].trace_fp_log = tmp;
+            va_infoMessage("LIBVA_TRACE is on, save log into %s\n", trace_context[trace_index].trace_log_fn);
+            trace_flag = VA_TRACE_FLAG_LOG;
+        } else
+            va_errorMessage("Open file %s failed (%s)\n", env_value, strerror(errno));
+    }
+
+    /* may re-get the global settings for multiple context */
+    if (va_parseConfig("LIBVA_TRACE_LOGSIZE", &env_value[0]) == 0) {
+        trace_logsize = atoi(env_value);
+        va_infoMessage("LIBVA_TRACE_LOGSIZE is on, size is %d\n", trace_logsize);
+    }
+
+    if ((trace_flag & VA_TRACE_FLAG_LOG) && (va_parseConfig("LIBVA_TRACE_BUFDATA", NULL) == 0)) {
+        trace_flag |= VA_TRACE_FLAG_BUFDATA;
+        va_infoMessage("LIBVA_TRACE_BUFDATA is on, dump buffer into log file\n");
+    }
+
+    /* per-context setting */
+    if (va_parseConfig("LIBVA_TRACE_CODEDBUF", &env_value[0]) == 0) {
+        FILE_NAME_SUFFIX(env_value);
+        trace_context[trace_index].trace_codedbuf_fn = strdup(env_value);
+        va_infoMessage("LIBVA_TRACE_CODEDBUF is on, save codedbuf into log file %s\n",
+                       trace_context[trace_index].trace_codedbuf_fn);
+        trace_flag |= VA_TRACE_FLAG_CODEDBUF;
+    }
+
+    if (va_parseConfig("LIBVA_TRACE_SURFACE", &env_value[0]) == 0) {
+        FILE_NAME_SUFFIX(env_value);
+        trace_context[trace_index].trace_surface_fn = strdup(env_value);
+
+        va_infoMessage("LIBVA_TRACE_SURFACE is on, save surface into %s\n",
+                       trace_context[trace_index].trace_surface_fn);
+
+        /* for surface data dump, it is time-consume, and may
+         * cause some side-effect, so only trace the needed surfaces
+         * to trace encode surface, set the trace file name to sth like *enc*
+         * to trace decode surface, set the trace file name to sth like *dec*
+         * if no dec/enc in file name, set both
+         */
+        if (strstr(env_value, "dec"))
+            trace_flag |= VA_TRACE_FLAG_SURFACE_DECODE;
+        if (strstr(env_value, "enc"))
+            trace_flag |= VA_TRACE_FLAG_SURFACE_ENCODE;
+        if (strstr(env_value, "jpeg") || strstr(env_value, "jpg"))
+            trace_flag |= VA_TRACE_FLAG_SURFACE_JPEG;
+
+        if (va_parseConfig("LIBVA_TRACE_SURFACE_GEOMETRY", &env_value[0]) == 0) {
+            char *p = env_value, *q;
+
+            trace_context[trace_index].trace_surface_width = strtod(p, &q);
+            p = q+1; /* skip "x" */
+            trace_context[trace_index].trace_surface_height = strtod(p, &q);
+            p = q+1; /* skip "+" */
+            trace_context[trace_index].trace_surface_xoff = strtod(p, &q);
+            p = q+1; /* skip "+" */
+            trace_context[trace_index].trace_surface_yoff = strtod(p, &q);
+
+            va_infoMessage("LIBVA_TRACE_SURFACE_GEOMETRY is on, only dump surface %dx%d+%d+%d content\n",
+                           trace_context[trace_index].trace_surface_width,
+                           trace_context[trace_index].trace_surface_height,
+                           trace_context[trace_index].trace_surface_xoff,
+                           trace_context[trace_index].trace_surface_yoff);
+        }
     }
+
+    trace_context[trace_index].dpy = dpy;
+}
+
+
+void va_TraceEnd(VADisplay dpy)
+{
+    DPY2INDEX(dpy);
+    
+    if (trace_context[idx].trace_fp_log)
+        fclose(trace_context[idx].trace_fp_log);
+    
+    if (trace_context[idx].trace_fp_codedbuf)
+        fclose(trace_context[idx].trace_fp_codedbuf);
+    
+    if (trace_context[idx].trace_fp_surface)
+        fclose(trace_context[idx].trace_fp_surface);
+
+    if (trace_context[idx].trace_log_fn)
+        free(trace_context[idx].trace_log_fn);
+    
+    if (trace_context[idx].trace_codedbuf_fn)
+        free(trace_context[idx].trace_codedbuf_fn);
+    
+    if (trace_context[idx].trace_surface_fn)
+        free(trace_context[idx].trace_surface_fn);
+    
+    memset(&trace_context[idx], 0, sizeof(struct _trace_context));
 }
 
-void va_TraceEnd(void)
+
+static unsigned int file_size(FILE *fp)
 {
-    if (trace_file && trace_fp) {
-        fclose(trace_fp);
+    struct stat buf;
 
-        trace_file = NULL;
-        trace_fp = NULL;
+    fstat(fileno(fp), &buf);
 
-        trace_flag = 0;
+    return buf.st_size;
+}
 
-        trace_width = 0;
-        trace_height = 0;
-    }
+
+static void truncate_file(FILE *fp)
+{
+    ftruncate(fileno(fp), 0);
+    rewind(fp);
 }
 
-void va_TraceMsg(const char *msg, ...)
+void va_TraceMsg(int idx, const char *msg, ...)
 {
     va_list args;
-    
+
+    if (!(trace_flag & VA_TRACE_FLAG_LOG))
+        return;
+
+    if (file_size(trace_context[idx].trace_fp_log) >= trace_logsize)
+        truncate_file(trace_context[idx].trace_fp_log);
     if (msg)  {
         va_start(args, msg);
-        vfprintf(trace_fp, msg, args);
+        vfprintf(trace_context[idx].trace_fp_log, msg, args);
         va_end(args);
-    } else  {
-        fflush(trace_fp);
+    } else
+        fflush(trace_context[idx].trace_fp_log);
+}
+
+void va_TraceCodedBuf(VADisplay dpy)
+{
+    VACodedBufferSegment *buf_list = NULL;
+    VAStatus va_status;
+    unsigned char check_sum = 0;
+    DPY2INDEX(dpy);
+    
+    /* can only truncate at a sequence boudary */
+    if (((file_size(trace_context[idx].trace_fp_log) >= trace_logsize))
+        && trace_context[idx].trace_sequence_start) {
+        va_TraceMsg(idx, "==========truncate file %s\n", trace_context[idx].trace_codedbuf_fn);
+        truncate_file(trace_context[idx].trace_fp_log);
+    }
+    
+
+    trace_context[idx].trace_sequence_start = 0; /* only truncate coded file when meet next new sequence */
+    
+    va_status = vaMapBuffer(dpy, trace_context[idx].trace_codedbuf, (void **)(&buf_list));
+    if (va_status != VA_STATUS_SUCCESS)
+        return;
+
+    va_TraceMsg(idx, "==========dump codedbuf into file %s\n", trace_context[idx].trace_codedbuf_fn);
+    
+    while (buf_list != NULL) {
+        unsigned int i;
+        
+        va_TraceMsg(idx, "\tsize = %d\n", buf_list->size);
+        if (trace_context[idx].trace_fp_codedbuf)
+            fwrite(buf_list->buf, buf_list->size, 1, trace_context[idx].trace_fp_codedbuf);
+
+        for (i=0; i<buf_list->size; i++)
+            check_sum ^= *((unsigned char *)buf_list->buf + i);
+
+        buf_list = buf_list->next;
+    }
+    vaUnmapBuffer(dpy,trace_context[idx].trace_codedbuf);
+    
+    va_TraceMsg(idx, "\tchecksum = 0x%02x\n", check_sum);
+    va_TraceMsg(idx, NULL);
+}
+
+
+void va_TraceSurface(VADisplay dpy)
+{
+    unsigned int i, j;
+    unsigned int fourcc; /* following are output argument */
+    unsigned int luma_stride;
+    unsigned int chroma_u_stride;
+    unsigned int chroma_v_stride;
+    unsigned int luma_offset;
+    unsigned int chroma_u_offset;
+    unsigned int chroma_v_offset;
+    unsigned int buffer_name;
+    void *buffer = NULL;
+    unsigned char *Y_data, *UV_data, *tmp;
+    VAStatus va_status;
+    unsigned char check_sum = 0;
+    DPY2INDEX(dpy);
+
+    va_TraceMsg(idx, "==========dump surface data in file %s\n", trace_context[idx].trace_surface_fn);
+
+    if ((file_size(trace_context[idx].trace_fp_surface) >= trace_logsize)) {
+        va_TraceMsg(idx, "==========truncate file %s\n", trace_context[idx].trace_surface_fn);
+        truncate_file(trace_context[idx].trace_fp_surface);
+    }
+    va_TraceMsg(idx, NULL);
+
+    va_status = vaLockSurface(
+        dpy,
+        trace_context[idx].trace_rendertarget,
+        &fourcc,
+        &luma_stride, &chroma_u_stride, &chroma_v_stride,
+        &luma_offset, &chroma_u_offset, &chroma_v_offset,
+        &buffer_name, &buffer);
+
+    if (va_status != VA_STATUS_SUCCESS) {
+        va_TraceMsg(idx, "Error:vaLockSurface failed\n");
+        return;
+    }
+
+    va_TraceMsg(idx, "\tfourcc = 0x%08x\n", fourcc);
+    va_TraceMsg(idx, "\twidth = %d\n", trace_context[idx].trace_frame_width);
+    va_TraceMsg(idx, "\theight = %d\n", trace_context[idx].trace_frame_height);
+    va_TraceMsg(idx, "\tluma_stride = %d\n", luma_stride);
+    va_TraceMsg(idx, "\tchroma_u_stride = %d\n", chroma_u_stride);
+    va_TraceMsg(idx, "\tchroma_v_stride = %d\n", chroma_v_stride);
+    va_TraceMsg(idx, "\tluma_offset = %d\n", luma_offset);
+    va_TraceMsg(idx, "\tchroma_u_offset = %d\n", chroma_u_offset);
+    va_TraceMsg(idx, "\tchroma_v_offset = %d\n", chroma_v_offset);
+
+    if (buffer == NULL) {
+        va_TraceMsg(idx, "Error:vaLockSurface return NULL buffer\n");
+        va_TraceMsg(idx, NULL);
+
+        vaUnlockSurface(dpy, trace_context[idx].trace_rendertarget);
+        return;
+    }
+    va_TraceMsg(idx, "\tbuffer location = 0x%08x\n", buffer);
+    va_TraceMsg(idx, NULL);
+
+    Y_data = (unsigned char*)buffer;
+    UV_data = (unsigned char*)buffer + chroma_u_offset;
+
+    tmp = Y_data + luma_stride * trace_context[idx].trace_surface_yoff;
+    for (i=0; i<trace_context[idx].trace_surface_height; i++) {
+        if (trace_context[idx].trace_fp_surface)
+            fwrite(tmp + trace_context[idx].trace_surface_xoff,
+                   trace_context[idx].trace_surface_width,
+                   1, trace_context[idx].trace_fp_surface);
+        
+        tmp += luma_stride;
+    }
+    tmp = UV_data + chroma_u_stride * trace_context[idx].trace_surface_yoff;
+    if (fourcc == VA_FOURCC_NV12) {
+        for (i=0; i<trace_context[idx].trace_surface_height/2; i++) {
+            if (trace_context[idx].trace_fp_surface)
+                fwrite(tmp + trace_context[idx].trace_surface_xoff,
+                       trace_context[idx].trace_surface_width,
+                       1, trace_context[idx].trace_fp_surface);
+            
+            tmp += chroma_u_stride;
+        }
     }
+
+    vaUnlockSurface(dpy, trace_context[idx].trace_rendertarget);
+
+    va_TraceMsg(idx, NULL);
+}
+
+
+void va_TraceInitialize (
+    VADisplay dpy,
+    int *major_version,     /* out */
+    int *minor_version      /* out */
+)
+{
+    DPY2INDEX(dpy);    
+    TRACE_FUNCNAME(idx);
+}
+
+void va_TraceTerminate (
+    VADisplay dpy
+)
+{
+    DPY2INDEX(dpy);    
+    TRACE_FUNCNAME(idx);
 }
 
 
@@ -122,40 +464,148 @@ void va_TraceCreateConfig(
     VAConfigAttrib *attrib_list,
     int num_attribs,
     VAConfigID *config_id /* out */
-                         )
+)
 {
     int i;
+    int encode, decode, jpeg;
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
     
-    va_TraceMsg("\tprofile = %d\n", profile);
-    va_TraceMsg("\tentrypoint = %d\n", entrypoint);
-    va_TraceMsg("\tnum_attribs = %d\n", num_attribs);
-    for (i = 0; i < num_attribs; i++) {
-       va_TraceMsg("\t\tattrib_list[%d].type = 0x%08x\n", i, attrib_list[i].type);
-        va_TraceMsg("\t\tattrib_list[%d].value = 0x%08x\n", i, attrib_list[i].value);
+    va_TraceMsg(idx, "\tprofile = %d\n", profile);
+    va_TraceMsg(idx, "\tentrypoint = %d\n", entrypoint);
+    va_TraceMsg(idx, "\tnum_attribs = %d\n", num_attribs);
+    if (attrib_list) {
+        for (i = 0; i < num_attribs; i++) {
+            va_TraceMsg(idx, "\t\tattrib_list[%d].type = 0x%08x\n", i, attrib_list[i].type);
+            va_TraceMsg(idx, "\t\tattrib_list[%d].value = 0x%08x\n", i, attrib_list[i].value);
+        }
+    }
+    va_TraceMsg(idx, NULL);
+
+    trace_context[idx].trace_profile = profile;
+    trace_context[idx].trace_entrypoint = entrypoint;
+
+    /* avoid to create so many empty files */
+    encode = (trace_context[idx].trace_entrypoint == VAEntrypointEncSlice);
+    decode = (trace_context[idx].trace_entrypoint == VAEntrypointVLD);
+    jpeg = (trace_context[idx].trace_entrypoint == VAEntrypointEncPicture);
+    if ((encode && (trace_flag & VA_TRACE_FLAG_SURFACE_ENCODE)) ||
+        (decode && (trace_flag & VA_TRACE_FLAG_SURFACE_DECODE)) ||
+        (jpeg && (trace_flag & VA_TRACE_FLAG_SURFACE_JPEG))) {
+        FILE *tmp = fopen(trace_context[idx].trace_surface_fn, "w");
+        
+        if (tmp)
+            trace_context[idx].trace_fp_surface = tmp;
+        else {
+            va_errorMessage("Open file %s failed (%s)\n",
+                            trace_context[idx].trace_surface_fn,
+                            strerror(errno));
+            trace_context[idx].trace_fp_surface = NULL;
+            trace_flag &= ~(VA_TRACE_FLAG_SURFACE);
+        }
     }
 
-    trace_profile = profile;
+    if (encode && (trace_flag & VA_TRACE_FLAG_CODEDBUF)) {
+        FILE *tmp = fopen(trace_context[idx].trace_codedbuf_fn, "w");
+        
+        if (tmp)
+            trace_context[idx].trace_fp_codedbuf = tmp;
+        else {
+            va_errorMessage("Open file %s failed (%s)\n",
+                            trace_context[idx].trace_codedbuf_fn,
+                            strerror(errno));
+            trace_context[idx].trace_fp_codedbuf = NULL;
+            trace_flag &= ~VA_TRACE_FLAG_CODEDBUF;
+        }
+    }
 }
 
+static void va_TraceSurfaceAttributes(
+    int idx,
+    VASurfaceAttrib    *attrib_list,
+    unsigned int       *num_attribs
+)
+{
+    int i, num;
+    VASurfaceAttrib *p;
+    
+    if (!attrib_list || !num_attribs)
+        return;
+    
+    p = attrib_list;
+    num = *num_attribs;
+    if (num > VASurfaceAttribCount)
+        num = VASurfaceAttribCount;
+
+    for (i=0; i<num; i++) {
+        va_TraceMsg(idx, "\tattrib_list[%i] =\n", i);
+        
+        va_TraceMsg(idx, "\t\ttype = %d\n", p->type);
+        va_TraceMsg(idx, "\t\tflags = %d\n", p->flags);
+        va_TraceMsg(idx, "\t\tvalue.type = %d\n", p->value.type);
+        if (p->value.type == VAGenericValueTypeInteger)
+            va_TraceMsg(idx, "\t\tvalue.value.i = 0x%08x\n", p->value.value.i);
+        else if (p->value.type == VAGenericValueTypeFloat)
+        va_TraceMsg(idx, "\t\tvalue.value.f = %f\n", p->value.value.f);
+        else if (p->value.type == VAGenericValueTypePointer)
+            va_TraceMsg(idx, "\t\tvalue.value.p = %p\n", p->value.value.p);
+        else if (p->value.type == VAGenericValueTypeFunc)
+            va_TraceMsg(idx, "\t\tvalue.value.fn = %p\n", p->value.value.fn);
+
+        p++;
+    }
+}
 
-void va_TraceCreateSurface(
+void va_TraceCreateSurfaces(
     VADisplay dpy,
     int width,
     int height,
     int format,
     int num_surfaces,
-    VASurfaceID *surfaces      /* out */
-                          )
+    VASurfaceID *surfaces,    /* out */
+    VASurfaceAttrib    *attrib_list,
+    unsigned int        num_attribs
+)
 {
     int i;
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
+    
+    va_TraceMsg(idx, "\twidth = %d\n", width);
+    va_TraceMsg(idx, "\theight = %d\n", height);
+    va_TraceMsg(idx, "\tformat = %d\n", format);
+    va_TraceMsg(idx, "\tnum_surfaces = %d\n", num_surfaces);
+
+    if (surfaces) {
+        for (i = 0; i < num_surfaces; i++)
+            va_TraceMsg(idx, "\t\tsurfaces[%d] = 0x%08x\n", i, surfaces[i]);
+    }
     
-    va_TraceMsg("\twidth = %d\n", width);
-    va_TraceMsg("\theight = %d\n", height);
-    va_TraceMsg("\tformat = %d\n", format);
-    va_TraceMsg("\tnum_surfaces = %d\n", num_surfaces);
+    va_TraceSurfaceAttributes(idx, attrib_list, &num_attribs);
+
+    va_TraceMsg(idx, NULL);
+}
+
+
+void va_TraceDestroySurfaces(
+    VADisplay dpy,
+    VASurfaceID *surface_list,
+    int num_surfaces
+)
+{
+    int i;
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
 
-    for (i = 0; i < num_surfaces; i++)
-        va_TraceMsg("\t\tsurfaces[%d] = 0x%08x\n", i, surfaces[i]);
+    if (surface_list) {
+        for (i = 0; i < num_surfaces; i++)
+            va_TraceMsg(idx, "\t\tsurfaces[%d] = 0x%08x\n", i, surface_list[i]);
+    }
+    
+    va_TraceMsg(idx, NULL);
 }
 
 
@@ -167,25 +617,39 @@ void va_TraceCreateContext(
     int flag,
     VASurfaceID *render_targets,
     int num_render_targets,
-    VAContextID *context               /* out */
-                          )
+    VAContextID *context        /* out */
+)
 {
     int i;
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
+
+    va_TraceMsg(idx, "\tconfig = 0x%08x\n", config_id);
+    va_TraceMsg(idx, "\twidth = %d\n", picture_width);
+    va_TraceMsg(idx, "\theight = %d\n", picture_height);
+    va_TraceMsg(idx, "\tflag = 0x%08x\n", flag);
+    va_TraceMsg(idx, "\tnum_render_targets = %d\n", num_render_targets);
+    if (render_targets) {
+        for (i=0; i<num_render_targets; i++)
+            va_TraceMsg(idx, "\t\trender_targets[%d] = 0x%08x\n", i, render_targets[i]);
+    }
+    if (context) {
+        va_TraceMsg(idx, "\tcontext = 0x%08x\n", *context);
+        trace_context[idx].trace_context = *context;
+    } else
+        trace_context[idx].trace_context = VA_INVALID_ID;
+    
+    trace_context[idx].trace_frame_no = 0;
+    trace_context[idx].trace_slice_no = 0;
 
-    va_TraceMsg("\twidth = %d\n", picture_width);
-    va_TraceMsg("\theight = %d\n", picture_height);
-    va_TraceMsg("\tflag = 0x%08x\n", flag);
-    va_TraceMsg("\tnum_render_targets = %d\n", num_render_targets);
-    for (i=0; i<num_render_targets; i++)
-        va_TraceMsg("\t\trender_targets[%d] = 0x%08x\n", i, render_targets[i]);
-    va_TraceMsg("\tcontext = 0x%08x\n", context);
-
-
-    trace_frame = 0;
-    trace_slice = 0;
+    trace_context[idx].trace_frame_width = picture_width;
+    trace_context[idx].trace_frame_height = picture_height;
 
-    trace_width = picture_width;
-    trace_height = picture_height;
+    if (trace_context[idx].trace_surface_width == 0)
+        trace_context[idx].trace_surface_width = picture_width;
+    if (trace_context[idx].trace_surface_height == 0)
+        trace_context[idx].trace_surface_height = picture_height;
 }
 
 
@@ -203,16 +667,122 @@ static char * buffer_type_to_string(int type)
     case VAResidualDataBufferType: return "VAResidualDataBufferType";
     case VADeblockingParameterBufferType: return "VADeblockingParameterBufferType";
     case VAImageBufferType: return "VAImageBufferType";
+    case VAQMatrixBufferType: return "VAQMatrixBufferType";
+    case VAHuffmanTableBufferType: return "VAHuffmanTableBufferType";
+/* Following are encode buffer types */
     case VAEncCodedBufferType: return "VAEncCodedBufferType";
     case VAEncSequenceParameterBufferType: return "VAEncSequenceParameterBufferType";
     case VAEncPictureParameterBufferType: return "VAEncPictureParameterBufferType";
     case VAEncSliceParameterBufferType: return "VAEncSliceParameterBufferType";
+    case VAEncPackedHeaderParameterBufferType: return "VAEncPackedHeaderParameterBufferType";
+    case VAEncPackedHeaderDataBufferType: return "VAEncPackedHeaderDataBufferType";
+    case VAEncMiscParameterBufferType: return "VAEncMiscParameterBufferType";
+    case VAEncMacroblockParameterBufferType: return "VAEncMacroblockParameterBufferType";
+    case VAProcPipelineParameterBufferType: return "VAProcPipelineParameterBufferType";
+    case VAProcFilterParameterBufferType: return "VAProcFilterParameterBufferType";
     default: return "UnknowBuffer";
     }
 }
 
+void va_TraceCreateBuffer (
+    VADisplay dpy,
+    VAContextID context,       /* in */
+    VABufferType type,         /* in */
+    unsigned int size,         /* in */
+    unsigned int num_elements, /* in */
+    void *data,                        /* in */
+    VABufferID *buf_id         /* out */
+)
+{
+    DPY2INDEX(dpy);
+
+    /* only trace CodedBuffer */
+    if (type != VAEncCodedBufferType)
+        return;
+
+    TRACE_FUNCNAME(idx);
+    va_TraceMsg(idx, "\tbuf_type=%s\n", buffer_type_to_string(type));
+    if (buf_id)
+        va_TraceMsg(idx, "\tbuf_id=0x%x\n", *buf_id);
+    va_TraceMsg(idx, "\tsize=%d\n", size);
+    va_TraceMsg(idx, "\tnum_elements=%d\n", num_elements);
+    
+    va_TraceMsg(idx, NULL);
+}
+
+void va_TraceDestroyBuffer (
+    VADisplay dpy,
+    VABufferID buf_id    /* in */
+)
+{
+    VABufferType type;
+    unsigned int size;
+    unsigned int num_elements;
+    
+    VACodedBufferSegment *buf_list;
+    int i = 0;
+    
+    DPY2INDEX(dpy);
+
+    vaBufferInfo(dpy, trace_context[idx].trace_context, buf_id, &type, &size, &num_elements);    
+    
+    /* only trace CodedBuffer */
+    if (type != VAEncCodedBufferType)
+        return;
+
+    TRACE_FUNCNAME(idx);
+    va_TraceMsg(idx, "\tbuf_type=%s\n", buffer_type_to_string(type));
+    va_TraceMsg(idx, "\tbuf_id=0x%x\n", buf_id);
+    va_TraceMsg(idx, "\tsize=%d\n", size);
+    va_TraceMsg(idx, "\tnum_elements=%d\n", num_elements);
+    
+    va_TraceMsg(idx, NULL);
+}
+
+
+void va_TraceMapBuffer (
+    VADisplay dpy,
+    VABufferID buf_id,    /* in */
+    void **pbuf           /* out */
+)
+{
+    VABufferType type;
+    unsigned int size;
+    unsigned int num_elements;
+    
+    VACodedBufferSegment *buf_list;
+    int i = 0;
+    
+    DPY2INDEX(dpy);
+
+    vaBufferInfo(dpy, trace_context[idx].trace_context, buf_id, &type, &size, &num_elements);    
+    
+    /* only trace CodedBuffer */
+    if (type != VAEncCodedBufferType)
+        return;
+
+    TRACE_FUNCNAME(idx);
+    va_TraceMsg(idx, "\tbuf_id=0x%x\n", buf_id);
+    va_TraceMsg(idx, "\tbuf_type=%s\n", buffer_type_to_string(type));
+    if ((pbuf == NULL) || (*pbuf == NULL))
+        return;
+    
+    buf_list = (VACodedBufferSegment *)(*pbuf);
+    while (buf_list != NULL) {
+        va_TraceMsg(idx, "\tCodedbuf[%d] =\n", i++);
+        
+        va_TraceMsg(idx, "\t   size = %d\n", buf_list->size);
+        va_TraceMsg(idx, "\t   bit_offset = %d\n", buf_list->bit_offset);
+        va_TraceMsg(idx, "\t   status = 0x%08x\n", buf_list->status);
+        va_TraceMsg(idx, "\t   reserved = 0x%08x\n", buf_list->reserved);
+        va_TraceMsg(idx, "\t   buf = 0x%08x\n", buf_list->buf);
+
+        buf_list = buf_list->next;
+    }
+    va_TraceMsg(idx, NULL);
+}
 
-static int va_TraceVABuffers(
+static void va_TraceVABuffers(
     VADisplay dpy,
     VAContextID context,
     VABufferID buffer,
@@ -220,21 +790,31 @@ static int va_TraceVABuffers(
     unsigned int size,
     unsigned int num_elements,
     void *pbuf
-                             )
+)
 {
-    int i;
+    unsigned int i;
     unsigned char *p = pbuf;
-    unsigned int *pi = (unsigned int *)pbuf;
+    unsigned char  check_sum = 0;
+    DPY2INDEX(dpy);
+    
+    va_TraceMsg(idx, "%s",  buffer_type_to_string(type));
 
-    va_TraceMsg("***Buffer Data***");
     for (i=0; i<size; i++) {
-        if ((i%16) == 0)
-            va_TraceMsg("\n0x%08x:", i);
-        va_TraceMsg(" %02x", p[i]);
+        unsigned char value =  p[i];
+            
+        if ((trace_flag & VA_TRACE_FLAG_BUFDATA) && ((i%16) == 0))
+            va_TraceMsg(idx, "\n\t0x%08x:", i);
+
+        if (trace_flag & VA_TRACE_FLAG_BUFDATA)
+            va_TraceMsg(idx, " %02x", value);
+
+        check_sum ^= value;
     }
 
-    va_TraceMsg("\n");
-    return 0;
+    va_TraceMsg(idx, "\n\tchecksum = 0x%02x\n", check_sum & 0xff);
+    va_TraceMsg(idx, NULL);
+
+    return;
 }
 
 
@@ -247,8 +827,32 @@ static void va_TraceVAPictureParameterBufferMPEG2(
     unsigned int num_elements,
     void *data)
 {
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
-    
+    VAPictureParameterBufferMPEG2 *p=(VAPictureParameterBufferMPEG2 *)data;
+    DPY2INDEX(dpy);
+
+    va_TraceMsg(idx,"VAPictureParameterBufferMPEG2\n");
+
+    va_TraceMsg(idx,"\thorizontal size= %d\n", p->horizontal_size);
+    va_TraceMsg(idx,"\tvertical size= %d\n", p->vertical_size);
+    va_TraceMsg(idx,"\tforward reference picture= %d\n", p->forward_reference_picture);
+    va_TraceMsg(idx,"\tbackward reference picture= %d\n", p->backward_reference_picture);
+    va_TraceMsg(idx,"\tpicture coding type= %d\n", p->picture_coding_type);
+    va_TraceMsg(idx,"\tf mode= %d\n", p->f_code);
+
+    va_TraceMsg(idx,"\tpicture coding extension = %d\n", p->picture_coding_extension.value);
+    va_TraceMsg(idx,"\tintra_dc_precision= %d\n", p->picture_coding_extension.bits.intra_dc_precision);
+    va_TraceMsg(idx,"\tpicture_structure= %d\n", p->picture_coding_extension.bits.picture_structure);
+    va_TraceMsg(idx,"\ttop_field_first= %d\n", p->picture_coding_extension.bits.top_field_first);
+    va_TraceMsg(idx,"\tframe_pred_frame_dct= %d\n", p->picture_coding_extension.bits.frame_pred_frame_dct);
+    va_TraceMsg(idx,"\tconcealment_motion_vectors= %d\n", p->picture_coding_extension.bits.concealment_motion_vectors);
+    va_TraceMsg(idx,"\tq_scale_type= %d\n", p->picture_coding_extension.bits.q_scale_type);
+    va_TraceMsg(idx,"\tintra_vlc_format= %d\n", p->picture_coding_extension.bits.intra_vlc_format);
+    va_TraceMsg(idx,"\talternate_scan= %d\n", p->picture_coding_extension.bits.alternate_scan);
+    va_TraceMsg(idx,"\trepeat_first_field= %d\n", p->picture_coding_extension.bits.repeat_first_field);
+    va_TraceMsg(idx,"\tprogressive_frame= %d\n", p->picture_coding_extension.bits.progressive_frame);
+    va_TraceMsg(idx,"\tis_first_field= %d\n", p->picture_coding_extension.bits.is_first_field);
+    va_TraceMsg(idx, NULL);
+
     return;
 }
 
@@ -262,8 +866,21 @@ static void va_TraceVAIQMatrixBufferMPEG2(
     unsigned int num_elements,
     void *data)
 {
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
-    
+    VAIQMatrixBufferMPEG2 *p=(VAIQMatrixBufferMPEG2 *)data;
+    DPY2INDEX(dpy);
+
+    va_TraceMsg(idx,"VAIQMatrixBufferMPEG2\n");
+
+    va_TraceMsg(idx,"\tload_intra_quantiser_matrix = %d\n", p->load_intra_quantiser_matrix);
+    va_TraceMsg(idx,"\tload_non_intra_quantiser_matrix = %d\n", p->load_non_intra_quantiser_matrix);
+    va_TraceMsg(idx,"\tload_chroma_intra_quantiser_matrix = %d\n", p->load_chroma_intra_quantiser_matrix);
+    va_TraceMsg(idx,"\tload_chroma_non_intra_quantiser_matrix = %d\n", p->load_chroma_non_intra_quantiser_matrix);
+    va_TraceMsg(idx,"\tintra_quantiser_matrix = %d\n", p->intra_quantiser_matrix);
+    va_TraceMsg(idx,"\tnon_intra_quantiser_matrix = %d\n", p->non_intra_quantiser_matrix);
+    va_TraceMsg(idx,"\tchroma_intra_quantiser_matrix = %d\n", p->chroma_intra_quantiser_matrix);
+    va_TraceMsg(idx,"\tchroma_non_intra_quantiser_matrix = %d\n", p->chroma_non_intra_quantiser_matrix);
+    va_TraceMsg(idx, NULL);
+
     return;
 }
 
@@ -277,14 +894,30 @@ static void va_TraceVASliceParameterBufferMPEG2(
     unsigned int num_elements,
     void *data)
 {
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
+    VASliceParameterBufferMPEG2 *p=(VASliceParameterBufferMPEG2 *)data;
+
+    DPY2INDEX(dpy);
+
+    trace_context[idx].trace_slice_no++;
     
-    return;
-}
+    trace_context[idx].trace_slice_size = p->slice_data_size;
 
+    va_TraceMsg(idx,"VASliceParameterBufferMPEG2\n");
 
+    va_TraceMsg(idx,"\tslice_data_size = %d\n", p->slice_data_size);
+    va_TraceMsg(idx,"\tslice_data_offset = %d\n", p->slice_data_offset);
+    va_TraceMsg(idx,"\tslice_data_flag = %d\n", p->slice_data_flag);
+    va_TraceMsg(idx,"\tmacroblock_offset = %d\n", p->macroblock_offset);
+    va_TraceMsg(idx,"\tslice_horizontal_position = %d\n", p->slice_horizontal_position);
+    va_TraceMsg(idx,"\tslice_vertical_position = %d\n", p->slice_vertical_position);
+    va_TraceMsg(idx,"\tquantiser_scale_code = %d\n", p->quantiser_scale_code);
+    va_TraceMsg(idx,"\tintra_slice_flag = %d\n", p->intra_slice_flag);
+    va_TraceMsg(idx, NULL);
 
-static void va_TraceVAPictureParameterBufferMPEG4(
+    return;
+}
+
+static void va_TraceVAPictureParameterBufferJPEG(
     VADisplay dpy,
     VAContextID context,
     VABufferID buffer,
@@ -293,13 +926,51 @@ static void va_TraceVAPictureParameterBufferMPEG4(
     unsigned int num_elements,
     void *data)
 {
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
-    
-    return;
+    int i;
+    VAPictureParameterBufferJPEGBaseline *p=(VAPictureParameterBufferJPEGBaseline *)data;
+    DPY2INDEX(dpy);
+
+    va_TraceMsg(idx,"*VAPictureParameterBufferJPEG\n");
+    va_TraceMsg(idx,"\tpicture_width = %u\n", p->picture_width);
+    va_TraceMsg(idx,"\tpicture_height = %u\n", p->picture_height);
+    va_TraceMsg(idx,"\tcomponents = \n");
+    for (i = 0; i < p->num_components && i < 255; ++i) {
+        va_TraceMsg(idx,"\t\t[%d] component_id = %u\n", i, p->components[i].component_id);
+        va_TraceMsg(idx,"\t\t[%d] h_sampling_factor = %u\n", i, p->components[i].h_sampling_factor);
+        va_TraceMsg(idx,"\t\t[%d] v_sampling_factor = %u\n", i, p->components[i].v_sampling_factor);
+        va_TraceMsg(idx,"\t\t[%d] quantiser_table_selector = %u\n", i, p->components[i].quantiser_table_selector);
+    }
 }
 
+static void va_TraceVAIQMatrixBufferJPEG(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    int i, j;
+    static char tmp[1024];
+    VAIQMatrixBufferJPEGBaseline *p=(VAIQMatrixBufferJPEGBaseline *)data;
+    DPY2INDEX(dpy);
+    va_TraceMsg(idx,"*VAIQMatrixParameterBufferJPEG\n");
+    va_TraceMsg(idx,"\tload_quantiser_table =\n");
+    for (i = 0; i < 4; ++i) {
+        va_TraceMsg(idx,"\t\t[%d] = %u\n", i, p->load_quantiser_table[i]);
+    }
+    va_TraceMsg(idx,"\tquantiser_table =\n");
+    for (i = 0; i < 4; ++i) {
+        memset(tmp, 0, sizeof tmp);
+        for (j = 0; j < 64; ++j) {
+            sprintf(tmp + strlen(tmp), "%u ", p->quantiser_table[i][j]);
+        }
+        va_TraceMsg(idx,"\t\t[%d] = %s\n", i, tmp);
+    }
+}
 
-static void va_TraceVAIQMatrixBufferMPEG4(
+static void va_TraceVASliceParameterBufferJPEG(
     VADisplay dpy,
     VAContextID context,
     VABufferID buffer,
@@ -308,13 +979,72 @@ static void va_TraceVAIQMatrixBufferMPEG4(
     unsigned int num_elements,
     void *data)
 {
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
-    
-    return;
+    int i;
+    VASliceParameterBufferJPEGBaseline *p=(VASliceParameterBufferJPEGBaseline *)data;
+    DPY2INDEX(dpy);
+    va_TraceMsg(idx,"*VASliceParameterBufferJPEG\n");
+    va_TraceMsg(idx,"\tslice_data_size = %u\n", p->slice_data_size);
+    va_TraceMsg(idx,"\tslice_data_offset = %u\n", p->slice_data_offset);
+    va_TraceMsg(idx,"\tslice_data_flag = %u\n", p->slice_data_flag);
+    va_TraceMsg(idx,"\tslice_horizontal_position = %u\n", p->slice_horizontal_position);
+    va_TraceMsg(idx,"\tslice_vertical_position = %u\n", p->slice_vertical_position);
+    va_TraceMsg(idx,"\tcomponents = \n");
+    for (i = 0; i < p->num_components && i < 4; ++i) {
+        va_TraceMsg(idx,"\t\t[%d] component_selector = %u\n", i, p->components[i].component_selector);
+        va_TraceMsg(idx,"\t\t[%d] dc_table_selector = %u\n", i, p->components[i].dc_table_selector);
+        va_TraceMsg(idx,"\t\t[%d] ac_table_selector = %u\n", i, p->components[i].ac_table_selector);
+    }
+    va_TraceMsg(idx,"\trestart_interval = %u\n", p->restart_interval);
+    va_TraceMsg(idx,"\tnum_mcus = %u\n", p->num_mcus);
 }
 
+static void va_TraceVAHuffmanTableBufferJPEG(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    int i, j;
+    static char tmp[1024];
+    VAHuffmanTableBufferJPEGBaseline *p=(VAHuffmanTableBufferJPEGBaseline *)data;
+    DPY2INDEX(dpy);
+    va_TraceMsg(idx,"*VAHuffmanTableBufferJPEG\n");
+
+    for (i = 0; i < 2; ++i) {
+        va_TraceMsg(idx,"\tload_huffman_table[%d] =%u\n", i, p->load_huffman_table[0]);
+        va_TraceMsg(idx,"\thuffman_table[%d] =\n", i);
+        memset(tmp, 0, sizeof tmp);
+        for (j = 0; j < 16; ++j) {
+            sprintf(tmp + strlen(tmp), "%u ", p->huffman_table[i].num_dc_codes[j]);
+        }
+        va_TraceMsg(idx,"\t\tnum_dc_codes =%s\n", tmp);
+        memset(tmp, 0, sizeof tmp);
+        for (j = 0; j < 12; ++j) {
+            sprintf(tmp + strlen(tmp), "%u ", p->huffman_table[i].dc_values[j]);
+        }
+        va_TraceMsg(idx,"\t\tdc_values =%s\n", tmp);
+        memset(tmp, 0, sizeof tmp);
+        for (j = 0; j < 16; ++j) {
+            sprintf(tmp + strlen(tmp), "%u ", p->huffman_table[i].num_ac_codes[j]);
+        }
+        va_TraceMsg(idx,"\t\tnum_dc_codes =%s\n", tmp);
+        memset(tmp, 0, sizeof tmp);
+        for (j = 0; j < 162; ++j) {
+            sprintf(tmp + strlen(tmp), "%u ", p->huffman_table[i].ac_values[j]);
+        }
+        va_TraceMsg(idx,"\t\tnum_dc_codes =%s\n", tmp);
+        memset(tmp, 0, sizeof tmp);
+        for (j = 0; j < 2; ++j) {
+            sprintf(tmp + strlen(tmp), "%u ", p->huffman_table[i].pad[j]);
+        }
+        va_TraceMsg(idx,"\t\tnum_dc_codes =%s\n", tmp);
+    }
+}
 
-static void va_TraceVASliceParameterBufferMPEG4(
+static void va_TraceVAPictureParameterBufferMPEG4(
     VADisplay dpy,
     VAContextID context,
     VABufferID buffer,
@@ -323,13 +1053,58 @@ static void va_TraceVASliceParameterBufferMPEG4(
     unsigned int num_elements,
     void *data)
 {
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
+    int i;
+    VAPictureParameterBufferMPEG4 *p=(VAPictureParameterBufferMPEG4 *)data;
     
+    DPY2INDEX(dpy);
+
+    va_TraceMsg(idx,"*VAPictureParameterBufferMPEG4\n");
+    va_TraceMsg(idx,"\tvop_width = %d\n", p->vop_width);
+    va_TraceMsg(idx,"\tvop_height = %d\n", p->vop_height);
+    va_TraceMsg(idx,"\tforward_reference_picture = %d\n", p->forward_reference_picture);
+    va_TraceMsg(idx,"\tbackward_reference_picture = %d\n", p->backward_reference_picture);
+    va_TraceMsg(idx,"\tvol_fields value = %d\n", p->vol_fields.value);
+    va_TraceMsg(idx,"\tshort_video_header= %d\n", p->vol_fields.bits.short_video_header);
+    va_TraceMsg(idx,"\tchroma_format= %d\n", p->vol_fields.bits.chroma_format);
+    va_TraceMsg(idx,"\tinterlaced= %d\n", p->vol_fields.bits.interlaced);
+    va_TraceMsg(idx,"\tobmc_disable= %d\n", p->vol_fields.bits.obmc_disable);
+    va_TraceMsg(idx,"\tsprite_enable= %d\n", p->vol_fields.bits.sprite_enable);
+    va_TraceMsg(idx,"\tsprite_warping_accuracy= %d\n", p->vol_fields.bits.sprite_warping_accuracy);
+    va_TraceMsg(idx,"\tquant_type= %d\n", p->vol_fields.bits.quant_type);
+    va_TraceMsg(idx,"\tquarter_sample= %d\n", p->vol_fields.bits.quarter_sample);
+    va_TraceMsg(idx,"\tdata_partitioned= %d\n", p->vol_fields.bits.data_partitioned);
+    va_TraceMsg(idx,"\treversible_vlc= %d\n", p->vol_fields.bits.reversible_vlc);
+    va_TraceMsg(idx,"\tresync_marker_disable= %d\n", p->vol_fields.bits.resync_marker_disable);
+    va_TraceMsg(idx,"\tno_of_sprite_warping_points = %d\n", p->no_of_sprite_warping_points);
+    va_TraceMsg(idx,"\tsprite_trajectory_du =");
+    for(i=0;i<3;i++)
+        va_TraceMsg(idx,"\t%d", p->sprite_trajectory_du[i]);
+
+    va_TraceMsg(idx,"\n");
+    va_TraceMsg(idx,"\tsprite_trajectory_dv =");
+    for(i=0;i<3;i++)
+        va_TraceMsg(idx,"\t%d", p->sprite_trajectory_dv[i]);
+    va_TraceMsg(idx,"\n");
+    va_TraceMsg(idx,"\tvop_fields value = %d\n", p->vop_fields.value);
+    va_TraceMsg(idx,"\tvop_coding_type= %d\n", p->vop_fields.bits.vop_coding_type);
+    va_TraceMsg(idx,"\tbackward_reference_vop_coding_type= %d\n", p->vop_fields.bits.backward_reference_vop_coding_type);
+    va_TraceMsg(idx,"\tvop_rounding_type= %d\n", p->vop_fields.bits.vop_rounding_type);
+    va_TraceMsg(idx,"\tintra_dc_vlc_thr= %d\n", p->vop_fields.bits.intra_dc_vlc_thr);
+    va_TraceMsg(idx,"\ttop_field_first= %d\n", p->vop_fields.bits.top_field_first);
+    va_TraceMsg(idx,"\talternate_vertical_scan_flag= %d\n", p->vop_fields.bits.alternate_vertical_scan_flag);
+    va_TraceMsg(idx,"\tvop_fcode_forward = %d\n", p->vop_fcode_forward);
+    va_TraceMsg(idx,"\tvop_fcode_backward = %d\n", p->vop_fcode_backward);
+    va_TraceMsg(idx,"\tnum_gobs_in_vop = %d\n", p->num_gobs_in_vop);
+    va_TraceMsg(idx,"\tnum_macroblocks_in_gob = %d\n", p->num_macroblocks_in_gob);
+    va_TraceMsg(idx,"\tTRB = %d\n", p->TRB);
+    va_TraceMsg(idx,"\tTRD = %d\n", p->TRD);
+    va_TraceMsg(idx, NULL);
+
     return;
 }
 
 
-static void va_TraceVAPictureParameterBufferH264(
+static void va_TraceVAIQMatrixBufferMPEG4(
     VADisplay dpy,
     VAContextID context,
     VABufferID buffer,
@@ -339,76 +1114,200 @@ static void va_TraceVAPictureParameterBufferH264(
     void *data)
 {
     int i;
+    VAIQMatrixBufferMPEG4 *p=(VAIQMatrixBufferMPEG4 *)data;
+    DPY2INDEX(dpy);
 
-    VAPictureParameterBufferH264 *p = (VAPictureParameterBufferH264*)data;
+    va_TraceMsg(idx,"VAIQMatrixBufferMPEG4\n");
 
-    va_TraceMsg  ("==========H264PicParameterBuffer============\n");
+    va_TraceMsg(idx,"\tload_intra_quant_mat = %d\n", p->load_intra_quant_mat);
+    va_TraceMsg(idx,"\tload_non_intra_quant_mat = %d\n", p->load_non_intra_quant_mat);
+    va_TraceMsg(idx,"\tintra_quant_mat =\n");
+    for(i=0;i<64;i++)
+        va_TraceMsg(idx,"\t\t%d\n", p->intra_quant_mat[i]);
 
-#if 0    
-    if (p->num_ref_frames > 4)
-    {
-        int num = 0;
-        for (i = 15; i >= 0; i--)
-        {
-            if (p->ReferenceFrames[i].flags != VA_PICTURE_H264_INVALID)
-            {
-                num++;
-            }
-            if (num > 4)
-            {
-                p->ReferenceFrames[i].flags = VA_PICTURE_H264_INVALID;
-            }
-        }      
-        p->num_ref_frames  = 4;
+    va_TraceMsg(idx,"\tnon_intra_quant_mat =\n");
+    for(i=0;i<64;i++)
+        va_TraceMsg(idx,"\t\t%d\n", p->non_intra_quant_mat[i]);
+    va_TraceMsg(idx, NULL);
+
+    return;
+}
+
+static void va_TraceVAEncSequenceParameterBufferMPEG4(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    VAEncSequenceParameterBufferMPEG4 *p = (VAEncSequenceParameterBufferMPEG4 *)data;
+    DPY2INDEX(dpy);
+    
+    va_TraceMsg(idx, "VAEncSequenceParameterBufferMPEG4\n");
+    
+    va_TraceMsg(idx, "\tprofile_and_level_indication = %d\n", p->profile_and_level_indication);
+    va_TraceMsg(idx, "\tintra_period = %d\n", p->intra_period);
+    va_TraceMsg(idx, "\tvideo_object_layer_width = %d\n", p->video_object_layer_width);
+    va_TraceMsg(idx, "\tvideo_object_layer_height = %d\n", p->video_object_layer_height);
+    va_TraceMsg(idx, "\tvop_time_increment_resolution = %d\n", p->vop_time_increment_resolution);
+    va_TraceMsg(idx, "\tfixed_vop_rate = %d\n", p->fixed_vop_rate);
+    va_TraceMsg(idx, "\tfixed_vop_time_increment = %d\n", p->fixed_vop_time_increment);
+    va_TraceMsg(idx, "\tbits_per_second = %d\n", p->bits_per_second);
+    va_TraceMsg(idx, "\tframe_rate = %d\n", p->frame_rate);
+    va_TraceMsg(idx, "\tinitial_qp = %d\n", p->initial_qp);
+    va_TraceMsg(idx, "\tmin_qp = %d\n", p->min_qp);
+    va_TraceMsg(idx, NULL);
+
+    /* start a new sequce, coded log file can be truncated */
+    trace_context[idx].trace_sequence_start = 1;
+
+    return;
+}
+
+static void va_TraceVAEncPictureParameterBufferMPEG4(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    VAEncPictureParameterBufferMPEG4 *p = (VAEncPictureParameterBufferMPEG4 *)data;
+    DPY2INDEX(dpy);
+    
+    va_TraceMsg(idx, "VAEncPictureParameterBufferMPEG4\n");
+    va_TraceMsg(idx, "\treference_picture = 0x%08x\n", p->reference_picture);
+    va_TraceMsg(idx, "\treconstructed_picture = 0x%08x\n", p->reconstructed_picture);
+    va_TraceMsg(idx, "\tcoded_buf = 0x%08x\n", p->coded_buf);
+    va_TraceMsg(idx, "\tpicture_width = %d\n", p->picture_width);
+    va_TraceMsg(idx, "\tpicture_height = %d\n", p->picture_height);
+    va_TraceMsg(idx, "\tmodulo_time_base = %d\n", p->modulo_time_base);
+    va_TraceMsg(idx, "\tvop_time_increment = %d\n", p->vop_time_increment);
+    va_TraceMsg(idx, "\tpicture_type = %d\n", p->picture_type);
+    va_TraceMsg(idx, NULL);
+
+    trace_context[idx].trace_codedbuf =  p->coded_buf;
+    
+    return;
+}
+
+
+static void va_TraceVASliceParameterBufferMPEG4(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    VASliceParameterBufferMPEG4 *p=(VASliceParameterBufferMPEG4 *)data;
+    
+    DPY2INDEX(dpy);
+
+    trace_context[idx].trace_slice_no++;
+
+    trace_context[idx].trace_slice_size = p->slice_data_size;
+
+    va_TraceMsg(idx,"VASliceParameterBufferMPEG4\n");
+
+    va_TraceMsg(idx,"\tslice_data_size = %d\n", p->slice_data_size);
+    va_TraceMsg(idx,"\tslice_data_offset = %d\n", p->slice_data_offset);
+    va_TraceMsg(idx,"\tslice_data_flag = %d\n", p->slice_data_flag);
+    va_TraceMsg(idx,"\tmacroblock_offset = %d\n", p->macroblock_offset);
+    va_TraceMsg(idx,"\tmacroblock_number = %d\n", p->macroblock_number);
+    va_TraceMsg(idx,"\tquant_scale = %d\n", p->quant_scale);
+    va_TraceMsg(idx, NULL);
+
+    return;
+}
+
+
+static inline void va_TraceFlagIfNotZero(
+    int idx,            /* in */
+    const char *name,   /* in */
+    unsigned int flag   /* in */
+)
+{
+    if (flag != 0) {
+        va_TraceMsg(idx, "%s = %x\n", name, flag);
     }
-#endif
+}
+
+
+static void va_TraceVAPictureParameterBufferH264(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    int i;
+    VAPictureParameterBufferH264 *p = (VAPictureParameterBufferH264*)data;
     
-#if 1
-    va_TraceMsg("picture id: %d\n", p->CurrPic.picture_id);
-    va_TraceMsg("frame idx: %d\n", p->CurrPic.frame_idx);
-    va_TraceMsg("picture flags: %d\n", p->CurrPic.flags);
-    va_TraceMsg("top field order count: %d\n", p->CurrPic.TopFieldOrderCnt);
-    va_TraceMsg("bottom field order count: %d\n", p->CurrPic.BottomFieldOrderCnt);
+    DPY2INDEX(dpy);
+
+    va_TraceMsg(idx, "VAPictureParameterBufferH264\n");
 
+    va_TraceMsg(idx, "\tCurrPic.picture_id = 0x%08x\n", p->CurrPic.picture_id);
+    va_TraceMsg(idx, "\tCurrPic.frame_idx = %d\n", p->CurrPic.frame_idx);
+    va_TraceMsg(idx, "\tCurrPic.flags = %d\n", p->CurrPic.flags);
+    va_TraceMsg(idx, "\tCurrPic.TopFieldOrderCnt = %d\n", p->CurrPic.TopFieldOrderCnt);
+    va_TraceMsg(idx, "\tCurrPic.BottomFieldOrderCnt = %d\n", p->CurrPic.BottomFieldOrderCnt);
 
-    va_TraceMsg("Reference frames: \n");
+    va_TraceMsg(idx, "\tReferenceFrames (TopFieldOrderCnt-BottomFieldOrderCnt-picture_id-frame_idx-flags:\n");
     for (i = 0; i < 16; i++)
     {
-        if (p->ReferenceFrames[i].flags != VA_PICTURE_H264_INVALID)
-        {
-            //va_TraceMsg("%d-%d; ", p->ReferenceFrames[i].TopFieldOrderCnt, p->ReferenceFrames[i].BottomFieldOrderCnt);
-            va_TraceMsg("%d-%d-%d-%d; ", p->ReferenceFrames[i].TopFieldOrderCnt, p->ReferenceFrames[i].BottomFieldOrderCnt, p->ReferenceFrames[i].picture_id, p->ReferenceFrames[i].frame_idx);
-        }
+        if ((p->ReferenceFrames[i].picture_id != VA_INVALID_SURFACE) &&
+            ((p->ReferenceFrames[i].flags & VA_PICTURE_H264_INVALID) == 0)) {
+            va_TraceMsg(idx, "\t\t%08d-%08d-0x%08x-%08d-0x%08x\n",
+                        p->ReferenceFrames[i].TopFieldOrderCnt,
+                        p->ReferenceFrames[i].BottomFieldOrderCnt,
+                        p->ReferenceFrames[i].picture_id,
+                        p->ReferenceFrames[i].frame_idx,
+                        p->ReferenceFrames[i].flags);
+        } else
+            va_TraceMsg(idx, "\t\tinv-inv-inv-inv-inv\n");
     }
-    va_TraceMsg("\n");
-#endif
-    va_TraceMsg("picture_width_in_mbs_minus1: %d\n", p->picture_width_in_mbs_minus1);
-    va_TraceMsg("picture_height_in_mbs_minus1: %d\n", p->picture_height_in_mbs_minus1);
-    va_TraceMsg("bit_depth_luma_minus8: %d\n", p->bit_depth_luma_minus8);
-    va_TraceMsg("bit_depth_chroma_minus8: %d\n", p->bit_depth_chroma_minus8);
-    va_TraceMsg("num_ref_frames: %d\n", p->num_ref_frames);
-    va_TraceMsg("seq fields: %d\n", p->seq_fields.value);
-    va_TraceMsg("\t chroma_format_idc: %d\n", p->seq_fields.bits.chroma_format_idc);
-    va_TraceMsg("\t residual_colour_transform_flag: %d\n", p->seq_fields.bits.residual_colour_transform_flag);
-    va_TraceMsg("\t frame_mbs_only_flag: %d\n", p->seq_fields.bits.frame_mbs_only_flag);
-    va_TraceMsg("\t mb_adaptive_frame_field_flag: %d\n", p->seq_fields.bits.mb_adaptive_frame_field_flag);
-    va_TraceMsg("\t direct_8x8_inference_flag: %d\n", p->seq_fields.bits.direct_8x8_inference_flag);
-    va_TraceMsg("\t MinLumaBiPredSize8x8: %d\n", p->seq_fields.bits.MinLumaBiPredSize8x8);
-    va_TraceMsg("num_slice_groups_minus1: %d\n", p->num_slice_groups_minus1);
-    va_TraceMsg("slice_group_map_type: %d\n", p->slice_group_map_type);
-    va_TraceMsg("slice_group_change_rate_minus1: %d\n", p->slice_group_change_rate_minus1);
-    va_TraceMsg("pic_init_qp_minus26: %d\n", p->pic_init_qp_minus26);
-    va_TraceMsg("pic_init_qs_minus26: %d\n", p->pic_init_qs_minus26);
-    va_TraceMsg("chroma_qp_index_offset: %d\n", p->chroma_qp_index_offset);
-    va_TraceMsg("second_chroma_qp_index_offset: %d\n", p->second_chroma_qp_index_offset);
-    va_TraceMsg("pic_fields: %d\n", p->pic_fields.value);
-    va_TraceMsg("\t entropy_coding_mode_flag: %d\n", p->pic_fields.bits.entropy_coding_mode_flag);
-    va_TraceMsg("\t weighted_pred_flag: %d\n", p->pic_fields.bits.weighted_pred_flag);
-    va_TraceMsg("\t weighted_bipred_idc: %d\n", p->pic_fields.bits.weighted_bipred_idc);
-    va_TraceMsg("\t transform_8x8_mode_flag: %d\n", p->pic_fields.bits.transform_8x8_mode_flag);
-    va_TraceMsg("\t field_pic_flag: %d\n", p->pic_fields.bits.field_pic_flag);
-    va_TraceMsg("\t constrained_intra_pred_flag: %d\n", p->pic_fields.bits.constrained_intra_pred_flag);
-    va_TraceMsg("frame_num: %d\n", p->frame_num);
+    va_TraceMsg(idx, "\n");
+    
+    va_TraceMsg(idx, "\tpicture_width_in_mbs_minus1 = %d\n", p->picture_width_in_mbs_minus1);
+    va_TraceMsg(idx, "\tpicture_height_in_mbs_minus1 = %d\n", p->picture_height_in_mbs_minus1);
+    va_TraceMsg(idx, "\tbit_depth_luma_minus8 = %d\n", p->bit_depth_luma_minus8);
+    va_TraceMsg(idx, "\tbit_depth_chroma_minus8 = %d\n", p->bit_depth_chroma_minus8);
+    va_TraceMsg(idx, "\tnum_ref_frames = %d\n", p->num_ref_frames);
+    va_TraceMsg(idx, "\tseq fields = %d\n", p->seq_fields.value);
+    va_TraceMsg(idx, "\tchroma_format_idc = %d\n", p->seq_fields.bits.chroma_format_idc);
+    va_TraceMsg(idx, "\tresidual_colour_transform_flag = %d\n", p->seq_fields.bits.residual_colour_transform_flag);
+    va_TraceMsg(idx, "\tframe_mbs_only_flag = %d\n", p->seq_fields.bits.frame_mbs_only_flag);
+    va_TraceMsg(idx, "\tmb_adaptive_frame_field_flag = %d\n", p->seq_fields.bits.mb_adaptive_frame_field_flag);
+    va_TraceMsg(idx, "\tdirect_8x8_inference_flag = %d\n", p->seq_fields.bits.direct_8x8_inference_flag);
+    va_TraceMsg(idx, "\tMinLumaBiPredSize8x8 = %d\n", p->seq_fields.bits.MinLumaBiPredSize8x8);
+    va_TraceMsg(idx, "\tnum_slice_groups_minus1 = %d\n", p->num_slice_groups_minus1);
+    va_TraceMsg(idx, "\tslice_group_map_type = %d\n", p->slice_group_map_type);
+    va_TraceMsg(idx, "\tslice_group_change_rate_minus1 = %d\n", p->slice_group_change_rate_minus1);
+    va_TraceMsg(idx, "\tpic_init_qp_minus26 = %d\n", p->pic_init_qp_minus26);
+    va_TraceMsg(idx, "\tpic_init_qs_minus26 = %d\n", p->pic_init_qs_minus26);
+    va_TraceMsg(idx, "\tchroma_qp_index_offset = %d\n", p->chroma_qp_index_offset);
+    va_TraceMsg(idx, "\tsecond_chroma_qp_index_offset = %d\n", p->second_chroma_qp_index_offset);
+    va_TraceMsg(idx, "\tpic_fields = 0x%03x\n", p->pic_fields.value);
+    va_TraceFlagIfNotZero(idx, "\t\tentropy_coding_mode_flag", p->pic_fields.bits.entropy_coding_mode_flag);
+    va_TraceFlagIfNotZero(idx, "\t\tweighted_pred_flag", p->pic_fields.bits.weighted_pred_flag);
+    va_TraceFlagIfNotZero(idx, "\t\tweighted_bipred_idc", p->pic_fields.bits.weighted_bipred_idc);
+    va_TraceFlagIfNotZero(idx, "\t\ttransform_8x8_mode_flag", p->pic_fields.bits.transform_8x8_mode_flag);
+    va_TraceFlagIfNotZero(idx, "\t\tfield_pic_flag", p->pic_fields.bits.field_pic_flag);
+    va_TraceFlagIfNotZero(idx, "\t\tconstrained_intra_pred_flag", p->pic_fields.bits.constrained_intra_pred_flag);
+    va_TraceFlagIfNotZero(idx, "\t\tpic_order_present_flag", p->pic_fields.bits.pic_order_present_flag);
+    va_TraceFlagIfNotZero(idx, "\t\tdeblocking_filter_control_present_flag", p->pic_fields.bits.deblocking_filter_control_present_flag);
+    va_TraceFlagIfNotZero(idx, "\t\tredundant_pic_cnt_present_flag", p->pic_fields.bits.redundant_pic_cnt_present_flag);
+    va_TraceFlagIfNotZero(idx, "\t\treference_pic_flag", p->pic_fields.bits.reference_pic_flag);
+    va_TraceMsg(idx, "\tframe_num = %d\n", p->frame_num);
+    va_TraceMsg(idx, NULL);
 
     return;
 }
@@ -424,94 +1323,80 @@ static void va_TraceVASliceParameterBufferH264(
 {
     int i;
     VASliceParameterBufferH264* p = (VASliceParameterBufferH264*)data;
-
-    va_TraceMsg  ("========== SLICE HEADER ============.\n");
-    va_TraceMsg("slice_data_size: %d\n", p->slice_data_size);
-    va_TraceMsg("slice_data_offset: %d\n", p->slice_data_offset);
-    va_TraceMsg("slice_data_flag: %d\n", p->slice_data_flag);
-    va_TraceMsg("slice_data_bit_offset: %d\n", p->slice_data_bit_offset);
-    va_TraceMsg("first_mb_in_slice: %d\n", p->first_mb_in_slice);
-    va_TraceMsg("slice_type: %d\n", p->slice_type);
-    va_TraceMsg("direct_spatial_mv_pred_flag: %d\n", p->direct_spatial_mv_pred_flag);
-    va_TraceMsg("num_ref_idx_l0_active_minus1: %d\n", p->num_ref_idx_l0_active_minus1);
-    va_TraceMsg("num_ref_idx_l1_active_minus1: %d\n", p->num_ref_idx_l1_active_minus1);
-    va_TraceMsg("cabac_init_idc: %d\n", p->cabac_init_idc);
-    va_TraceMsg("slice_qp_delta: %d\n", p->slice_qp_delta);
-    va_TraceMsg("disable_deblocking_filter_idc: %d\n", p->disable_deblocking_filter_idc);
-    va_TraceMsg("slice_alpha_c0_offset_div2: %d\n", p->slice_alpha_c0_offset_div2);
-    va_TraceMsg("slice_beta_offset_div2: %d\n", p->slice_beta_offset_div2);    
-
-#if 1
-    if (p->slice_type == 0 || p->slice_type == 1)
-    {
-        va_TraceMsg("RefPicList0:\n");
-        for (i = 0; i < p->num_ref_idx_l0_active_minus1 + 1; i++)
-        {
-            //va_TraceMsg("%d-%d; ", p->RefPicList0[i].TopFieldOrderCnt, p->RefPicList0[i].BottomFieldOrderCnt);
-            va_TraceMsg("%d-%d-%d-%d; ", p->RefPicList0[i].TopFieldOrderCnt, p->RefPicList0[i].BottomFieldOrderCnt, p->RefPicList0[i].picture_id, p->RefPicList0[i].frame_idx);
+    DPY2INDEX(dpy);
+
+    trace_context[idx].trace_slice_no++;
+    trace_context[idx].trace_slice_size = p->slice_data_size;
+
+    va_TraceMsg(idx, "VASliceParameterBufferH264\n");
+    va_TraceMsg(idx, "\tslice_data_size = %d\n", p->slice_data_size);
+    va_TraceMsg(idx, "\tslice_data_offset = %d\n", p->slice_data_offset);
+    va_TraceMsg(idx, "\tslice_data_flag = %d\n", p->slice_data_flag);
+    va_TraceMsg(idx, "\tslice_data_bit_offset = %d\n", p->slice_data_bit_offset);
+    va_TraceMsg(idx, "\tfirst_mb_in_slice = %d\n", p->first_mb_in_slice);
+    va_TraceMsg(idx, "\tslice_type = %d\n", p->slice_type);
+    va_TraceMsg(idx, "\tdirect_spatial_mv_pred_flag = %d\n", p->direct_spatial_mv_pred_flag);
+    va_TraceMsg(idx, "\tnum_ref_idx_l0_active_minus1 = %d\n", p->num_ref_idx_l0_active_minus1);
+    va_TraceMsg(idx, "\tnum_ref_idx_l1_active_minus1 = %d\n", p->num_ref_idx_l1_active_minus1);
+    va_TraceMsg(idx, "\tcabac_init_idc = %d\n", p->cabac_init_idc);
+    va_TraceMsg(idx, "\tslice_qp_delta = %d\n", p->slice_qp_delta);
+    va_TraceMsg(idx, "\tdisable_deblocking_filter_idc = %d\n", p->disable_deblocking_filter_idc);
+    va_TraceMsg(idx, "\tslice_alpha_c0_offset_div2 = %d\n", p->slice_alpha_c0_offset_div2);
+    va_TraceMsg(idx, "\tslice_beta_offset_div2 = %d\n", p->slice_beta_offset_div2);
+
+    if (p->slice_type == 0 || p->slice_type == 1) {
+        va_TraceMsg(idx, "\tRefPicList0 =");
+        for (i = 0; (i < p->num_ref_idx_l0_active_minus1 + 1 && i < 32); i++) {
+            va_TraceMsg(idx, "%08d-%08d-0x%08x-%08d-0x%08x\n", p->RefPicList0[i].TopFieldOrderCnt, p->RefPicList0[i].BottomFieldOrderCnt, p->RefPicList0[i].picture_id, p->RefPicList0[i].frame_idx,  p->RefPicList0[i].flags);
         }
-        va_TraceMsg("\n");
-        if (p->slice_type == 1)
-        {
-            va_TraceMsg("RefPicList1:\n");
-            for (i = 0; i < p->num_ref_idx_l1_active_minus1 + 1; i++)
+        if (p->slice_type == 1) {
+            va_TraceMsg(idx, "\tRefPicList1 =");
+            for (i = 0; (i < p->num_ref_idx_l1_active_minus1 + 1 && i < 32); i++)
             {
-                //va_TraceMsg("%d-%d; ", p->RefPicList1[i].TopFieldOrderCnt, p->RefPicList1[i].BottomFieldOrderCnt);
-                va_TraceMsg("%d-%d-%d-%d; ", p->RefPicList1[i].TopFieldOrderCnt, p->RefPicList1[i].BottomFieldOrderCnt, p->RefPicList1[i].picture_id, p->RefPicList1[i].frame_idx);
+                va_TraceMsg(idx, "%08d-%08d-0x%08x-%08d-0x%08x\n", p->RefPicList1[i].TopFieldOrderCnt, p->RefPicList1[i].BottomFieldOrderCnt, p->RefPicList1[i].picture_id, p->RefPicList1[i].frame_idx, p->RefPicList1[i].flags);
             }
         }
-        va_TraceMsg("\n");
     }
-#endif
-
-    va_TraceMsg("luma_log2_weight_denom: %d\n", p->luma_log2_weight_denom);
-    va_TraceMsg("chroma_log2_weight_denom: %d\n", p->chroma_log2_weight_denom);
-    va_TraceMsg("luma_weight_l0_flag: %d\n", p->luma_weight_l0_flag);
-    if (p->luma_weight_l0_flag)
-    {
-        for (i = 0; i <=  p->num_ref_idx_l0_active_minus1; i++)
-        {
-            va_TraceMsg("%d ", p->luma_weight_l0[i]);
-            va_TraceMsg("%d ", p->luma_offset_l0[i]);
+    
+    va_TraceMsg(idx, "\tluma_log2_weight_denom = %d\n", p->luma_log2_weight_denom);
+    va_TraceMsg(idx, "\tchroma_log2_weight_denom = %d\n", p->chroma_log2_weight_denom);
+    va_TraceMsg(idx, "\tluma_weight_l0_flag = %d\n", p->luma_weight_l0_flag);
+    if (p->luma_weight_l0_flag) {
+        for (i = 0; i <=  p->num_ref_idx_l0_active_minus1; i++) {
+            va_TraceMsg(idx, "\t%d ", p->luma_weight_l0[i]);
+            va_TraceMsg(idx, "\t%d ", p->luma_offset_l0[i]);
         }
-        va_TraceMsg("\n");
     }
-       
-               
-    va_TraceMsg("chroma_weight_l0_flag: %d\n", p->chroma_weight_l0_flag);
-    if (p->chroma_weight_l0_flag)
-    {
-        for (i = 0; i <= p->num_ref_idx_l0_active_minus1; i++)
-        {
-            va_TraceMsg("%d ", p->chroma_weight_l0[i][0]);
-            va_TraceMsg("%d ", p->chroma_offset_l0[i][0]);
-            va_TraceMsg("%d ", p->chroma_weight_l0[i][1]);
-            va_TraceMsg("%d ", p->chroma_offset_l0[i][1]);
+
+    va_TraceMsg(idx, "\tchroma_weight_l0_flag = %d\n", p->chroma_weight_l0_flag);
+    if (p->chroma_weight_l0_flag) {
+        for (i = 0; i <= p->num_ref_idx_l0_active_minus1; i++) {
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_weight_l0[i][0]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_offset_l0[i][0]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_weight_l0[i][1]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_offset_l0[i][1]);
         }
-        va_TraceMsg("\n");                     
     }
-    va_TraceMsg("luma_weight_l1_flag: %d\n", p->luma_weight_l1_flag);
-    if (p->luma_weight_l1_flag)
-    {
-        for (i = 0; i <=  p->num_ref_idx_l1_active_minus1; i++)
-        {
-            va_TraceMsg("%d ", p->luma_weight_l1[i]);
-            va_TraceMsg("%d ", p->luma_offset_l1[i]);
+    
+    va_TraceMsg(idx, "\tluma_weight_l1_flag = %d\n", p->luma_weight_l1_flag);
+    if (p->luma_weight_l1_flag) {
+        for (i = 0; i <=  p->num_ref_idx_l1_active_minus1; i++) {
+            va_TraceMsg(idx, "\t\t%d ", p->luma_weight_l1[i]);
+            va_TraceMsg(idx, "\t\t%d ", p->luma_offset_l1[i]);
         }
-        va_TraceMsg("\n");
     }
-    va_TraceMsg("chroma_weight_l1_flag: %d\n", p->chroma_weight_l1_flag);
-    if (p->chroma_weight_l1_flag)
-    {
-        for (i = 0; i <= p->num_ref_idx_l1_active_minus1; i++)
-        {
-            va_TraceMsg("%d ", p->chroma_weight_l1[i][0]);
-            va_TraceMsg("%d ", p->chroma_offset_l1[i][0]);
-            va_TraceMsg("%d ", p->chroma_weight_l1[i][1]);
-            va_TraceMsg("%d ", p->chroma_offset_l1[i][1]);
+    
+    va_TraceMsg(idx, "\tchroma_weight_l1_flag = %d\n", p->chroma_weight_l1_flag);
+    if (p->chroma_weight_l1_flag) {
+        for (i = 0; i <= p->num_ref_idx_l1_active_minus1; i++) {
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_weight_l1[i][0]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_offset_l1[i][0]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_weight_l1[i][1]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_offset_l1[i][1]);
         }
-        va_TraceMsg("\n");                     
-    }  
+        va_TraceMsg(idx, "\n");
+    }
+    va_TraceMsg(idx, NULL);
 }
 
 static void va_TraceVAIQMatrixBufferH264(
@@ -524,249 +1409,734 @@ static void va_TraceVAIQMatrixBufferH264(
     void *data
 )
 {
-    va_TraceMsg("========== IQMatrix ============.\n");
+    int i, j;    
     VAIQMatrixBufferH264* p = (VAIQMatrixBufferH264* )data;
-    int i, j;
-    for (i = 0; i < 6; i++)
-    {
-        for (j = 0; j < 16; j++)
-        {
-            va_TraceMsg("%d\t", p->ScalingList4x4[i][j]);
+
+    DPY2INDEX(dpy);
+
+    va_TraceMsg(idx, "VAIQMatrixBufferH264\n");
+
+    va_TraceMsg(idx, "\tScalingList4x4[6][16]=\n");
+    for (i = 0; i < 6; i++) {
+        for (j = 0; j < 16; j++) {
+            va_TraceMsg(idx, "\t%d\t", p->ScalingList4x4[i][j]);
             if ((j + 1) % 8 == 0)
-                va_TraceMsg("\n");
+                va_TraceMsg(idx, "\n");
         }
     }
 
-    for (i = 0; i < 2; i++)
-    {
-        for (j = 0; j < 64; j++)
-        {
-            va_TraceMsg("%d\t", p->ScalingList8x8[i][j]);
+    va_TraceMsg(idx, "\tScalingList8x8[2][64]=\n");
+    for (i = 0; i < 2; i++) {
+        for (j = 0; j < 64; j++) {
+            va_TraceMsg(idx, "\t%d", p->ScalingList8x8[i][j]);
             if ((j + 1) % 8 == 0)
-                va_TraceMsg("\n");
-        }              
+                va_TraceMsg(idx, "\n");
+        }
+    }
+
+    va_TraceMsg(idx, NULL);
+}
+
+
+
+static void va_TraceVAEncSequenceParameterBufferH264(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    VAEncSequenceParameterBufferH264 *p = (VAEncSequenceParameterBufferH264 *)data;
+    DPY2INDEX(dpy);
+    int i;
+
+    va_TraceMsg(idx, "VAEncSequenceParameterBufferH264\n");
+
+    va_TraceMsg(idx, "\tseq_parameter_set_id = %d\n", p->seq_parameter_set_id);
+    va_TraceMsg(idx, "\tlevel_idc = %d\n", p->level_idc);
+    va_TraceMsg(idx, "\tintra_period = %d\n", p->intra_period);
+    va_TraceMsg(idx, "\tintra_idr_period = %d\n", p->intra_idr_period);
+    va_TraceMsg(idx, "\tip_period = %d\n", p->ip_period);
+    va_TraceMsg(idx, "\tbits_per_second = %d\n", p->bits_per_second);
+    va_TraceMsg(idx, "\tmax_num_ref_frames = %d\n", p->max_num_ref_frames);
+    va_TraceMsg(idx, "\tpicture_width_in_mbs = %d\n", p->picture_width_in_mbs);
+    va_TraceMsg(idx, "\tpicture_height_in_mbs = %d\n", p->picture_height_in_mbs);
+    va_TraceMsg(idx, "\tchroma_format_idc = %d\n", p->seq_fields.bits.chroma_format_idc);
+    va_TraceMsg(idx, "\tframe_mbs_only_flag = %d\n", p->seq_fields.bits.frame_mbs_only_flag);
+    va_TraceMsg(idx, "\tmb_adaptive_frame_field_flag = %d\n", p->seq_fields.bits.mb_adaptive_frame_field_flag);
+    va_TraceMsg(idx, "\tseq_scaling_matrix_present_flag = %d\n", p->seq_fields.bits.seq_scaling_matrix_present_flag);
+    va_TraceMsg(idx, "\tdirect_8x8_inference_flag = %d\n", p->seq_fields.bits.direct_8x8_inference_flag);
+    va_TraceMsg(idx, "\tlog2_max_frame_num_minus4 = %d\n", p->seq_fields.bits.log2_max_frame_num_minus4);
+    va_TraceMsg(idx, "\tpic_order_cnt_type = %d\n", p->seq_fields.bits.pic_order_cnt_type);
+    va_TraceMsg(idx, "\tlog2_max_pic_order_cnt_lsb_minus4 = %d\n", p->seq_fields.bits.log2_max_pic_order_cnt_lsb_minus4);
+    va_TraceMsg(idx, "\tdelta_pic_order_always_zero_flag = %d\n", p->seq_fields.bits.delta_pic_order_always_zero_flag);
+    va_TraceMsg(idx, "\tbit_depth_luma_minus8 = %d\n", p->bit_depth_luma_minus8);
+    va_TraceMsg(idx, "\tbit_depth_chroma_minus8 = %d\n", p->bit_depth_chroma_minus8);
+    va_TraceMsg(idx, "\tnum_ref_frames_in_pic_order_cnt_cycle = %d\n", p->num_ref_frames_in_pic_order_cnt_cycle);
+    va_TraceMsg(idx, "\toffset_for_non_ref_pic = %d\n", p->offset_for_non_ref_pic);
+    va_TraceMsg(idx, "\toffset_for_top_to_bottom_field = %d\n", p->offset_for_top_to_bottom_field);
+    for(i = 0; i< p->max_num_ref_frames; ++i)
+        va_TraceMsg(idx, "\toffset_for_ref_frame[%d] = %d\n", i, p->offset_for_ref_frame[i]);
+    va_TraceMsg(idx, "\tframe_cropping_flag = %d\n", p->frame_cropping_flag);
+    va_TraceMsg(idx, "\tframe_crop_left_offset = %d\n", p->frame_crop_left_offset);
+    va_TraceMsg(idx, "\tframe_crop_right_offset = %d\n", p->frame_crop_right_offset);
+    va_TraceMsg(idx, "\tframe_crop_top_offset = %d\n", p->frame_crop_top_offset);
+    va_TraceMsg(idx, "\tframe_crop_bottom_offset = %d\n", p->frame_crop_bottom_offset);
+    va_TraceMsg(idx, "\tvui_parameters_present_flag = %d\n", p->vui_parameters_present_flag);
+    va_TraceMsg(idx, "\taspect_ratio_info_present_flag = %d\n", p->vui_fields.bits.aspect_ratio_info_present_flag);
+    va_TraceMsg(idx, "\ttiming_info_present_flag = %d\n", p->vui_fields.bits.timing_info_present_flag);
+    va_TraceMsg(idx, "\tbitstream_restriction_flag = %d\n", p->vui_fields.bits.bitstream_restriction_flag);
+    va_TraceMsg(idx, "\tlog2_max_mv_length_horizontal = %d\n", p->vui_fields.bits.log2_max_mv_length_horizontal);
+    va_TraceMsg(idx, "\tlog2_max_mv_length_vertical = %d\n", p->vui_fields.bits.log2_max_mv_length_vertical);
+    va_TraceMsg(idx, "\taspect_ratio_idc = %d\n", p->aspect_ratio_idc);
+    va_TraceMsg(idx, "\tsar_width = %d\n", p->sar_width);
+    va_TraceMsg(idx, "\tsar_height = %d\n", p->sar_height);
+    va_TraceMsg(idx, "\tnum_units_in_tick = %d\n", p->num_units_in_tick);
+    va_TraceMsg(idx, "\ttime_scale = %d\n", p->time_scale);
+
+    va_TraceMsg(idx, NULL);
+
+    /* start a new sequce, coded log file can be truncated */
+    trace_context[idx].trace_sequence_start = 1;
+
+    return;
+}
+
+
+static void va_TraceVAEncPictureParameterBufferH264(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    VAEncPictureParameterBufferH264 *p = (VAEncPictureParameterBufferH264 *)data;
+    DPY2INDEX(dpy);
+    int i;
+
+    va_TraceMsg(idx, "VAEncPictureParameterBufferH264\n");
+
+    va_TraceMsg(idx, "\tCurrPic.picture_id = 0x%08x\n", p->CurrPic.picture_id);
+    va_TraceMsg(idx, "\tCurrPic.frame_idx = %d\n", p->CurrPic.frame_idx);
+    va_TraceMsg(idx, "\tCurrPic.flags = %d\n", p->CurrPic.flags);
+    va_TraceMsg(idx, "\tCurrPic.TopFieldOrderCnt = %d\n", p->CurrPic.TopFieldOrderCnt);
+    va_TraceMsg(idx, "\tCurrPic.BottomFieldOrderCnt = %d\n", p->CurrPic.BottomFieldOrderCnt);
+    va_TraceMsg(idx, "\tReferenceFrames (TopFieldOrderCnt-BottomFieldOrderCnt-picture_id-frame_idx-flags):\n");
+    for (i = 0; i < 16; i++)
+    {
+        if ((p->ReferenceFrames[i].picture_id != VA_INVALID_SURFACE) &&
+            ((p->ReferenceFrames[i].flags & VA_PICTURE_H264_INVALID) == 0)) {
+            va_TraceMsg(idx, "\t\t%08d-%08d-0x%08x-%08d-0x%08x\n",
+                        p->ReferenceFrames[i].TopFieldOrderCnt,
+                        p->ReferenceFrames[i].BottomFieldOrderCnt,
+                        p->ReferenceFrames[i].picture_id,
+                        p->ReferenceFrames[i].frame_idx,
+                        p->ReferenceFrames[i].flags
+                        );
+        } else
+            va_TraceMsg(idx, "\t\tinv-inv-inv-inv-inv\n");
+    }
+    va_TraceMsg(idx, "\tcoded_buf = %08x\n", p->coded_buf);
+    va_TraceMsg(idx, "\tpic_parameter_set_id = %d\n", p->pic_parameter_set_id);
+    va_TraceMsg(idx, "\tseq_parameter_set_id = %d\n", p->seq_parameter_set_id);
+    va_TraceMsg(idx, "\tlast_picture = 0x%08x\n", p->last_picture);
+    va_TraceMsg(idx, "\tframe_num = %d\n", p->frame_num);
+    va_TraceMsg(idx, "\tpic_init_qp = %d\n", p->pic_init_qp);
+    va_TraceMsg(idx, "\tnum_ref_idx_l0_active_minus1 = %d\n", p->num_ref_idx_l0_active_minus1);
+    va_TraceMsg(idx, "\tnum_ref_idx_l1_active_minus1 = %d\n", p->num_ref_idx_l1_active_minus1);
+    va_TraceMsg(idx, "\tchroma_qp_index_offset = %d\n", p->chroma_qp_index_offset);
+    va_TraceMsg(idx, "\tsecond_chroma_qp_index_offset = %d\n", p->second_chroma_qp_index_offset);
+    va_TraceMsg(idx, "\tpic_fields = 0x%03x\n", p->pic_fields.value);
+    va_TraceMsg(idx, "\tidr_pic_flag = %d\n", p->pic_fields.bits.idr_pic_flag);
+    va_TraceMsg(idx, "\treference_pic_flag = %d\n", p->pic_fields.bits.reference_pic_flag);
+    va_TraceMsg(idx, "\tentropy_coding_mode_flag = %d\n", p->pic_fields.bits.entropy_coding_mode_flag);
+    va_TraceMsg(idx, "\tweighted_pred_flag = %d\n", p->pic_fields.bits.weighted_pred_flag);
+    va_TraceMsg(idx, "\tweighted_bipred_idc = %d\n", p->pic_fields.bits.weighted_bipred_idc);
+    va_TraceMsg(idx, "\tconstrained_intra_pred_flag = %d\n", p->pic_fields.bits.constrained_intra_pred_flag);
+    va_TraceMsg(idx, "\ttransform_8x8_mode_flag = %d\n", p->pic_fields.bits.transform_8x8_mode_flag);
+    va_TraceMsg(idx, "\tdeblocking_filter_control_present_flag = %d\n", p->pic_fields.bits.deblocking_filter_control_present_flag);
+    va_TraceMsg(idx, "\tredundant_pic_cnt_present_flag = %d\n", p->pic_fields.bits.redundant_pic_cnt_present_flag);
+    va_TraceMsg(idx, "\tpic_order_present_flag = %d\n", p->pic_fields.bits.pic_order_present_flag);
+    va_TraceMsg(idx, "\tpic_scaling_matrix_present_flag = %d\n", p->pic_fields.bits.pic_scaling_matrix_present_flag);
+
+    va_TraceMsg(idx, NULL);
+
+    trace_context[idx].trace_codedbuf =  p->coded_buf;
+
+    return;
+}
+
+static void va_TraceVAEncSliceParameterBuffer(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    VAEncSliceParameterBuffer* p = (VAEncSliceParameterBuffer*)data;
+    DPY2INDEX(dpy);
+    
+    va_TraceMsg(idx, "VAEncSliceParameterBuffer\n");
+    
+    va_TraceMsg(idx, "\tstart_row_number = %d\n", p->start_row_number);
+    va_TraceMsg(idx, "\tslice_height = %d\n", p->slice_height);
+    va_TraceMsg(idx, "\tslice_flags.is_intra = %d\n", p->slice_flags.bits.is_intra);
+    va_TraceMsg(idx, "\tslice_flags.disable_deblocking_filter_idc = %d\n", p->slice_flags.bits.disable_deblocking_filter_idc);
+    va_TraceMsg(idx, "\tslice_flags.uses_long_term_ref = %d\n", p->slice_flags.bits.uses_long_term_ref);
+    va_TraceMsg(idx, "\tslice_flags.is_long_term_ref = %d\n", p->slice_flags.bits.is_long_term_ref);
+    va_TraceMsg(idx, NULL);
+
+    return;
+}
+
+static void va_TraceVAEncSliceParameterBufferH264(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    VAEncSliceParameterBufferH264* p = (VAEncSliceParameterBufferH264*)data;
+    DPY2INDEX(dpy);
+    int i;
+
+    if (!p)
+        return;
+    va_TraceMsg(idx, "VAEncSliceParameterBufferH264\n");
+    va_TraceMsg(idx, "\tmacroblock_address = %d\n", p->macroblock_address);
+    va_TraceMsg(idx, "\tnum_macroblocks = %d\n", p->num_macroblocks);
+    va_TraceMsg(idx, "\tmacroblock_info = %08x\n", p->macroblock_info);
+    va_TraceMsg(idx, "\tslice_type = %d\n", p->slice_type);
+    va_TraceMsg(idx, "\tpic_parameter_set_id = %d\n", p->pic_parameter_set_id);
+    va_TraceMsg(idx, "\tidr_pic_id = %d\n", p->idr_pic_id);
+    va_TraceMsg(idx, "\tpic_order_cnt_lsb = %d\n", p->pic_order_cnt_lsb);
+    va_TraceMsg(idx, "\tdelta_pic_order_cnt_bottom = %d\n", p->delta_pic_order_cnt_bottom);
+    va_TraceMsg(idx, "\tdelta_pic_order_cnt[0] = %d\n", p->delta_pic_order_cnt[0]);
+    va_TraceMsg(idx, "\tdelta_pic_order_cnt[1] = %d\n", p->delta_pic_order_cnt[1]);
+    va_TraceMsg(idx, "\tdirect_spatial_mv_pred_flag = %d\n", p->direct_spatial_mv_pred_flag);
+    va_TraceMsg(idx, "\tnum_ref_idx_active_override_flag = %d\n", p->num_ref_idx_active_override_flag);
+    va_TraceMsg(idx, "\tnum_ref_idx_l1_active_minus1 = %d\n", p->num_ref_idx_l1_active_minus1);
+    va_TraceMsg(idx, "\tslice_beta_offset_div2 = %d\n", p->slice_beta_offset_div2);
+
+    if (p->slice_type == 0 || p->slice_type == 1) {
+        va_TraceMsg(idx, "\tRefPicList0 (TopFieldOrderCnt-BottomFieldOrderCnt-picture_id-frame_idx-flags):\n");
+        for (i = 0; i < 32; i++) {
+            if ((p->RefPicList0[i].picture_id != VA_INVALID_SURFACE) &&
+                ((p->RefPicList0[i].flags & VA_PICTURE_H264_INVALID) == 0))
+                va_TraceMsg(idx, "\t\t%08d-%08d-0x%08x-%08d-0x%08x\n",
+                            p->RefPicList0[i].TopFieldOrderCnt,
+                            p->RefPicList0[i].BottomFieldOrderCnt,
+                            p->RefPicList0[i].picture_id,
+                            p->RefPicList0[i].frame_idx,
+                            p->RefPicList0[i].flags);
+            else
+                break;
+        }
+    }
+    
+    if (p->slice_type == 1) {
+        va_TraceMsg(idx, "\tRefPicList1 (TopFieldOrderCnt-BottomFieldOrderCnt-picture_id-frame_idx-flags):\n");
+        for (i = 0; i < 32; i++) {
+            if ((p->RefPicList1[i].picture_id != VA_INVALID_SURFACE) &&
+                ((p->RefPicList1[i].flags & VA_PICTURE_H264_INVALID) == 0))
+                va_TraceMsg(idx, "\t\t%08d-%08d-0x%08x-%08d-0x%08d\n",
+                            p->RefPicList1[i].TopFieldOrderCnt,
+                            p->RefPicList1[i].BottomFieldOrderCnt,
+                            p->RefPicList1[i].picture_id,
+                            p->RefPicList1[i].frame_idx,
+                            p->RefPicList1[i].flags
+                            );
+            else
+                break;
+        }
+    }
+    
+    va_TraceMsg(idx, "\tluma_log2_weight_denom = %d\n", p->luma_log2_weight_denom);
+    va_TraceMsg(idx, "\tchroma_log2_weight_denom = %d\n", p->chroma_log2_weight_denom);
+    va_TraceMsg(idx, "\tluma_weight_l0_flag = %d\n", p->luma_weight_l0_flag);
+    if (p->luma_weight_l0_flag && p->num_ref_idx_l0_active_minus1 < 32) {
+        for (i = 0; i <=  p->num_ref_idx_l0_active_minus1; i++) {
+            va_TraceMsg(idx, "\t%d ", p->luma_weight_l0[i]);
+            va_TraceMsg(idx, "\t%d ", p->luma_offset_l0[i]);
+        }
+    }
+
+    va_TraceMsg(idx, "\tchroma_weight_l0_flag = %d\n", p->chroma_weight_l0_flag);
+    if (p->chroma_weight_l0_flag && p->num_ref_idx_l0_active_minus1 < 32) {
+        for (i = 0; i <= p->num_ref_idx_l0_active_minus1; i++) {
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_weight_l0[i][0]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_offset_l0[i][0]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_weight_l0[i][1]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_offset_l0[i][1]);
+        }
+    }
+
+    va_TraceMsg(idx, "\tluma_weight_l1_flag = %d\n", p->luma_weight_l1_flag);
+    if (p->luma_weight_l1_flag && p->num_ref_idx_l1_active_minus1 < 32) {
+        for (i = 0; i <=  p->num_ref_idx_l1_active_minus1; i++) {
+            va_TraceMsg(idx, "\t\t%d ", p->luma_weight_l1[i]);
+            va_TraceMsg(idx, "\t\t%d ", p->luma_offset_l1[i]);
+        }
+    }
+
+    va_TraceMsg(idx, "\tchroma_weight_l1_flag = %d\n", p->chroma_weight_l1_flag);
+    if (p->chroma_weight_l1_flag && p->num_ref_idx_l1_active_minus1 < 32) {
+        for (i = 0; i <= p->num_ref_idx_l1_active_minus1; i++) {
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_weight_l1[i][0]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_offset_l1[i][0]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_weight_l1[i][1]);
+            va_TraceMsg(idx, "\t\t%d ", p->chroma_offset_l1[i][1]);
+        }
+        va_TraceMsg(idx, "\n");
+    }
+    va_TraceMsg(idx, NULL);
+
+    va_TraceMsg(idx, "\tcabac_init_idc = %d\n", p->cabac_init_idc);
+    va_TraceMsg(idx, "\tslice_qp_delta = %d\n", p->slice_qp_delta);
+    va_TraceMsg(idx, "\tdisable_deblocking_filter_idc = %d\n", p->disable_deblocking_filter_idc);
+    va_TraceMsg(idx, "\tslice_alpha_c0_offset_div2 = %d\n", p->slice_alpha_c0_offset_div2);
+    va_TraceMsg(idx, "\tslice_beta_offset_div2 = %d\n", p->slice_beta_offset_div2);
+    va_TraceMsg(idx, NULL);
+
+    return;
+}
+
+
+static void va_TraceVAEncPackedHeaderParameterBufferType(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    VAEncPackedHeaderParameterBuffer* p = (VAEncPackedHeaderParameterBuffer*)data;
+    DPY2INDEX(dpy);
+    int i;
+
+    if (!p)
+        return;
+    va_TraceMsg(idx, "VAEncPackedHeaderParameterBuffer\n");
+    va_TraceMsg(idx, "\ttype = 0x%08x\n", p->type);
+    va_TraceMsg(idx, "\tbit_length = %d\n", p->bit_length);
+    va_TraceMsg(idx, "\thas_emulation_bytes = %d\n", p->has_emulation_bytes);
+    va_TraceMsg(idx, NULL);
+
+    return;
+}
+
+static void va_TraceVAEncMiscParameterBuffer(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    VAEncMiscParameterBuffer* tmp = (VAEncMiscParameterBuffer*)data;
+    DPY2INDEX(dpy);
+    
+    switch (tmp->type) {
+    case VAEncMiscParameterTypeFrameRate:
+    {
+        VAEncMiscParameterFrameRate *p = (VAEncMiscParameterFrameRate *)tmp->data;
+        va_TraceMsg(idx, "VAEncMiscParameterFrameRate\n");
+        va_TraceMsg(idx, "\tframerate = %d\n", p->framerate);
+        
+        break;
+    }
+    case VAEncMiscParameterTypeRateControl:
+    {
+        VAEncMiscParameterRateControl *p = (VAEncMiscParameterRateControl *)tmp->data;
+
+        va_TraceMsg(idx, "VAEncMiscParameterRateControl\n");
+        va_TraceMsg(idx, "\tbits_per_second = %d\n", p->bits_per_second);
+        va_TraceMsg(idx, "\ttarget_percentage = %d\n", p->target_percentage);
+        va_TraceMsg(idx, "\twindow_size = %d\n", p->window_size);
+        va_TraceMsg(idx, "\tinitial_qp = %d\n", p->initial_qp);
+        va_TraceMsg(idx, "\tmin_qp = %d\n", p->min_qp);
+        va_TraceMsg(idx, "\tbasic_unit_size = %d\n", p->basic_unit_size);
+        va_TraceMsg(idx, "\trc_flags.reset = %d \n", p->rc_flags.bits.reset);
+        va_TraceMsg(idx, "\trc_flags.disable_frame_skip = %d\n", p->rc_flags.bits.disable_frame_skip);
+        va_TraceMsg(idx, "\trc_flags.disable_bit_stuffing = %d\n", p->rc_flags.bits.disable_bit_stuffing);
+        break;
+    }
+    case VAEncMiscParameterTypeMaxSliceSize:
+    {
+        VAEncMiscParameterMaxSliceSize *p = (VAEncMiscParameterMaxSliceSize *)tmp->data;
+        
+        va_TraceMsg(idx, "VAEncMiscParameterTypeMaxSliceSize\n");
+        va_TraceMsg(idx, "\tmax_slice_size = %d\n", p->max_slice_size);
+        break;
+    }
+    case VAEncMiscParameterTypeAIR:
+    {
+        VAEncMiscParameterAIR *p = (VAEncMiscParameterAIR *)tmp->data;
+        
+        va_TraceMsg(idx, "VAEncMiscParameterAIR\n");
+        va_TraceMsg(idx, "\tair_num_mbs = %d\n", p->air_num_mbs);
+        va_TraceMsg(idx, "\tair_threshold = %d\n", p->air_threshold);
+        va_TraceMsg(idx, "\tair_auto = %d\n", p->air_auto);
+        break;
+    }
+    case VAEncMiscParameterTypeHRD:
+    {
+        VAEncMiscParameterHRD *p = (VAEncMiscParameterHRD *)tmp->data;
+
+        va_TraceMsg(idx, "VAEncMiscParameterHRD\n");
+        va_TraceMsg(idx, "\tinitial_buffer_fullness = %d\n", p->initial_buffer_fullness);
+        va_TraceMsg(idx, "\tbuffer_size = %d\n", p->buffer_size);
+        break;
+    }
+    default:
+        va_TraceMsg(idx, "Unknown VAEncMiscParameterBuffer(type = %d):", tmp->type);
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
+        break;
+    }
+    va_TraceMsg(idx, NULL);
+
+    return;
+}
+
+
+static void va_TraceVAPictureParameterBufferVC1(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data
+)
+{
+    VAPictureParameterBufferVC1* p = (VAPictureParameterBufferVC1*)data;
+    DPY2INDEX(dpy);
+    
+    va_TraceMsg(idx, "VAPictureParameterBufferVC1\n");
+    
+    va_TraceMsg(idx, "\tforward_reference_picture = 0x%08x\n", p->forward_reference_picture);
+    va_TraceMsg(idx, "\tbackward_reference_picture = 0x%08x\n", p->backward_reference_picture);
+    va_TraceMsg(idx, "\tinloop_decoded_picture = 0x%08x\n", p->inloop_decoded_picture);
+    
+    va_TraceMsg(idx, "\tpulldown = %d\n", p->sequence_fields.bits.pulldown);
+    va_TraceMsg(idx, "\tinterlace = %d\n", p->sequence_fields.bits.interlace);
+    va_TraceMsg(idx, "\ttfcntrflag = %d\n", p->sequence_fields.bits.tfcntrflag);
+    va_TraceMsg(idx, "\tfinterpflag = %d\n", p->sequence_fields.bits.finterpflag);
+    va_TraceMsg(idx, "\tpsf = %d\n", p->sequence_fields.bits.psf);
+    va_TraceMsg(idx, "\tmultires = %d\n", p->sequence_fields.bits.multires);
+    va_TraceMsg(idx, "\toverlap = %d\n", p->sequence_fields.bits.overlap);
+    va_TraceMsg(idx, "\tsyncmarker = %d\n", p->sequence_fields.bits.syncmarker);
+    va_TraceMsg(idx, "\trangered = %d\n", p->sequence_fields.bits.rangered);
+    va_TraceMsg(idx, "\tmax_b_frames = %d\n", p->sequence_fields.bits.max_b_frames);
+    va_TraceMsg(idx, "\tprofile = %d\n", p->sequence_fields.bits.profile);
+    va_TraceMsg(idx, "\tcoded_width = %d\n", p->coded_width);
+    va_TraceMsg(idx, "\tcoded_height = %d\n", p->coded_height);
+    va_TraceMsg(idx, "\tclosed_entry = %d\n", p->entrypoint_fields.bits.closed_entry);
+    va_TraceMsg(idx, "\tbroken_link = %d\n", p->entrypoint_fields.bits.broken_link);
+    va_TraceMsg(idx, "\tclosed_entry = %d\n", p->entrypoint_fields.bits.closed_entry);
+    va_TraceMsg(idx, "\tpanscan_flag = %d\n", p->entrypoint_fields.bits.panscan_flag);
+    va_TraceMsg(idx, "\tloopfilter = %d\n", p->entrypoint_fields.bits.loopfilter);
+    va_TraceMsg(idx, "\tconditional_overlap_flag = %d\n", p->conditional_overlap_flag);
+    va_TraceMsg(idx, "\tfast_uvmc_flag = %d\n", p->fast_uvmc_flag);
+    va_TraceMsg(idx, "\trange_mapping_luma_flag = %d\n", p->range_mapping_fields.bits.luma_flag);
+    va_TraceMsg(idx, "\trange_mapping_luma = %d\n", p->range_mapping_fields.bits.luma);
+    va_TraceMsg(idx, "\trange_mapping_chroma_flag = %d\n", p->range_mapping_fields.bits.chroma_flag);
+    va_TraceMsg(idx, "\trange_mapping_chroma = %d\n", p->range_mapping_fields.bits.chroma);
+    va_TraceMsg(idx, "\tb_picture_fraction = %d\n", p->b_picture_fraction);
+    va_TraceMsg(idx, "\tcbp_table = %d\n", p->cbp_table);
+    va_TraceMsg(idx, "\tmb_mode_table = %d\n", p->mb_mode_table);
+    va_TraceMsg(idx, "\trange_reduction_frame = %d\n", p->range_reduction_frame);
+    va_TraceMsg(idx, "\trounding_control = %d\n", p->rounding_control);
+    va_TraceMsg(idx, "\tpost_processing = %d\n", p->post_processing);
+    va_TraceMsg(idx, "\tpicture_resolution_index = %d\n", p->picture_resolution_index);
+    va_TraceMsg(idx, "\tluma_scale = %d\n", p->luma_scale);
+    va_TraceMsg(idx, "\tluma_shift = %d\n", p->luma_shift);
+    va_TraceMsg(idx, "\tpicture_type = %d\n", p->picture_fields.bits.picture_type);
+    va_TraceMsg(idx, "\tframe_coding_mode = %d\n", p->picture_fields.bits.frame_coding_mode);
+    va_TraceMsg(idx, "\ttop_field_first = %d\n", p->picture_fields.bits.top_field_first);
+    va_TraceMsg(idx, "\tis_first_field = %d\n", p->picture_fields.bits.is_first_field);
+    va_TraceMsg(idx, "\tintensity_compensation = %d\n", p->picture_fields.bits.intensity_compensation);
+    va_TraceMsg(idx, "\tmv_type_mb = %d\n", p->raw_coding.flags.mv_type_mb);
+    va_TraceMsg(idx, "\tdirect_mb = %d\n", p->raw_coding.flags.direct_mb);
+    va_TraceMsg(idx, "\tskip_mb = %d\n", p->raw_coding.flags.skip_mb);
+    va_TraceMsg(idx, "\tfield_tx = %d\n", p->raw_coding.flags.field_tx);
+    va_TraceMsg(idx, "\tforward_mb = %d\n", p->raw_coding.flags.forward_mb);
+    va_TraceMsg(idx, "\tac_pred = %d\n", p->raw_coding.flags.ac_pred);
+    va_TraceMsg(idx, "\toverflags = %d\n", p->raw_coding.flags.overflags);
+    va_TraceMsg(idx, "\tbp_mv_type_mb = %d\n", p->bitplane_present.flags.bp_mv_type_mb);
+    va_TraceMsg(idx, "\tbp_direct_mb = %d\n", p->bitplane_present.flags.bp_direct_mb);
+    va_TraceMsg(idx, "\tbp_skip_mb = %d\n", p->bitplane_present.flags.bp_skip_mb);
+    va_TraceMsg(idx, "\tbp_field_tx = %d\n", p->bitplane_present.flags.bp_field_tx);
+    va_TraceMsg(idx, "\tbp_forward_mb = %d\n", p->bitplane_present.flags.bp_forward_mb);
+    va_TraceMsg(idx, "\tbp_ac_pred = %d\n", p->bitplane_present.flags.bp_ac_pred);
+    va_TraceMsg(idx, "\tbp_overflags = %d\n", p->bitplane_present.flags.bp_overflags);
+    va_TraceMsg(idx, "\treference_distance_flag = %d\n", p->reference_fields.bits.reference_distance_flag);
+    va_TraceMsg(idx, "\treference_distance = %d\n", p->reference_fields.bits.reference_distance);
+    va_TraceMsg(idx, "\tnum_reference_pictures = %d\n", p->reference_fields.bits.num_reference_pictures);
+    va_TraceMsg(idx, "\treference_field_pic_indicator = %d\n", p->reference_fields.bits.reference_field_pic_indicator);
+    va_TraceMsg(idx, "\tmv_mode = %d\n", p->mv_fields.bits.mv_mode);
+    va_TraceMsg(idx, "\tmv_mode2 = %d\n", p->mv_fields.bits.mv_mode2);
+    va_TraceMsg(idx, "\tmv_table = %d\n", p->mv_fields.bits.mv_table);
+    va_TraceMsg(idx, "\ttwo_mv_block_pattern_table = %d\n", p->mv_fields.bits.two_mv_block_pattern_table);
+    va_TraceMsg(idx, "\tfour_mv_switch = %d\n", p->mv_fields.bits.four_mv_switch);
+    va_TraceMsg(idx, "\tfour_mv_block_pattern_table = %d\n", p->mv_fields.bits.four_mv_block_pattern_table);
+    va_TraceMsg(idx, "\textended_mv_flag = %d\n", p->mv_fields.bits.extended_mv_flag);
+    va_TraceMsg(idx, "\textended_mv_range = %d\n", p->mv_fields.bits.extended_mv_range);
+    va_TraceMsg(idx, "\textended_dmv_flag = %d\n", p->mv_fields.bits.extended_dmv_flag);
+    va_TraceMsg(idx, "\textended_dmv_range = %d\n", p->mv_fields.bits.extended_dmv_range);
+    va_TraceMsg(idx, "\tdquant = %d\n", p->pic_quantizer_fields.bits.dquant);
+    va_TraceMsg(idx, "\tquantizer = %d\n", p->pic_quantizer_fields.bits.quantizer);
+    va_TraceMsg(idx, "\thalf_qp = %d\n", p->pic_quantizer_fields.bits.half_qp);
+    va_TraceMsg(idx, "\tpic_quantizer_scale = %d\n", p->pic_quantizer_fields.bits.pic_quantizer_scale);
+    va_TraceMsg(idx, "\tpic_quantizer_type = %d\n", p->pic_quantizer_fields.bits.pic_quantizer_type);
+    va_TraceMsg(idx, "\tdq_frame = %d\n", p->pic_quantizer_fields.bits.dq_frame);
+    va_TraceMsg(idx, "\tdq_profile = %d\n", p->pic_quantizer_fields.bits.dq_profile);
+    va_TraceMsg(idx, "\tdq_sb_edge = %d\n", p->pic_quantizer_fields.bits.dq_sb_edge);
+    va_TraceMsg(idx, "\tdq_db_edge = %d\n", p->pic_quantizer_fields.bits.dq_db_edge);
+    va_TraceMsg(idx, "\tdq_binary_level = %d\n", p->pic_quantizer_fields.bits.dq_binary_level);
+    va_TraceMsg(idx, "\talt_pic_quantizer = %d\n", p->pic_quantizer_fields.bits.alt_pic_quantizer);
+    va_TraceMsg(idx, "\tvariable_sized_transform_flag = %d\n", p->transform_fields.bits.variable_sized_transform_flag);
+    va_TraceMsg(idx, "\tmb_level_transform_type_flag = %d\n", p->transform_fields.bits.mb_level_transform_type_flag);
+    va_TraceMsg(idx, "\tframe_level_transform_type = %d\n", p->transform_fields.bits.frame_level_transform_type);
+    va_TraceMsg(idx, "\ttransform_ac_codingset_idx1 = %d\n", p->transform_fields.bits.transform_ac_codingset_idx1);
+    va_TraceMsg(idx, "\ttransform_ac_codingset_idx2 = %d\n", p->transform_fields.bits.transform_ac_codingset_idx2);
+    va_TraceMsg(idx, "\tintra_transform_dc_table = %d\n", p->transform_fields.bits.intra_transform_dc_table);
+    va_TraceMsg(idx, NULL);
+}
+
+static void va_TraceVASliceParameterBufferVC1(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void* data
+)
+{
+    VASliceParameterBufferVC1 *p = (VASliceParameterBufferVC1*)data;
+    DPY2INDEX(dpy);
+
+    trace_context[idx].trace_slice_no++;
+    trace_context[idx].trace_slice_size = p->slice_data_size;
+
+    va_TraceMsg(idx, "VASliceParameterBufferVC1\n");
+    va_TraceMsg(idx, "\tslice_data_size = %d\n", p->slice_data_size);
+    va_TraceMsg(idx, "\tslice_data_offset = %d\n", p->slice_data_offset);
+    va_TraceMsg(idx, "\tslice_data_flag = %d\n", p->slice_data_flag);
+    va_TraceMsg(idx, "\tmacroblock_offset = %d\n", p->macroblock_offset);
+    va_TraceMsg(idx, "\tslice_vertical_position = %d\n", p->slice_vertical_position);
+    va_TraceMsg(idx, NULL);
+}
+
+void va_TraceBeginPicture(
+    VADisplay dpy,
+    VAContextID context,
+    VASurfaceID render_target
+)
+{
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
+
+    va_TraceMsg(idx, "\tcontext = 0x%08x\n", context);
+    va_TraceMsg(idx, "\trender_targets = 0x%08x\n", render_target);
+    va_TraceMsg(idx, "\tframe_count  = #%d\n", trace_context[idx].trace_frame_no);
+    va_TraceMsg(idx, NULL);
+
+    trace_context[idx].trace_rendertarget = render_target; /* for surface data dump after vaEndPicture */
+
+    trace_context[idx].trace_frame_no++;
+    trace_context[idx].trace_slice_no = 0;
+}
+
+static void va_TraceMPEG2Buf(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *pbuf
+)
+{
+    switch (type) {
+    case VAPictureParameterBufferType:
+        va_TraceVAPictureParameterBufferMPEG2(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAIQMatrixBufferType:
+        va_TraceVAIQMatrixBufferMPEG2(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VABitPlaneBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VASliceGroupMapBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VASliceParameterBufferType:
+        va_TraceVASliceParameterBufferMPEG2(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VASliceDataBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAMacroblockParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAResidualDataBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VADeblockingParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAImageBufferType:
+        break;
+    case VAProtectedSliceDataBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAEncCodedBufferType:
+        break;
+    case VAEncSequenceParameterBufferType:
+        break;
+    case VAEncPictureParameterBufferType:
+        break;
+    case VAEncSliceParameterBufferType:
+        break;
+    default:
+        break;
     }
 }
 
-static void va_TraceVAPictureParameterBufferVC1(
+static void va_TraceVAEncSequenceParameterBufferH263(
     VADisplay dpy,
     VAContextID context,
     VABufferID buffer,
     VABufferType type,
     unsigned int size,
     unsigned int num_elements,
-    void *data
-)
+    void *data)
 {
-    VAPictureParameterBufferVC1* p = (VAPictureParameterBufferVC1*)data;
+    VAEncSequenceParameterBufferH263 *p = (VAEncSequenceParameterBufferH263 *)data;
+    DPY2INDEX(dpy);
+    
+    va_TraceMsg(idx, "VAEncSequenceParameterBufferH263\n");
+    
+    va_TraceMsg(idx, "\tintra_period = %d\n", p->intra_period);
+    va_TraceMsg(idx, "\tbits_per_second = %d\n", p->bits_per_second);
+    va_TraceMsg(idx, "\tframe_rate = %d\n", p->frame_rate);
+    va_TraceMsg(idx, "\tinitial_qp = %d\n", p->initial_qp);
+    va_TraceMsg(idx, "\tmin_qp = %d\n", p->min_qp);
+    va_TraceMsg(idx, NULL);
+
+    /* start a new sequce, coded log file can be truncated */
+    trace_context[idx].trace_sequence_start = 1;
 
-    va_TraceMsg("\tforward_reference_picture = 0x%08x\n", p->forward_reference_picture);
-    va_TraceMsg("\tbackward_reference_picture = 0x%08x\n", p->backward_reference_picture);
-    va_TraceMsg("\tinloop_decoded_picture = 0x%08x\n", p->inloop_decoded_picture);
-    
-    va_TraceMsg("\tpulldown = %d\n", p->sequence_fields.bits.pulldown);
-    va_TraceMsg("\tinterlace = %d\n", p->sequence_fields.bits.interlace);
-    va_TraceMsg("\ttfcntrflag = %d\n", p->sequence_fields.bits.tfcntrflag);
-    va_TraceMsg("\tfinterpflag = %d\n", p->sequence_fields.bits.finterpflag);
-    va_TraceMsg("\tpsf                           = %d.\n",
-                p->sequence_fields.bits.psf);
-    va_TraceMsg("\tmultires                      = %d.\n",
-                p->sequence_fields.bits.multires);
-    va_TraceMsg("\toverlap                       = %d.\n",
-                p->sequence_fields.bits.overlap);
-    va_TraceMsg("\tsyncmarker                    = %d.\n",
-                p->sequence_fields.bits.syncmarker);
-    va_TraceMsg("\trangered                      = %d.\n",
-                p->sequence_fields.bits.rangered);
-    va_TraceMsg("\tmax_b_frames                  = %d.\n",
-                p->sequence_fields.bits.max_b_frames);
-    va_TraceMsg("\tcoded_width                   = %d.\n",
-                p->coded_width);
-    va_TraceMsg("\tcoded_height                  = %d.\n",
-                p->coded_height);
-    va_TraceMsg("\tclosed_entry                  = %d.\n",
-                p->entrypoint_fields.bits.closed_entry);
-    va_TraceMsg("\tbroken_link                   = %d.\n",
-                p->entrypoint_fields.bits.broken_link);
-    va_TraceMsg("\tclosed_entry                  = %d.\n",
-                p->entrypoint_fields.bits.closed_entry);
-    va_TraceMsg("\tpanscan_flag                  = %d.\n",
-                p->entrypoint_fields.bits.panscan_flag);
-    va_TraceMsg("\tloopfilter                    = %d.\n",
-                p->entrypoint_fields.bits.loopfilter);
-    va_TraceMsg("\tconditional_overlap_flag      = %d.\n",
-                p->conditional_overlap_flag);
-    va_TraceMsg("\tfast_uvmc_flag                = %d.\n",
-                p->fast_uvmc_flag);
-    va_TraceMsg("\trange_mapping_luma_flag       = %d.\n",
-                p->range_mapping_fields.bits.luma_flag);
-    va_TraceMsg("\trange_mapping_luma            = %d.\n",
-                p->range_mapping_fields.bits.luma);
-    va_TraceMsg("\trange_mapping_chroma_flag     = %d.\n",
-                p->range_mapping_fields.bits.chroma_flag);
-    va_TraceMsg("\trange_mapping_chroma          = %d.\n",
-                p->range_mapping_fields.bits.chroma);
-    va_TraceMsg("\tb_picture_fraction            = %d.\n",
-                p->b_picture_fraction);
-    va_TraceMsg("\tcbp_table                     = %d.\n",
-                p->cbp_table);
-    va_TraceMsg("\tmb_mode_table                 = %d.\n",
-                p->mb_mode_table);
-    va_TraceMsg("\trange_reduction_frame         = %d.\n",
-                p->range_reduction_frame);
-    va_TraceMsg("\trounding_control              = %d.\n",
-                p->rounding_control);
-    va_TraceMsg("\tpost_processing               = %d.\n",
-                p->post_processing);
-    va_TraceMsg("\tpicture_resolution_index      = %d.\n",
-                p->picture_resolution_index);
-    va_TraceMsg("\tluma_scale                    = %d.\n",
-                p->luma_scale);
-    va_TraceMsg("\tluma_shift                    = %d.\n",
-                p->luma_shift);
-    va_TraceMsg("\tpicture_type                  = %d.\n",
-                p->picture_fields.bits.picture_type);
-    va_TraceMsg("\tframe_coding_mode             = %d.\n",
-                p->picture_fields.bits.frame_coding_mode);
-    va_TraceMsg("\ttop_field_first               = %d.\n",
-                p->picture_fields.bits.top_field_first);
-    va_TraceMsg("\tis_first_field                = %d.\n",
-                p->picture_fields.bits.is_first_field);
-    va_TraceMsg("\tintensity_compensation        = %d.\n",
-                p->picture_fields.bits.intensity_compensation);
-    va_TraceMsg("  ---------------------------------\n");
-    va_TraceMsg("\tmv_type_mb                    = %d.\n",
-                p->raw_coding.flags.mv_type_mb);
-    va_TraceMsg("\tdirect_mb                     = %d.\n",
-                p->raw_coding.flags.direct_mb);
-    va_TraceMsg("\tskip_mb                       = %d.\n",
-                p->raw_coding.flags.skip_mb);
-    va_TraceMsg("\tfield_tx                      = %d.\n",
-                p->raw_coding.flags.field_tx);
-    va_TraceMsg("\tforward_mb                    = %d.\n",
-                p->raw_coding.flags.forward_mb);
-    va_TraceMsg("\tac_pred                       = %d.\n",
-                p->raw_coding.flags.ac_pred);
-    va_TraceMsg("\toverflags                     = %d.\n",
-                p->raw_coding.flags.overflags);
-    va_TraceMsg("  ---------------------------------\n");
-    va_TraceMsg("\tbp_mv_type_mb                 = %d.\n",
-                p->bitplane_present.flags.bp_mv_type_mb);
-    va_TraceMsg("\tbp_direct_mb                  = %d.\n",
-                p->bitplane_present.flags.bp_direct_mb);
-    va_TraceMsg("\tbp_skip_mb                    = %d.\n",
-                p->bitplane_present.flags.bp_skip_mb);
-    va_TraceMsg("\tbp_field_tx                   = %d.\n",
-                p->bitplane_present.flags.bp_field_tx);
-    va_TraceMsg("\tbp_forward_mb                 = %d.\n",
-                p->bitplane_present.flags.bp_forward_mb);
-    va_TraceMsg("\tbp_ac_pred                    = %d.\n",
-                p->bitplane_present.flags.bp_ac_pred);
-    va_TraceMsg("\tbp_overflags                  = %d.\n",
-                p->bitplane_present.flags.bp_overflags);
-    va_TraceMsg("  ---------------------------------\n");
-    va_TraceMsg("\treference_distance_flag       = %d.\n",
-                p->reference_fields.bits.reference_distance_flag);
-    va_TraceMsg("\treference_distance            = %d.\n",
-                p->reference_fields.bits.reference_distance);
-    va_TraceMsg("\tnum_reference_pictures        = %d.\n",
-                p->reference_fields.bits.num_reference_pictures);
-    va_TraceMsg("\treference_field_pic_indicator = %d.\n",
-                p->reference_fields.bits.reference_field_pic_indicator);
-    va_TraceMsg("\tmv_mode                       = %d.\n",
-                p->mv_fields.bits.mv_mode);
-    va_TraceMsg("\tmv_mode2                      = %d.\n",
-                p->mv_fields.bits.mv_mode2);
-    va_TraceMsg("\tmv_table                      = %d.\n",
-                p->mv_fields.bits.mv_table);
-    va_TraceMsg("\ttwo_mv_block_pattern_table    = %d.\n",
-                p->mv_fields.bits.two_mv_block_pattern_table);
-    va_TraceMsg("\tfour_mv_switch                = %d.\n",
-                p->mv_fields.bits.four_mv_switch);
-    va_TraceMsg("\tfour_mv_block_pattern_table   = %d.\n",
-                p->mv_fields.bits.four_mv_block_pattern_table);
-    va_TraceMsg("\textended_mv_flag              = %d.\n",
-                p->mv_fields.bits.extended_mv_flag);
-    va_TraceMsg("\textended_mv_range             = %d.\n",
-                p->mv_fields.bits.extended_mv_range);
-    va_TraceMsg("\textended_dmv_flag             = %d.\n",
-                p->mv_fields.bits.extended_dmv_flag);
-    va_TraceMsg("\textended_dmv_range            = %d.\n",
-                p->mv_fields.bits.extended_dmv_range);
-    va_TraceMsg("\tdquant                        = %d.\n",
-                p->pic_quantizer_fields.bits.dquant);
-    va_TraceMsg("\tquantizer                     = %d.\n",
-                p->pic_quantizer_fields.bits.quantizer);
-    va_TraceMsg("\thalf_qp                       = %d.\n",
-                p->pic_quantizer_fields.bits.half_qp);
-    va_TraceMsg("\tpic_quantizer_scale           = %d.\n",
-                p->pic_quantizer_fields.bits.pic_quantizer_scale);
-    va_TraceMsg("\tpic_quantizer_type            = %d.\n",
-                p->pic_quantizer_fields.bits.pic_quantizer_type);
-    va_TraceMsg("\tdq_frame                      = %d.\n",
-                p->pic_quantizer_fields.bits.dq_frame);
-    va_TraceMsg("\tdq_profile                    = %d.\n",
-                p->pic_quantizer_fields.bits.dq_profile);
-    va_TraceMsg("\tdq_sb_edge                    = %d.\n",
-                p->pic_quantizer_fields.bits.dq_sb_edge);
-    va_TraceMsg("\tdq_db_edge                    = %d.\n",
-                p->pic_quantizer_fields.bits.dq_db_edge);
-    va_TraceMsg("\tdq_binary_level               = %d.\n",
-                p->pic_quantizer_fields.bits.dq_binary_level);
-    va_TraceMsg("\talt_pic_quantizer             = %d.\n",
-                p->pic_quantizer_fields.bits.alt_pic_quantizer);
-    va_TraceMsg("\tvariable_sized_transform_flag = %d.\n",
-                p->transform_fields.bits.variable_sized_transform_flag);
-    va_TraceMsg("\tmb_level_transform_type_flag  = %d.\n",
-                p->transform_fields.bits.mb_level_transform_type_flag);
-    va_TraceMsg("\tframe_level_transform_type    = %d.\n",
-                p->transform_fields.bits.frame_level_transform_type);
-    va_TraceMsg("\ttransform_ac_codingset_idx1   = %d.\n",
-                p->transform_fields.bits.transform_ac_codingset_idx1);
-    va_TraceMsg("\ttransform_ac_codingset_idx2   = %d.\n",
-                p->transform_fields.bits.transform_ac_codingset_idx2);
-    va_TraceMsg("\tintra_transform_dc_table      = %d.\n",
-                p->transform_fields.bits.intra_transform_dc_table);
+    return;
 }
 
-static void va_TraceVASliceParameterBufferVC1(
+
+static void va_TraceVAEncPictureParameterBufferH263(
     VADisplay dpy,
     VAContextID context,
     VABufferID buffer,
     VABufferType type,
     unsigned int size,
     unsigned int num_elements,
-    void* data
-)
+    void *data)
 {
-    VASliceParameterBufferVC1 *p = (VASliceParameterBufferVC1*)data;
-
-    va_TraceMsg ("========== SLICE NUMBER ==========\n");
-    va_TraceMsg ("    slice_data_size               = %d\n", p->slice_data_size);
-    va_TraceMsg ("    slice_data_offset             = %d\n", p->slice_data_offset);
-    va_TraceMsg ("    slice_data_flag               = %d\n", p->slice_data_flag);
-    va_TraceMsg ("    macroblock_offset             = %d\n", p->macroblock_offset);
-    va_TraceMsg ("    slice_vertical_position       = %d\n", p->slice_vertical_position);
+    VAEncPictureParameterBufferH263 *p = (VAEncPictureParameterBufferH263 *)data;
+    DPY2INDEX(dpy);
+    
+    va_TraceMsg(idx, "VAEncPictureParameterBufferH263\n");
+    va_TraceMsg(idx, "\treference_picture = 0x%08x\n", p->reference_picture);
+    va_TraceMsg(idx, "\treconstructed_picture = 0x%08x\n", p->reconstructed_picture);
+    va_TraceMsg(idx, "\tcoded_buf = %08x\n", p->coded_buf);
+    va_TraceMsg(idx, "\tpicture_width = %d\n", p->picture_width);
+    va_TraceMsg(idx, "\tpicture_height = %d\n", p->picture_height);
+    va_TraceMsg(idx, "\tpicture_type = 0x%08x\n", p->picture_type);
+    va_TraceMsg(idx, NULL);
+
+    trace_context[idx].trace_codedbuf =  p->coded_buf;
+    
+    return;
 }
 
-void va_TraceBeginPicture(
+static void va_TraceVAEncPictureParameterBufferJPEG(
     VADisplay dpy,
     VAContextID context,
-    VASurfaceID render_target
-)
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
 {
+    VAEncPictureParameterBufferJPEG *p = (VAEncPictureParameterBufferJPEG *)data;
     int i;
+    
+    DPY2INDEX(dpy);
+    
+    va_TraceMsg(idx, "VAEncPictureParameterBufferJPEG\n");
+    va_TraceMsg(idx, "\treconstructed_picture = 0x%08x\n", p->reconstructed_picture);
+    va_TraceMsg(idx, "\tcoded_buf = %08x\n", p->coded_buf);
+    va_TraceMsg(idx, "\tpicture_width = %d\n", p->picture_width);
+    va_TraceMsg(idx, "\tpicture_height = %d\n", p->picture_height);
+    va_TraceMsg(idx, NULL);
+
+    trace_context[idx].trace_codedbuf =  p->coded_buf;
+    
+    return;
+}
 
-    va_TraceMsg("\tcontext = 0x%08x\n", context);
-    va_TraceMsg("\t\trender_targets = 0x%08x\n", render_target);
-
-    trace_rendertarget = render_target; /* for surface data dump after vaEndPicture */
-
-    trace_frame++;
-    trace_slice = 0;
+static void va_TraceVAEncQMatrixBufferJPEG(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *data)
+{
+    VAQMatrixBufferJPEG *p = (VAQMatrixBufferJPEG *)data;
+    DPY2INDEX(dpy);
+    
+    va_TraceMsg(idx, "VAQMatrixBufferJPEG\n");
+    va_TraceMsg(idx, "\tload_lum_quantiser_matrix = %d", p->load_lum_quantiser_matrix);
+    if (p->load_lum_quantiser_matrix) {
+        int i;
+        for (i = 0; i < 64; i++) {
+            if ((i % 8) == 0)
+                va_TraceMsg(idx, "\n\t");
+            va_TraceMsg(idx, "\t0x%02x", p->lum_quantiser_matrix[i]);
+        }
+        va_TraceMsg(idx, "\n");
+    }
+    va_TraceMsg(idx, "\tload_chroma_quantiser_matrix = %08x\n", p->load_chroma_quantiser_matrix);
+    if (p->load_chroma_quantiser_matrix) {
+        int i;
+        for (i = 0; i < 64; i++) {
+            if ((i % 8) == 0)
+                va_TraceMsg(idx, "\n\t");
+            va_TraceMsg(idx, "\t0x%02x", p->chroma_quantiser_matrix[i]);
+        }
+        va_TraceMsg(idx, "\n");
+    }
+    
+    va_TraceMsg(idx, NULL);
+    
+    return;
 }
 
-static void va_TraceMPEG2Buf(
+
+static void va_TraceH263Buf(
     VADisplay dpy,
     VAContextID context,
     VABufferID buffer,
@@ -777,44 +2147,104 @@ static void va_TraceMPEG2Buf(
 )
 {
     switch (type) {
-    case VAPictureParameterBufferType:
-        va_TraceVAPictureParameterBufferMPEG2(dpy, context, buffer, type, size, num_elements, pbuf);
+    case VAPictureParameterBufferType:/* print MPEG4 buffer */
+        va_TraceVAPictureParameterBufferMPEG4(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
-    case VAIQMatrixBufferType:
-        va_TraceVAIQMatrixBufferMPEG2(dpy, context, buffer, type, size, num_elements, pbuf);
+    case VAIQMatrixBufferType:/* print MPEG4 buffer */
+        va_TraceVAIQMatrixBufferMPEG4(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
-    case VABitPlaneBufferType:
+    case VABitPlaneBufferType:/* print MPEG4 buffer */
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VASliceGroupMapBufferType:
         break;
-    case VASliceParameterBufferType:
-        trace_slice++;
-        va_TraceVASliceParameterBufferMPEG2(dpy, context, buffer, type, size, num_elements, pbuf);
+    case VASliceParameterBufferType:/* print MPEG4 buffer */
+        va_TraceVASliceParameterBufferMPEG4(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VASliceDataBufferType:
         va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAMacroblockParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAResidualDataBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VADeblockingParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAImageBufferType:
         break;
     case VAProtectedSliceDataBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAEncCodedBufferType:
         break;
     case VAEncSequenceParameterBufferType:
+        va_TraceVAEncSequenceParameterBufferH263(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAEncPictureParameterBufferType:
+        va_TraceVAEncPictureParameterBufferH263(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAEncSliceParameterBufferType:
+        va_TraceVAEncSliceParameterBuffer(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAEncPackedHeaderParameterBufferType:
+        va_TraceVAEncPackedHeaderParameterBufferType(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    default:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    }
+}
+
+
+static void va_TraceJPEGBuf(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID buffer,
+    VABufferType type,
+    unsigned int size,
+    unsigned int num_elements,
+    void *pbuf
+)
+{
+    switch (type) {
+    case VABitPlaneBufferType:
+    case VASliceGroupMapBufferType:
+    case VASliceDataBufferType:
+    case VAMacroblockParameterBufferType:
+    case VAResidualDataBufferType:
+    case VADeblockingParameterBufferType:
+    case VAImageBufferType:
+    case VAProtectedSliceDataBufferType:
+    case VAEncCodedBufferType:
+    case VAEncSequenceParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAEncSliceParameterBufferType:
+        va_TraceVAEncPictureParameterBufferJPEG(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAPictureParameterBufferType:
+        va_TraceVAPictureParameterBufferJPEG(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAIQMatrixBufferType:
+        va_TraceVAIQMatrixBufferJPEG(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VASliceParameterBufferType:
+        va_TraceVASliceParameterBufferJPEG(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAHuffmanTableBufferType:
+        va_TraceVAHuffmanTableBufferJPEG(dpy, context, buffer, type, size, num_elements, pbuf);
+        break;
+    case VAEncPictureParameterBufferType:
+        va_TraceVAEncPictureParameterBufferJPEG(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
-    case VAEncH264VUIBufferType:
+    case VAQMatrixBufferType:
+        va_TraceVAEncQMatrixBufferJPEG(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
-    case VAEncH264SEIBufferType:
+    default:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     }
 }
@@ -837,6 +2267,7 @@ static void va_TraceMPEG4Buf(
         va_TraceVAIQMatrixBufferMPEG4(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VABitPlaneBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VASliceGroupMapBufferType:
         break;
@@ -847,10 +2278,13 @@ static void va_TraceMPEG4Buf(
         va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAMacroblockParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAResidualDataBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VADeblockingParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAImageBufferType:
         break;
@@ -860,16 +2294,16 @@ static void va_TraceMPEG4Buf(
     case VAEncCodedBufferType:
         break;
     case VAEncSequenceParameterBufferType:
+        va_TraceVAEncSequenceParameterBufferMPEG4(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAEncPictureParameterBufferType:
+        va_TraceVAEncPictureParameterBufferMPEG4(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAEncSliceParameterBufferType:
-        break;
-    case VAEncH264VUIBufferType:
-        break;
-    case VAEncH264SEIBufferType:
+        va_TraceVAEncSliceParameterBuffer(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     default:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     }
 }
@@ -885,28 +2319,35 @@ static void va_TraceH264Buf(
     void *pbuf
 )
 {
+    DPY2INDEX(dpy);
+    
     switch (type) {
     case VAPictureParameterBufferType:
-        va_TraceVAPictureParameterBufferMPEG2(dpy, context, buffer, type, size, num_elements, pbuf);
+        va_TraceVAPictureParameterBufferH264(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAIQMatrixBufferType:
         va_TraceVAIQMatrixBufferH264(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VABitPlaneBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);        
         break;
     case VASliceGroupMapBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VASliceParameterBufferType:
         va_TraceVASliceParameterBufferH264(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VASliceDataBufferType:
-        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
+        va_TraceVABuffers(dpy, context, buffer, type, trace_context[idx].trace_slice_size, num_elements, pbuf);
         break;
     case VAMacroblockParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);        
         break;
     case VAResidualDataBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);        
         break;
     case VADeblockingParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAImageBufferType:
         break;
@@ -916,16 +2357,26 @@ static void va_TraceH264Buf(
     case VAEncCodedBufferType:
         break;
     case VAEncSequenceParameterBufferType:
+        va_TraceVAEncSequenceParameterBufferH264(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAEncPictureParameterBufferType:
+        va_TraceVAEncPictureParameterBufferH264(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAEncSliceParameterBufferType:
+        if (size == sizeof(VAEncSliceParameterBuffer))
+            va_TraceVAEncSliceParameterBuffer(dpy, context, buffer, type, size, num_elements, pbuf);
+        else
+            va_TraceVAEncSliceParameterBufferH264(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
-    case VAEncH264VUIBufferType:
+    case VAEncPackedHeaderParameterBufferType:
+        va_TraceVAEncPackedHeaderParameterBufferType(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
-    case VAEncH264SEIBufferType:
+        
+    case VAEncMiscParameterBufferType:
+        va_TraceVAEncMiscParameterBuffer(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     default:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     }
 }
@@ -941,6 +2392,8 @@ static void va_TraceVC1Buf(
     void *pbuf
 )
 {
+    DPY2INDEX(dpy);
+
     switch (type) {
     case VAPictureParameterBufferType:
         va_TraceVAPictureParameterBufferVC1(dpy, context, buffer, type, size, num_elements, pbuf);
@@ -951,18 +2404,22 @@ static void va_TraceVC1Buf(
         va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VASliceGroupMapBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VASliceParameterBufferType:
         va_TraceVASliceParameterBufferVC1(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VASliceDataBufferType:
-        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
+        va_TraceVABuffers(dpy, context, buffer, type, trace_context[idx].trace_slice_size, num_elements, pbuf);
         break;
     case VAMacroblockParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAResidualDataBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VADeblockingParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAImageBufferType:
         break;
@@ -972,16 +2429,16 @@ static void va_TraceVC1Buf(
     case VAEncCodedBufferType:
         break;
     case VAEncSequenceParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAEncPictureParameterBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     case VAEncSliceParameterBufferType:
-        break;
-    case VAEncH264VUIBufferType:
-        break;
-    case VAEncH264SEIBufferType:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     default:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     }
 }
@@ -997,131 +2454,329 @@ void va_TraceRenderPicture(
     unsigned int size;
     unsigned int num_elements;
     int i;
+    DPY2INDEX(dpy);
 
-    va_TraceMsg("\tcontext = 0x%08x\n", context);
-    va_TraceMsg("\tnum_buffers = %d\n", num_buffers);
+    TRACE_FUNCNAME(idx);
+    
+    va_TraceMsg(idx, "\tcontext = 0x%08x\n", context);
+    va_TraceMsg(idx, "\tnum_buffers = %d\n", num_buffers);
+    if (buffers == NULL)
+        return;
+    
     for (i = 0; i < num_buffers; i++) {
-        void *pbuf;
-
+        unsigned char *pbuf = NULL;
+        unsigned int j;
+        
         /* get buffer type information */
         vaBufferInfo(dpy, context, buffers[i], &type, &size, &num_elements);
-        
-        va_TraceMsg("\t\tbuffers[%d] = 0x%08x\n", i, buffers[i]);
-        va_TraceMsg("\t\t\ttype = %s\n", buffer_type_to_string(type));
-        va_TraceMsg("\t\t\tsize = %d\n", size);
-        va_TraceMsg("\t\t\tnum_elements = %d\n", num_elements);
 
+        va_TraceMsg(idx, "\t---------------------------\n");
+        va_TraceMsg(idx, "\tbuffers[%d] = 0x%08x\n", i, buffers[i]);
+        va_TraceMsg(idx, "\t  type = %s\n", buffer_type_to_string(type));
+        va_TraceMsg(idx, "\t  size = %d\n", size);
+        va_TraceMsg(idx, "\t  num_elements = %d\n", num_elements);
 
-        vaMapBuffer(dpy, buffers[i], &pbuf);
-
-        switch (trace_profile) {
+        vaMapBuffer(dpy, buffers[i], (void **)&pbuf);
+        if (pbuf == NULL)
+            continue;
+        
+        switch (trace_context[idx].trace_profile) {
         case VAProfileMPEG2Simple:
         case VAProfileMPEG2Main:
-            va_TraceMPEG2Buf(dpy, context, buffers[i], type, size, num_elements, pbuf);
+            for (j=0; j<num_elements; j++) {
+                va_TraceMsg(idx, "\telement[%d] = ", j);
+                va_TraceMPEG2Buf(dpy, context, buffers[i], type, size, num_elements, pbuf + size*j);
+            }
             break;
         case VAProfileMPEG4Simple:
         case VAProfileMPEG4AdvancedSimple:
         case VAProfileMPEG4Main:
-            va_TraceMPEG4Buf(dpy, context, buffers[i], type, size, num_elements, pbuf);
+            for (j=0; j<num_elements; j++) {
+                va_TraceMsg(idx, "\telement[%d] = ", j);
+                va_TraceMPEG4Buf(dpy, context, buffers[i], type, size, num_elements, pbuf + size*j);
+            }
             break;
         case VAProfileH264Baseline:
         case VAProfileH264Main:
         case VAProfileH264High:
-            va_TraceH264Buf(dpy, context, buffers[i], type, size, num_elements, pbuf);
+        case VAProfileH264ConstrainedBaseline:
+            for (j=0; j<num_elements; j++) {
+                va_TraceMsg(idx, "\telement[%d] = ", j);
+                
+                va_TraceH264Buf(dpy, context, buffers[i], type, size, num_elements, pbuf + size*j);
+            }
             break;
         case VAProfileVC1Simple:
         case VAProfileVC1Main:
         case VAProfileVC1Advanced:
-            va_TraceVC1Buf(dpy, context, buffers[i], type, size, num_elements, pbuf);
+            for (j=0; j<num_elements; j++) {
+                va_TraceMsg(idx, "\telement[%d] = ", j);
+                
+                va_TraceVC1Buf(dpy, context, buffers[i], type, size, num_elements, pbuf + size*j);
+            }
             break;
         case VAProfileH263Baseline:
+            for (j=0; j<num_elements; j++) {
+                va_TraceMsg(idx, "\telement[%d] = ", j);
+                
+                va_TraceH263Buf(dpy, context, buffers[i], type, size, num_elements, pbuf + size*j);
+            }
+            break;
+        case VAProfileJPEGBaseline:
+            for (j=0; j<num_elements; j++) {
+                va_TraceMsg(idx, "\telement[%d] = ", j);
+                
+                va_TraceJPEGBuf(dpy, context, buffers[i], type, size, num_elements, pbuf + size*j);
+            }
+            break;
+        default:
             break;
         }
 
         vaUnmapBuffer(dpy, buffers[i]);
     }
-}
 
+    va_TraceMsg(idx, NULL);
+}
 
 void va_TraceEndPicture(
     VADisplay dpy,
-    VAContextID context
+    VAContextID context,
+    int endpic_done
 )
 {
-    int i, j;
-    unsigned int fourcc; /* following are output argument */
-    unsigned int luma_stride;
-    unsigned int chroma_u_stride;
-    unsigned int chroma_v_stride;
-    unsigned int luma_offset;
-    unsigned int chroma_u_offset;
-    unsigned int chroma_v_offset;
-    unsigned int buffer_name;
-    void *buffer;
-    char *Y_data, *UV_data, *tmp;
-    
-    VAStatus va_status;
+    int encode, decode, jpeg;
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
+
+    va_TraceMsg(idx, "\tcontext = 0x%08x\n", context);
+    va_TraceMsg(idx, "\trender_targets = 0x%08x\n", trace_context[idx].trace_rendertarget);
+
+    /* avoid to create so many empty files */
+    encode = (trace_context[idx].trace_entrypoint == VAEntrypointEncSlice);
+    decode = (trace_context[idx].trace_entrypoint == VAEntrypointVLD);
+    jpeg = (trace_context[idx].trace_entrypoint == VAEntrypointEncPicture);
+
+    /* trace encode source surface, can do it before HW completes rendering */
+    if ((encode && (trace_flag & VA_TRACE_FLAG_SURFACE_ENCODE))||
+           (jpeg && (trace_flag & VA_TRACE_FLAG_SURFACE_JPEG)))
+        va_TraceSurface(dpy);
     
-    va_TraceMsg("\tcontext = 0x%08x\n", context);
-    va_TraceMsg("\t\trender_targets = 0x%08x\n", trace_rendertarget);
+    /* trace coded buffer, do it after HW completes rendering */
+    if ((encode || jpeg) && (trace_flag & VA_TRACE_FLAG_CODEDBUF)) {
+        vaSyncSurface(dpy, trace_context[idx].trace_rendertarget);
+        va_TraceCodedBuf(dpy);
+    }
+
+    /* trace decoded surface, do it after HW completes rendering */
+    if (decode && ((trace_flag & VA_TRACE_FLAG_SURFACE_DECODE))) {
+        vaSyncSurface(dpy, trace_context[idx].trace_rendertarget);
+        va_TraceSurface(dpy);
+    }
+
+    va_TraceMsg(idx, NULL);
+}
+
+
+void va_TraceSyncSurface(
+    VADisplay dpy,
+    VASurfaceID render_target
+)
+{
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
+
+    va_TraceMsg(idx, "\trender_target = 0x%08x\n", render_target);
+    va_TraceMsg(idx, NULL);
+}
+
+void va_TraceQuerySurfaceAttributes(
+    VADisplay           dpy,
+    VAConfigID          config,
+    VASurfaceAttrib    *attrib_list,
+    unsigned int       *num_attribs
+)
+{
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
+    va_TraceMsg(idx, "\tconfig = 0x%08x\n", config);
+    va_TraceSurfaceAttributes(idx, attrib_list, num_attribs);
     
-    /* force the pipleline finish rendering */
-    vaSyncSurface(dpy, trace_rendertarget);
+    va_TraceMsg(idx, NULL);
 
-    va_TraceMsg("***dump surface data***\n", trace_rendertarget);
+}
 
-    va_status = vaLockSurface(dpy, trace_rendertarget, &fourcc, &luma_stride, &chroma_u_stride, &chroma_v_stride,
-                                      &luma_offset, &chroma_u_offset, &chroma_v_offset, &buffer_name, &buffer);
 
-    if (va_status != VA_STATUS_SUCCESS)
+void va_TraceQuerySurfaceStatus(
+    VADisplay dpy,
+    VASurfaceID render_target,
+    VASurfaceStatus *status    /* out */
+)
+{
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
+
+    va_TraceMsg(idx, "\trender_target = 0x%08x\n", render_target);
+    if (status)
+        va_TraceMsg(idx, "\tstatus = 0x%08x\n", *status);
+    va_TraceMsg(idx, NULL);
+}
+
+
+void va_TraceQuerySurfaceError(
+    VADisplay dpy,
+    VASurfaceID surface,
+    VAStatus error_status,
+    void **error_info       /*out*/
+)
+{
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
+    va_TraceMsg(idx, "\tsurface = 0x%08x\n", surface);
+    va_TraceMsg(idx, "\terror_status = 0x%08x\n", error_status);
+    if (error_info && (error_status == VA_STATUS_ERROR_DECODING_ERROR)) {
+        VASurfaceDecodeMBErrors *p = *error_info;
+        while (p && (p->status != -1)) {
+            va_TraceMsg(idx, "\t\tstatus = %d\n", p->status);
+            va_TraceMsg(idx, "\t\tstart_mb = %d\n", p->start_mb);
+            va_TraceMsg(idx, "\t\tend_mb = %d\n", p->end_mb);
+            p++; /* next error record */
+        }
+    }
+    va_TraceMsg(idx, NULL);
+}
+
+void va_TraceMaxNumDisplayAttributes (
+    VADisplay dpy,
+    int number
+)
+{
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
+    
+    va_TraceMsg(idx, "\tmax_display_attributes = %d\n", number);
+    va_TraceMsg(idx, NULL);
+}
+
+void va_TraceQueryDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,    /* out */
+    int *num_attributes               /* out */
+)
+{
+    int i;
+    
+    DPY2INDEX(dpy);
+    
+    if (attr_list == NULL || num_attributes == NULL)
         return;
+
+    va_TraceMsg(idx, "\tnum_attributes = %d\n", *num_attributes);
+    
+    for (i=0; i<*num_attributes; i++) {
+        va_TraceMsg(idx, "\tattr_list[%d] =\n");
+        va_TraceMsg(idx, "\t  typ = 0x%08x\n", attr_list[i].type);
+        va_TraceMsg(idx, "\t  min_value = %d\n", attr_list[i].min_value);
+        va_TraceMsg(idx, "\t  max_value = %d\n", attr_list[i].max_value);
+        va_TraceMsg(idx, "\t  value = %d\n", attr_list[i].value);
+        va_TraceMsg(idx, "\t  flags = %d\n", attr_list[i].flags);
+    }
+    va_TraceMsg(idx, NULL);
+}
+
+
+static void va_TraceDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,
+    int num_attributes
+)
+{
+    int i;
+    
+    DPY2INDEX(dpy);
     
-    va_TraceMsg("\tfourcc=0x%08x\n", fourcc);
-    va_TraceMsg("\twidth=%d\n", trace_width);
-    va_TraceMsg("\theight=%d\n", trace_height);
-    va_TraceMsg("\tluma_stride=%d\n", luma_stride);
-    va_TraceMsg("\tchroma_u_stride=%d\n", chroma_u_stride);
-    va_TraceMsg("\tchroma_v_stride=%d\n", chroma_v_stride);
-    va_TraceMsg("\tluma_offset=%d\n", luma_offset);
-    va_TraceMsg("\tchroma_u_offset=%d\n", chroma_u_offset);
-    va_TraceMsg("\tchroma_v_offset=%d\n", chroma_v_offset);
-
-    if (!buffer) {
-        vaUnlockSurface(dpy, trace_rendertarget);
+    va_TraceMsg(idx, "\tnum_attributes = %d\n", num_attributes);
+    if (attr_list == NULL)
         return;
+    
+    for (i=0; i<num_attributes; i++) {
+        va_TraceMsg(idx, "\tattr_list[%d] =\n");
+        va_TraceMsg(idx, "\t  typ = 0x%08x\n", attr_list[i].type);
+        va_TraceMsg(idx, "\t  min_value = %d\n", attr_list[i].min_value);
+        va_TraceMsg(idx, "\t  max_value = %d\n", attr_list[i].max_value);
+        va_TraceMsg(idx, "\t  value = %d\n", attr_list[i].value);
+        va_TraceMsg(idx, "\t  flags = %d\n", attr_list[i].flags);
     }
+    va_TraceMsg(idx, NULL);
+}
 
-    Y_data = buffer;
-    UV_data = buffer + luma_offset;
 
-    tmp = Y_data;
-    va_TraceMsg("**Y data**\n");
-    for (i=0; i<trace_height; i++) {
-        for (j=0; j<trace_width; j++) {
-            if ((j%16) == 0)
-                va_TraceMsg("\n0x%08x:", j + i*trace_width);
-            va_TraceMsg(" %02x", tmp[j]);
-        }
+void va_TraceGetDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,
+    int num_attributes
+)
+{
+    DPY2INDEX(dpy);
 
-        va_TraceMsg("\n");
-        tmp = Y_data + i * luma_stride;
-    }
+    TRACE_FUNCNAME(idx);
 
-    tmp = UV_data;
-    if (fourcc == VA_FOURCC_NV12) {
-        va_TraceMsg("**UV data**\n");
-        
-        for (i=0; i<trace_height/2; i++) {
-            for (j=0; j<trace_width; j++) {
-                if ((j%16) == 0)
-                    va_TraceMsg("\n0x%08x:", j + i*trace_width);
-                va_TraceMsg(" %02x", tmp[j]);
-            }
+    va_TraceDisplayAttributes (dpy, attr_list, num_attributes);
+}
 
-            va_TraceMsg("\n");
-            tmp = UV_data + i * chroma_u_stride;
-        }
-    }
+void va_TraceSetDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,
+    int num_attributes
+)
+{
+    DPY2INDEX(dpy);
+
+    TRACE_FUNCNAME(idx);
+
+    va_TraceDisplayAttributes (dpy, attr_list, num_attributes);
+}
+
+
+void va_TracePutSurface (
+    VADisplay dpy,
+    VASurfaceID surface,
+    void *draw, /* the target Drawable */
+    short srcx,
+    short srcy,
+    unsigned short srcw,
+    unsigned short srch,
+    short destx,
+    short desty,
+    unsigned short destw,
+    unsigned short desth,
+    VARectangle *cliprects, /* client supplied clip list */
+    unsigned int number_cliprects, /* number of clip rects in the clip list */
+    unsigned int flags /* de-interlacing flags */
+)
+{
+    DPY2INDEX(dpy);
 
-    vaUnlockSurface(dpy, trace_rendertarget);
+    TRACE_FUNCNAME(idx);
+    
+    va_TraceMsg(idx, "\tsurface = 0x%08x\n", surface);
+    va_TraceMsg(idx, "\tdraw = 0x%08x\n", draw);
+    va_TraceMsg(idx, "\tsrcx = %d\n", srcx);
+    va_TraceMsg(idx, "\tsrcy = %d\n", srcy);
+    va_TraceMsg(idx, "\tsrcw = %d\n", srcw);
+    va_TraceMsg(idx, "\tsrch = %d\n", srch);
+    va_TraceMsg(idx, "\tdestx = %d\n", destx);
+    va_TraceMsg(idx, "\tdesty = %d\n", desty);
+    va_TraceMsg(idx, "\tdestw = %d\n", destw);
+    va_TraceMsg(idx, "\tdesth = %d\n", desth);
+    va_TraceMsg(idx, "\tcliprects = 0x%08x\n", cliprects);
+    va_TraceMsg(idx, "\tnumber_cliprects = %d\n", number_cliprects);
+    va_TraceMsg(idx, "\tflags = 0x%08x\n", flags);
+    va_TraceMsg(idx, NULL);
 }