diff --git a/src/gallium/auxiliary/driver_trace/enums2names.py b/src/gallium/auxiliary/driver_trace/enums2names.py
index d64e919d651..183b25f07ae 100755
--- a/src/gallium/auxiliary/driver_trace/enums2names.py
+++ b/src/gallium/auxiliary/driver_trace/enums2names.py
@@ -51,6 +51,8 @@ lst_enum_include = [
     "pipe_video_cap",
     "pipe_video_profile",
     "pipe_video_entrypoint",
+    "pipe_video_vpp_orientation",
+    "pipe_video_vpp_blend_mode",
     "pipe_resource_param",
     "pipe_fd_type",
     "pipe_blendfactor",
diff --git a/src/gallium/auxiliary/driver_trace/tr_context.c b/src/gallium/auxiliary/driver_trace/tr_context.c
index 24d8f45677f..902e404f409 100644
--- a/src/gallium/auxiliary/driver_trace/tr_context.c
+++ b/src/gallium/auxiliary/driver_trace/tr_context.c
@@ -41,6 +41,7 @@
 #include "tr_texture.h"
 #include "tr_context.h"
 #include "tr_util.h"
+#include "tr_video.h"
 
 
 struct trace_query
@@ -2088,6 +2089,8 @@ trace_context_create_video_codec(struct pipe_context *_context,
    trace_dump_ret(ptr, result);
    trace_dump_call_end();
 
+   result = trace_video_codec_create(tr_context, result);
+
    return result;
 }
 
@@ -2113,6 +2116,8 @@ trace_context_create_video_buffer_with_modifiers(struct pipe_context *_context,
    trace_dump_ret(ptr, result);
    trace_dump_call_end();
 
+   result = trace_video_buffer_create(tr_context, result);
+
    return result;
 }
 
@@ -2134,6 +2139,8 @@ trace_context_create_video_buffer(struct pipe_context *_context,
    trace_dump_ret(ptr, result);
    trace_dump_call_end();
 
+   result = trace_video_buffer_create(tr_context, result);
+
    return result;
 }
 
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.h b/src/gallium/auxiliary/driver_trace/tr_dump.h
index 7fbd3cb58bd..9155440cbec 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump.h
+++ b/src/gallium/auxiliary/driver_trace/tr_dump.h
@@ -198,6 +198,13 @@ bool trace_dump_is_triggered(void);
       trace_dump_member_end(); \
    } while(0)
 
