genX_mfd: remove mapping of I frame to BI frame

This mapping does not make sense. Unless the mapping is some workaround
for a hardware quirk, we should be able to safely remove it. If this
breaks things, we can always put it back accompanied with an explanation
in the code.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>

diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c
index 35b570b..e2c3b1f 100644 (file)
--- a/src/gen6_mfd.c
+++ b/src/gen6_mfd.c
@@ -1457,10 +1457,6 @@ gen6_mfd_vc1_pic_state(VADriverContextP ctx,
     else
         ptype = pic_param->picture_fields.bits.picture_type;
 
-    if (profile == GEN6_VC1_ADVANCED_PROFILE &&
-        picture_type == GEN6_VC1_I_PICTURE)
-        picture_type = GEN6_VC1_BI_PICTURE;
-
     if (picture_type == GEN6_VC1_I_PICTURE || picture_type == GEN6_VC1_BI_PICTURE) /* I picture */
         trans_ac_y = pic_param->transform_fields.bits.transform_ac_codingset_idx2;
     else {

diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c
index 84ae856..896a615 100644 (file)
--- a/src/gen75_mfd.c
+++ b/src/gen75_mfd.c
@@ -1782,10 +1782,6 @@ gen75_mfd_vc1_pic_state(VADriverContextP ctx,
     else
         ptype = pic_param->picture_fields.bits.picture_type;
 
-    if (profile == GEN7_VC1_ADVANCED_PROFILE &&
-        picture_type == GEN7_VC1_I_PICTURE)
-        picture_type = GEN7_VC1_BI_PICTURE;
-
     if (picture_type == GEN7_VC1_I_PICTURE || picture_type == GEN7_VC1_BI_PICTURE) /* I picture */
         trans_ac_y = pic_param->transform_fields.bits.transform_ac_codingset_idx2;
     else {

diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index 80be4f6..cb23379 100644 (file)
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -1517,10 +1517,6 @@ gen7_mfd_vc1_pic_state(VADriverContextP ctx,
     else
         ptype = pic_param->picture_fields.bits.picture_type;
 
-    if (profile == GEN7_VC1_ADVANCED_PROFILE &&
-        picture_type == GEN7_VC1_I_PICTURE)
-        picture_type = GEN7_VC1_BI_PICTURE;
-
     if (picture_type == GEN7_VC1_I_PICTURE || picture_type == GEN7_VC1_BI_PICTURE) /* I picture */
         trans_ac_y = pic_param->transform_fields.bits.transform_ac_codingset_idx2;
     else {

diff --git a/src/gen8_mfd.c b/src/gen8_mfd.c
index 962cb15..5dcccb7 100644 (file)
--- a/src/gen8_mfd.c
+++ b/src/gen8_mfd.c
@@ -1561,10 +1561,6 @@ gen8_mfd_vc1_pic_state(VADriverContextP ctx,
     else
         ptype = pic_param->picture_fields.bits.picture_type;
 
-    if (profile == GEN7_VC1_ADVANCED_PROFILE &&
-        picture_type == GEN7_VC1_I_PICTURE)
-        picture_type = GEN7_VC1_BI_PICTURE;
-
     if (picture_type == GEN7_VC1_I_PICTURE || picture_type == GEN7_VC1_BI_PICTURE) /* I picture */
         trans_ac_y = pic_param->transform_fields.bits.transform_ac_codingset_idx2;
     else {