VP9_SoftwareBRC: Debug + Mino Fixesvp9-softwarebrc-experimental

2 files changed, 12 insertions, 6 deletions

diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_vp9.c b/gst-libs/gst/vaapi/gstvaapiencoder_vp9.c
index f6d3366b..e38a6799 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder_vp9.c
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_vp9.c
@@ -460,9 +460,9 @@ fill_picture (GstVaapiEncoderVP9 * encoder,
   }
 
   pic_param->luma_ac_qindex = encoder->yac_qi;
-  pic_param->luma_dc_qindex_delta = 1;
-  pic_param->chroma_ac_qindex_delta = 1;
-  pic_param->chroma_dc_qindex_delta = 1;
+  pic_param->luma_dc_qindex_delta = 0;
+  pic_param->chroma_ac_qindex_delta = 0;
+  pic_param->chroma_dc_qindex_delta = 0;
   pic_param->filter_level = encoder->loop_filter_level;
   pic_param->sharpness_level = encoder->sharpness_level;
 
@@ -653,6 +653,7 @@ gst_vaapi_encoder_vp9_encode (GstVaapiEncoder * base_encoder,
     vp9_rc_get_one_pass_cbr_params (&encoder->cpi);
     vp9_set_size_dependent_vars(&encoder->cpi, &q, &bottom_index, &top_index);
     encoder->yac_qi = q;
+    g_message ("Q=%d",q);
     vp9_set_quantizer(&encoder->cpi, q);
   }
 
@@ -679,6 +680,7 @@ gst_vaapi_encoder_vp9_encode (GstVaapiEncoder * base_encoder,
   if (encoder->software_brc) {
     gint32 buf_size;
     buf_size = gst_vaapi_coded_buffer_get_size (GST_VAAPI_CODED_BUFFER_PROXY_BUFFER (codedbuf));
+    g_message ("PostEncUpdateBufSize %d",buf_size);
     vp9_rc_postencode_update (&encoder->cpi, buf_size);
     encoder->cpi.common.current_video_frame++;
   }
diff --git a/gst-libs/gst/vaapi/vp9_ratectrl.c b/gst-libs/gst/vaapi/vp9_ratectrl.c
index c2d24076..7e7149b0 100644
--- a/gst-libs/gst/vaapi/vp9_ratectrl.c
+++ b/gst-libs/gst/vaapi/vp9_ratectrl.c
@@ -1807,6 +1807,7 @@ void vp9_rc_get_one_pass_cbr_params(VP9_COMP *cpi) {
   VP9_COMMON *const cm = &cpi->common;
   RATE_CONTROL *const rc = &cpi->rc;
   int target;
+  printf ("onepasscbr\n");
 #if 0
   if ((cm->current_video_frame == 0) || (cpi->frame_flags & FRAMEFLAGS_KEY) ||
       (cpi->oxcf.auto_key && rc->frames_to_key == 0)) {
@@ -1829,11 +1830,14 @@ void vp9_rc_get_one_pass_cbr_params(VP9_COMP *cpi) {
     rc->gfu_boost = DEFAULT_GF_BOOST;
   }
 
-  if (frame_is_intra_only(cm))
+  if (frame_is_intra_only(cm)) {
     target = calc_iframe_target_size_one_pass_cbr(cpi);
-  else
+    printf ("\n TargetSize (Iframe) %d \n",target);
+  }
+  else {
     target = calc_pframe_target_size_one_pass_cbr(cpi);
-
+    printf ("TargetSize (Pframe)%d \n",target);
+  }
   vp9_rc_set_frame_target(cpi, target);
 
   if (cm->show_frame) update_buffer_level_preencode(cpi);