Attachment 105407 Details for Bug 83143 – Fix the incorrect QP setting under CBR when slice_header info is passed

[patch] Fix the incorrect QP setting under CBR when slice_header info is passed

0001_test.patch (text/plain), 7.50 KB, created by ykzhao on 2014-08-29 05:29:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ykzhao

Created: 2014-08-29 05:29:23 UTC

Size: 7.50 KB

patch

obsolete

>From: Zhao Yakui <yakui.zhao@intel.com>
>Subject: [Patch] Encoding: Fix the incorrect Qp setting under CBR when slice_header is passed
>
>Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
>---
> src/gen6_mfc.c  |   17 +++++++++++++----
> src/gen75_mfc.c |   16 ++++++++++++----
> src/gen8_mfc.c  |   17 ++++++++++++-----
> 3 files changed, 37 insertions(+), 13 deletions(-)
>
>Index: intel-driver/src/gen6_mfc.c
>===================================================================
>--- intel-driver.orig/src/gen6_mfc.c	2014-08-07 08:20:42.542986307 +0800
>+++ intel-driver/src/gen6_mfc.c	2014-08-29 13:04:02.443023568 +0800
>@@ -842,11 +842,15 @@
>     int slice_type = intel_avc_enc_slice_type_fixup(pSliceParameter->slice_type);
>     int is_intra = slice_type == SLICE_TYPE_I;
>     int is_low_quality = (encoder_context->quality_level == ENCODER_LOW_QUALITY);
>+    int qp_slice;
> 
>+    qp_slice = qp;
>     if (rate_control_mode == VA_RC_CBR) {
>         qp = mfc_context->bit_rate_control_context[slice_type].QpPrimeY;
>-        if (encode_state->slice_header_index[slice_index] == 0)
>+        if (encode_state->slice_header_index[slice_index] == 0) {
>             pSliceParameter->slice_qp_delta = qp - pPicParameter->pic_init_qp;
>+            qp_slice = qp;
>+        }
>     }
> 
>     /* only support for 8-bit pixel bit-depth */
>@@ -859,7 +863,7 @@
>                              pPicParameter,
>                              pSliceParameter,
>                              encode_state, encoder_context,
>-                             (rate_control_mode == VA_RC_CBR), qp, slice_batch);
>+                             (rate_control_mode == VA_RC_CBR), qp_slice, slice_batch);
> 
>     if ( slice_index == 0) 
>         intel_mfc_avc_pipeline_header_programing(ctx, encode_state, encoder_context, slice_batch);
>@@ -1238,11 +1242,16 @@
>     int old_used = intel_batchbuffer_used_size(slice_batch), used;
>     unsigned short head_size, tail_size;
>     int slice_type = intel_avc_enc_slice_type_fixup(pSliceParameter->slice_type);
>+    int qp_slice;
> 
>+    qp_slice = qp;
>     if (rate_control_mode == VA_RC_CBR) {
>         qp = mfc_context->bit_rate_control_context[slice_type].QpPrimeY;
>-        if (encode_state->slice_header_index[slice_index] == 0)
>+        if (encode_state->slice_header_index[slice_index] == 0) {
>             pSliceParameter->slice_qp_delta = qp - pPicParameter->pic_init_qp;
>+            /* Use the adjusted qp when slice_header is generated by driver */
>+            qp_slice = qp;
>+        }
>     }
> 
>     /* only support for 8-bit pixel bit-depth */
>@@ -1258,7 +1267,7 @@
>                              encode_state,
>                              encoder_context,
>                              (rate_control_mode == VA_RC_CBR),
>-                             qp,
>+                             qp_slice,
>                              slice_batch);
> 
>     if (slice_index == 0)
>Index: intel-driver/src/gen75_mfc.c
>===================================================================
>--- intel-driver.orig/src/gen75_mfc.c	2014-08-07 08:20:42.544986307 +0800
>+++ intel-driver/src/gen75_mfc.c	2014-08-29 13:00:39.197021164 +0800
>@@ -1169,11 +1169,15 @@
>     unsigned int tail_data[] = { 0x0, 0x0 };
>     int slice_type = intel_avc_enc_slice_type_fixup(pSliceParameter->slice_type);
>     int is_intra = slice_type == SLICE_TYPE_I;
>+    int qp_slice;
> 
>+    qp_slice = qp;
>     if (rate_control_mode == VA_RC_CBR) {
>         qp = mfc_context->bit_rate_control_context[slice_type].QpPrimeY;
>-        if (encode_state->slice_header_index[slice_index] == 0)
>+        if (encode_state->slice_header_index[slice_index] == 0) {
>             pSliceParameter->slice_qp_delta = qp - pPicParameter->pic_init_qp;
>+            qp_slice = qp;
>+        }
>     }
> 
>     /* only support for 8-bit pixel bit-depth */
>@@ -1186,7 +1190,7 @@
>                               pPicParameter,
>                               pSliceParameter,
>                               encode_state, encoder_context,
>-                              (rate_control_mode == VA_RC_CBR), qp, slice_batch);
>+                              (rate_control_mode == VA_RC_CBR), qp_slice, slice_batch);
> 
>     if ( slice_index == 0)
>           intel_mfc_avc_pipeline_header_programing(ctx, encode_state, encoder_context, slice_batch);
>@@ -1510,11 +1514,15 @@
>     unsigned int tail_data[] = { 0x0, 0x0 };
>     long head_offset;
>     int slice_type = intel_avc_enc_slice_type_fixup(pSliceParameter->slice_type);
>+    int qp_slice;
> 
>+    qp_slice = qp;
>     if (rate_control_mode == VA_RC_CBR) {
>         qp = mfc_context->bit_rate_control_context[slice_type].QpPrimeY;
>-        if (encode_state->slice_header_index[slice_index] == 0)
>+        if (encode_state->slice_header_index[slice_index] == 0) {
>             pSliceParameter->slice_qp_delta = qp - pPicParameter->pic_init_qp;
>+            qp_slice = qp;
>+        }
>     }
> 
>     /* only support for 8-bit pixel bit-depth */
>@@ -1529,7 +1537,7 @@
>                               encode_state,
>                               encoder_context,
>                               (rate_control_mode == VA_RC_CBR),
>-                              qp,
>+                              qp_slice,
>                               slice_batch);
> 
>     if (slice_index == 0)
>Index: intel-driver/src/gen8_mfc.c
>===================================================================
>--- intel-driver.orig/src/gen8_mfc.c	2014-08-07 08:20:42.545986307 +0800
>+++ intel-driver/src/gen8_mfc.c	2014-08-29 13:02:17.741022330 +0800
>@@ -1032,12 +1032,15 @@
>     unsigned int tail_data[] = { 0x0, 0x0 };
>     int slice_type = intel_avc_enc_slice_type_fixup(pSliceParameter->slice_type);
>     int is_intra = slice_type == SLICE_TYPE_I;
>+    int qp_slice;
> 
>-
>+    qp_slice = qp;
>     if (rate_control_mode == VA_RC_CBR) {
>         qp = mfc_context->bit_rate_control_context[slice_type].QpPrimeY;
>-        if (encode_state->slice_header_index[slice_index] == 0)
>+        if (encode_state->slice_header_index[slice_index] == 0) {
>             pSliceParameter->slice_qp_delta = qp - pPicParameter->pic_init_qp;
>+            qp_slice = qp;
>+        }
>     }
> 
>     /* only support for 8-bit pixel bit-depth */
>@@ -1050,7 +1053,7 @@
>                                   pPicParameter,
>                                   pSliceParameter,
>                                   encode_state, encoder_context,
>-                                  (rate_control_mode == VA_RC_CBR), qp, slice_batch);
>+                                  (rate_control_mode == VA_RC_CBR), qp_slice, slice_batch);
> 
>         if ( slice_index == 0)
>             intel_mfc_avc_pipeline_header_programing(ctx, encode_state, encoder_context, slice_batch);
>@@ -1405,11 +1408,15 @@
>     int old_used = intel_batchbuffer_used_size(slice_batch), used;
>     unsigned short head_size, tail_size;
>     int slice_type = intel_avc_enc_slice_type_fixup(pSliceParameter->slice_type);
>+    int qp_slice;
> 
>+    qp_slice = qp;
>     if (rate_control_mode == VA_RC_CBR) {
>         qp = mfc_context->bit_rate_control_context[slice_type].QpPrimeY;
>-        if (encode_state->slice_header_index[slice_index] == 0)
>+        if (encode_state->slice_header_index[slice_index] == 0) {
>             pSliceParameter->slice_qp_delta = qp - pPicParameter->pic_init_qp;
>+            qp_slice = qp;
>+        }
>     }
> 
>     /* only support for 8-bit pixel bit-depth */
>@@ -1425,7 +1432,7 @@
>                              encode_state,
>                              encoder_context,
>                              (rate_control_mode == VA_RC_CBR),
>-                             qp,
>+                             qp_slice,
>                              slice_batch);
> 
>     if (slice_index == 0)

Actions: View | Splinter Review

Attachments on bug 83143: 105407

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.