diff options
Diffstat (limited to 'src/gallium/drivers')
23 files changed, 81 insertions, 81 deletions
diff --git a/src/gallium/drivers/ilo/ilo_video.c b/src/gallium/drivers/ilo/ilo_video.c index 95305db37b1..04be1da81a2 100644 --- a/src/gallium/drivers/ilo/ilo_video.c +++ b/src/gallium/drivers/ilo/ilo_video.c @@ -35,9 +35,9 @@ * Nothing here. We could make use of the video codec engine someday. */ -static struct pipe_video_decoder * +static struct pipe_video_codec * ilo_create_video_decoder(struct pipe_context *pipe, - const struct pipe_video_decoder *templ) + const struct pipe_video_codec *templ) { return vl_create_decoder(pipe, templ); } @@ -55,6 +55,6 @@ ilo_create_video_buffer(struct pipe_context *pipe, void ilo_init_video_functions(struct ilo_context *ilo) { - ilo->base.create_video_decoder = ilo_create_video_decoder; + ilo->base.create_video_codec = ilo_create_video_decoder; ilo->base.create_video_buffer = ilo_create_video_buffer; } diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c index 9cf5e349bd7..67b67392bbc 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.c +++ b/src/gallium/drivers/nouveau/nouveau_video.c @@ -403,14 +403,14 @@ nouveau_decoder_surface_index(struct nouveau_decoder *dec, } static void -nouveau_decoder_begin_frame(struct pipe_video_decoder *decoder, +nouveau_decoder_begin_frame(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture) { } static void -nouveau_decoder_decode_macroblock(struct pipe_video_decoder *decoder, +nouveau_decoder_decode_macroblock(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture, const struct pipe_macroblock *pipe_mb, @@ -457,14 +457,14 @@ nouveau_decoder_decode_macroblock(struct pipe_video_decoder *decoder, } static void -nouveau_decoder_end_frame(struct pipe_video_decoder *decoder, +nouveau_decoder_end_frame(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture) { } static void -nouveau_decoder_flush(struct pipe_video_decoder *decoder) +nouveau_decoder_flush(struct pipe_video_codec *decoder) { struct nouveau_decoder *dec = (struct nouveau_decoder *)decoder; if (dec->ofs) @@ -472,7 +472,7 @@ nouveau_decoder_flush(struct pipe_video_decoder *decoder) } static void -nouveau_decoder_destroy(struct pipe_video_decoder *decoder) +nouveau_decoder_destroy(struct pipe_video_codec *decoder) { struct nouveau_decoder *dec = (struct nouveau_decoder*)decoder; @@ -497,9 +497,9 @@ nouveau_decoder_destroy(struct pipe_video_decoder *decoder) FREE(dec); } -static struct pipe_video_decoder * +static struct pipe_video_codec * nouveau_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ, + const struct pipe_video_codec *templ, struct nouveau_screen *screen) { struct nv04_fifo nv04_data = { .vram = 0xbeef0201, .gart = 0xbeef0202 }; @@ -867,9 +867,9 @@ nouveau_screen_init_vdec(struct nouveau_screen *screen) screen->base.is_video_format_supported = vl_video_buffer_is_format_supported; } -static struct pipe_video_decoder * +static struct pipe_video_codec * nouveau_context_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ) + const struct pipe_video_codec *templ) { struct nouveau_screen *screen = nouveau_context(context)->screen; return nouveau_create_decoder(context, templ, screen); @@ -886,6 +886,6 @@ nouveau_context_video_buffer_create(struct pipe_context *pipe, void nouveau_context_init_vdec(struct nouveau_context *nv) { - nv->pipe.create_video_decoder = nouveau_context_create_decoder; + nv->pipe.create_video_codec = nouveau_context_create_decoder; nv->pipe.create_video_buffer = nouveau_context_video_buffer_create; } diff --git a/src/gallium/drivers/nouveau/nouveau_video.h b/src/gallium/drivers/nouveau/nouveau_video.h index be537582eac..08d48b371fd 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.h +++ b/src/gallium/drivers/nouveau/nouveau_video.h @@ -17,7 +17,7 @@ struct nouveau_video_buffer { }; struct nouveau_decoder { - struct pipe_video_decoder base; + struct pipe_video_codec base; struct nouveau_screen *screen; struct nouveau_pushbuf *push; struct nouveau_object *chan; diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.c b/src/gallium/drivers/nouveau/nouveau_vp3_video.c index 611b455a46a..be0e6b3fafd 100644 --- a/src/gallium/drivers/nouveau/nouveau_vp3_video.c +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.c @@ -169,26 +169,26 @@ error: } static void -nouveau_vp3_decoder_flush(struct pipe_video_decoder *decoder) +nouveau_vp3_decoder_flush(struct pipe_video_codec *decoder) { } static void -nouveau_vp3_decoder_begin_frame(struct pipe_video_decoder *decoder, +nouveau_vp3_decoder_begin_frame(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture) { } static void -nouveau_vp3_decoder_end_frame(struct pipe_video_decoder *decoder, +nouveau_vp3_decoder_end_frame(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture) { } static void -nouveau_vp3_decoder_destroy(struct pipe_video_decoder *decoder) +nouveau_vp3_decoder_destroy(struct pipe_video_codec *decoder) { struct nouveau_vp3_decoder *dec = (struct nouveau_vp3_decoder *)decoder; int i; @@ -223,7 +223,7 @@ nouveau_vp3_decoder_destroy(struct pipe_video_decoder *decoder) } void -nouveau_vp3_decoder_init_common(struct pipe_video_decoder *dec) +nouveau_vp3_decoder_init_common(struct pipe_video_codec *dec) { dec->destroy = nouveau_vp3_decoder_destroy; dec->flush = nouveau_vp3_decoder_flush; diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.h b/src/gallium/drivers/nouveau/nouveau_vp3_video.h index 9af29cddaed..177f0a851d0 100644 --- a/src/gallium/drivers/nouveau/nouveau_vp3_video.h +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.h @@ -60,7 +60,7 @@ union pipe_desc { }; struct nouveau_vp3_decoder { - struct pipe_video_decoder base; + struct pipe_video_codec base; struct nouveau_client *client; struct nouveau_object *channel[3], *bsp, *vp, *ppp; struct nouveau_pushbuf *pushbuf[3]; @@ -198,7 +198,7 @@ nouveau_vp3_video_buffer_create(struct pipe_context *pipe, int flags); void -nouveau_vp3_decoder_init_common(struct pipe_video_decoder *decoder); +nouveau_vp3_decoder_init_common(struct pipe_video_codec *decoder); int nouveau_vp3_load_firmware(struct nouveau_vp3_decoder *dec, diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c index 0ed9d8f1839..d9de443b1e5 100644 --- a/src/gallium/drivers/nv50/nv50_context.c +++ b/src/gallium/drivers/nv50/nv50_context.c @@ -265,11 +265,11 @@ nv50_create(struct pipe_screen *pscreen, void *priv) } else if (screen->base.device->chipset < 0x98 || screen->base.device->chipset == 0xa0) { /* VP2 */ - pipe->create_video_decoder = nv84_create_decoder; + pipe->create_video_codec = nv84_create_decoder; pipe->create_video_buffer = nv84_video_buffer_create; } else { /* VP3/4 */ - pipe->create_video_decoder = nv98_create_decoder; + pipe->create_video_codec = nv98_create_decoder; pipe->create_video_buffer = nv98_video_buffer_create; } diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h index 3c24546beef..f89a55110cf 100644 --- a/src/gallium/drivers/nv50/nv50_context.h +++ b/src/gallium/drivers/nv50/nv50_context.h @@ -290,9 +290,9 @@ void nv50_vertex_arrays_validate(struct nv50_context *nv50); void nv50_push_vbo(struct nv50_context *, const struct pipe_draw_info *); /* nv84_video.c */ -struct pipe_video_decoder * +struct pipe_video_codec * nv84_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ); + const struct pipe_video_codec *templ); struct pipe_video_buffer * nv84_video_buffer_create(struct pipe_context *pipe, @@ -309,9 +309,9 @@ nv84_screen_video_supported(struct pipe_screen *screen, enum pipe_video_profile profile); /* nv98_video.c */ -struct pipe_video_decoder * +struct pipe_video_codec * nv98_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ); + const struct pipe_video_codec *templ); struct pipe_video_buffer * nv98_video_buffer_create(struct pipe_context *pipe, diff --git a/src/gallium/drivers/nv50/nv84_video.c b/src/gallium/drivers/nv50/nv84_video.c index 7c81d2d4025..7759979b499 100644 --- a/src/gallium/drivers/nv50/nv84_video.c +++ b/src/gallium/drivers/nv50/nv84_video.c @@ -121,7 +121,7 @@ nv84_load_vp_firmware_mpeg(struct nouveau_device *dev, struct nv84_decoder *dec) } static void -nv84_decoder_decode_bitstream_h264(struct pipe_video_decoder *decoder, +nv84_decoder_decode_bitstream_h264(struct pipe_video_codec *decoder, struct pipe_video_buffer *video_target, struct pipe_picture_desc *picture, unsigned num_buffers, @@ -140,26 +140,26 @@ nv84_decoder_decode_bitstream_h264(struct pipe_video_decoder *decoder, } static void -nv84_decoder_flush(struct pipe_video_decoder *decoder) +nv84_decoder_flush(struct pipe_video_codec *decoder) { } static void -nv84_decoder_begin_frame_h264(struct pipe_video_decoder *decoder, +nv84_decoder_begin_frame_h264(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture) { } static void -nv84_decoder_end_frame_h264(struct pipe_video_decoder *decoder, +nv84_decoder_end_frame_h264(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture) { } static void -nv84_decoder_decode_bitstream_mpeg12(struct pipe_video_decoder *decoder, +nv84_decoder_decode_bitstream_mpeg12(struct pipe_video_codec *decoder, struct pipe_video_buffer *video_target, struct pipe_picture_desc *picture, unsigned num_buffers, @@ -179,7 +179,7 @@ nv84_decoder_decode_bitstream_mpeg12(struct pipe_video_decoder *decoder, } static void -nv84_decoder_begin_frame_mpeg12(struct pipe_video_decoder *decoder, +nv84_decoder_begin_frame_mpeg12(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture) { @@ -202,7 +202,7 @@ nv84_decoder_begin_frame_mpeg12(struct pipe_video_decoder *decoder, } static void -nv84_decoder_end_frame_mpeg12(struct pipe_video_decoder *decoder, +nv84_decoder_end_frame_mpeg12(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture) { @@ -213,7 +213,7 @@ nv84_decoder_end_frame_mpeg12(struct pipe_video_decoder *decoder, } static void -nv84_decoder_decode_macroblock(struct pipe_video_decoder *decoder, +nv84_decoder_decode_macroblock(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture, const struct pipe_macroblock *macroblocks, @@ -229,7 +229,7 @@ nv84_decoder_decode_macroblock(struct pipe_video_decoder *decoder, } static void -nv84_decoder_destroy(struct pipe_video_decoder *decoder) +nv84_decoder_destroy(struct pipe_video_codec *decoder) { struct nv84_decoder *dec = (struct nv84_decoder *)decoder; @@ -261,9 +261,9 @@ nv84_decoder_destroy(struct pipe_video_decoder *decoder) FREE(dec); } -struct pipe_video_decoder * +struct pipe_video_codec * nv84_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ) + const struct pipe_video_codec *templ) { struct nv50_context *nv50 = (struct nv50_context *)context; struct nouveau_screen *screen = &nv50->screen->base; diff --git a/src/gallium/drivers/nv50/nv84_video.h b/src/gallium/drivers/nv50/nv84_video.h index 4240cef6564..b43fe9685d2 100644 --- a/src/gallium/drivers/nv50/nv84_video.h +++ b/src/gallium/drivers/nv50/nv84_video.h @@ -58,7 +58,7 @@ struct nv84_video_buffer { }; struct nv84_decoder { - struct pipe_video_decoder base; + struct pipe_video_codec base; struct nouveau_client *client; struct nouveau_object *bsp_channel, *vp_channel, *bsp, *vp; struct nouveau_pushbuf *bsp_pushbuf, *vp_pushbuf; diff --git a/src/gallium/drivers/nv50/nv98_video.c b/src/gallium/drivers/nv50/nv98_video.c index 541cd729352..0fa3a626d9c 100644 --- a/src/gallium/drivers/nv50/nv98_video.c +++ b/src/gallium/drivers/nv50/nv98_video.c @@ -26,7 +26,7 @@ #include "util/u_format.h" static void -nv98_decoder_decode_bitstream(struct pipe_video_decoder *decoder, +nv98_decoder_decode_bitstream(struct pipe_video_codec *decoder, struct pipe_video_buffer *video_target, struct pipe_picture_desc *picture, unsigned num_buffers, @@ -56,9 +56,9 @@ nv98_decoder_decode_bitstream(struct pipe_video_decoder *decoder, nv98_decoder_ppp(dec, desc, target, comm_seq); } -struct pipe_video_decoder * +struct pipe_video_codec * nv98_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ) + const struct pipe_video_codec *templ) { struct nouveau_screen *screen = &((struct nv50_context *)context)->screen->base; struct nouveau_vp3_decoder *dec; diff --git a/src/gallium/drivers/nvc0/nvc0_context.c b/src/gallium/drivers/nvc0/nvc0_context.c index 5da491f14e9..bf0c204e197 100644 --- a/src/gallium/drivers/nvc0/nvc0_context.c +++ b/src/gallium/drivers/nvc0/nvc0_context.c @@ -286,7 +286,7 @@ nvc0_create(struct pipe_screen *pscreen, void *priv) draw_set_rasterize_stage(nvc0->draw, nvc0_draw_render_stage(nvc0)); #endif - pipe->create_video_decoder = nvc0_create_decoder; + pipe->create_video_codec = nvc0_create_decoder; pipe->create_video_buffer = nvc0_video_buffer_create; /* shader builtin library is per-screen, but we need a context for m2mf */ diff --git a/src/gallium/drivers/nvc0/nvc0_context.h b/src/gallium/drivers/nvc0/nvc0_context.h index d976de6fd91..2c84cdf44c6 100644 --- a/src/gallium/drivers/nvc0/nvc0_context.h +++ b/src/gallium/drivers/nvc0/nvc0_context.h @@ -333,9 +333,9 @@ void nvc0_vertex_arrays_validate(struct nvc0_context *); void nvc0_idxbuf_validate(struct nvc0_context *); /* nvc0_video.c */ -struct pipe_video_decoder * +struct pipe_video_codec * nvc0_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ); + const struct pipe_video_codec *templ); struct pipe_video_buffer * nvc0_video_buffer_create(struct pipe_context *pipe, diff --git a/src/gallium/drivers/nvc0/nvc0_video.c b/src/gallium/drivers/nvc0/nvc0_video.c index e913126df4c..f3a301eeea8 100644 --- a/src/gallium/drivers/nvc0/nvc0_video.c +++ b/src/gallium/drivers/nvc0/nvc0_video.c @@ -26,7 +26,7 @@ #include "util/u_format.h" static void -nvc0_decoder_decode_bitstream(struct pipe_video_decoder *decoder, +nvc0_decoder_decode_bitstream(struct pipe_video_codec *decoder, struct pipe_video_buffer *video_target, struct pipe_picture_desc *picture, unsigned num_buffers, @@ -56,9 +56,9 @@ nvc0_decoder_decode_bitstream(struct pipe_video_decoder *decoder, nvc0_decoder_ppp(dec, desc, target, comm_seq); } -struct pipe_video_decoder * +struct pipe_video_codec * nvc0_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ) + const struct pipe_video_codec *templ) { struct nouveau_screen *screen = &((struct nvc0_context *)context)->screen->base; struct nouveau_vp3_decoder *dec; diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index a808eb98d40..5627aafec59 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -409,7 +409,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, r300_init_render_functions(r300); r300_init_states(&r300->context); - r300->context.create_video_decoder = vl_create_decoder; + r300->context.create_video_codec = vl_create_decoder; r300->context.create_video_buffer = vl_video_buffer_create; r300->uploader = u_upload_create(&r300->context, 256 * 1024, 4, diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index e5aa55e46a9..c8fb547a30a 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -400,10 +400,10 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void r600_init_surface_functions(rctx); if (rscreen->info.has_uvd) { - rctx->context.create_video_decoder = r600_uvd_create_decoder; + rctx->context.create_video_codec = r600_uvd_create_decoder; rctx->context.create_video_buffer = r600_video_buffer_create; } else { - rctx->context.create_video_decoder = vl_create_decoder; + rctx->context.create_video_codec = vl_create_decoder; rctx->context.create_video_buffer = vl_video_buffer_create; } diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index eaef920b156..743f9abf6ab 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -890,8 +890,8 @@ unsigned r600_tex_compare(unsigned compare); bool sampler_state_needs_border_color(const struct pipe_sampler_state *state); /* r600_uvd.c */ -struct pipe_video_decoder *r600_uvd_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *decoder); +struct pipe_video_codec *r600_uvd_create_decoder(struct pipe_context *context, + const struct pipe_video_codec *decoder); struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe, const struct pipe_video_buffer *tmpl); diff --git a/src/gallium/drivers/r600/r600_uvd.c b/src/gallium/drivers/r600/r600_uvd.c index 288790591ce..8fb58614ad2 100644 --- a/src/gallium/drivers/r600/r600_uvd.c +++ b/src/gallium/drivers/r600/r600_uvd.c @@ -36,7 +36,7 @@ #include <errno.h> #include <unistd.h> -#include "pipe/p_video_decoder.h" +#include "pipe/p_video_codec.h" #include "util/u_memory.h" #include "util/u_video.h" @@ -164,8 +164,8 @@ static struct radeon_winsys_cs_handle* r600_uvd_set_dtb(struct ruvd_msg *msg, st } /* create decoder */ -struct pipe_video_decoder *r600_uvd_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templat) +struct pipe_video_codec *r600_uvd_create_decoder(struct pipe_context *context, + const struct pipe_video_codec *templat) { struct r600_context *ctx = (struct r600_context *)context; diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c index fd6bc4c20cf..ed4e4fc8f3d 100644 --- a/src/gallium/drivers/radeon/radeon_uvd.c +++ b/src/gallium/drivers/radeon/radeon_uvd.c @@ -37,7 +37,7 @@ #include <unistd.h> #include <stdio.h> -#include "pipe/p_video_decoder.h" +#include "pipe/p_video_codec.h" #include "util/u_memory.h" #include "util/u_video.h" @@ -65,7 +65,7 @@ struct ruvd_buffer /* UVD decoder representation */ struct ruvd_decoder { - struct pipe_video_decoder base; + struct pipe_video_codec base; ruvd_set_dtb set_dtb; @@ -262,7 +262,7 @@ static uint32_t profile2stream_type(enum pipe_video_profile profile) } /* calculate size of reference picture buffer */ -static unsigned calc_dpb_size(const struct pipe_video_decoder *templ) +static unsigned calc_dpb_size(const struct pipe_video_codec *templ) { unsigned width_in_mb, height_in_mb, image_size, dpb_size; @@ -613,7 +613,7 @@ static struct ruvd_mpeg4 get_mpeg4_msg(struct ruvd_decoder *dec, /** * destroy this video decoder */ -static void ruvd_destroy(struct pipe_video_decoder *decoder) +static void ruvd_destroy(struct pipe_video_codec *decoder) { struct ruvd_decoder *dec = (struct ruvd_decoder*)decoder; struct ruvd_msg msg; @@ -650,7 +650,7 @@ static void ruvd_destroy_associated_data(void *data) /** * start decoding of a new frame */ -static void ruvd_begin_frame(struct pipe_video_decoder *decoder, +static void ruvd_begin_frame(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture) { @@ -672,7 +672,7 @@ static void ruvd_begin_frame(struct pipe_video_decoder *decoder, /** * decode a macroblock */ -static void ruvd_decode_macroblock(struct pipe_video_decoder *decoder, +static void ruvd_decode_macroblock(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture, const struct pipe_macroblock *macroblocks, @@ -685,7 +685,7 @@ static void ruvd_decode_macroblock(struct pipe_video_decoder *decoder, /** * decode a bitstream */ -static void ruvd_decode_bitstream(struct pipe_video_decoder *decoder, +static void ruvd_decode_bitstream(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture, unsigned num_buffers, @@ -728,7 +728,7 @@ static void ruvd_decode_bitstream(struct pipe_video_decoder *decoder, /** * end decoding of the current frame */ -static void ruvd_end_frame(struct pipe_video_decoder *decoder, +static void ruvd_end_frame(struct pipe_video_codec *decoder, struct pipe_video_buffer *target, struct pipe_picture_desc *picture) { @@ -809,17 +809,17 @@ static void ruvd_end_frame(struct pipe_video_decoder *decoder, /** * flush any outstanding command buffers to the hardware */ -static void ruvd_flush(struct pipe_video_decoder *decoder) +static void ruvd_flush(struct pipe_video_codec *decoder) { } /** * create and UVD decoder */ -struct pipe_video_decoder *ruvd_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ, - struct radeon_winsys* ws, - ruvd_set_dtb set_dtb) +struct pipe_video_codec *ruvd_create_decoder(struct pipe_context *context, + const struct pipe_video_codec *templ, + struct radeon_winsys* ws, + ruvd_set_dtb set_dtb) { unsigned dpb_size = calc_dpb_size(templ); unsigned width = templ->width, height = templ->height; diff --git a/src/gallium/drivers/radeon/radeon_uvd.h b/src/gallium/drivers/radeon/radeon_uvd.h index 82fbda4d1ee..89a10c8fe91 100644 --- a/src/gallium/drivers/radeon/radeon_uvd.h +++ b/src/gallium/drivers/radeon/radeon_uvd.h @@ -345,10 +345,10 @@ typedef struct radeon_winsys_cs_handle* (*ruvd_set_dtb) (struct ruvd_msg* msg, struct vl_video_buffer *vb); /* create an UVD decode */ -struct pipe_video_decoder *ruvd_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templat, - struct radeon_winsys* ws, - ruvd_set_dtb set_dtb); +struct pipe_video_codec *ruvd_create_decoder(struct pipe_context *context, + const struct pipe_video_codec *templat, + struct radeon_winsys* ws, + ruvd_set_dtb set_dtb); /* join surfaces into the same buffer with identical tiling params sumup their sizes and replace the backend buffers with a single bo */ diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c index 7de9a4eb720..b491672e128 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c @@ -230,10 +230,10 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void si_init_compute_functions(rctx); if (rscreen->info.has_uvd) { - rctx->context.create_video_decoder = radeonsi_uvd_create_decoder; + rctx->context.create_video_codec = radeonsi_uvd_create_decoder; rctx->context.create_video_buffer = radeonsi_video_buffer_create; } else { - rctx->context.create_video_decoder = vl_create_decoder; + rctx->context.create_video_codec = vl_create_decoder; rctx->context.create_video_buffer = vl_video_buffer_create; } diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.h b/src/gallium/drivers/radeonsi/radeonsi_pipe.h index cbfd7dae4be..f9e49996e2c 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.h +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.h @@ -277,8 +277,8 @@ void r600_trace_emit(struct r600_context *rctx); void si_init_compute_functions(struct r600_context *rctx); /* radeonsi_uvd.c */ -struct pipe_video_decoder *radeonsi_uvd_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ); +struct pipe_video_codec *radeonsi_uvd_create_decoder(struct pipe_context *context, + const struct pipe_video_codec *templ); struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe, const struct pipe_video_buffer *tmpl); diff --git a/src/gallium/drivers/radeonsi/radeonsi_uvd.c b/src/gallium/drivers/radeonsi/radeonsi_uvd.c index d19bf3382a0..4d48b4e6f9c 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_uvd.c +++ b/src/gallium/drivers/radeonsi/radeonsi_uvd.c @@ -36,7 +36,7 @@ #include <errno.h> #include <unistd.h> -#include "pipe/p_video_decoder.h" +#include "pipe/p_video_codec.h" #include "util/u_memory.h" #include "util/u_video.h" @@ -146,8 +146,8 @@ static struct radeon_winsys_cs_handle* radeonsi_uvd_set_dtb(struct ruvd_msg *msg /** * creates an UVD compatible decoder */ -struct pipe_video_decoder *radeonsi_uvd_create_decoder(struct pipe_context *context, - const struct pipe_video_decoder *templ) +struct pipe_video_codec *radeonsi_uvd_create_decoder(struct pipe_context *context, + const struct pipe_video_codec *templ) { struct r600_context *ctx = (struct r600_context *)context; diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c index 14cfdc8c23b..6796ad29c17 100644 --- a/src/gallium/drivers/softpipe/sp_context.c +++ b/src/gallium/drivers/softpipe/sp_context.c @@ -228,7 +228,7 @@ softpipe_create_context( struct pipe_screen *screen, softpipe->pipe.render_condition = softpipe_render_condition; - softpipe->pipe.create_video_decoder = vl_create_decoder; + softpipe->pipe.create_video_codec = vl_create_decoder; softpipe->pipe.create_video_buffer = vl_video_buffer_create; /* |