Merge "Removed vp9_setup_intra_recon()" into experimental
This commit is contained in:
Scott LaVarnway
Gerrit Code Review
Коммит
9c7d06e6f3
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
@ -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_
|
||||
|
|
@ -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"
|
||||
|
|
@ -1335,9 +1334,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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
#include <limits.h>
|
||||
#include <vp9/encoder/vp9_encodeintra.h>
|
||||
#include <vp9/encoder/vp9_rdopt.h>
|
||||
#include <vp9/common/vp9_setupintrarecon.h>
|
||||
#include <vp9/common/vp9_blockd.h>
|
||||
#include <vp9/common/vp9_reconinter.h>
|
||||
#include <vp9/common/vp9_systemdependent.h>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче