net/freeswitch/patches/501-libvpx-Fix-bug-with-smaller-width-bigger-size.patch

   1 From 2ab7a3d323984a4df969ea19dadf86213308a361 Mon Sep 17 00:00:00 2001
   2 From: Andrey Volk <andywolk@gmail.com>
   3 Date: Fri, 6 Oct 2023 00:42:10 +0300
   4 Subject: [PATCH] [libvpx] Fix bug with smaller width bigger size
   5
   6 ---
   7  libs/libvpx/vp9/common/vp9_alloccommon.c | 12 +++++------
   8  libs/libvpx/vp9/encoder/vp9_encoder.c    | 27 ++++++++++++++++++++++--
   9  2 files changed, 31 insertions(+), 8 deletions(-)
  10
  11 --- a/libs/libvpx/vp9/common/vp9_alloccommon.c
  12 +++ b/libs/libvpx/vp9/common/vp9_alloccommon.c
  13 @@ -123,12 +123,6 @@ int vp9_alloc_context_buffers(VP9_COMMON
  14      if (cm->alloc_mi(cm, new_mi_size)) goto fail;
  15    }
  16
  17 -  if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
  18 -    // Create the segmentation map structure and set to 0.
  19 -    free_seg_map(cm);
  20 -    if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
  21 -  }
  22 -
  23    if (cm->above_context_alloc_cols < cm->mi_cols) {
  24      vpx_free(cm->above_context);
  25      cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc(
  26 @@ -143,6 +137,12 @@ int vp9_alloc_context_buffers(VP9_COMMON
  27      cm->above_context_alloc_cols = cm->mi_cols;
  28    }
  29
  30 +  if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
  31 +    // Create the segmentation map structure and set to 0.
  32 +    free_seg_map(cm);
  33 +    if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
  34 +  }
  35 +
  36    if (vp9_alloc_loop_filter(cm)) goto fail;
  37
  38    return 0;
  39 --- a/libs/libvpx/vp9/encoder/vp9_encoder.c
  40 +++ b/libs/libvpx/vp9/encoder/vp9_encoder.c
  41 @@ -1915,6 +1915,17 @@ static void alloc_copy_partition_data(VP
  42    }
  43  }
  44
  45 +static void free_copy_partition_data(VP9_COMP *cpi) {
  46 +  vpx_free(cpi->prev_partition);
  47 +  cpi->prev_partition = NULL;
  48 +  vpx_free(cpi->prev_segment_id);
  49 +  cpi->prev_segment_id = NULL;
  50 +  vpx_free(cpi->prev_variance_low);
  51 +  cpi->prev_variance_low = NULL;
  52 +  vpx_free(cpi->copied_frame_cnt);
  53 +  cpi->copied_frame_cnt = NULL;
  54 +}
  55 +
  56  void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
  57    VP9_COMMON *const cm = &cpi->common;
  58    RATE_CONTROL *const rc = &cpi->rc;
  59 @@ -1999,6 +2010,8 @@ void vp9_change_config(struct VP9_COMP *
  60      new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows);
  61      if (cm->mi_alloc_size < new_mi_size) {
  62        vp9_free_context_buffers(cm);
  63 +      vp9_free_pc_tree(&cpi->td);
  64 +      vpx_free(cpi->mbmi_ext_base);
  65        alloc_compressor_data(cpi);
  66        realloc_segmentation_maps(cpi);
  67        cpi->initial_width = cpi->initial_height = 0;
  68 @@ -2014,8 +2027,18 @@ void vp9_change_config(struct VP9_COMP *
  69      update_frame_size(cpi);
  70
  71    if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) {
  72 -    memset(cpi->consec_zero_mv, 0,
  73 -           cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv));
  74 +    vpx_free(cpi->consec_zero_mv);
  75 +    CHECK_MEM_ERROR(
  76 +        cm, cpi->consec_zero_mv,
  77 +        vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv)));
  78 +
  79 +    vpx_free(cpi->skin_map);
  80 +    CHECK_MEM_ERROR(
  81 +        cm, cpi->skin_map,
  82 +        vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0])));
  83 +
  84 +    free_copy_partition_data(cpi);
  85 +    alloc_copy_partition_data(cpi);
  86      if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ)
  87        vp9_cyclic_refresh_reset_resize(cpi);
  88      rc->rc_1_frame = 0;