summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gallium/auxiliary/Makefile2
-rw-r--r--src/gallium/auxiliary/vl/vl_mc.c (renamed from src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c)40
-rw-r--r--src/gallium/auxiliary/vl/vl_mc.h (renamed from src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h)26
-rw-r--r--src/gallium/auxiliary/vl/vl_mpeg12_decoder.h6
4 files changed, 37 insertions, 37 deletions
diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index 425ae78138b..d210a25510b 100644
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -149,11 +149,11 @@ C_SOURCES = \
util/u_vbuf_mgr.c \
vl/vl_context.c \
vl/vl_bitstream_parser.c \
- vl/vl_mpeg12_mc_renderer.c \
vl/vl_mpeg12_decoder.c \
vl/vl_compositor.c \
vl/vl_csc.c \
vl/vl_idct.c \
+ vl/vl_mc.c \
vl/vl_vertex_buffers.c \
vl/vl_video_buffer.c
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c b/src/gallium/auxiliary/vl/vl_mc.c
index eae546aefcc..707a4a27077 100644
--- a/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
+++ b/src/gallium/auxiliary/vl/vl_mc.c
@@ -36,7 +36,7 @@
#include "vl_defines.h"
#include "vl_vertex_buffers.h"
-#include "vl_mpeg12_mc_renderer.h"
+#include "vl_mc.h"
enum VS_OUTPUT
{
@@ -47,7 +47,7 @@ enum VS_OUTPUT
};
static struct ureg_dst
-calc_position(struct vl_mpeg12_mc_renderer *r, struct ureg_program *shader)
+calc_position(struct vl_mc *r, struct ureg_program *shader)
{
struct ureg_src block_scale;
struct ureg_src vrect, vpos;
@@ -81,7 +81,7 @@ calc_position(struct vl_mpeg12_mc_renderer *r, struct ureg_program *shader)
}
static void *
-create_ycbcr_vert_shader(struct vl_mpeg12_mc_renderer *r)
+create_ycbcr_vert_shader(struct vl_mc *r)
{
struct ureg_program *shader;
struct ureg_src block_scale;
@@ -176,7 +176,7 @@ create_ycbcr_vert_shader(struct vl_mpeg12_mc_renderer *r)
}
static void *
-create_ref_vert_shader(struct vl_mpeg12_mc_renderer *r)
+create_ref_vert_shader(struct vl_mc *r)
{
struct ureg_program *shader;
struct ureg_src mv_scale;
@@ -259,7 +259,7 @@ calc_field(struct ureg_program *shader)
}
static void *
-create_ycbcr_frag_shader(struct vl_mpeg12_mc_renderer *r, float scale)
+create_ycbcr_frag_shader(struct vl_mc *r, float scale)
{
struct ureg_program *shader;
struct ureg_src tc[2], sampler;
@@ -318,7 +318,7 @@ create_ycbcr_frag_shader(struct vl_mpeg12_mc_renderer *r, float scale)
}
static void *
-create_ref_frag_shader(struct vl_mpeg12_mc_renderer *r)
+create_ref_frag_shader(struct vl_mc *r)
{
const float y_scale =
r->buffer_height / 2 *
@@ -387,7 +387,7 @@ create_ref_frag_shader(struct vl_mpeg12_mc_renderer *r)
}
static bool
-init_pipe_state(struct vl_mpeg12_mc_renderer *r)
+init_pipe_state(struct vl_mc *r)
{
struct pipe_sampler_state sampler;
struct pipe_blend_state blend;
@@ -467,7 +467,7 @@ error_sampler_ycbcr:
}
static void
-cleanup_pipe_state(struct vl_mpeg12_mc_renderer *r)
+cleanup_pipe_state(struct vl_mc *r)
{
assert(r);
@@ -479,14 +479,14 @@ cleanup_pipe_state(struct vl_mpeg12_mc_renderer *r)
}
bool
-vl_mc_init(struct vl_mpeg12_mc_renderer *renderer, struct pipe_context *pipe,
+vl_mc_init(struct vl_mc *renderer, struct pipe_context *pipe,
unsigned buffer_width, unsigned buffer_height,
unsigned macroblock_size, float scale)
{
assert(renderer);
assert(pipe);
- memset(renderer, 0, sizeof(struct vl_mpeg12_mc_renderer));
+ memset(renderer, 0, sizeof(struct vl_mc));
renderer->pipe = pipe;
renderer->buffer_width = buffer_width;
@@ -531,7 +531,7 @@ error_pipe_state:
}
void
-vl_mc_cleanup(struct vl_mpeg12_mc_renderer *renderer)
+vl_mc_cleanup(struct vl_mc *renderer)
{
assert(renderer);
@@ -544,7 +544,7 @@ vl_mc_cleanup(struct vl_mpeg12_mc_renderer *renderer)
}
bool
-vl_mc_init_buffer(struct vl_mpeg12_mc_renderer *renderer, struct vl_mpeg12_mc_buffer *buffer,
+vl_mc_init_buffer(struct vl_mc *renderer, struct vl_mc_buffer *buffer,
struct pipe_sampler_view *source)
{
assert(renderer && buffer);
@@ -568,7 +568,7 @@ vl_mc_init_buffer(struct vl_mpeg12_mc_renderer *renderer, struct vl_mpeg12_mc_bu
}
void
-vl_mc_cleanup_buffer(struct vl_mpeg12_mc_buffer *buffer)
+vl_mc_cleanup_buffer(struct vl_mc_buffer *buffer)
{
assert(buffer);
@@ -576,7 +576,7 @@ vl_mc_cleanup_buffer(struct vl_mpeg12_mc_buffer *buffer)
}
void
-vl_mc_set_surface(struct vl_mpeg12_mc_buffer *buffer, struct pipe_surface *surface)
+vl_mc_set_surface(struct vl_mc_buffer *buffer, struct pipe_surface *surface)
{
assert(buffer && surface);
@@ -591,9 +591,9 @@ vl_mc_set_surface(struct vl_mpeg12_mc_buffer *buffer, struct pipe_surface *surfa
}
static void
-prepare_pipe_4_rendering(struct vl_mpeg12_mc_buffer *buffer)
+prepare_pipe_4_rendering(struct vl_mc_buffer *buffer)
{
- struct vl_mpeg12_mc_renderer *renderer;
+ struct vl_mc *renderer;
assert(buffer);
@@ -612,11 +612,11 @@ prepare_pipe_4_rendering(struct vl_mpeg12_mc_buffer *buffer)
}
void
-vl_mc_render_ref(struct vl_mpeg12_mc_buffer *buffer, struct pipe_sampler_view *ref,
+vl_mc_render_ref(struct vl_mc_buffer *buffer, struct pipe_sampler_view *ref,
unsigned not_empty_start_instance, unsigned not_empty_num_instances,
unsigned empty_start_instance, unsigned empty_num_instances)
{
- struct vl_mpeg12_mc_renderer *renderer;
+ struct vl_mc *renderer;
assert(buffer && ref);
@@ -643,10 +643,10 @@ vl_mc_render_ref(struct vl_mpeg12_mc_buffer *buffer, struct pipe_sampler_view *r
}
void
-vl_mc_render_ycbcr(struct vl_mpeg12_mc_buffer *buffer,
+vl_mc_render_ycbcr(struct vl_mc_buffer *buffer,
unsigned not_empty_start_instance, unsigned not_empty_num_instances)
{
- struct vl_mpeg12_mc_renderer *renderer;
+ struct vl_mc *renderer;
assert(buffer);
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h b/src/gallium/auxiliary/vl/vl_mc.h
index 4137ac407d2..e5b16b5b9da 100644
--- a/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h
+++ b/src/gallium/auxiliary/vl/vl_mc.h
@@ -25,8 +25,8 @@
*
**************************************************************************/
-#ifndef vl_mpeg12_mc_renderer_h
-#define vl_mpeg12_mc_renderer_h
+#ifndef vl_mc_h
+#define vl_mc_h
#include <pipe/p_state.h>
#include <pipe/p_video_state.h>
@@ -35,7 +35,7 @@
struct pipe_context;
-struct vl_mpeg12_mc_renderer
+struct vl_mc
{
struct pipe_context *pipe;
unsigned buffer_width;
@@ -50,9 +50,9 @@ struct vl_mpeg12_mc_renderer
void *sampler_ref, *sampler_ycbcr;
};
-struct vl_mpeg12_mc_buffer
+struct vl_mc_buffer
{
- struct vl_mpeg12_mc_renderer *renderer;
+ struct vl_mc *renderer;
bool surface_cleared;
@@ -62,24 +62,24 @@ struct vl_mpeg12_mc_buffer
struct pipe_sampler_view *source;
};
-bool vl_mc_init(struct vl_mpeg12_mc_renderer *renderer, struct pipe_context *pipe,
+bool vl_mc_init(struct vl_mc *renderer, struct pipe_context *pipe,
unsigned picture_width, unsigned picture_height,
unsigned macroblock_size, float scale);
-void vl_mc_cleanup(struct vl_mpeg12_mc_renderer *renderer);
+void vl_mc_cleanup(struct vl_mc *renderer);
-bool vl_mc_init_buffer(struct vl_mpeg12_mc_renderer *renderer, struct vl_mpeg12_mc_buffer *buffer,
+bool vl_mc_init_buffer(struct vl_mc *renderer, struct vl_mc_buffer *buffer,
struct pipe_sampler_view *source);
-void vl_mc_cleanup_buffer(struct vl_mpeg12_mc_buffer *buffer);
+void vl_mc_cleanup_buffer(struct vl_mc_buffer *buffer);
-void vl_mc_set_surface(struct vl_mpeg12_mc_buffer *buffer, struct pipe_surface *surface);
+void vl_mc_set_surface(struct vl_mc_buffer *buffer, struct pipe_surface *surface);
-void vl_mc_render_ref(struct vl_mpeg12_mc_buffer *buffer, struct pipe_sampler_view *ref,
+void vl_mc_render_ref(struct vl_mc_buffer *buffer, struct pipe_sampler_view *ref,
unsigned not_empty_start_instance, unsigned not_empty_num_instances,
unsigned empty_start_instance, unsigned empty_num_instances);
-void vl_mc_render_ycbcr(struct vl_mpeg12_mc_buffer *buffer,
+void vl_mc_render_ycbcr(struct vl_mc_buffer *buffer,
unsigned not_empty_start_instance, unsigned not_empty_num_instances);
-#endif /* vl_mpeg12_mc_renderer_h */
+#endif /* vl_mc_h */
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h
index 6f93c5a01ab..4d494b0bd2a 100644
--- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h
+++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h
@@ -31,7 +31,7 @@
#include <pipe/p_video_context.h>
#include "vl_idct.h"
-#include "vl_mpeg12_mc_renderer.h"
+#include "vl_mc.h"
#include "vl_vertex_buffers.h"
#include "vl_video_buffer.h"
@@ -56,7 +56,7 @@ struct vl_mpeg12_decoder
void *ves_mv[2];
struct vl_idct idct_y, idct_c;
- struct vl_mpeg12_mc_renderer mc_y, mc_c;
+ struct vl_mc mc_y, mc_c;
void *dsa;
void *blend;
@@ -81,7 +81,7 @@ struct vl_mpeg12_buffer
} vertex_bufs;
struct vl_idct_buffer idct[VL_MAX_PLANES];
- struct vl_mpeg12_mc_buffer mc[VL_MAX_PLANES];
+ struct vl_mc_buffer mc[VL_MAX_PLANES];
struct pipe_transfer *tex_transfer[VL_MAX_PLANES];
short *texels[VL_MAX_PLANES];
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 01:03:06 +0000