Merge "Removing vp9_encodeintra.{h, c} files."
This commit is contained in:
Dmitry Kovalev
Gerrit Code Review
commit
3b9befe52e
@ -31,7 +31,6 @@
|
||||
#include "vp9/common/vp9_seg_common.h"
|
||||
#include "vp9/common/vp9_tile_common.h"
|
||||
#include "vp9/encoder/vp9_encodeframe.h"
|
||||
#include "vp9/encoder/vp9_encodeintra.h"
|
||||
#include "vp9/encoder/vp9_encodemb.h"
|
||||
#include "vp9/encoder/vp9_encodemv.h"
|
||||
#include "vp9/encoder/vp9_onyx_int.h"
|
||||
|
||||
@ -1,28 +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 "./vpx_config.h"
|
||||
#include "./vp9_rtcd.h"
|
||||
#include "vp9/encoder/vp9_quantize.h"
|
||||
#include "vp9/common/vp9_reconintra.h"
|
||||
#include "vp9/encoder/vp9_encodemb.h"
|
||||
#include "vp9/encoder/vp9_encodeintra.h"
|
||||
|
||||
int vp9_encode_intra(MACROBLOCK *x, int use_16x16_pred) {
|
||||
MB_MODE_INFO * mbmi = &x->e_mbd.mi_8x8[0]->mbmi;
|
||||
x->skip_encode = 0;
|
||||
mbmi->mode = DC_PRED;
|
||||
mbmi->ref_frame[0] = INTRA_FRAME;
|
||||
mbmi->tx_size = use_16x16_pred ? (mbmi->sb_type >= BLOCK_16X16 ? TX_16X16
|
||||
: TX_8X8)
|
||||
: TX_4X4;
|
||||
vp9_encode_intra_block_y(x, mbmi->sb_type);
|
||||
return vp9_get_mb_ss(x->plane[0].src_diff);
|
||||
}
|
||||
@ -1,20 +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_ENCODER_VP9_ENCODEINTRA_H_
|
||||
#define VP9_ENCODER_VP9_ENCODEINTRA_H_
|
||||
|
||||
#include "vp9/encoder/vp9_onyx_int.h"
|
||||
|
||||
int vp9_encode_intra(MACROBLOCK *x, int use_16x16_pred);
|
||||
void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
|
||||
TX_SIZE tx_size, void *arg);
|
||||
|
||||
#endif // VP9_ENCODER_VP9_ENCODEINTRA_H_
|
||||
@ -680,3 +680,14 @@ void vp9_encode_intra_block_uv(MACROBLOCK *x, BLOCK_SIZE bsize) {
|
||||
foreach_transformed_block_uv(xd, bsize, vp9_encode_block_intra, &arg);
|
||||
}
|
||||
|
||||
int vp9_encode_intra(MACROBLOCK *x, int use_16x16_pred) {
|
||||
MB_MODE_INFO * mbmi = &x->e_mbd.mi_8x8[0]->mbmi;
|
||||
x->skip_encode = 0;
|
||||
mbmi->mode = DC_PRED;
|
||||
mbmi->ref_frame[0] = INTRA_FRAME;
|
||||
mbmi->tx_size = use_16x16_pred ? (mbmi->sb_type >= BLOCK_16X16 ? TX_16X16
|
||||
: TX_8X8)
|
||||
: TX_4X4;
|
||||
vp9_encode_intra_block_y(x, mbmi->sb_type);
|
||||
return vp9_get_mb_ss(x->plane[0].src_diff);
|
||||
}
|
||||
|
||||
@ -47,8 +47,12 @@ void vp9_subtract_sby(MACROBLOCK *x, BLOCK_SIZE bsize);
|
||||
void vp9_subtract_sbuv(MACROBLOCK *x, BLOCK_SIZE bsize);
|
||||
void vp9_subtract_sb(MACROBLOCK *x, BLOCK_SIZE bsize);
|
||||
|
||||
void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
|
||||
TX_SIZE tx_size, void *arg);
|
||||
|
||||
void vp9_encode_intra_block_y(MACROBLOCK *x, BLOCK_SIZE bsize);
|
||||
void vp9_encode_intra_block_uv(MACROBLOCK *x, BLOCK_SIZE bsize);
|
||||
|
||||
int vp9_encode_intra(MACROBLOCK *x, int use_16x16_pred);
|
||||
|
||||
#endif // VP9_ENCODER_VP9_ENCODEMB_H_
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
#include "vp9/encoder/vp9_block.h"
|
||||
#include "vp9/encoder/vp9_onyx_int.h"
|
||||
#include "vp9/encoder/vp9_variance.h"
|
||||
#include "vp9/encoder/vp9_encodeintra.h"
|
||||
#include "vp9/encoder/vp9_mcomp.h"
|
||||
#include "vp9/encoder/vp9_firstpass.h"
|
||||
#include "vpx_scale/vpx_scale.h"
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
#include <limits.h>
|
||||
|
||||
#include "vpx_mem/vpx_mem.h"
|
||||
#include "vp9/encoder/vp9_encodeintra.h"
|
||||
#include "vp9/encoder/vp9_rdopt.h"
|
||||
#include "vp9/encoder/vp9_segmentation.h"
|
||||
#include "vp9/encoder/vp9_mcomp.h"
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
#include "vp9/encoder/vp9_treewriter.h"
|
||||
#include "vp9/encoder/vp9_onyx_int.h"
|
||||
#include "vp9/encoder/vp9_modecosts.h"
|
||||
#include "vp9/encoder/vp9_encodeintra.h"
|
||||
#include "vp9/common/vp9_entropymode.h"
|
||||
#include "vp9/common/vp9_reconinter.h"
|
||||
#include "vp9/common/vp9_reconintra.h"
|
||||
|
||||
@ -8,10 +8,11 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef VP9_ENCODER_VP9_RDOPT_H_
|
||||
#define VP9_ENCODER_VP9_RDOPT_H_
|
||||
|
||||
#include "vp9/encoder/vp9_onyx_int.h"
|
||||
|
||||
#define RDDIV_BITS 7
|
||||
|
||||
#define RDCOST(RM, DM, R, D) \
|
||||
|
||||
@ -23,7 +23,6 @@ VP9_CX_SRCS-yes += encoder/vp9_dct.c
|
||||
VP9_CX_SRCS-yes += encoder/vp9_dct.h
|
||||
VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c
|
||||
VP9_CX_SRCS-yes += encoder/vp9_encodeframe.h
|
||||
VP9_CX_SRCS-yes += encoder/vp9_encodeintra.c
|
||||
VP9_CX_SRCS-yes += encoder/vp9_encodemb.c
|
||||
VP9_CX_SRCS-yes += encoder/vp9_encodemv.c
|
||||
VP9_CX_SRCS-yes += encoder/vp9_firstpass.c
|
||||
@ -31,7 +30,6 @@ VP9_CX_SRCS-yes += encoder/vp9_block.h
|
||||
VP9_CX_SRCS-yes += encoder/vp9_boolhuff.h
|
||||
VP9_CX_SRCS-yes += encoder/vp9_write_bit_buffer.h
|
||||
VP9_CX_SRCS-yes += encoder/vp9_bitstream.h
|
||||
VP9_CX_SRCS-yes += encoder/vp9_encodeintra.h
|
||||
VP9_CX_SRCS-yes += encoder/vp9_encodemb.h
|
||||
VP9_CX_SRCS-yes += encoder/vp9_encodemv.h
|
||||
VP9_CX_SRCS-yes += encoder/vp9_firstpass.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user