Fix trace for vaBeginPicture

Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>

2 files changed, 12 insertions, 6 deletions

diff --git a/va/va.c b/va/va.c
index 93fda7a..98b9f76 100644
--- a/va/va.c
+++ b/va/va.c
@@ -763,7 +763,7 @@ VAStatus vaBeginPicture (
   CHECK_DISPLAY(dpy);
   ctx = CTX(dpy);
 
-  VA_TRACE(va_TraceBeginPicture, ctx, context, render_target);
+  VA_TRACE(va_TraceBeginPicture, dpy, context, render_target);
 
   if (va_FoolBeginPicture(dpy, context, render_target))
       return VA_STATUS_SUCCESS;
@@ -800,12 +800,13 @@ VAStatus vaEndPicture (
   CHECK_DISPLAY(dpy);
   ctx = CTX(dpy);
 
-  if (va_FoolEndPicture(dpy, context))
-  {
+  if (va_FoolEndPicture(dpy, context)) {
     VA_TRACE(va_TraceEndPicture, dpy, context);
     return VA_STATUS_SUCCESS;
   }
+  
   va_status = ctx->vtable.vaEndPicture( ctx, context );
+  
   VA_TRACE(va_TraceEndPicture, dpy, context);
 
   return va_status;
diff --git a/va/va_trace.c b/va/va_trace.c
index f7f82ef..7fff04f 100644
--- a/va/va_trace.c
+++ b/va/va_trace.c
@@ -306,9 +306,12 @@ void va_TraceSurface(VADisplay dpy)
                               &luma_offset, &chroma_u_offset, &chroma_v_offset,
                               &buffer_name, &buffer);
 
-    if (va_status != VA_STATUS_SUCCESS)
+    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);
@@ -319,7 +322,9 @@ void va_TraceSurface(VADisplay dpy)
     va_TraceMsg(idx, "\tchroma_u_offset = %d\n", chroma_u_offset);
     va_TraceMsg(idx, "\tchroma_v_offset = %d\n", chroma_v_offset);
 
-    if (!buffer) {
+    if (*(unsigned int *)buffer == NULL) {
+        va_TraceMsg(idx, "Error:vaLockSurface return NULL buffer\n");
+        
         vaUnlockSurface(dpy, trace_context[idx].trace_rendertarget);
         return;
     }