shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Properly set segmentation for error-resilient mode"

--- a/vp9/encoder/vp9_aq_complexity.c

+++ b/vp9/encoder/vp9_aq_complexity.c

@@ -51,7 +51,7 @@

   // Make SURE use of floating point in this function is safe.

   vpx_clear_system_state();

-  if (cm->frame_type == KEY_FRAME ||

+  if (frame_is_intra_only(cm) || cm->error_resilient_mode ||

       cpi->refresh_alt_ref_frame ||

       (cpi->refresh_golden_frame && !cpi->rc.is_src_frame_alt_ref)) {

     int segment;

--- a/vp9/encoder/vp9_aq_variance.c

+++ b/vp9/encoder/vp9_aq_variance.c

@@ -48,7 +48,7 @@

   struct segmentation *seg = &cm->seg;

   int i;

-  if (cm->frame_type == KEY_FRAME ||

+  if (frame_is_intra_only(cm) || cm->error_resilient_mode ||

       cpi->refresh_alt_ref_frame ||

       (cpi->refresh_golden_frame && !cpi->rc.is_src_frame_alt_ref)) {

     vp9_enable_segmentation(seg);