From 8e423ab98403135140a093be3c66c88b9a36ad5c Mon Sep 17 00:00:00 2001 From: Christian König Date: Mon, 15 Jul 2013 02:35:37 -0600 Subject: vl: rename enum pipe_video_codec to pipe_video_format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- src/gallium/auxiliary/util/u_video.h | 12 ++++++------ src/gallium/auxiliary/vl/vl_decoder.c | 4 ++-- src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c | 2 +- src/gallium/auxiliary/vl/vl_mpeg12_decoder.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/gallium/auxiliary') diff --git a/src/gallium/auxiliary/util/u_video.h b/src/gallium/auxiliary/util/u_video.h index e575947d4e3..276e46097ef 100644 --- a/src/gallium/auxiliary/util/u_video.h +++ b/src/gallium/auxiliary/util/u_video.h @@ -39,7 +39,7 @@ extern "C" { #include "pipe/p_compiler.h" #include "util/u_debug.h" -static INLINE enum pipe_video_codec +static INLINE enum pipe_video_format u_reduce_video_profile(enum pipe_video_profile profile) { switch (profile) @@ -47,24 +47,24 @@ u_reduce_video_profile(enum pipe_video_profile profile) case PIPE_VIDEO_PROFILE_MPEG1: case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE: case PIPE_VIDEO_PROFILE_MPEG2_MAIN: - return PIPE_VIDEO_CODEC_MPEG12; + return PIPE_VIDEO_FORMAT_MPEG12; case PIPE_VIDEO_PROFILE_MPEG4_SIMPLE: case PIPE_VIDEO_PROFILE_MPEG4_ADVANCED_SIMPLE: - return PIPE_VIDEO_CODEC_MPEG4; + return PIPE_VIDEO_FORMAT_MPEG4; case PIPE_VIDEO_PROFILE_VC1_SIMPLE: case PIPE_VIDEO_PROFILE_VC1_MAIN: case PIPE_VIDEO_PROFILE_VC1_ADVANCED: - return PIPE_VIDEO_CODEC_VC1; + return PIPE_VIDEO_FORMAT_VC1; case PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE: case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN: case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH: - return PIPE_VIDEO_CODEC_MPEG4_AVC; + return PIPE_VIDEO_FORMAT_MPEG4_AVC; default: - return PIPE_VIDEO_CODEC_UNKNOWN; + return PIPE_VIDEO_FORMAT_UNKNOWN; } } diff --git a/src/gallium/auxiliary/vl/vl_decoder.c b/src/gallium/auxiliary/vl/vl_decoder.c index dcbb77c9bfd..60e0ce995e6 100644 --- a/src/gallium/auxiliary/vl/vl_decoder.c +++ b/src/gallium/auxiliary/vl/vl_decoder.c @@ -37,7 +37,7 @@ vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile { assert(screen); switch (u_reduce_video_profile(profile)) { - case PIPE_VIDEO_CODEC_MPEG12: + case PIPE_VIDEO_FORMAT_MPEG12: return true; default: return false; @@ -82,7 +82,7 @@ vl_create_decoder(struct pipe_context *pipe, temp.height = pot_buffers ? util_next_power_of_two(height) : align(height, VL_MACROBLOCK_HEIGHT); switch (u_reduce_video_profile(temp.profile)) { - case PIPE_VIDEO_CODEC_MPEG12: + case PIPE_VIDEO_FORMAT_MPEG12: return vl_create_mpeg12_decoder(pipe, &temp); default: diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c b/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c index 81199e433b5..d8c53117db4 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c @@ -814,7 +814,7 @@ decode_slice(struct vl_mpg12_bs *bs, struct pipe_video_buffer *target) signed x = -1; memset(&mb, 0, sizeof(mb)); - mb.base.codec = PIPE_VIDEO_CODEC_MPEG12; + mb.base.codec = PIPE_VIDEO_FORMAT_MPEG12; mb.y = vl_vlc_get_uimsbf(&bs->vlc, 8) - 1; mb.blocks = dct_blocks; diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c index 48661cf589c..9349b5e171c 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c @@ -582,7 +582,7 @@ vl_mpeg12_decode_macroblock(struct pipe_video_decoder *decoder, unsigned i, j, mv_weights[2]; assert(dec && target && picture); - assert(macroblocks && macroblocks->codec == PIPE_VIDEO_CODEC_MPEG12); + assert(macroblocks && macroblocks->codec == PIPE_VIDEO_FORMAT_MPEG12); buf = vl_mpeg12_get_decode_buffer(dec, target); assert(buf); @@ -1024,7 +1024,7 @@ vl_create_mpeg12_decoder(struct pipe_context *context, const struct format_config *format_config; struct vl_mpeg12_decoder *dec; - assert(u_reduce_video_profile(templat->profile) == PIPE_VIDEO_CODEC_MPEG12); + assert(u_reduce_video_profile(templat->profile) == PIPE_VIDEO_FORMAT_MPEG12); dec = CALLOC_STRUCT(vl_mpeg12_decoder); -- cgit v1.2.3