shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Rename post_encode drop function."

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -4848,8 +4848,7 @@

   vp9_pack_bitstream(cpi, dest, size);

   if (cpi->rc.use_post_encode_drop && cm->base_qindex < cpi->rc.worst_quality &&

-      cpi->svc.spatial_layer_id == 0 &&

-      post_encode_drop_screen_content(cpi, size)) {

+      cpi->svc.spatial_layer_id == 0 && post_encode_drop_cbr(cpi, size)) {

     restore_coding_context(cpi);

     return;

   }

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

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

@@ -550,7 +550,7 @@

   }

 }

-int post_encode_drop_screen_content(VP9_COMP *cpi, size_t *size) {

+int post_encode_drop_cbr(VP9_COMP *cpi, size_t *size) {

   size_t frame_size = *size << 3;

   int64_t new_buffer_level =

       cpi->rc.buffer_level + cpi->rc.avg_frame_bandwidth - (int64_t)frame_size;

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

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

@@ -256,8 +256,8 @@

 // Changes only the rate correction factors in the rate control structure.

 void vp9_rc_update_rate_correction_factors(struct VP9_COMP *cpi);

-// Post encode drop for CBR screen-content mode.

-int post_encode_drop_screen_content(struct VP9_COMP *cpi, size_t *size);

+// Post encode drop for CBR mode.

+int post_encode_drop_cbr(struct VP9_COMP *cpi, size_t *size);

 // Decide if we should drop this frame: For 1-pass CBR.

 // Changes only the decimation count in the rate control structure