From: Scott LaVarnway Date: Mon, 6 May 2013 20:13:06 +0000 (-0400) Subject: Removed vp9_setup_intra_recon() X-Git-Tag: v1.3.0~1106^2~49^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb7955d83e11deb2f8ecf8dc76141ada39981e40;p=platform%2Fupstream%2Flibvpx.git Removed vp9_setup_intra_recon() This setup is now handled by vp9_build_intra_predictors() when left_available and/or up_available is zero. Change-Id: I59cec0ab95f8be69ce885fd20727510e4deef8a0 --- diff --git a/vp9/common/vp9_setupintrarecon.c b/vp9/common/vp9_setupintrarecon.c deleted file mode 100644 index 6784103..0000000 --- a/vp9/common/vp9_setupintrarecon.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. 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. - */ - - -#include "vp9/common/vp9_setupintrarecon.h" -#include "vpx_mem/vpx_mem.h" - -void vp9_setup_intra_recon(YV12_BUFFER_CONFIG *ybf) { - int i; - - // luma - vpx_memset(ybf->y_buffer - 1 - ybf->y_stride, 127, ybf->y_width + 5); - for (i = 0; i < ybf->y_height; i++) - ybf->y_buffer[ybf->y_stride * i - 1] = 129; - - // chroma - vpx_memset(ybf->u_buffer - 1 - ybf->uv_stride, 127, ybf->uv_width + 5); - vpx_memset(ybf->v_buffer - 1 - ybf->uv_stride, 127, ybf->uv_width + 5); - for (i = 0; i < ybf->uv_height; i++) { - ybf->u_buffer[ybf->uv_stride * i - 1] = 129; - ybf->v_buffer[ybf->uv_stride * i - 1] = 129; - } -} diff --git a/vp9/common/vp9_setupintrarecon.h b/vp9/common/vp9_setupintrarecon.h deleted file mode 100644 index e389f3c..0000000 --- a/vp9/common/vp9_setupintrarecon.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. 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. - */ - -#ifndef VP9_COMMON_VP9_SETUPINTRARECON_H_ -#define VP9_COMMON_VP9_SETUPINTRARECON_H_ - -#include "vpx_scale/yv12config.h" - -void vp9_setup_intra_recon(YV12_BUFFER_CONFIG *ybf); - -#endif // VP9_COMMON_VP9_SETUPINTRARECON_H_ diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 2f713d3..b85053d 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -24,7 +24,6 @@ #include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_quant_common.h" #include "vpx_scale/vpx_scale.h" -#include "vp9/common/vp9_setupintrarecon.h" #include "vp9/decoder/vp9_decodemv.h" #include "vp9/common/vp9_extend.h" @@ -1337,9 +1336,6 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { CHECK_MEM_ERROR(pc->last_frame_seg_map, vpx_calloc((pc->mi_rows * pc->mi_cols), 1)); - // set up frame new frame for intra coded blocks - vp9_setup_intra_recon(new_fb); - vp9_setup_block_dptrs(xd); // clear out the coeff buffer diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index f866597..d1b6a2a 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -20,7 +20,6 @@ #include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_quant_common.h" #include "vp9/encoder/vp9_segmentation.h" -#include "vp9/common/vp9_setupintrarecon.h" #include "vp9/encoder/vp9_encodeintra.h" #include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_invtrans.h" @@ -1561,9 +1560,6 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) { 0, 0, NULL, NULL); setup_dst_planes(xd, &cm->yv12_fb[cm->new_fb_idx], 0, 0); - // set up frame for intra coded blocks - vp9_setup_intra_recon(&cm->yv12_fb[cm->new_fb_idx]); - vp9_build_block_offsets(x); vp9_setup_block_dptrs(&x->e_mbd); diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 4d28f1b..84b01fc 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -14,7 +14,6 @@ #include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_variance.h" #include "vp9/encoder/vp9_encodeintra.h" -#include "vp9/common/vp9_setupintrarecon.h" #include "vp9/encoder/vp9_mcomp.h" #include "vp9/encoder/vp9_firstpass.h" #include "vpx_scale/vpx_scale.h" @@ -486,8 +485,6 @@ void vp9_first_pass(VP9_COMP *cpi) { vp9_setup_block_dptrs(&x->e_mbd); - // set up frame new frame for intra coded blocks - vp9_setup_intra_recon(new_yv12); vp9_frame_init_quantizer(cpi); // Initialise the MV cost table to the defaults diff --git a/vp9/encoder/vp9_mbgraph.c b/vp9/encoder/vp9_mbgraph.c index af62ec3..93f459a 100644 --- a/vp9/encoder/vp9_mbgraph.c +++ b/vp9/encoder/vp9_mbgraph.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index 1ddd4f0..bda1741 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -56,7 +56,6 @@ VP9_COMMON_SRCS-yes += common/vp9_sadmxn.h VP9_COMMON_SRCS-yes += common/vp9_subpelvar.h VP9_COMMON_SRCS-yes += common/vp9_seg_common.h VP9_COMMON_SRCS-yes += common/vp9_seg_common.c -VP9_COMMON_SRCS-yes += common/vp9_setupintrarecon.h VP9_COMMON_SRCS-yes += common/vp9_swapyv12buffer.h VP9_COMMON_SRCS-yes += common/vp9_systemdependent.h VP9_COMMON_SRCS-yes += common/vp9_textblit.h @@ -76,7 +75,6 @@ VP9_COMMON_SRCS-yes += common/vp9_recon.c VP9_COMMON_SRCS-yes += common/vp9_reconinter.c VP9_COMMON_SRCS-yes += common/vp9_reconintra.c VP9_COMMON_SRCS-yes += common/vp9_reconintra4x4.c -VP9_COMMON_SRCS-yes += common/vp9_setupintrarecon.c VP9_COMMON_SRCS-yes += common/vp9_swapyv12buffer.c VP9_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/vp9_textblit.c VP9_COMMON_SRCS-yes += common/vp9_treecoder.c