g3dvl: pipe_video_context interface, softpipe impl, auxiliary libs

6 files changed, 379 insertions, 2 deletions

diff --git a/src/gallium/drivers/softpipe/Makefile b/src/gallium/drivers/softpipe/Makefile
index 6ab3753762..bcb887a0b2 100644
--- a/src/gallium/drivers/softpipe/Makefile
+++ b/src/gallium/drivers/softpipe/Makefile
@@ -31,6 +31,7 @@ C_SOURCES = \
 	sp_tex_sample.c \
 	sp_tex_tile_cache.c \
 	sp_tile_cache.c \
-	sp_surface.c 
+	sp_surface.c \
+	sp_video_context.c
 
 include ../../Makefile.template
diff --git a/src/gallium/drivers/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
index 950c3d9955..aac9edf44e 100644
--- a/src/gallium/drivers/softpipe/SConscript
+++ b/src/gallium/drivers/softpipe/SConscript
@@ -33,6 +33,7 @@ softpipe = env.ConvenienceLibrary(
 		'sp_tex_tile_cache.c',
 		'sp_texture.c',
 		'sp_tile_cache.c',
+		'sp_video_context.c',
 	])
 
-Export('softpipe')
\ No newline at end of file
+Export('softpipe')
diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c
index 49b51afda7..45289380d0 100644
--- a/src/gallium/drivers/softpipe/sp_texture.c
+++ b/src/gallium/drivers/softpipe/sp_texture.c
@@ -381,6 +381,59 @@ softpipe_transfer_unmap(struct pipe_screen *screen,
    }
 }
 
+static struct pipe_video_surface*
+softpipe_video_surface_create(struct pipe_screen *screen,
+                              enum pipe_video_chroma_format chroma_format,
+                              unsigned width, unsigned height)
+{
+   struct softpipe_video_surface *sp_vsfc;
+   struct pipe_texture template;
+
+   assert(screen);
+   assert(width && height);
+
+   sp_vsfc = CALLOC_STRUCT(softpipe_video_surface);
+   if (!sp_vsfc)
+      return NULL;
+
+   pipe_reference_init(&sp_vsfc->base.reference, 1);
+   sp_vsfc->base.screen = screen;
+   sp_vsfc->base.chroma_format = chroma_format;
+   /*sp_vsfc->base.surface_format = PIPE_VIDEO_SURFACE_FORMAT_VUYA;*/
+   sp_vsfc->base.width = width;
+   sp_vsfc->base.height = height;
+
+   memset(&template, 0, sizeof(struct pipe_texture));
+   template.target = PIPE_TEXTURE_2D;
+   template.format = PIPE_FORMAT_X8R8G8B8_UNORM;
+   template.last_level = 0;
+   /* vl_mpeg12_mc_renderer expects this when it's initialized with pot_buffers=true */
+   template.width[0] = util_next_power_of_two(width);
+   template.height[0] = util_next_power_of_two(height);
+   template.depth[0] = 1;
+   pf_get_block(template.format, &template.block);
+   template.tex_usage = PIPE_TEXTURE_USAGE_SAMPLER | PIPE_TEXTURE_USAGE_RENDER_TARGET;
+
+   sp_vsfc->tex = screen->texture_create(screen, &template);
+   if (!sp_vsfc->tex)
+   {
+      FREE(sp_vsfc);
+      return NULL;
+   }
+
+   return &sp_vsfc->base;
+}
+
+
+static void
+softpipe_video_surface_destroy(struct pipe_video_surface *vsfc)
+{
+   struct softpipe_video_surface *sp_vsfc = softpipe_video_surface(vsfc);
+
+   pipe_texture_reference(&sp_vsfc->tex, NULL);
+   FREE(sp_vsfc);
+}
+
 
 void
 softpipe_init_screen_texture_funcs(struct pipe_screen *screen)
@@ -396,6 +449,9 @@ softpipe_init_screen_texture_funcs(struct pipe_screen *screen)
    screen->tex_transfer_destroy = softpipe_tex_transfer_destroy;
    screen->transfer_map = softpipe_transfer_map;
    screen->transfer_unmap = softpipe_transfer_unmap;
+
+   screen->video_surface_create = softpipe_video_surface_create;
+   screen->video_surface_destroy = softpipe_video_surface_destroy;
 }
 
 
diff --git a/src/gallium/drivers/softpipe/sp_texture.h b/src/gallium/drivers/softpipe/sp_texture.h
index 2537ab6a40..2ef64e1e7c 100644
--- a/src/gallium/drivers/softpipe/sp_texture.h
+++ b/src/gallium/drivers/softpipe/sp_texture.h
@@ -30,6 +30,7 @@
 
 
 #include "pipe/p_state.h"
