From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Thu, 15 Apr 2010 01:18:53 +0000 (+0800)
Subject: i965_drv_video: [H.264] fix for weight/offset state
X-Git-Tag: libva-1.0.3~3^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F554%2F1;p=profile%2Fivi%2Flibva.git

i965_drv_video: [H.264] fix for weight/offset state
---

diff --git a/i965_drv_video/i965_avc_bsd.c b/i965_drv_video/i965_avc_bsd.c
index 3017bb2..157bf16 100644
--- a/i965_drv_video/i965_avc_bsd.c
+++ b/i965_drv_video/i965_avc_bsd.c
@@ -263,18 +263,16 @@ i965_avc_bsd_slice_state(VADriverContextP ctx,
         cmd_len += 16;
     }
 
-    if (slice_param->luma_weight_l0_flag | slice_param->chroma_weight_l0_flag) {
+    if (pic_param->pic_fields.bits.weighted_pred_flag == 1 ||
+        pic_param->pic_fields.bits.weighted_bipred_idc == 1) {
         present_flag |= PRESENT_WEIGHT_OFFSET_L0;
         cmd_len += 48;
-        assert((pic_param->pic_fields.bits.weighted_pred_flag == 1) || /* P slice */
-               (pic_param->pic_fields.bits.weighted_bipred_idc == 1)); /* B slice */
     }
 
-    if (slice_param->luma_weight_l1_flag | slice_param->chroma_weight_l1_flag) {
+    if (pic_param->pic_fields.bits.weighted_bipred_idc == 1) {
         present_flag |= PRESENT_WEIGHT_OFFSET_L1;
         cmd_len += 48;
         assert(slice_param->slice_type == SLICE_TYPE_B);
-        assert(pic_param->pic_fields.bits.weighted_bipred_idc == 1);
     }
 
     BEGIN_BCS_BATCH(ctx, cmd_len);