From ea88da7492c5db50a946f2ef0a957853834ab0d0 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Mon, 3 Mar 2014 14:34:39 -0800 Subject: [PATCH] Removing vp9_onyxd_int.h file. Moving VP9Decompressor struct from vp9_onyxd_int.h to vp9_onyxd.h. Change-Id: Ic86c15e44130541a7f692db43ef9109293f99ae8 --- vp9/decoder/vp9_decodeframe.c | 2 +- vp9/decoder/vp9_decodemv.c | 1 - vp9/decoder/vp9_decodemv.h | 1 - vp9/decoder/vp9_detokenize.h | 2 +- vp9/decoder/vp9_dthread.c | 7 ++-- vp9/decoder/vp9_onyxd.h | 50 ++++++++++++++++++++++++-- vp9/decoder/vp9_onyxd_if.c | 1 - vp9/decoder/vp9_onyxd_int.h | 67 ----------------------------------- vp9/vp9_dx_iface.c | 1 - vp9/vp9dx.mk | 1 - 10 files changed, 54 insertions(+), 79 deletions(-) delete mode 100644 vp9/decoder/vp9_onyxd_int.h diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 54a14f381..e185d01af 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -35,7 +35,7 @@ #include "vp9/decoder/vp9_decodemv.h" #include "vp9/decoder/vp9_dsubexp.h" #include "vp9/decoder/vp9_dthread.h" -#include "vp9/decoder/vp9_onyxd_int.h" +#include "vp9/decoder/vp9_onyxd.h" #include "vp9/decoder/vp9_read_bit_buffer.h" #include "vp9/decoder/vp9_reader.h" #include "vp9/decoder/vp9_thread.h" diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 0fb7a1580..9bc21d271 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -21,7 +21,6 @@ #include "vp9/decoder/vp9_decodemv.h" #include "vp9/decoder/vp9_decodeframe.h" -#include "vp9/decoder/vp9_onyxd_int.h" #include "vp9/decoder/vp9_reader.h" static MB_PREDICTION_MODE read_intra_mode(vp9_reader *r, const vp9_prob *p) { diff --git a/vp9/decoder/vp9_decodemv.h b/vp9/decoder/vp9_decodemv.h index 539c9840e..7394b62b4 100644 --- a/vp9/decoder/vp9_decodemv.h +++ b/vp9/decoder/vp9_decodemv.h @@ -11,7 +11,6 @@ #ifndef VP9_DECODER_VP9_DECODEMV_H_ #define VP9_DECODER_VP9_DECODEMV_H_ -#include "vp9/decoder/vp9_onyxd_int.h" #include "vp9/decoder/vp9_reader.h" #ifdef __cplusplus diff --git a/vp9/decoder/vp9_detokenize.h b/vp9/decoder/vp9_detokenize.h index ce3d7653d..c5198a216 100644 --- a/vp9/decoder/vp9_detokenize.h +++ b/vp9/decoder/vp9_detokenize.h @@ -12,7 +12,7 @@ #ifndef VP9_DECODER_VP9_DETOKENIZE_H_ #define VP9_DECODER_VP9_DETOKENIZE_H_ -#include "vp9/decoder/vp9_onyxd_int.h" +#include "vp9/decoder/vp9_onyxd.h" #include "vp9/decoder/vp9_reader.h" #ifdef __cplusplus diff --git a/vp9/decoder/vp9_dthread.c b/vp9/decoder/vp9_dthread.c index 542732aa0..2e00a8bb5 100644 --- a/vp9/decoder/vp9_dthread.c +++ b/vp9/decoder/vp9_dthread.c @@ -9,10 +9,13 @@ */ #include "./vpx_config.h" + +#include "vpx_mem/vpx_mem.h" + #include "vp9/common/vp9_reconinter.h" + #include "vp9/decoder/vp9_dthread.h" -#include "vp9/decoder/vp9_onyxd_int.h" -#include "vpx_mem/vpx_mem.h" +#include "vp9/decoder/vp9_onyxd.h" #if CONFIG_MULTITHREAD static INLINE void mutex_lock(pthread_mutex_t *const mutex) { diff --git a/vp9/decoder/vp9_onyxd.h b/vp9/decoder/vp9_onyxd.h index 203e9fae9..5ea251bd7 100644 --- a/vp9/decoder/vp9_onyxd.h +++ b/vp9/decoder/vp9_onyxd.h @@ -11,16 +11,22 @@ #ifndef VP9_DECODER_VP9_ONYXD_H_ #define VP9_DECODER_VP9_ONYXD_H_ +#include "./vpx_config.h" + +#include "vpx/vpx_codec.h" #include "vpx_scale/yv12config.h" + +#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_ppflags.h" -#include "vpx/vpx_codec.h" + +#include "vp9/decoder/vp9_dthread.h" +#include "vp9/decoder/vp9_onyxd.h" +#include "vp9/decoder/vp9_thread.h" #ifdef __cplusplus extern "C" { #endif -struct VP9Decompressor; - typedef struct { int width; int height; @@ -37,6 +43,44 @@ typedef enum { VP9_ALT_FLAG = 4 } VP9_REFFRAME; +typedef struct VP9Decompressor { + DECLARE_ALIGNED(16, MACROBLOCKD, mb); + + DECLARE_ALIGNED(16, VP9_COMMON, common); + + DECLARE_ALIGNED(16, int16_t, dqcoeff[MAX_MB_PLANE][64 * 64]); + + VP9D_CONFIG oxcf; + + const uint8_t *source; + size_t source_sz; + + int64_t last_time_stamp; + int ready_for_new_data; + + int refresh_frame_flags; + + int decoded_key_frame; + + int initial_width; + int initial_height; + + int do_loopfilter_inline; // apply loopfilter to available rows immediately + VP9Worker lf_worker; + + VP9Worker *tile_workers; + int num_tile_workers; + + VP9LfSync lf_row_sync; + + /* Each tile column has its own MODE_INFO stream. This array indexes them by + tile column index. */ + MODE_INFO **mi_streams; + + ENTROPY_CONTEXT *above_context[MAX_MB_PLANE]; + PARTITION_CONTEXT *above_seg_context; +} VP9D_COMP; + void vp9_initialize_dec(); int vp9_receive_compressed_data(struct VP9Decompressor *pbi, diff --git a/vp9/decoder/vp9_onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c index 24248a458..70528885e 100644 --- a/vp9/decoder/vp9_onyxd_if.c +++ b/vp9/decoder/vp9_onyxd_if.c @@ -17,7 +17,6 @@ #include "vp9/common/vp9_postproc.h" #endif #include "vp9/decoder/vp9_onyxd.h" -#include "vp9/decoder/vp9_onyxd_int.h" #include "vpx_mem/vpx_mem.h" #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_loopfilter.h" diff --git a/vp9/decoder/vp9_onyxd_int.h b/vp9/decoder/vp9_onyxd_int.h deleted file mode 100644 index 6c6c23926..000000000 --- a/vp9/decoder/vp9_onyxd_int.h +++ /dev/null @@ -1,67 +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_DECODER_VP9_ONYXD_INT_H_ -#define VP9_DECODER_VP9_ONYXD_INT_H_ - -#include "./vpx_config.h" - -#include "vp9/common/vp9_onyxc_int.h" -#include "vp9/decoder/vp9_dthread.h" -#include "vp9/decoder/vp9_onyxd.h" -#include "vp9/decoder/vp9_thread.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct VP9Decompressor { - DECLARE_ALIGNED(16, MACROBLOCKD, mb); - - DECLARE_ALIGNED(16, VP9_COMMON, common); - - DECLARE_ALIGNED(16, int16_t, dqcoeff[MAX_MB_PLANE][64 * 64]); - - VP9D_CONFIG oxcf; - - const uint8_t *source; - size_t source_sz; - - int64_t last_time_stamp; - int ready_for_new_data; - - int refresh_frame_flags; - - int decoded_key_frame; - - int initial_width; - int initial_height; - - int do_loopfilter_inline; // apply loopfilter to available rows immediately - VP9Worker lf_worker; - - VP9Worker *tile_workers; - int num_tile_workers; - - VP9LfSync lf_row_sync; - - /* Each tile column has its own MODE_INFO stream. This array indexes them by - tile column index. */ - MODE_INFO **mi_streams; - - ENTROPY_CONTEXT *above_context[MAX_MB_PLANE]; - PARTITION_CONTEXT *above_seg_context; -} VP9D_COMP; - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // VP9_DECODER_VP9_ONYXD_INT_H_ diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index 83d64b8c0..a9e6a882d 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -17,7 +17,6 @@ #include "./vpx_version.h" #include "vp9/common/vp9_frame_buffers.h" #include "vp9/decoder/vp9_onyxd.h" -#include "vp9/decoder/vp9_onyxd_int.h" #include "vp9/decoder/vp9_read_bit_buffer.h" #include "vp9/vp9_iface_common.h" diff --git a/vp9/vp9dx.mk b/vp9/vp9dx.mk index de210f4b7..4967baf64 100644 --- a/vp9/vp9dx.mk +++ b/vp9/vp9dx.mk @@ -29,7 +29,6 @@ VP9_DX_SRCS-yes += decoder/vp9_read_bit_buffer.h VP9_DX_SRCS-yes += decoder/vp9_decodemv.h VP9_DX_SRCS-yes += decoder/vp9_detokenize.h VP9_DX_SRCS-yes += decoder/vp9_onyxd.h -VP9_DX_SRCS-yes += decoder/vp9_onyxd_int.h VP9_DX_SRCS-yes += decoder/vp9_thread.c VP9_DX_SRCS-yes += decoder/vp9_thread.h VP9_DX_SRCS-yes += decoder/vp9_onyxd_if.c -- 2.40.0