+#define trace_dump_member_struct(_type, _obj, _member) \
+   do { \
+      trace_dump_member_begin(#_member); \
+      trace_dump_##_type(&((_obj)->_member)); \
+      trace_dump_member_end(); \
+   } while(0)
+
 #define trace_dump_arg_array(_type, _arg, _size) \
    do { \
       trace_dump_arg_begin(#_arg); \
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_state.c b/src/gallium/auxiliary/driver_trace/tr_dump_state.c
index 8a0522527c2..278332cf0ff 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump_state.c
+++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.c
@@ -148,6 +148,25 @@ void trace_dump_box(const struct pipe_box *box)
    trace_dump_struct_end();
 }
 
+void trace_dump_u_rect(const struct u_rect *rect)
+{
+   if (!trace_dumping_enabled_locked())
+      return;
+
+   if (!rect) {
+      trace_dump_null();
+      return;
+   }
+
+   trace_dump_struct_begin("u_rect");
+
+   trace_dump_member(int, rect, x0);
+   trace_dump_member(int, rect, x1);
+   trace_dump_member(int, rect, y0);
+   trace_dump_member(int, rect, y1);
+
+   trace_dump_struct_end();
+}
 
 void trace_dump_rasterizer_state(const struct pipe_rasterizer_state *state)
 {
@@ -1166,3 +1185,65 @@ void trace_dump_winsys_handle(const struct winsys_handle *whandle)
 
    trace_dump_struct_end();
 }
+
+void trace_dump_pipe_picture_desc(const struct pipe_picture_desc *picture)
+{
+   if (!trace_dumping_enabled_locked())
+      return;
+
+   if (!picture) {
+      trace_dump_null();
+      return;
+   }
+
+   trace_dump_struct_begin("pipe_picture_desc");
+
+   trace_dump_member_enum(pipe_video_profile, picture, profile);
+   trace_dump_member_enum(pipe_video_entrypoint, picture, entry_point);
+   trace_dump_member(bool, picture, protected_playback);
+   trace_dump_member_begin("decrypt_key");
+   trace_dump_array(uint, picture->decrypt_key, picture->key_size);
+   trace_dump_member_end();
+   trace_dump_member(uint, picture, key_size);
+   trace_dump_member(format, picture, input_format);
+   trace_dump_member(bool, picture, input_full_range);
+   trace_dump_member(format, picture, output_format);
+   trace_dump_member(ptr, picture, fence);
+   trace_dump_struct_end();
+}
+
+void trace_dump_pipe_vpp_blend(const struct pipe_vpp_blend *blend)
+{
+   if (!trace_dumping_enabled_locked())
+      return;
+
+   if (!blend) {
+      trace_dump_null();
+      return;
+   }
+
+   trace_dump_struct_begin("pipe_vpp_blend");
+   trace_dump_member_enum(pipe_video_vpp_blend_mode, blend, mode);
+   trace_dump_member(float, blend, global_alpha);
+   trace_dump_struct_end();
+}
+
+void trace_dump_pipe_vpp_desc(const struct pipe_vpp_desc *process_properties)
+{
+   if (!trace_dumping_enabled_locked())
+      return;
+
+   if (!process_properties) {
+      trace_dump_null();
+      return;
+   }
+
+   trace_dump_struct_begin("pipe_vpp_desc");
+   trace_dump_member_struct(pipe_picture_desc, process_properties, base);
+   trace_dump_member_struct(u_rect, process_properties, src_region);
+   trace_dump_member_struct(u_rect, process_properties, dst_region);
+   trace_dump_member_enum(pipe_video_vpp_orientation, process_properties, orientation);
+   trace_dump_member_struct(pipe_vpp_blend, process_properties, blend);
+   trace_dump_member(ptr, process_properties, src_surface_fence);
+   trace_dump_struct_end();
+}
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_state.h b/src/gallium/auxiliary/driver_trace/tr_dump_state.h
index 10033d06af1..ff3dc50ea6a 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump_state.h
+++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.h
@@ -40,8 +40,16 @@ void trace_dump_video_codec_template(const struct pipe_video_codec *templat);
 
 void trace_dump_video_buffer_template(const struct pipe_video_buffer *templat);
 
+void trace_dump_pipe_picture_desc(const struct pipe_picture_desc *picture);
+
+void trace_dump_pipe_vpp_blend(const struct pipe_vpp_blend *blend);
+
+void trace_dump_pipe_vpp_desc(const struct pipe_vpp_desc *process_properties);
+
 void trace_dump_box(const struct pipe_box *box);
 
+void trace_dump_u_rect(const struct u_rect *rect);
+
 void trace_dump_rasterizer_state(const struct pipe_rasterizer_state *state);
 
 void trace_dump_poly_stipple(const struct pipe_poly_stipple *state);
diff --git a/src/gallium/auxiliary/driver_trace/tr_video.c b/src/gallium/auxiliary/driver_trace/tr_video.c
new file mode 100644
index 00000000000..139dbad7724
--- /dev/null
+++ b/src/gallium/auxiliary/driver_trace/tr_video.c
@@ -0,0 +1,442 @@
+#include "tr_public.h"
+#include "tr_dump.h"
+#include "tr_dump_state.h"
+#include "tr_texture.h"
+#include "u_inlines.h"
+#include "tr_video.h"
+#include "pipe/p_video_codec.h"
+#include "vl/vl_defines.h"
+
+static void
+trace_video_codec_destroy(struct pipe_video_codec *_codec)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *video_codec = tr_vcodec->video_codec;
+
+    trace_dump_call_begin("pipe_video_codec", "destroy");
+    trace_dump_arg(ptr, video_codec);
+    trace_dump_call_end();
+
+    video_codec->destroy(video_codec);
+
+    ralloc_free(tr_vcodec);
+}
+
+static void
+trace_video_codec_begin_frame(struct pipe_video_codec *_codec,
+                    struct pipe_video_buffer *_target,
+                    struct pipe_picture_desc *picture)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+    struct trace_video_buffer *tr_target = trace_video_buffer(_target);
+    struct pipe_video_buffer *target = tr_target->video_buffer;
+
+    trace_dump_call_begin("pipe_video_codec", "begin_frame");
+    trace_dump_arg(ptr, codec);
+    trace_dump_arg(ptr, target);
+    trace_dump_arg(pipe_picture_desc, picture);
+    trace_dump_call_end();
+
+    codec->begin_frame(codec, target, picture);
+}
+
+static void
+trace_video_codec_decode_macroblock(struct pipe_video_codec *_codec,
+                            struct pipe_video_buffer *_target,
+                            struct pipe_picture_desc *picture,
+                            const struct pipe_macroblock *macroblocks,
+                            unsigned num_macroblocks)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+    struct trace_video_buffer *tr_target = trace_video_buffer(_target);
+    struct pipe_video_buffer *target = tr_target->video_buffer;
+
+    trace_dump_call_begin("pipe_video_codec", "decode_macroblock");
+    trace_dump_arg(ptr, codec);
+    trace_dump_arg(ptr, target);
+    trace_dump_arg(pipe_picture_desc, picture);
+    // TODO: how to dump pipe_macroblocks? It's only a single pointer,
+    //  but each struct has codec dependent size, so can't use generic trace_dump_arg_array
+    trace_dump_arg(ptr, macroblocks);
+    trace_dump_arg(uint, num_macroblocks);
+    trace_dump_call_end();
+
+    codec->decode_macroblock(codec, target, picture, macroblocks, num_macroblocks);
+}
+
+static void 
+trace_video_codec_decode_bitstream(struct pipe_video_codec *_codec,
+                        struct pipe_video_buffer *_target,
+                        struct pipe_picture_desc *picture,
+                        unsigned num_buffers,
+                        const void * const *buffers,
+                        const unsigned *sizes)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+    struct trace_video_buffer *tr_target = trace_video_buffer(_target);
+    struct pipe_video_buffer *target = tr_target->video_buffer;
+
+    trace_dump_call_begin("pipe_video_codec", "decode_bitstream");
+    trace_dump_arg(ptr, codec);
+    trace_dump_arg(ptr, target);
+    trace_dump_arg(pipe_picture_desc, picture);
+
+    trace_dump_arg(uint, num_buffers);
+    trace_dump_arg_array(ptr, buffers, num_buffers);
+    trace_dump_arg_array(uint, sizes, num_buffers);
+    trace_dump_call_end();
+
+    codec->decode_bitstream(codec, target, picture, num_buffers, buffers, sizes);
+}
+
+static void
+trace_video_codec_encode_bitstream(struct pipe_video_codec *_codec,
+                        struct pipe_video_buffer *_source,
+                        struct pipe_resource *destination,
+                        void **feedback)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+    struct trace_video_buffer *tr_source = trace_video_buffer(_source);
+    struct pipe_video_buffer *source = tr_source->video_buffer;
+
+    trace_dump_call_begin("pipe_video_codec", "encode_bitstream");
+    trace_dump_arg(ptr, codec);
+    trace_dump_arg(ptr, source);
+    trace_dump_arg(ptr, destination);
+    trace_dump_arg(ptr, feedback);
+    trace_dump_call_end();
+
+    codec->encode_bitstream(codec, source, destination, feedback);
+}
+
+static void
+trace_video_codec_process_frame(struct pipe_video_codec *_codec,
+                        struct pipe_video_buffer *_source,
+                        const struct pipe_vpp_desc *process_properties)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+    struct trace_video_buffer *tr_source = trace_video_buffer(_source);
+    struct pipe_video_buffer *source = tr_source->video_buffer;
+
+    trace_dump_call_begin("pipe_video_codec", "process_frame");
+    trace_dump_arg(ptr, codec);
+    trace_dump_arg(ptr, source);
+    trace_dump_arg(pipe_vpp_desc, process_properties);
+    trace_dump_call_end();
+
+    codec->process_frame(codec, source, process_properties);
+}
+
+static void
+trace_video_codec_end_frame(struct pipe_video_codec *_codec,
+                    struct pipe_video_buffer *_target,
+                    struct pipe_picture_desc *picture)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+    struct trace_video_buffer *tr_target = trace_video_buffer(_target);
+    struct pipe_video_buffer *target = tr_target->video_buffer;
+
+    trace_dump_call_begin("pipe_video_codec", "end_frame");
+    trace_dump_arg(ptr, codec);
+    trace_dump_arg(ptr, target);
+    trace_dump_arg(pipe_picture_desc, picture);
+    trace_dump_call_end();
+
+    codec->end_frame(codec, target, picture);
+}
+
+static void
+trace_video_codec_flush(struct pipe_video_codec *_codec)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+
+    trace_dump_call_begin("pipe_video_codec", "flush");
+    trace_dump_arg(ptr, codec);
+    trace_dump_call_end();
+
+    codec->flush(codec);
+}
+
+static void
+trace_video_codec_get_feedback(struct pipe_video_codec *_codec, void *feedback, unsigned *size)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+
+    trace_dump_call_begin("pipe_video_codec", "get_feedback");
+    trace_dump_arg(ptr, codec);
+    trace_dump_arg(ptr, feedback);
+    trace_dump_arg(ptr, size);
+    trace_dump_call_end();
+
+    codec->get_feedback(codec, feedback, size);
+}
+
+static int
+trace_video_codec_get_decoder_fence(struct pipe_video_codec *_codec,
+                        struct pipe_fence_handle *fence,
+                        uint64_t timeout)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+
+    trace_dump_call_begin("pipe_video_codec", "get_decoder_fence");
+    trace_dump_arg(ptr, codec);
+    trace_dump_arg(ptr, fence);
+    trace_dump_arg(uint, timeout);
+
+    int ret = codec->get_decoder_fence(codec, fence, timeout);
+
+    trace_dump_ret(int, ret);
+    trace_dump_call_end();
+
+    return ret;
+}
+
+static int
+trace_video_codec_get_processor_fence(struct pipe_video_codec *_codec,
+                            struct pipe_fence_handle *fence,
+                            uint64_t timeout)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+
+    trace_dump_call_begin("pipe_video_codec", "get_processor_fence");
+    trace_dump_arg(ptr, codec);
+    trace_dump_arg(ptr, fence);
+    trace_dump_arg(uint, timeout);
+
+    int ret = codec->get_processor_fence(codec, fence, timeout);
+
+    trace_dump_ret(int, ret);
+    trace_dump_call_end();
+
+    return ret;
+}
+
+static void
+trace_video_codec_update_decoder_target(struct pipe_video_codec *_codec,
+                                struct pipe_video_buffer *_old,
+                                struct pipe_video_buffer *_updated)
+{
+    struct trace_video_codec *tr_vcodec = trace_video_codec(_codec);
+    struct pipe_video_codec *codec = tr_vcodec->video_codec;
+    struct trace_video_buffer *tr_old = trace_video_buffer(_old);
+    struct pipe_video_buffer *old = tr_old->video_buffer;
+    struct trace_video_buffer *tr_updated = trace_video_buffer(_updated);
+    struct pipe_video_buffer *updated = tr_updated->video_buffer;
+
+    trace_dump_call_begin("pipe_video_codec", "update_decoder_target");
+    trace_dump_arg(ptr, codec);
+    trace_dump_arg(ptr, old);
+    trace_dump_arg(ptr, updated);
+    trace_dump_call_end();
+
+    codec->update_decoder_target(codec, old, updated);
+}
+
+struct pipe_video_codec *
+trace_video_codec_create(struct trace_context *tr_ctx,
+                         struct pipe_video_codec *video_codec)
+{
+   struct trace_video_codec *tr_vcodec;
+
+   if (!video_codec)
+      goto error1;
+
+   if (!trace_enabled())
+      goto error1;
+
+   tr_vcodec = rzalloc(NULL, struct trace_video_codec);
+   if (!tr_vcodec)
+      goto error1;
+
+    memcpy(&tr_vcodec->base, video_codec, sizeof(struct pipe_video_codec));
+    tr_vcodec->base.context = &tr_ctx->base;
+
+#define TR_VC_INIT(_member) \
+   tr_vcodec->base . _member = video_codec -> _member ? trace_video_codec_ ## _member : NULL
+
+    TR_VC_INIT(destroy);
+    TR_VC_INIT(begin_frame);
+    TR_VC_INIT(decode_macroblock);
+    TR_VC_INIT(decode_bitstream);
+    TR_VC_INIT(encode_bitstream);
+    TR_VC_INIT(process_frame);
+    TR_VC_INIT(end_frame);
+    TR_VC_INIT(flush);
+    TR_VC_INIT(get_feedback);
+    TR_VC_INIT(get_decoder_fence);
+    TR_VC_INIT(get_processor_fence);
+    TR_VC_INIT(update_decoder_target);
+
+#undef TR_VC_INIT
+
+   tr_vcodec->video_codec = video_codec;
+
+   return &tr_vcodec->base;
+
+error1:
+   return video_codec;
+}
+
+
+static void
+trace_video_buffer_destroy(struct pipe_video_buffer *_buffer)
+{
+    struct trace_video_buffer *tr_vbuffer = trace_video_buffer(_buffer);
+    struct pipe_video_buffer *video_buffer = tr_vbuffer->video_buffer;
+
+    trace_dump_call_begin("pipe_video_buffer", "destroy");
+    trace_dump_arg(ptr, video_buffer);
+    trace_dump_call_end();
+
+    for (int i=0; i < VL_NUM_COMPONENTS; i++) {
+        pipe_sampler_view_reference(&tr_vbuffer->sampler_view_planes[i], NULL);
+        pipe_sampler_view_reference(&tr_vbuffer->sampler_view_components[i], NULL);
+    }
+    for (int i=0; i < VL_MAX_SURFACES; i++) {
+        pipe_surface_reference(&tr_vbuffer->surfaces[i], NULL);
+    }
+    video_buffer->destroy(video_buffer);
+
+    ralloc_free(tr_vbuffer);
+}
+
+static void
+trace_video_buffer_get_resources(struct pipe_video_buffer *_buffer, struct pipe_resource **resources)
+{
+    struct trace_video_buffer *tr_vbuffer = trace_video_buffer(_buffer);
+    struct pipe_video_buffer *buffer = tr_vbuffer->video_buffer;
+
+    trace_dump_call_begin("pipe_video_buffer", "get_resources");
+    trace_dump_arg(ptr, buffer);
+    trace_dump_arg(ptr, resources);
+    trace_dump_call_end();
+
+    buffer->get_resources(buffer, resources);
+}
+
+static struct pipe_sampler_view **
+trace_video_buffer_get_sampler_view_planes(struct pipe_video_buffer *_buffer)
+{
+    struct trace_context *tr_ctx = trace_context(_buffer->context);
+    struct trace_video_buffer *tr_vbuffer = trace_video_buffer(_buffer);
+    struct pipe_video_buffer *buffer = tr_vbuffer->video_buffer;
+
+    trace_dump_call_begin("pipe_video_buffer", "get_sampler_view_planes");
+    trace_dump_arg(ptr, buffer);
+
+    struct pipe_sampler_view **view_planes = buffer->get_sampler_view_planes(buffer);
+
+    trace_dump_ret(ptr, view_planes);
+    trace_dump_call_end();
+
+    for (int i=0; i < VL_NUM_COMPONENTS; i++) {
+        if (!view_planes[i]) {
+            pipe_sampler_view_reference(&tr_vbuffer->sampler_view_planes[i], NULL);
+        } else if (tr_vbuffer->sampler_view_planes[i] == NULL || (trace_sampler_view(tr_vbuffer->sampler_view_planes[i])->sampler_view != view_planes[i])) {
+            pipe_sampler_view_reference(&tr_vbuffer->sampler_view_planes[i], trace_sampler_view_create(tr_ctx, view_planes[i]->texture, view_planes[i]));
+        }
+    }
+
+    return tr_vbuffer->sampler_view_planes;
+}
+
+static struct pipe_sampler_view **
+trace_video_buffer_get_sampler_view_components(struct pipe_video_buffer *_buffer)
+{
+    struct trace_context *tr_ctx = trace_context(_buffer->context);
+    struct trace_video_buffer *tr_vbuffer = trace_video_buffer(_buffer);
+    struct pipe_video_buffer *buffer = tr_vbuffer->video_buffer;
+
+    trace_dump_call_begin("pipe_video_buffer", "get_sampler_view_components");
+    trace_dump_arg(ptr, buffer);
+
+    struct pipe_sampler_view **view_components = buffer->get_sampler_view_components(buffer);
+
+    trace_dump_ret(ptr, view_components);
+    trace_dump_call_end();
+
+    for (int i=0; i < VL_NUM_COMPONENTS; i++) {
+        if (!view_components[i]) {
+            pipe_sampler_view_reference(&tr_vbuffer->sampler_view_components[i], NULL);
+        } else if (tr_vbuffer->sampler_view_components[i] == NULL || (trace_sampler_view(tr_vbuffer->sampler_view_components[i])->sampler_view != view_components[i])) {
+            pipe_sampler_view_reference(&tr_vbuffer->sampler_view_components[i], trace_sampler_view_create(tr_ctx, view_components[i]->texture, view_components[i]));
+        }
+    }
+
+    return tr_vbuffer->sampler_view_components;
+}
+
+static struct pipe_surface **
+trace_video_buffer_get_surfaces(struct pipe_video_buffer *_buffer)
+{
+    struct trace_context *tr_ctx = trace_context(_buffer->context);
+    struct trace_video_buffer *tr_vbuffer = trace_video_buffer(_buffer);
+    struct pipe_video_buffer *buffer = tr_vbuffer->video_buffer;
+
+    trace_dump_call_begin("pipe_video_buffer", "get_surfaces");
+    trace_dump_arg(ptr, buffer);
+
+    struct pipe_surface **surfaces = buffer->get_surfaces(buffer);
+
+    trace_dump_ret(ptr, surfaces);
+    trace_dump_call_end();
+
+    for (int i=0; i < VL_MAX_SURFACES; i++) {
+        if (!surfaces[i]) {
+            pipe_surface_reference(&tr_vbuffer->surfaces[i], NULL);
+        } else if (tr_vbuffer->surfaces[i] == NULL || (trace_surface(tr_vbuffer->surfaces[i])->surface != surfaces[i])){
+            pipe_surface_reference(&tr_vbuffer->surfaces[i], trace_surf_create(tr_ctx, surfaces[i]->texture, surfaces[i]));
+        }
+    }
+
+    return tr_vbuffer->surfaces;
+}
+
+
+struct pipe_video_buffer *
+trace_video_buffer_create(struct trace_context *tr_ctx,
+                          struct pipe_video_buffer *video_buffer)
+{
+   struct trace_video_buffer *tr_vbuffer;
+
+   if (!video_buffer)
+      goto error1;
+
+   if (!trace_enabled())
+      goto error1;
+
+   tr_vbuffer = rzalloc(NULL, struct trace_video_buffer);
+   if (!tr_vbuffer)
+      goto error1;
+
+    memcpy(&tr_vbuffer->base, video_buffer, sizeof(struct pipe_video_buffer));
+    tr_vbuffer->base.context = &tr_ctx->base;
+
+#define TR_VB_INIT(_member) \
+   tr_vbuffer->base . _member = video_buffer -> _member ? trace_video_buffer_ ## _member : NULL
+
+    TR_VB_INIT(destroy);
+    TR_VB_INIT(get_resources);
+    TR_VB_INIT(get_sampler_view_planes);
+    TR_VB_INIT(get_sampler_view_components);
+    TR_VB_INIT(get_surfaces);
+
+#undef TR_VB_INIT
+
+   tr_vbuffer->video_buffer = video_buffer;
+
+   return &tr_vbuffer->base;
+
+error1:
+   return video_buffer;
+}
diff --git a/src/gallium/auxiliary/driver_trace/tr_video.h b/src/gallium/auxiliary/driver_trace/tr_video.h
new file mode 100644
index 00000000000..dd3412b58c3
--- /dev/null
+++ b/src/gallium/auxiliary/driver_trace/tr_video.h
@@ -0,0 +1,51 @@
+#ifndef TR_VIDEO_H_
+#define TR_VIDEO_H_
+
+
+#include "pipe/p_video_codec.h"
+#include "vl/vl_defines.h"
+
+#include "tr_context.h"
+
+
+struct trace_video_codec
+{
+   struct pipe_video_codec base;
+
+   struct pipe_video_codec *video_codec;
+};
+
+static inline struct trace_video_codec *
+trace_video_codec(struct pipe_video_codec *video_codec)
+{
+   assert(video_codec);
+   return (struct trace_video_codec *)video_codec;
+}
+
+struct pipe_video_codec *
+trace_video_codec_create(struct trace_context *tr_ctx, struct pipe_video_codec *video_codec);
+
+
+struct trace_video_buffer
+{
+   struct pipe_video_buffer base;
+
+   struct pipe_video_buffer *video_buffer;
+
+   struct pipe_sampler_view *sampler_view_planes[VL_NUM_COMPONENTS];
+   struct pipe_sampler_view *sampler_view_components[VL_NUM_COMPONENTS];
+   struct pipe_surface      *surfaces[VL_MAX_SURFACES];
+};
+
+static inline struct trace_video_buffer *
+trace_video_buffer(struct pipe_video_buffer *video_buffer)
+{
+   assert(video_buffer);
+   return (struct trace_video_buffer *)video_buffer;
+}
+
+struct pipe_video_buffer *
+trace_video_buffer_create(struct trace_context *tr_ctx, struct pipe_video_buffer *video_buffer);
+
+
+#endif /* TR_VIDEO_H_ */
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 03885428812..8547160ae3e 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -107,6 +107,8 @@ files_libgallium = files(
   'driver_trace/tr_screen.h',
   'driver_trace/tr_texture.c',
   'driver_trace/tr_texture.h',
+  'driver_trace/tr_video.c',
+  'driver_trace/tr_video.h',
   'hud/font.c',
   'hud/font.h',
   'hud/hud_context.c',