+#include "pipe/p_video_state.h"
 
 
 struct pipe_context;
@@ -62,6 +63,15 @@ struct softpipe_transfer
    unsigned long offset;
 };
 
+struct softpipe_video_surface
+{
+   struct pipe_video_surface base;
+
+   /* The data is held here:
+    */
+   struct pipe_texture *tex;
+};
+
 
 /** cast wrappers */
 static INLINE struct softpipe_texture *
@@ -76,6 +86,12 @@ softpipe_transfer(struct pipe_transfer *pt)
    return (struct softpipe_transfer *) pt;
 }
 
+static INLINE struct softpipe_video_surface *
+softpipe_video_surface(struct pipe_video_surface *pvs)
+{
+   return (struct softpipe_video_surface *) pvs;
+}
+
 
 extern void
 softpipe_init_screen_texture_funcs(struct pipe_screen *screen);
diff --git a/src/gallium/drivers/softpipe/sp_video_context.c b/src/gallium/drivers/softpipe/sp_video_context.c
new file mode 100644
index 0000000000..1b47bbede2
--- /dev/null
+++ b/src/gallium/drivers/softpipe/sp_video_context.c
@@ -0,0 +1,273 @@
+#include "sp_video_context.h"
+#include <pipe/p_inlines.h>
+#include <util/u_memory.h>
+#include "softpipe/sp_winsys.h"
+#include "softpipe/sp_texture.h"
+
+static void
+sp_mpeg12_destroy(struct pipe_video_context *vpipe)
+{
+	struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
+
+	assert(vpipe);
+	
+	/* Asserted in softpipe_delete_fs_state() for some reason */
+	ctx->pipe->bind_vs_state(ctx->pipe, NULL);
+	ctx->pipe->bind_fs_state(ctx->pipe, NULL);
+
+	ctx->pipe->delete_blend_state(ctx->pipe, ctx->blend);
+	ctx->pipe->delete_rasterizer_state(ctx->pipe, ctx->rast);
+	ctx->pipe->delete_depth_stencil_alpha_state(ctx->pipe, ctx->dsa);
+
+	pipe_video_surface_reference(&ctx->decode_target, NULL);
+	vl_compositor_cleanup(&ctx->compositor);
+	vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
+	ctx->pipe->destroy(ctx->pipe);
+
+	FREE(ctx);
+}
+
+static void
+sp_mpeg12_decode_macroblocks(struct pipe_video_context *vpipe,
+                             struct pipe_video_surface *past,
+                             struct pipe_video_surface *future,
+                             unsigned num_macroblocks,
+                             struct pipe_macroblock *macroblocks,
+                             struct pipe_fence_handle **fence)
+{
+	struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
+	struct pipe_mpeg12_macroblock *mpeg12_macroblocks = (struct pipe_mpeg12_macroblock*)macroblocks;
+
+	assert(vpipe);
+	assert(num_macroblocks);
+	assert(macroblocks);
+	assert(macroblocks->codec == PIPE_VIDEO_CODEC_MPEG12);
+	assert(ctx->decode_target);
+
+	vl_mpeg12_mc_renderer_render_macroblocks(&ctx->mc_renderer,
+	                                         softpipe_video_surface(ctx->decode_target)->tex,
+	                                         past ? softpipe_video_surface(past)->tex : NULL,
+	                                         future ? softpipe_video_surface(future)->tex : NULL,
+	                                         num_macroblocks, mpeg12_macroblocks, fence);
+}
+
+static void
+sp_mpeg12_clear_surface(struct pipe_video_context *vpipe,
+                        unsigned x, unsigned y,
+                        unsigned width, unsigned height,
+                        unsigned value,
+                        struct pipe_surface *surface)
+{
+	struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
+
+	assert(vpipe);
+	assert(surface);
+
+	ctx->pipe->surface_fill(ctx->pipe, surface, x, y, width, height, value);
+}
+
+static void
+sp_mpeg12_render_picture(struct pipe_video_context     *vpipe,
+                         /*struct pipe_surface         *backround,
+                         struct pipe_video_rect        *backround_area,*/
+                         struct pipe_video_surface     *src_surface,
+                         enum pipe_mpeg12_picture_type picture_type,
+                         /*unsigned                    num_past_surfaces,
+                         struct pipe_video_surface     *past_surfaces,
+                         unsigned                      num_future_surfaces,
+                         struct pipe_video_surface     *future_surfaces,*/
+                         struct pipe_video_rect        *src_area,
+                         struct pipe_surface           *dst_surface,
+                         struct pipe_video_rect        *dst_area,
+                         /*unsigned                      num_layers,
+                         struct pipe_surface           *layers,
+                         struct pipe_video_rect        *layer_src_areas,
+                         struct pipe_video_rect        *layer_dst_areas*/
+                         struct pipe_fence_handle      **fence)
+{
+	struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
+	
+	assert(vpipe);
+	assert(src_surface);
+	assert(src_area);
+	assert(dst_surface);
+	assert(dst_area);
+	
+	vl_compositor_render(&ctx->compositor, softpipe_video_surface(src_surface)->tex,
+	                     picture_type, src_area, dst_surface->texture, dst_area, fence);
+}
+
+static void
+sp_mpeg12_set_decode_target(struct pipe_video_context *vpipe,
+                            struct pipe_video_surface *dt)
+{
+	struct sp_mpeg12_context *ctx = (struct sp_mpeg12_context*)vpipe;
+
+	assert(vpipe);
+	assert(dt);
+
+	pipe_video_surface_reference(&ctx->decode_target, dt);
+}
+
+static bool
+init_pipe_state(struct sp_mpeg12_context *ctx)
+{
+	struct pipe_rasterizer_state rast;
+	struct pipe_blend_state blend;
+	struct pipe_depth_stencil_alpha_state dsa;
+
+	assert(ctx);
+	
+	rast.flatshade = 1;
+	rast.flatshade_first = 0;
+	rast.light_twoside = 0;
+	rast.front_winding = PIPE_WINDING_CCW;
+	rast.cull_mode = PIPE_WINDING_CW;
+	rast.fill_cw = PIPE_POLYGON_MODE_FILL;
+	rast.fill_ccw = PIPE_POLYGON_MODE_FILL;
+	rast.offset_cw = 0;
+	rast.offset_ccw = 0;
+	rast.scissor = 0;
+	rast.poly_smooth = 0;
+	rast.poly_stipple_enable = 0;
+	rast.point_sprite = 0;
+	rast.point_size_per_vertex = 0;
+	rast.multisample = 0;
+	rast.line_smooth = 0;
+	rast.line_stipple_enable = 0;
+	rast.line_stipple_factor = 0;
+	rast.line_stipple_pattern = 0;
+	rast.line_last_pixel = 0;
+	rast.bypass_vs_clip_and_viewport = 0;
+	rast.line_width = 1;
+	rast.point_smooth = 0;
+	rast.point_size = 1;
+	rast.offset_units = 1;
+	rast.offset_scale = 1;
+	/*rast.sprite_coord_mode[i] = ;*/
+	ctx->rast = ctx->pipe->create_rasterizer_state(ctx->pipe, &rast);
+	ctx->pipe->bind_rasterizer_state(ctx->pipe, ctx->rast);
+
+	blend.blend_enable = 0;
+	blend.rgb_func = PIPE_BLEND_ADD;
+	blend.rgb_src_factor = PIPE_BLENDFACTOR_ONE;
+	blend.rgb_dst_factor = PIPE_BLENDFACTOR_ONE;
+	blend.alpha_func = PIPE_BLEND_ADD;
+	blend.alpha_src_factor = PIPE_BLENDFACTOR_ONE;
+	blend.alpha_dst_factor = PIPE_BLENDFACTOR_ONE;
+	blend.logicop_enable = 0;
+	blend.logicop_func = PIPE_LOGICOP_CLEAR;
+	/* Needed to allow color writes to FB, even if blending disabled */
+	blend.colormask = PIPE_MASK_RGBA;
+	blend.dither = 0;
+	ctx->blend = ctx->pipe->create_blend_state(ctx->pipe, &blend);
+	ctx->pipe->bind_blend_state(ctx->pipe, ctx->blend);
+
+	dsa.depth.enabled = 0;
+	dsa.depth.writemask = 0;
+	dsa.depth.func = PIPE_FUNC_ALWAYS;
+	dsa.depth.occlusion_count = 0;
+	for (unsigned i = 0; i < 2; ++i)
+	{
+		dsa.stencil[i].enabled = 0;
+		dsa.stencil[i].func = PIPE_FUNC_ALWAYS;
+		dsa.stencil[i].fail_op = PIPE_STENCIL_OP_KEEP;
+		dsa.stencil[i].zpass_op = PIPE_STENCIL_OP_KEEP;
+		dsa.stencil[i].zfail_op = PIPE_STENCIL_OP_KEEP;
+		dsa.stencil[i].ref_value = 0;
+		dsa.stencil[i].valuemask = 0;
+		dsa.stencil[i].writemask = 0;
+	}
+	dsa.alpha.enabled = 0;
+	dsa.alpha.func = PIPE_FUNC_ALWAYS;
+	dsa.alpha.ref_value = 0;
+	ctx->dsa = ctx->pipe->create_depth_stencil_alpha_state(ctx->pipe, &dsa);
+	ctx->pipe->bind_depth_stencil_alpha_state(ctx->pipe, ctx->dsa);
+	
+	return true;
+}
+
+static struct pipe_video_context *
+sp_mpeg12_create(struct pipe_screen *screen, enum pipe_video_profile profile,
+                 enum pipe_video_chroma_format chroma_format,
+                 unsigned width, unsigned height)
+{
+	struct sp_mpeg12_context *ctx;
+
+	assert(u_reduce_video_profile(profile) == PIPE_VIDEO_CODEC_MPEG12);
+
+	ctx = CALLOC_STRUCT(sp_mpeg12_context);
+
+	if (!ctx)
+		return NULL;
+
+	ctx->base.profile = profile;
+	ctx->base.chroma_format = chroma_format;
+	ctx->base.width = width;
+	ctx->base.height = height;
+
+	ctx->base.screen = screen;
+	ctx->base.destroy = sp_mpeg12_destroy;
+	ctx->base.decode_macroblocks = sp_mpeg12_decode_macroblocks;
+	ctx->base.clear_surface = sp_mpeg12_clear_surface;
+	ctx->base.render_picture = sp_mpeg12_render_picture;
+	ctx->base.set_decode_target = sp_mpeg12_set_decode_target;
+
+	ctx->pipe = softpipe_create(screen);
+	if (!ctx->pipe)
+	{
+		FREE(ctx);
+		return NULL;
+	}
+
+	/* TODO: Use slice buffering for softpipe when implemented, no advantage to buffering an entire picture */
+	if (!vl_mpeg12_mc_renderer_init(&ctx->mc_renderer, ctx->pipe,
+	                                width, height, chroma_format,
+	                                VL_MPEG12_MC_RENDERER_BUFFER_PICTURE,
+	                                /* TODO: Use XFER_NONE when implemented */
+	                                VL_MPEG12_MC_RENDERER_EMPTY_BLOCK_XFER_ONE,
+	                                true))
+	{
+		ctx->pipe->destroy(ctx->pipe);
+		FREE(ctx);
+		return NULL;
+	}
+	
+	if (!vl_compositor_init(&ctx->compositor, ctx->pipe))
+	{
+		vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
+		ctx->pipe->destroy(ctx->pipe);
+		FREE(ctx);
+		return NULL;
+	}
+	
+	if (!init_pipe_state(ctx))
+	{
+		vl_compositor_cleanup(&ctx->compositor);
+		vl_mpeg12_mc_renderer_cleanup(&ctx->mc_renderer);
+		ctx->pipe->destroy(ctx->pipe);
+		FREE(ctx);
+		return NULL;
+	}
+
+	return &ctx->base;
+}
+
+struct pipe_video_context *
+sp_video_create(struct pipe_screen *screen, enum pipe_video_profile profile,
+                enum pipe_video_chroma_format chroma_format,
+                unsigned width, unsigned height)
+{
+	assert(screen);
+	assert(width && height);
+
+	switch (u_reduce_video_profile(profile))
+	{
+		case PIPE_VIDEO_CODEC_MPEG12:
+			return sp_mpeg12_create(screen, profile,
+			                        chroma_format,
+			                        width, height);
+		default:
+			return NULL;
+	}
+}
diff --git a/src/gallium/drivers/softpipe/sp_video_context.h b/src/gallium/drivers/softpipe/sp_video_context.h
new file mode 100644
index 0000000000..a70ce9f476
--- /dev/null
+++ b/src/gallium/drivers/softpipe/sp_video_context.h
@@ -0,0 +1,30 @@
+#ifndef SP_VIDEO_CONTEXT_H
+#define SP_VIDEO_CONTEXT_H
+
+#include <pipe/p_video_context.h>
+#include <vl/vl_mpeg12_mc_renderer.h>
+#include <vl/vl_compositor.h>
+
+struct pipe_screen;
+struct pipe_context;
+struct pipe_video_surface;
+
+struct sp_mpeg12_context
+{
+	struct pipe_video_context base;
+	struct pipe_context *pipe;
+	struct pipe_video_surface *decode_target;
+	struct vl_mpeg12_mc_renderer mc_renderer;
+	struct vl_compositor compositor;
+
+	void *rast;
+	void *dsa;
+	void *blend;
+};
+
+struct pipe_video_context *
+sp_video_create(struct pipe_screen *screen, enum pipe_video_profile profile,
+                enum pipe_video_chroma_format chroma_format,
+                unsigned width, unsigned height);
+
+#endif /* SP_VIDEO_CONTEXT_H */