diff options
| author | Zhao Yakui <yakui.zhao@intel.com> | 2013-12-27 15:56:37 +0800 |
|---|---|---|
| committer | Yakui Zhao <yakui.zhao@intel.com> | 2013-12-27 15:56:37 +0800 |
| commit | 540d4b98c881a8e6a540963ef2abcb28a7f0e41b (patch) | |
| tree | 9b2f4ba75f504f9db37504371a76a2cc8ece58d8 | |
| parent | 3090239bc60ca3691ace5bfad6a8662703952cad (diff) | |
| download | libva-intel-driver-540d4b98c881a8e6a540963ef2abcb28a7f0e41b.tar.gz libva-intel-driver-540d4b98c881a8e6a540963ef2abcb28a7f0e41b.tar.bz2 libva-intel-driver-540d4b98c881a8e6a540963ef2abcb28a7f0e41b.zip | |
Update the MFX_AVC_IMAGE_STATE to follow the spec
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
| -rw-r--r-- | src/gen75_mfc.c | 2 | ||||
| -rw-r--r-- | src/gen75_mfd.c | 4 | ||||
| -rw-r--r-- | src/gen7_mfc.c | 2 | ||||
| -rwxr-xr-x | src/gen7_mfd.c | 4 | ||||
| -rw-r--r-- | src/gen8_mfc.c | 2 | ||||
| -rw-r--r-- | src/gen8_mfd.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/gen75_mfc.c b/src/gen75_mfc.c index 7161acd..28edd40 100644 --- a/src/gen75_mfc.c +++ b/src/gen75_mfc.c @@ -259,7 +259,7 @@ gen75_mfc_avc_img_state(VADriverContextP ctx, struct encode_state *encode_state, OUT_BCS_BATCH(batch, MFX_AVC_IMG_STATE | (16 - 2)); /*DW1. MB setting of frame */ OUT_BCS_BATCH(batch, - ((width_in_mbs * height_in_mbs) & 0xFFFF)); + ((width_in_mbs * height_in_mbs - 1) & 0xFFFF)); OUT_BCS_BATCH(batch, ((height_in_mbs - 1) << 16) | ((width_in_mbs - 1) << 0)); diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c index dc7c940..4a4de0b 100644 --- a/src/gen75_mfd.c +++ b/src/gen75_mfd.c @@ -566,7 +566,7 @@ gen75_mfd_avc_img_state(VADriverContextP ctx, BEGIN_BCS_BATCH(batch, 17); OUT_BCS_BATCH(batch, MFX_AVC_IMG_STATE | (17 - 2)); OUT_BCS_BATCH(batch, - width_in_mbs * height_in_mbs); + (width_in_mbs * height_in_mbs - 1)); OUT_BCS_BATCH(batch, ((height_in_mbs - 1) << 16) | ((width_in_mbs - 1) << 0)); @@ -2826,7 +2826,7 @@ gen75_jpeg_wa_avc_img_state(VADriverContextP ctx, BEGIN_BCS_BATCH(batch, 16); OUT_BCS_BATCH(batch, MFX_AVC_IMG_STATE | (16 - 2)); OUT_BCS_BATCH(batch, - width_in_mbs * height_in_mbs); + (width_in_mbs * height_in_mbs - 1)); OUT_BCS_BATCH(batch, ((height_in_mbs - 1) << 16) | ((width_in_mbs - 1) << 0)); diff --git a/src/gen7_mfc.c b/src/gen7_mfc.c index 48f4bf2..394665d 100644 --- a/src/gen7_mfc.c +++ b/src/gen7_mfc.c @@ -214,7 +214,7 @@ gen7_mfc_avc_img_state(VADriverContextP ctx, struct encode_state *encode_state, OUT_BCS_BATCH(batch, MFX_AVC_IMG_STATE | (16 - 2)); /*DW1 frame size */ OUT_BCS_BATCH(batch, - ((width_in_mbs * height_in_mbs) & 0xFFFF)); + ((width_in_mbs * height_in_mbs - 1) & 0xFFFF)); OUT_BCS_BATCH(batch, ((height_in_mbs - 1) << 16) | ((width_in_mbs - 1) << 0)); diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c index 51a1850..5091034 100755 --- a/src/gen7_mfd.c +++ b/src/gen7_mfd.c @@ -353,7 +353,7 @@ gen7_mfd_avc_img_state(VADriverContextP ctx, BEGIN_BCS_BATCH(batch, 16); OUT_BCS_BATCH(batch, MFX_AVC_IMG_STATE | (16 - 2)); OUT_BCS_BATCH(batch, - width_in_mbs * height_in_mbs); + (width_in_mbs * height_in_mbs - 1)); OUT_BCS_BATCH(batch, ((height_in_mbs - 1) << 16) | ((width_in_mbs - 1) << 0)); @@ -2320,7 +2320,7 @@ gen7_jpeg_wa_avc_img_state(VADriverContextP ctx, BEGIN_BCS_BATCH(batch, 16); OUT_BCS_BATCH(batch, MFX_AVC_IMG_STATE | (16 - 2)); OUT_BCS_BATCH(batch, - width_in_mbs * height_in_mbs); + (width_in_mbs * height_in_mbs - 1)); OUT_BCS_BATCH(batch, ((height_in_mbs - 1) << 16) | ((width_in_mbs - 1) << 0)); diff --git a/src/gen8_mfc.c b/src/gen8_mfc.c index b1e9bd3..90092a1 100644 --- a/src/gen8_mfc.c +++ b/src/gen8_mfc.c @@ -230,7 +230,7 @@ gen8_mfc_avc_img_state(VADriverContextP ctx, struct encode_state *encode_state, OUT_BCS_BATCH(batch, MFX_AVC_IMG_STATE | (16 - 2)); /*DW1. MB setting of frame */ OUT_BCS_BATCH(batch, - ((width_in_mbs * height_in_mbs) & 0xFFFF)); + ((width_in_mbs * height_in_mbs - 1) & 0xFFFF)); OUT_BCS_BATCH(batch, ((height_in_mbs - 1) << 16) | ((width_in_mbs - 1) << 0)); diff --git a/src/gen8_mfd.c b/src/gen8_mfd.c index 3ce8ebe..6a10663 100644 --- a/src/gen8_mfd.c +++ b/src/gen8_mfd.c @@ -433,7 +433,7 @@ gen8_mfd_avc_img_state(VADriverContextP ctx, BEGIN_BCS_BATCH(batch, 17); OUT_BCS_BATCH(batch, MFX_AVC_IMG_STATE | (17 - 2)); OUT_BCS_BATCH(batch, - width_in_mbs * height_in_mbs); + (width_in_mbs * height_in_mbs - 1)); OUT_BCS_BATCH(batch, ((height_in_mbs - 1) << 16) | ((width_in_mbs - 1) << 0)); |