Remove unused array 'last_frame_seg_map_copy'. This array was allocated and used to save and restore segmentation map, however the original segmentation map was never modified between the calls to save and restore. Change-Id: Iaf0fbfed733c097e84cf44d2aa6b8f35d2fb456b
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c index 82b75dc..ad33134 100644 --- a/av1/encoder/encoder.c +++ b/av1/encoder/encoder.c
@@ -1,11 +1,12 @@ /* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. + * Copyright (c) 2016, Alliance for Open Media. All rights reserved * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. + * This source code is subject to the terms of the BSD 2 Clause License and + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * was not distributed with this source code in the LICENSE file, you can + * obtain it at www.aomedia.org/license/software. If the Alliance for Open + * Media Patent License 1.0 was not distributed with this source code in the + * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ #include <limits.h> @@ -416,8 +417,6 @@ // Delete sementation map aom_free(cpi->segmentation_map); cpi->segmentation_map = NULL; - aom_free(cpi->coding_context.last_frame_seg_map_copy); - cpi->coding_context.last_frame_seg_map_copy = NULL; #if CONFIG_REF_MV for (i = 0; i < NMV_CONTEXTS; ++i) { @@ -531,9 +530,6 @@ memcpy(cc->nmvcosts_hp[1], cpi->nmvcosts_hp[1], MV_VALS * sizeof(*cpi->nmvcosts_hp[1])); - memcpy(cpi->coding_context.last_frame_seg_map_copy, cm->last_frame_seg_map, - (cm->mi_rows * cm->mi_cols)); - av1_copy(cc->last_ref_lf_deltas, cm->lf.last_ref_deltas); av1_copy(cc->last_mode_lf_deltas, cm->lf.last_mode_deltas); @@ -572,9 +568,6 @@ memcpy(cpi->nmvcosts_hp[1], cc->nmvcosts_hp[1], MV_VALS * sizeof(*cc->nmvcosts_hp[1])); - memcpy(cm->last_frame_seg_map, cpi->coding_context.last_frame_seg_map_copy, - (cm->mi_rows * cm->mi_cols)); - av1_copy(cm->lf.last_ref_deltas, cc->last_ref_lf_deltas); av1_copy(cm->lf.last_mode_deltas, cc->last_mode_lf_deltas); @@ -1895,12 +1888,6 @@ aom_free(cpi->active_map.map); CHECK_MEM_ERROR(cm, cpi->active_map.map, aom_calloc(cm->mi_rows * cm->mi_cols, 1)); - - // And a place holder structure is the coding context - // for use if we want to save and restore it - aom_free(cpi->coding_context.last_frame_seg_map_copy); - CHECK_MEM_ERROR(cm, cpi->coding_context.last_frame_seg_map_copy, - aom_calloc(cm->mi_rows * cm->mi_cols, 1)); } void av1_change_config(struct AV1_COMP *cpi, const AV1EncoderConfig *oxcf) {
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h index a99a5cb..8819655 100644 --- a/av1/encoder/encoder.h +++ b/av1/encoder/encoder.h
@@ -1,11 +1,12 @@ /* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. + * Copyright (c) 2016, Alliance for Open Media. All rights reserved * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. + * This source code is subject to the terms of the BSD 2 Clause License and + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * was not distributed with this source code in the LICENSE file, you can + * obtain it at www.aomedia.org/license/software. If the Alliance for Open + * Media Patent License 1.0 was not distributed with this source code in the + * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ #ifndef AV1_ENCODER_ENCODER_H_ @@ -59,8 +60,6 @@ int nmv_costs_hp[NMV_CONTEXTS][2][MV_VALS]; #endif - unsigned char *last_frame_seg_map_copy; - // 0 = Intra, Last, GF, ARF signed char last_ref_lf_deltas[TOTAL_REFS_PER_FRAME]; // 0 = ZERO_MV, MV