Renaming "onyx" to "encoder".

Actual renames:
  vp9_onyx_if.c -> vp9_encoder.c
  vp9_onyx_int.h -> vp9_encoder.h

Change-Id: I80532a80b118d0060518e6c6a0d640e3f411783c
This commit is contained in:
Dmitry Kovalev 2014-04-18 18:27:47 -07:00
parent b0d9bfe420
commit ef003078e8
24 changed files with 27 additions and 27 deletions

View File

@ -12,7 +12,7 @@
#ifndef VP9_ENCODER_VP9_AQ_VARIANCE_H_ #ifndef VP9_ENCODER_VP9_AQ_VARIANCE_H_
#define VP9_ENCODER_VP9_AQ_VARIANCE_H_ #define VP9_ENCODER_VP9_AQ_VARIANCE_H_
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -903,7 +903,7 @@ static int get_refresh_mask(VP9_COMP *cpi) {
// other uses are implemented (like RTC/temporal scaling) // other uses are implemented (like RTC/temporal scaling)
// //
// gld_fb_idx and alt_fb_idx need to be swapped for future frames, but // gld_fb_idx and alt_fb_idx need to be swapped for future frames, but
// that happens in vp9_onyx_if.c:update_reference_frames() so that it can // that happens in vp9_encoder.c:update_reference_frames() so that it can
// be done outside of the recode loop. // be done outside of the recode loop.
return (cpi->refresh_last_frame << cpi->lst_fb_idx) | return (cpi->refresh_last_frame << cpi->lst_fb_idx) |
(cpi->refresh_golden_frame << cpi->alt_fb_idx); (cpi->refresh_golden_frame << cpi->alt_fb_idx);

View File

@ -11,7 +11,7 @@
#ifndef VP9_ENCODER_VP9_CONTEXT_TREE_H_ #ifndef VP9_ENCODER_VP9_CONTEXT_TREE_H_
#define VP9_ENCODER_VP9_CONTEXT_TREE_H_ #define VP9_ENCODER_VP9_CONTEXT_TREE_H_
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
void vp9_setup_pc_tree(VP9_COMMON *cm, MACROBLOCK *x); void vp9_setup_pc_tree(VP9_COMMON *cm, MACROBLOCK *x);
void vp9_free_pc_tree(MACROBLOCK *x); void vp9_free_pc_tree(MACROBLOCK *x);

View File

@ -13,7 +13,7 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vp9/encoder/vp9_block.h" #include "vp9/encoder/vp9_block.h"
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -12,7 +12,7 @@
#ifndef VP9_ENCODER_VP9_ENCODEMV_H_ #ifndef VP9_ENCODER_VP9_ENCODEMV_H_
#define VP9_ENCODER_VP9_ENCODEMV_H_ #define VP9_ENCODER_VP9_ENCODEMV_H_
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -36,7 +36,7 @@
#include "vp9/encoder/vp9_encodemv.h" #include "vp9/encoder/vp9_encodemv.h"
#include "vp9/encoder/vp9_firstpass.h" #include "vp9/encoder/vp9_firstpass.h"
#include "vp9/encoder/vp9_mbgraph.h" #include "vp9/encoder/vp9_mbgraph.h"
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_picklpf.h" #include "vp9/encoder/vp9_picklpf.h"
#include "vp9/encoder/vp9_ratectrl.h" #include "vp9/encoder/vp9_ratectrl.h"
#include "vp9/encoder/vp9_rdopt.h" #include "vp9/encoder/vp9_rdopt.h"

View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef VP9_ENCODER_VP9_ONYX_INT_H_ #ifndef VP9_ENCODER_VP9_ENCODER_H_
#define VP9_ENCODER_VP9_ONYX_INT_H_ #define VP9_ENCODER_VP9_ENCODER_H_
#include <stdio.h> #include <stdio.h>
@ -634,4 +634,4 @@ static INLINE void set_ref_ptrs(VP9_COMMON *cm, MACROBLOCKD *xd,
} // extern "C" } // extern "C"
#endif #endif
#endif // VP9_ENCODER_VP9_ONYX_INT_H_ #endif // VP9_ENCODER_VP9_ENCODER_H_

View File

@ -28,10 +28,10 @@
#include "vp9/encoder/vp9_encodeframe.h" #include "vp9/encoder/vp9_encodeframe.h"
#include "vp9/encoder/vp9_encodemb.h" #include "vp9/encoder/vp9_encodemb.h"
#include "vp9/encoder/vp9_encodemv.h" #include "vp9/encoder/vp9_encodemv.h"
#include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_extend.h" #include "vp9/encoder/vp9_extend.h"
#include "vp9/encoder/vp9_firstpass.h" #include "vp9/encoder/vp9_firstpass.h"
#include "vp9/encoder/vp9_mcomp.h" #include "vp9/encoder/vp9_mcomp.h"
#include "vp9/encoder/vp9_onyx_int.h"
#include "vp9/encoder/vp9_quantize.h" #include "vp9/encoder/vp9_quantize.h"
#include "vp9/encoder/vp9_ratectrl.h" #include "vp9/encoder/vp9_ratectrl.h"
#include "vp9/encoder/vp9_rdopt.h" #include "vp9/encoder/vp9_rdopt.h"

View File

@ -14,9 +14,9 @@
#include "vp9/common/vp9_common.h" #include "vp9/common/vp9_common.h"
#include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_extend.h" #include "vp9/encoder/vp9_extend.h"
#include "vp9/encoder/vp9_lookahead.h" #include "vp9/encoder/vp9_lookahead.h"
#include "vp9/encoder/vp9_onyx_int.h"
struct lookahead_ctx { struct lookahead_ctx {
unsigned int max_sz; /* Absolute size of the queue */ unsigned int max_sz; /* Absolute size of the queue */

View File

@ -18,7 +18,7 @@
#include "vp9/common/vp9_common.h" #include "vp9/common/vp9_common.h"
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_mcomp.h" #include "vp9/encoder/vp9_mcomp.h"
// #define NEW_DIAMOND_SEARCH // #define NEW_DIAMOND_SEARCH

View File

@ -19,7 +19,7 @@
#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9/common/vp9_quant_common.h" #include "vp9/common/vp9_quant_common.h"
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_picklpf.h" #include "vp9/encoder/vp9_picklpf.h"
#include "vp9/encoder/vp9_quantize.h" #include "vp9/encoder/vp9_quantize.h"

View File

@ -16,7 +16,7 @@
extern "C" { extern "C" {
#endif #endif
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
struct yv12_buffer_config; struct yv12_buffer_config;
struct VP9_COMP; struct VP9_COMP;

View File

@ -22,7 +22,7 @@
#include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_reconinter.h"
#include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_reconintra.h"
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_ratectrl.h" #include "vp9/encoder/vp9_ratectrl.h"
#include "vp9/encoder/vp9_rdopt.h" #include "vp9/encoder/vp9_rdopt.h"

View File

@ -11,7 +11,7 @@
#ifndef VP9_ENCODER_VP9_PICKMODE_H_ #ifndef VP9_ENCODER_VP9_PICKMODE_H_
#define VP9_ENCODER_VP9_PICKMODE_H_ #define VP9_ENCODER_VP9_PICKMODE_H_
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -15,7 +15,7 @@
#include "vp9/common/vp9_quant_common.h" #include "vp9/common/vp9_quant_common.h"
#include "vp9/common/vp9_seg_common.h" #include "vp9/common/vp9_seg_common.h"
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_quantize.h" #include "vp9/encoder/vp9_quantize.h"
#include "vp9/encoder/vp9_rdopt.h" #include "vp9/encoder/vp9_rdopt.h"

View File

@ -33,8 +33,8 @@
#include "vp9/encoder/vp9_cost.h" #include "vp9/encoder/vp9_cost.h"
#include "vp9/encoder/vp9_encodemb.h" #include "vp9/encoder/vp9_encodemb.h"
#include "vp9/encoder/vp9_encodemv.h" #include "vp9/encoder/vp9_encodemv.h"
#include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_mcomp.h" #include "vp9/encoder/vp9_mcomp.h"
#include "vp9/encoder/vp9_onyx_int.h"
#include "vp9/encoder/vp9_quantize.h" #include "vp9/encoder/vp9_quantize.h"
#include "vp9/encoder/vp9_ratectrl.h" #include "vp9/encoder/vp9_ratectrl.h"
#include "vp9/encoder/vp9_rdopt.h" #include "vp9/encoder/vp9_rdopt.h"

View File

@ -11,7 +11,7 @@
#ifndef VP9_ENCODER_VP9_RDOPT_H_ #ifndef VP9_ENCODER_VP9_RDOPT_H_
#define VP9_ENCODER_VP9_RDOPT_H_ #define VP9_ENCODER_VP9_RDOPT_H_
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -13,7 +13,7 @@
#define VP9_ENCODER_VP9_SEGMENTATION_H_ #define VP9_ENCODER_VP9_SEGMENTATION_H_
#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -10,7 +10,7 @@
#include <limits.h> #include <limits.h>
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_speed_features.h" #include "vp9/encoder/vp9_speed_features.h"
enum { enum {

View File

@ -10,7 +10,7 @@
#include <math.h> #include <math.h>
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_svc_layercontext.h" #include "vp9/encoder/vp9_svc_layercontext.h"
void vp9_init_layer_context(VP9_COMP *const cpi) { void vp9_init_layer_context(VP9_COMP *const cpi) {

View File

@ -19,7 +19,7 @@
#include "vp9/encoder/vp9_extend.h" #include "vp9/encoder/vp9_extend.h"
#include "vp9/encoder/vp9_firstpass.h" #include "vp9/encoder/vp9_firstpass.h"
#include "vp9/encoder/vp9_mcomp.h" #include "vp9/encoder/vp9_mcomp.h"
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_quantize.h" #include "vp9/encoder/vp9_quantize.h"
#include "vp9/encoder/vp9_ratectrl.h" #include "vp9/encoder/vp9_ratectrl.h"
#include "vp9/encoder/vp9_segmentation.h" #include "vp9/encoder/vp9_segmentation.h"

View File

@ -20,7 +20,7 @@
#include "vp9/common/vp9_seg_common.h" #include "vp9/common/vp9_seg_common.h"
#include "vp9/encoder/vp9_cost.h" #include "vp9/encoder/vp9_cost.h"
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_tokenize.h" #include "vp9/encoder/vp9_tokenize.h"
static TOKENVALUE dct_value_tokens[DCT_MAX_VALUE * 2]; static TOKENVALUE dct_value_tokens[DCT_MAX_VALUE * 2];

View File

@ -14,7 +14,7 @@
#include "vpx/vpx_codec.h" #include "vpx/vpx_codec.h"
#include "vpx/internal/vpx_codec_internal.h" #include "vpx/internal/vpx_codec_internal.h"
#include "./vpx_version.h" #include "./vpx_version.h"
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_encoder.h"
#include "vpx/vp8cx.h" #include "vpx/vp8cx.h"
#include "vp9/encoder/vp9_firstpass.h" #include "vp9/encoder/vp9_firstpass.h"
#include "vp9/vp9_iface_common.h" #include "vp9/vp9_iface_common.h"

View File

@ -42,7 +42,7 @@ VP9_CX_SRCS-yes += encoder/vp9_firstpass.h
VP9_CX_SRCS-yes += encoder/vp9_lookahead.c VP9_CX_SRCS-yes += encoder/vp9_lookahead.c
VP9_CX_SRCS-yes += encoder/vp9_lookahead.h VP9_CX_SRCS-yes += encoder/vp9_lookahead.h
VP9_CX_SRCS-yes += encoder/vp9_mcomp.h VP9_CX_SRCS-yes += encoder/vp9_mcomp.h
VP9_CX_SRCS-yes += encoder/vp9_onyx_int.h VP9_CX_SRCS-yes += encoder/vp9_encoder.h
VP9_CX_SRCS-yes += encoder/vp9_quantize.h VP9_CX_SRCS-yes += encoder/vp9_quantize.h
VP9_CX_SRCS-yes += encoder/vp9_ratectrl.h VP9_CX_SRCS-yes += encoder/vp9_ratectrl.h
VP9_CX_SRCS-yes += encoder/vp9_rdopt.h VP9_CX_SRCS-yes += encoder/vp9_rdopt.h
@ -52,7 +52,7 @@ VP9_CX_SRCS-yes += encoder/vp9_tokenize.h
VP9_CX_SRCS-yes += encoder/vp9_treewriter.h VP9_CX_SRCS-yes += encoder/vp9_treewriter.h
VP9_CX_SRCS-yes += encoder/vp9_variance.h VP9_CX_SRCS-yes += encoder/vp9_variance.h
VP9_CX_SRCS-yes += encoder/vp9_mcomp.c VP9_CX_SRCS-yes += encoder/vp9_mcomp.c
VP9_CX_SRCS-yes += encoder/vp9_onyx_if.c VP9_CX_SRCS-yes += encoder/vp9_encoder.c
VP9_CX_SRCS-yes += encoder/vp9_picklpf.c VP9_CX_SRCS-yes += encoder/vp9_picklpf.c
VP9_CX_SRCS-yes += encoder/vp9_picklpf.h VP9_CX_SRCS-yes += encoder/vp9_picklpf.h
VP9_CX_SRCS-yes += encoder/vp9_quantize.c VP9_CX_SRCS-yes += encoder/vp9_quantize.c