diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2013-08-08 09:35:30 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2013-09-06 15:29:44 +0800 |
| commit | f08afbabeade7403557413f4858548d9a91b0d3e (patch) | |
| tree | a8d2813640c8e62d29beb55407efc2be1dc4a970 | |
| parent | 8dd5513e222524baa4be24acf774edc332a50a74 (diff) | |
Rename the macros
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit 3ab97be8db1b8e55d0d5b95f577863416a87c6ff)
| -rw-r--r-- | src/gen6_mfc_common.c | 2 | ||||
| -rw-r--r-- | src/gen75_mfc.c | 2 | ||||
| -rw-r--r-- | src/gen7_mfc.c | 2 | ||||
| -rwxr-xr-x | src/i965_drv_video.c | 4 | ||||
| -rw-r--r-- | src/i965_drv_video.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/gen6_mfc_common.c b/src/gen6_mfc_common.c index ab91c86..ba56c1a 100644 --- a/src/gen6_mfc_common.c +++ b/src/gen6_mfc_common.c @@ -642,7 +642,7 @@ VAStatus intel_mfc_avc_prepare(VADriverContextP ctx, dri_bo_map(bo, 1); coded_buffer_segment = (struct i965_coded_buffer_segment *)bo->virtual; coded_buffer_segment->mapped = 0; - coded_buffer_segment->codec = CODED_H264; + coded_buffer_segment->codec = CODEC_H264; dri_bo_unmap(bo); return vaStatus; diff --git a/src/gen75_mfc.c b/src/gen75_mfc.c index cfc3c22..3fdae21 100644 --- a/src/gen75_mfc.c +++ b/src/gen75_mfc.c @@ -2439,7 +2439,7 @@ intel_mfc_mpeg2_prepare(VADriverContextP ctx, dri_bo_map(bo, 1); coded_buffer_segment = (struct i965_coded_buffer_segment *)bo->virtual; coded_buffer_segment->mapped = 0; - coded_buffer_segment->codec = CODED_MPEG2; + coded_buffer_segment->codec = CODEC_MPEG2; dri_bo_unmap(bo); return vaStatus; diff --git a/src/gen7_mfc.c b/src/gen7_mfc.c index 8572b89..d1eb9a6 100644 --- a/src/gen7_mfc.c +++ b/src/gen7_mfc.c @@ -1069,7 +1069,7 @@ gen7_mfc_mpeg2_prepare(VADriverContextP ctx, dri_bo_map(bo, 1); coded_buffer_segment = (struct i965_coded_buffer_segment *)bo->virtual; coded_buffer_segment->mapped = 0; - coded_buffer_segment->codec = CODED_MPEG2; + coded_buffer_segment->codec = CODEC_MPEG2; dri_bo_unmap(bo); return vaStatus; diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c index 4dfc33e..6942eed 100755 --- a/src/i965_drv_video.c +++ b/src/i965_drv_video.c @@ -1761,13 +1761,13 @@ i965_MapBuffer(VADriverContextP ctx, coded_buffer_segment->base.buf = buffer = (unsigned char *)(obj_buffer->buffer_store->bo->virtual) + I965_CODEDBUFFER_HEADER_SIZE; - if (coded_buffer_segment->codec == CODED_H264) { + if (coded_buffer_segment->codec == CODEC_H264) { delimiter0 = H264_DELIMITER0; delimiter1 = H264_DELIMITER1; delimiter2 = H264_DELIMITER2; delimiter3 = H264_DELIMITER3; delimiter4 = H264_DELIMITER4; - } else if (coded_buffer_segment->codec == CODED_MPEG2) { + } else if (coded_buffer_segment->codec == CODEC_MPEG2) { delimiter0 = MPEG2_DELIMITER0; delimiter1 = MPEG2_DELIMITER1; delimiter2 = MPEG2_DELIMITER2; diff --git a/src/i965_drv_video.h b/src/i965_drv_video.h index 48519cd..301ebad 100644 --- a/src/i965_drv_video.h +++ b/src/i965_drv_video.h @@ -366,8 +366,8 @@ int va_enc_packed_type_to_idx(int packed_type); /* reserve 2 byte for internal using */ -#define CODED_H264 0 -#define CODED_MPEG2 1 +#define CODEC_H264 0 +#define CODEC_MPEG2 1 #define H264_DELIMITER0 0x00 #define H264_DELIMITER1 0x00 |