From f2f7064e560a83fc78d0e5b1d3a7d4aaac119a49 Mon Sep 17 00:00:00 2001 From: Christian König Date: Mon, 15 Jul 2013 03:48:04 -0600 Subject: vl: rename pipe_video_decoder to pipe_video_codec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- src/gallium/drivers/nouveau/nouveau_video.c | 20 ++++++++++---------- src/gallium/drivers/nouveau/nouveau_video.h | 2 +- src/gallium/drivers/nouveau/nouveau_vp3_video.c | 10 +++++----- src/gallium/drivers/nouveau/nouveau_vp3_video.h | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/gallium/drivers/nouveau') 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, -- cgit v1.2.3