diff options
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_mpeg12_decoder.c | 8 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_video_context.h | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/vdpau/decode.c | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/xvmc/surface.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c index 201f3abab13..bdca9dbe316 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c @@ -261,7 +261,7 @@ vl_mpeg12_buffer_destroy(struct pipe_video_decode_buffer *buffer) } static void -vl_mpeg12_buffer_map(struct pipe_video_decode_buffer *buffer) +vl_mpeg12_buffer_begin_frame(struct pipe_video_decode_buffer *buffer) { struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer; struct vl_mpeg12_decoder *dec; @@ -399,7 +399,7 @@ vl_mpeg12_buffer_decode_bitstream(struct pipe_video_decode_buffer *buffer, } static void -vl_mpeg12_buffer_unmap(struct pipe_video_decode_buffer *buffer) +vl_mpeg12_buffer_end_frame(struct pipe_video_decode_buffer *buffer) { struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer; struct vl_mpeg12_decoder *dec; @@ -472,13 +472,13 @@ vl_mpeg12_create_buffer(struct pipe_video_decoder *decoder) buffer->base.decoder = decoder; buffer->base.destroy = vl_mpeg12_buffer_destroy; - buffer->base.map = vl_mpeg12_buffer_map; + buffer->base.begin_frame = vl_mpeg12_buffer_begin_frame; buffer->base.get_ycbcr_stream = vl_mpeg12_buffer_get_ycbcr_stream; buffer->base.get_ycbcr_buffer = vl_mpeg12_buffer_get_ycbcr_buffer; buffer->base.get_mv_stream_stride = vl_mpeg12_buffer_get_mv_stream_stride; buffer->base.get_mv_stream = vl_mpeg12_buffer_get_mv_stream; buffer->base.decode_bitstream = vl_mpeg12_buffer_decode_bitstream; - buffer->base.unmap = vl_mpeg12_buffer_unmap; + buffer->base.end_frame = vl_mpeg12_buffer_end_frame; if (!vl_vb_init(&buffer->vertex_stream, dec->pipe, dec->base.width / MACROBLOCK_WIDTH, diff --git a/src/gallium/include/pipe/p_video_context.h b/src/gallium/include/pipe/p_video_context.h index 512b5b22d77..374fa511054 100644 --- a/src/gallium/include/pipe/p_video_context.h +++ b/src/gallium/include/pipe/p_video_context.h @@ -177,7 +177,7 @@ struct pipe_video_decode_buffer /** * map the input buffer into memory before starting decoding */ - void (*map)(struct pipe_video_decode_buffer *decbuf); + void (*begin_frame)(struct pipe_video_decode_buffer *decbuf); /** * get the pointer where to put the ycbcr blocks of a component @@ -210,7 +210,7 @@ struct pipe_video_decode_buffer /** * unmap decoder buffer before flushing */ - void (*unmap)(struct pipe_video_decode_buffer *decbuf); + void (*end_frame)(struct pipe_video_decode_buffer *decbuf); }; /** diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c index de6f96babcb..5c6d0467924 100644 --- a/src/gallium/state_trackers/vdpau/decode.c +++ b/src/gallium/state_trackers/vdpau/decode.c @@ -200,13 +200,13 @@ vlVdpDecoderRenderMpeg2(struct pipe_video_decoder *decoder, picture.intra_quantizer_matrix = picture_info->intra_quantizer_matrix; picture.non_intra_quantizer_matrix = picture_info->non_intra_quantizer_matrix; - buffer->map(buffer); + buffer->begin_frame(buffer); for (i = 0; i < bitstream_buffer_count; ++i) buffer->decode_bitstream(buffer, bitstream_buffers[i].bitstream_bytes, bitstream_buffers[i].bitstream, &picture, num_ycbcr_blocks); - buffer->unmap(buffer); + buffer->end_frame(buffer); decoder->flush_buffer(buffer, num_ycbcr_blocks, ref_frames, target); diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c index da41a182164..4d6c58ebc76 100644 --- a/src/gallium/state_trackers/xorg/xvmc/surface.c +++ b/src/gallium/state_trackers/xorg/xvmc/surface.c @@ -277,7 +277,7 @@ unmap_and_flush_surface(XvMCSurfacePrivate *surface) } if (surface->mapped) { - surface->decode_buffer->unmap(surface->decode_buffer); + surface->decode_buffer->end_frame(surface->decode_buffer); for (i = 0; i < 3; ++i) num_ycbcr_blocks[i] = surface->ycbcr[i].num_blocks_added; context_priv->decoder->flush_buffer(surface->decode_buffer, @@ -415,7 +415,7 @@ Status XvMCRenderSurface(Display *dpy, XvMCContext *context, unsigned int pictur } if (!target_surface_priv->mapped) { - t_buffer->map(t_buffer); + t_buffer->begin_frame(t_buffer); for (i = 0; i < 3; ++i) { target_surface_priv->ycbcr[i].num_blocks_added = 0; |