From 5233e10a84307909e728c8788f171bbdd8c67400 Mon Sep 17 00:00:00 2001
From: Dmitry Kovalev <dkovalev@google.com>
Date: Thu, 6 Mar 2014 12:08:20 -0800
Subject: [PATCH] Renaming vp9_onyxd.h and vp9_onyxd_if.c to vp9_decoder.{h,
c}.
Change-Id: Ibd0892be1ddadd93b8a22fa2c2e2053001f2948f
---
vp9/decoder/vp9_decodeframe.c | 2 +-
vp9/decoder/{vp9_onyxd_if.c => vp9_decoder.c} | 17 ++++++++++-------
vp9/decoder/{vp9_onyxd.h => vp9_decoder.h} | 8 ++++----
vp9/decoder/vp9_detokenize.h | 2 +-
vp9/decoder/vp9_dthread.c | 2 +-
vp9/vp9_dx_iface.c | 2 +-
vp9/vp9dx.mk | 4 ++--
7 files changed, 20 insertions(+), 17 deletions(-)
rename vp9/decoder/{vp9_onyxd_if.c => vp9_decoder.c} (99%)
rename vp9/decoder/{vp9_onyxd.h => vp9_decoder.h} (95%)
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c
index c04de5d0f2..16640185d2 100644
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -33,9 +33,9 @@
#include "vp9/decoder/vp9_decodeframe.h"
#include "vp9/decoder/vp9_detokenize.h"
#include "vp9/decoder/vp9_decodemv.h"
+#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_dsubexp.h"
#include "vp9/decoder/vp9_dthread.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_onyxd_if.c b/vp9/decoder/vp9_decoder.c
similarity index 99%
rename from vp9/decoder/vp9_onyxd_if.c
rename to vp9/decoder/vp9_decoder.c
index 70528885e2..77985c9e7c 100644
--- a/vp9/decoder/vp9_onyxd_if.c
+++ b/vp9/decoder/vp9_decoder.c
@@ -12,22 +12,25 @@
#include <limits.h>
#include <stdio.h>
+#include "./vpx_scale_rtcd.h"
+
+#include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/vpx_timer.h"
+#include "vpx_scale/vpx_scale.h"
+
+#include "vp9/common/vp9_alloccommon.h"
+#include "vp9/common/vp9_loopfilter.h"
#include "vp9/common/vp9_onyxc_int.h"
#if CONFIG_VP9_POSTPROC
#include "vp9/common/vp9_postproc.h"
#endif
-#include "vp9/decoder/vp9_onyxd.h"
-#include "vpx_mem/vpx_mem.h"
-#include "vp9/common/vp9_alloccommon.h"
-#include "vp9/common/vp9_loopfilter.h"
#include "vp9/common/vp9_quant_common.h"
-#include "vpx_scale/vpx_scale.h"
#include "vp9/common/vp9_systemdependent.h"
-#include "vpx_ports/vpx_timer.h"
+
#include "vp9/decoder/vp9_decodeframe.h"
+#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_detokenize.h"
#include "vp9/decoder/vp9_dthread.h"
-#include "./vpx_scale_rtcd.h"
#define WRITE_RECON_BUFFER 0
#if WRITE_RECON_BUFFER == 1
diff --git a/vp9/decoder/vp9_onyxd.h b/vp9/decoder/vp9_decoder.h
similarity index 95%
rename from vp9/decoder/vp9_onyxd.h
rename to vp9/decoder/vp9_decoder.h
index 5ea251bd73..e6edaf91fb 100644
--- a/vp9/decoder/vp9_onyxd.h
+++ b/vp9/decoder/vp9_decoder.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_DECODER_VP9_ONYXD_H_
-#define VP9_DECODER_VP9_ONYXD_H_
+#ifndef VP9_DECODER_VP9_DECODER_H_
+#define VP9_DECODER_VP9_DECODER_H_
#include "./vpx_config.h"
@@ -19,8 +19,8 @@
#include "vp9/common/vp9_onyxc_int.h"
#include "vp9/common/vp9_ppflags.h"
+#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_dthread.h"
-#include "vp9/decoder/vp9_onyxd.h"
#include "vp9/decoder/vp9_thread.h"
#ifdef __cplusplus
@@ -112,4 +112,4 @@ void vp9_remove_decompressor(struct VP9Decompressor *pbi);
} // extern "C"
#endif
-#endif // VP9_DECODER_VP9_ONYXD_H_
+#endif // VP9_DECODER_VP9_DECODER_H_
diff --git a/vp9/decoder/vp9_detokenize.h b/vp9/decoder/vp9_detokenize.h
index c5198a2169..5278e97a30 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.h"
+#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_reader.h"
#ifdef __cplusplus
diff --git a/vp9/decoder/vp9_dthread.c b/vp9/decoder/vp9_dthread.c
index 2e00a8bb5f..2ea943e7f1 100644
--- a/vp9/decoder/vp9_dthread.c
+++ b/vp9/decoder/vp9_dthread.c
@@ -15,7 +15,7 @@
#include "vp9/common/vp9_reconinter.h"
#include "vp9/decoder/vp9_dthread.h"
-#include "vp9/decoder/vp9_onyxd.h"
+#include "vp9/decoder/vp9_decoder.h"
#if CONFIG_MULTITHREAD
static INLINE void mutex_lock(pthread_mutex_t *const mutex) {
diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c
index a9e6a882da..ae6ccff9d5 100644
--- a/vp9/vp9_dx_iface.c
+++ b/vp9/vp9_dx_iface.c
@@ -16,7 +16,7 @@
#include "vpx/internal/vpx_codec_internal.h"
#include "./vpx_version.h"
#include "vp9/common/vp9_frame_buffers.h"
-#include "vp9/decoder/vp9_onyxd.h"
+#include "vp9/decoder/vp9_decoder.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 4967baf64b..5acc773ead 100644
--- a/vp9/vp9dx.mk
+++ b/vp9/vp9dx.mk
@@ -28,10 +28,10 @@ VP9_DX_SRCS-yes += decoder/vp9_reader.c
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_decoder.c
+VP9_DX_SRCS-yes += decoder/vp9_decoder.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
VP9_DX_SRCS-yes += decoder/vp9_dsubexp.c
VP9_DX_SRCS-yes += decoder/vp9_dsubexp.h
--
GitLab