From: Alex Converse <aconverse@google.com>
Date: Mon, 26 Sep 2016 20:09:09 +0000 (-0700)
Subject: Remove VP10 style bitreader and bitwriter wrappers
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fb213f31fea66d84852f63b7ddf3a014aaba943;p=libvpx

Remove VP10 style bitreader and bitwriter wrappers

Change-Id: I13eed9cb6950ea4fbdd586d43b73ac0cc2d78d33
---

diff --git a/av1/av1_cx.mk b/av1/av1_cx.mk
index ecbe2b32b..2bb405cee 100644
--- a/av1/av1_cx.mk
+++ b/av1/av1_cx.mk
@@ -19,7 +19,6 @@ AV1_CX_SRCS_REMOVE-no  += $(AV1_COMMON_SRCS_REMOVE-no)
 AV1_CX_SRCS-yes += av1_cx_iface.c
 
 AV1_CX_SRCS-yes += encoder/bitstream.c
-AV1_CX_SRCS-yes += encoder/bitwriter.h
 AV1_CX_SRCS-yes += encoder/context_tree.c
 AV1_CX_SRCS-yes += encoder/context_tree.h
 AV1_CX_SRCS-yes += encoder/variance_tree.c
diff --git a/av1/av1_dx.mk b/av1/av1_dx.mk
index 1ebf5fb27..36eec3044 100644
--- a/av1/av1_dx.mk
+++ b/av1/av1_dx.mk
@@ -30,6 +30,5 @@ AV1_DX_SRCS-yes += decoder/decoder.c
 AV1_DX_SRCS-yes += decoder/decoder.h
 AV1_DX_SRCS-yes += decoder/dsubexp.c
 AV1_DX_SRCS-yes += decoder/dsubexp.h
-AV1_DX_SRCS-yes += decoder/bitreader.h
 
 AV1_DX_SRCS-yes := $(filter-out $(AV1_DX_SRCS_REMOVE-yes),$(AV1_DX_SRCS-yes))
diff --git a/av1/decoder/bitreader.h b/av1/decoder/bitreader.h
deleted file mode 100644
index 4d77664cc..000000000
--- a/av1/decoder/bitreader.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (c) 2016 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.
- */
-
-/* The purpose of this header is to provide compile time pluggable bit reader
- * implementations with a common interface. */
-
-#ifndef AOM10_DECODER_BITREADER_H_
-#define AOM10_DECODER_BITREADER_H_
-
-#include "./aom_config.h"
-
-#if CONFIG_ANS
-#include "aom_dsp/ans.h"
-#include "aom/aomdx.h"  // for av1_decrypt_cb
-#define aom_reader struct AnsDecoder
-#define aom_reader_has_error ans_reader_has_error
-#define aom_read uabs_read
-#define aom_read_bit uabs_read_bit
-#define aom_read_literal uabs_read_literal
-#define aom_read_tree uabs_read_tree
-#else
-#include "aom_dsp/bitreader.h"
-#define aom_reader aom_reader
-#define aom_reader_has_error aom_reader_has_error
-#define aom_read aom_read
-#define aom_read_bit aom_read_bit
-#define aom_read_literal aom_read_literal
-#define aom_read_tree aom_read_tree
-#endif
-
-#endif  // AOM10_DECODER_BITREADER_H_
diff --git a/av1/decoder/decodemv.h b/av1/decoder/decodemv.h
index aa17b5bc8..e9162620f 100644
--- a/av1/decoder/decodemv.h
+++ b/av1/decoder/decodemv.h
@@ -12,7 +12,7 @@
 #ifndef AV1_DECODER_DECODEMV_H_
 #define AV1_DECODER_DECODEMV_H_
 
-#include "av1/decoder/bitreader.h"
+#include "aom_dsp/bitreader.h"
 
 #include "av1/decoder/decoder.h"
 
diff --git a/av1/decoder/decoder.h b/av1/decoder/decoder.h
index 43fac67d3..3900b4432 100644
--- a/av1/decoder/decoder.h
+++ b/av1/decoder/decoder.h
@@ -15,7 +15,7 @@
 #include "./aom_config.h"
 
 #include "aom/aom_codec.h"
-#include "av1/decoder/bitreader.h"
+#include "aom_dsp/bitreader.h"
 #include "aom_scale/yv12config.h"
 #include "aom_util/aom_thread.h"
 
diff --git a/av1/decoder/dsubexp.h b/av1/decoder/dsubexp.h
index ed88f2837..c0d372ab0 100644
--- a/av1/decoder/dsubexp.h
+++ b/av1/decoder/dsubexp.h
@@ -12,7 +12,7 @@
 #ifndef AV1_DECODER_DSUBEXP_H_
 #define AV1_DECODER_DSUBEXP_H_
 
-#include "av1/decoder/bitreader.h"
+#include "aom_dsp/bitreader.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/av1/encoder/bitwriter.h b/av1/encoder/bitwriter.h
deleted file mode 100644
index 21cc6a3a8..000000000
--- a/av1/encoder/bitwriter.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  Copyright (c) 2016 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.
- */
-
-/* The purpose of this header is to provide compile time pluggable bit writer
- * implementations with a common interface. */
-
-#ifndef AOM10_ENCODER_BITWRITER_H_
-#define AOM10_ENCODER_BITWRITER_H_
-
-#include "aom_dsp/bitwriter.h"
-
-#endif  // AOM10_ENCODER_BITWRITER_H_
diff --git a/av1/encoder/subexp.c b/av1/encoder/subexp.c
index aa02e53cb..0ca52477f 100644
--- a/av1/encoder/subexp.c
+++ b/av1/encoder/subexp.c
@@ -8,7 +8,7 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
-#include "av1/encoder/bitwriter.h"
+#include "aom_dsp/bitwriter.h"
 
 #include "av1/common/common.h"
 #include "av1/common/entropy.h"
diff --git a/av1/encoder/treewriter.h b/av1/encoder/treewriter.h
index eb7f0a7c8..a7b38b9fb 100644
--- a/av1/encoder/treewriter.h
+++ b/av1/encoder/treewriter.h
@@ -17,7 +17,7 @@
 #define tree_writer aom_dk_writer
 #define tree_bit_write aom_dk_write
 #else
-#include "av1/encoder/bitwriter.h"
+#include "aom_dsp/bitwriter.h"
 #define tree_writer aom_writer
 #define tree_bit_write aom_write
 #endif