shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Moving last_frame_type update out from vp9_rc_postencode_update."

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -2658,6 +2658,7 @@

   get_ref_frame_flags(cpi);

+  cm->last_frame_type = cm->frame_type;

   vp9_rc_postencode_update(cpi, *size);

   if (cm->frame_type == KEY_FRAME) {

--- a/vp9/encoder/vp9_ratectrl.c

+++ b/vp9/encoder/vp9_ratectrl.c

@@ -1065,11 +1065,10 @@

 }

 void vp9_rc_postencode_update(VP9_COMP *cpi, uint64_t bytes_used) {

-  VP9_COMMON *const cm = &cpi->common;

+  const VP9_COMMON *const cm = &cpi->common;

   const VP9_CONFIG *const oxcf = &cpi->oxcf;

   RATE_CONTROL *const rc = &cpi->rc;

-  cm->last_frame_type = cm->frame_type;

   // Update rate control heuristics

   rc->projected_frame_size = (int)(bytes_used << 3);

--- a/vp9/encoder/vp9_ratectrl.h

+++ b/vp9/encoder/vp9_ratectrl.h

@@ -125,8 +125,7 @@

 // Post encode update of the rate control parameters based

 // on bytes used

-void vp9_rc_postencode_update(struct VP9_COMP *cpi,

-                              uint64_t bytes_used);

+void vp9_rc_postencode_update(struct VP9_COMP *cpi, uint64_t bytes_used);

 // Post encode update of the rate control parameters for dropped frames

 void vp9_rc_postencode_update_drop_frame(struct VP9_COMP *cpi);

-- 

⑨