vatrace: print function name for vaMapBuffer trace with coded buffer

also fall into default va_TraceVABuffers if the buffer type falls into
"default"

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>
(cherry picked from commit acbf7d0c4830763e7c3be0e71c9da972f1aea7a5)

diff --git a/va/va_trace.c b/va/va_trace.c
index 0cfc1fe..2a05e02 100644 (file)
--- a/va/va_trace.c
+++ b/va/va_trace.c
@@ -635,17 +635,14 @@ void va_TraceMapBuffer (
     DPY2INDEX(dpy);
 
     vaBufferInfo(dpy, trace_context[idx].trace_context, buf_id, &type, &size, &num_elements);    
-    /*
-      va_TraceMsg(idx, "\tbuf_id=0x%x\n", buf_id);
-      va_TraceMsg(idx, "\tbuf_type=%s\n", buffer_type_to_string(type));
-      va_TraceMsg(idx, "\tbuf_size=%s\n", size);
-      va_TraceMsg(idx, "\tbuf_elements=%s\n", &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));
     buf_list = (VACodedBufferSegment *)(*pbuf);
     while (buf_list != NULL) {
         va_TraceMsg(idx, "\tCodedbuf[%d] =\n", i++);
@@ -1889,6 +1886,7 @@ static void va_TraceH263Buf(
         va_TraceVAEncSliceParameterBuffer(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     default:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     }
 }
@@ -1928,6 +1926,7 @@ static void va_TraceJPEGBuf(
         va_TraceVAEncQMatrixBufferJPEG(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     default:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     }
 }
@@ -1986,6 +1985,7 @@ static void va_TraceMPEG4Buf(
         va_TraceVAEncSliceParameterBuffer(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     default:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     }
 }
@@ -2054,6 +2054,7 @@ static void va_TraceH264Buf(
         va_TraceVAEncMiscParameterBuffer(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     default:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     }
 }
@@ -2115,6 +2116,7 @@ static void va_TraceVC1Buf(
         va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     default:
+        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
         break;
     }
 }