#ifndef vl_compositor_h
#define vl_compositor_h
-#include <pipe/p_state.h>
-#include <pipe/p_video_decoder.h>
-#include <pipe/p_video_state.h>
+#include "pipe/p_state.h"
+#include "pipe/p_video_decoder.h"
+#include "pipe/p_video_state.h"
+
+#include "util/u_rect.h"
#include "vl_types.h"
+#include "vl_csc.h"
struct pipe_context;
#define VL_COMPOSITOR_MAX_LAYERS 16
+/* deinterlace allgorithem */
+enum vl_compositor_deinterlace
+{
+ VL_COMPOSITOR_WEAVE,
+ VL_COMPOSITOR_BOB_TOP,
+ VL_COMPOSITOR_BOB_BOTTOM
+};
+
struct vl_compositor_layer
{
bool clearing;
+ bool viewport_valid;
+ struct pipe_viewport_state viewport;
+
void *fs;
void *samplers[3];
+ void *blend;
struct pipe_sampler_view *sampler_views[3];
struct {
struct vertex2f tl, br;
} src, dst;
+ struct vertex2f zw;
+ struct vertex4f colors[4];
+};
+
+struct vl_compositor_state
+{
+ struct pipe_context *pipe;
+
+ bool scissor_valid;
+ struct pipe_scissor_state scissor;
+ struct pipe_resource *csc_matrix;
+
+ union pipe_color_union clear_color;
+
+ unsigned used_layers:VL_COMPOSITOR_MAX_LAYERS;
+ struct vl_compositor_layer layers[VL_COMPOSITOR_MAX_LAYERS];
};
struct vl_compositor
struct pipe_context *pipe;
struct pipe_framebuffer_state fb_state;
- struct pipe_viewport_state viewport;
struct pipe_vertex_buffer vertex_buf;
- struct pipe_resource *csc_matrix;
void *sampler_linear;
void *sampler_nearest;
- void *blend;
+ void *blend_clear, *blend_add;
void *rast;
void *dsa;
void *vertex_elems_state;
void *vs;
void *fs_video_buffer;
- void *fs_palette;
+ void *fs_weave;
void *fs_rgba;
- float clear_color[4];
- struct vertex2f dirty_tl, dirty_br;
-
- unsigned used_layers:VL_COMPOSITOR_MAX_LAYERS;
- struct vl_compositor_layer layers[VL_COMPOSITOR_MAX_LAYERS];
+ struct {
+ void *rgb;
+ void *yuv;
+ } fs_palette;
};
/**
bool
vl_compositor_init(struct vl_compositor *compositor, struct pipe_context *pipe);
+/**
+ * init state bag
+ */
+bool
+vl_compositor_init_state(struct vl_compositor_state *state, struct pipe_context *pipe);
+
/**
* set yuv -> rgba conversion matrix
*/
void
-vl_compositor_set_csc_matrix(struct vl_compositor *compositor, const float mat[16]);
+vl_compositor_set_csc_matrix(struct vl_compositor_state *settings, const vl_csc_matrix *matrix);
/**
* reset dirty area, so it's cleared with the clear colour
*/
void
-vl_compositor_reset_dirty_area(struct vl_compositor *compositor);
+vl_compositor_reset_dirty_area(struct u_rect *dirty);
/**
* set the clear color
*/
void
-vl_compositor_set_clear_color(struct vl_compositor *compositor, float color[4]);
+vl_compositor_set_clear_color(struct vl_compositor_state *settings, union pipe_color_union *color);
+
+/**
+ * get the clear color
+ */
+void
+vl_compositor_get_clear_color(struct vl_compositor_state *settings, union pipe_color_union *color);
+
+/**
+ * set the destination clipping
+ */
+void
+vl_compositor_set_dst_clip(struct vl_compositor_state *settings, struct u_rect *dst_clip);
/**
* set overlay samplers
* reset all currently set layers
*/
void
-vl_compositor_clear_layers(struct vl_compositor *compositor);
+vl_compositor_clear_layers(struct vl_compositor_state *state);
+
+/**
+ * set the blender used to render a layer
+ */
+void
+vl_compositor_set_layer_blend(struct vl_compositor_state *state,
+ unsigned layer, void *blend, bool is_clearing);
+
+/**
+ * set the layer destination area
+ */
+void
+vl_compositor_set_layer_dst_area(struct vl_compositor_state *settings,
+ unsigned layer, struct u_rect *dst_area);
/**
* set a video buffer as a layer to render
*/
void
-vl_compositor_set_buffer_layer(struct vl_compositor *compositor,
+vl_compositor_set_buffer_layer(struct vl_compositor_state *state,
+ struct vl_compositor *compositor,
unsigned layer,
struct pipe_video_buffer *buffer,
- struct pipe_video_rect *src_rect,
- struct pipe_video_rect *dst_rect);
+ struct u_rect *src_rect,
+ struct u_rect *dst_rect,
+ enum vl_compositor_deinterlace deinterlace);
/**
* set a paletted sampler as a layer to render
*/
void
-vl_compositor_set_palette_layer(struct vl_compositor *compositor,
+vl_compositor_set_palette_layer(struct vl_compositor_state *state,
+ struct vl_compositor *compositor,
unsigned layer,
struct pipe_sampler_view *indexes,
struct pipe_sampler_view *palette,
- struct pipe_video_rect *src_rect,
- struct pipe_video_rect *dst_rect);
+ struct u_rect *src_rect,
+ struct u_rect *dst_rect,
+ bool include_color_conversion);
/**
* set a rgba sampler as a layer to render
*/
void
-vl_compositor_set_rgba_layer(struct vl_compositor *compositor,
+vl_compositor_set_rgba_layer(struct vl_compositor_state *state,
+ struct vl_compositor *compositor,
unsigned layer,
struct pipe_sampler_view *rgba,
- struct pipe_video_rect *src_rect,
- struct pipe_video_rect *dst_rect);
+ struct u_rect *src_rect,
+ struct u_rect *dst_rect,
+ struct vertex4f *colors);
/*@}*/
* render the layers to the frontbuffer
*/
void
-vl_compositor_render(struct vl_compositor *compositor,
- enum pipe_mpeg12_picture_type picture_type,
- struct pipe_surface *dst_surface,
- struct pipe_video_rect *dst_area,
- struct pipe_video_rect *dst_clip);
+vl_compositor_render(struct vl_compositor_state *state,
+ struct vl_compositor *compositor,
+ struct pipe_surface *dst_surface,
+ struct u_rect *dirty_area,
+ bool clear_dirty);
/**
-* destroy this compositor
-*/
+ * destroy this compositor
+ */
void
vl_compositor_cleanup(struct vl_compositor *compositor);
+/**
+ * destroy this state bag
+ */
+void
+vl_compositor_cleanup_state(struct vl_compositor_state *state);
+
#endif /* vl_compositor_h */
projects / mesa.git / blobdiff