Merge "Remove vp9_dct.h file"
This commit is contained in:
commit
39e3937c24
@ -11,16 +11,15 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#include "./vpx_config.h"
|
|
||||||
#include "./vp9_rtcd.h"
|
#include "./vp9_rtcd.h"
|
||||||
|
#include "./vpx_config.h"
|
||||||
#include "./vpx_dsp_rtcd.h"
|
#include "./vpx_dsp_rtcd.h"
|
||||||
|
|
||||||
#include "vp9/common/vp9_blockd.h"
|
#include "vp9/common/vp9_blockd.h"
|
||||||
#include "vp9/common/vp9_idct.h"
|
#include "vp9/common/vp9_idct.h"
|
||||||
#include "vp9/common/vp9_systemdependent.h"
|
#include "vp9/common/vp9_systemdependent.h"
|
||||||
#include "vp9/encoder/vp9_dct.h"
|
|
||||||
#include "vpx_ports/mem.h"
|
|
||||||
#include "vpx_dsp/fwd_txfm.h"
|
#include "vpx_dsp/fwd_txfm.h"
|
||||||
|
#include "vpx_ports/mem.h"
|
||||||
|
|
||||||
static void fdct4(const tran_low_t *input, tran_low_t *output) {
|
static void fdct4(const tran_low_t *input, tran_low_t *output) {
|
||||||
tran_high_t step[4];
|
tran_high_t step[4];
|
||||||
|
@ -1,24 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2014 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_DCT_H_
|
|
||||||
#define VP9_ENCODER_VP9_DCT_H_
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void vp9_fdct32(const tran_high_t *input, tran_high_t *output, int round);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} // extern "C"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // VP9_ENCODER_VP9_DCT_H_
|
|
@ -24,7 +24,6 @@ VP9_CX_SRCS-yes += encoder/vp9_context_tree.h
|
|||||||
VP9_CX_SRCS-yes += encoder/vp9_cost.h
|
VP9_CX_SRCS-yes += encoder/vp9_cost.h
|
||||||
VP9_CX_SRCS-yes += encoder/vp9_cost.c
|
VP9_CX_SRCS-yes += encoder/vp9_cost.c
|
||||||
VP9_CX_SRCS-yes += encoder/vp9_dct.c
|
VP9_CX_SRCS-yes += encoder/vp9_dct.c
|
||||||
VP9_CX_SRCS-yes += encoder/vp9_dct.h
|
|
||||||
VP9_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.c
|
VP9_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.c
|
||||||
VP9_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.h
|
VP9_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.h
|
||||||
VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c
|
VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c
|
||||||
|
Loading…
Reference in New Issue
Block a user