Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
97279ed2
Commit
97279ed2
authored
Jul 17, 2015
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move bit reader files to vpx_dsp
Change-Id: Ib1cb1fbe92a39ff5312cee069559be6d3ea458d0
parent
55e80a3c
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
37 additions
and
30 deletions
+37
-30
test/vp9_boolcoder_test.cc
test/vp9_boolcoder_test.cc
+3
-2
vp9/common/vp9_entropy.h
vp9/common/vp9_entropy.h
+1
-1
vp9/common/vp9_entropymv.h
vp9/common/vp9_entropymv.h
+2
-1
vp9/common/vp9_seg_common.h
vp9/common/vp9_seg_common.h
+1
-1
vp9/decoder/vp9_decodeframe.c
vp9/decoder/vp9_decodeframe.c
+2
-2
vp9/decoder/vp9_decodemv.c
vp9/decoder/vp9_decodemv.c
+0
-1
vp9/decoder/vp9_decodemv.h
vp9/decoder/vp9_decodemv.h
+2
-1
vp9/decoder/vp9_decoder.h
vp9/decoder/vp9_decoder.h
+1
-1
vp9/decoder/vp9_detokenize.h
vp9/decoder/vp9_detokenize.h
+2
-1
vp9/decoder/vp9_dsubexp.h
vp9/decoder/vp9_dsubexp.h
+1
-1
vp9/encoder/vp9_cost.c
vp9/encoder/vp9_cost.c
+1
-0
vp9/encoder/vp9_cost.h
vp9/encoder/vp9_cost.h
+1
-1
vp9/encoder/vp9_subexp.h
vp9/encoder/vp9_subexp.h
+1
-1
vp9/encoder/vp9_writer.h
vp9/encoder/vp9_writer.h
+1
-1
vp9/vp9_common.mk
vp9/vp9_common.mk
+0
-2
vp9/vp9_dx_iface.c
vp9/vp9_dx_iface.c
+1
-1
vp9/vp9dx.mk
vp9/vp9dx.mk
+0
-4
vpx_dsp/vp9_prob.c
vpx_dsp/vp9_prob.c
+1
-1
vpx_dsp/vp9_prob.h
vpx_dsp/vp9_prob.h
+1
-2
vpx_dsp/vp9_read_bit_buffer.c
vpx_dsp/vp9_read_bit_buffer.c
+1
-1
vpx_dsp/vp9_read_bit_buffer.h
vpx_dsp/vp9_read_bit_buffer.h
+0
-0
vpx_dsp/vp9_reader.c
vpx_dsp/vp9_reader.c
+2
-2
vpx_dsp/vp9_reader.h
vpx_dsp/vp9_reader.h
+1
-2
vpx_dsp/vpx_dsp.mk
vpx_dsp/vpx_dsp.mk
+11
-0
No files found.
test/vp9_boolcoder_test.cc
View file @
97279ed2
...
...
@@ -14,11 +14,12 @@
#include "third_party/googletest/src/include/gtest/gtest.h"
#include "vp9/decoder/vp9_reader.h"
#include "vpx/vpx_integer.h"
#include "vpx_dsp/vp9_reader.h"
#include "vp9/encoder/vp9_writer.h"
#include "test/acm_random.h"
#include "vpx/vpx_integer.h"
using
libvpx_test
::
ACMRandom
;
...
...
vp9/common/vp9_entropy.h
View file @
97279ed2
...
...
@@ -12,10 +12,10 @@
#define VP9_COMMON_VP9_ENTROPY_H_
#include "vpx/vpx_integer.h"
#include "vpx_dsp/vp9_prob.h"
#include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_enums.h"
#include "vp9/common/vp9_prob.h"
#ifdef __cplusplus
extern
"C"
{
...
...
vp9/common/vp9_entropymv.h
View file @
97279ed2
...
...
@@ -14,8 +14,9 @@
#include "./vpx_config.h"
#include "vpx_dsp/vp9_prob.h"
#include "vp9/common/vp9_mv.h"
#include "vp9/common/vp9_prob.h"
#ifdef __cplusplus
extern
"C"
{
...
...
vp9/common/vp9_seg_common.h
View file @
97279ed2
...
...
@@ -11,7 +11,7 @@
#ifndef VP9_COMMON_VP9_SEG_COMMON_H_
#define VP9_COMMON_VP9_SEG_COMMON_H_
#include "vp
9/common
/vp9_prob.h"
#include "vp
x_dsp
/vp9_prob.h"
#ifdef __cplusplus
extern
"C"
{
...
...
vp9/decoder/vp9_decodeframe.c
View file @
97279ed2
...
...
@@ -14,6 +14,8 @@
#include "./vp9_rtcd.h"
#include "./vpx_scale_rtcd.h"
#include "vpx_dsp/vp9_read_bit_buffer.h"
#include "vpx_dsp/vp9_reader.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
#include "vpx_ports/mem_ops.h"
...
...
@@ -38,8 +40,6 @@
#include "vp9/decoder/vp9_decodemv.h"
#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_dsubexp.h"
#include "vp9/decoder/vp9_read_bit_buffer.h"
#include "vp9/decoder/vp9_reader.h"
#define MAX_VP9_HEADER_SIZE 80
...
...
vp9/decoder/vp9_decodemv.c
View file @
97279ed2
...
...
@@ -21,7 +21,6 @@
#include "vp9/decoder/vp9_decodemv.h"
#include "vp9/decoder/vp9_decodeframe.h"
#include "vp9/decoder/vp9_reader.h"
static
PREDICTION_MODE
read_intra_mode
(
vp9_reader
*
r
,
const
vp9_prob
*
p
)
{
return
(
PREDICTION_MODE
)
vp9_read_tree
(
r
,
vp9_intra_mode_tree
,
p
);
...
...
vp9/decoder/vp9_decodemv.h
View file @
97279ed2
...
...
@@ -11,8 +11,9 @@
#ifndef VP9_DECODER_VP9_DECODEMV_H_
#define VP9_DECODER_VP9_DECODEMV_H_
#include "vpx_dsp/vp9_reader.h"
#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_reader.h"
#ifdef __cplusplus
extern
"C"
{
...
...
vp9/decoder/vp9_decoder.h
View file @
97279ed2
...
...
@@ -14,6 +14,7 @@
#include "./vpx_config.h"
#include "vpx/vpx_codec.h"
#include "vpx_dsp/vp9_reader.h"
#include "vpx_scale/yv12config.h"
#include "vpx_util/vpx_thread.h"
...
...
@@ -21,7 +22,6 @@
#include "vp9/common/vp9_onyxc_int.h"
#include "vp9/common/vp9_ppflags.h"
#include "vp9/decoder/vp9_dthread.h"
#include "vp9/decoder/vp9_reader.h"
#ifdef __cplusplus
extern
"C"
{
...
...
vp9/decoder/vp9_detokenize.h
View file @
97279ed2
...
...
@@ -12,8 +12,9 @@
#ifndef VP9_DECODER_VP9_DETOKENIZE_H_
#define VP9_DECODER_VP9_DETOKENIZE_H_
#include "vpx_dsp/vp9_reader.h"
#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_reader.h"
#include "vp9/common/vp9_scan.h"
#ifdef __cplusplus
...
...
vp9/decoder/vp9_dsubexp.h
View file @
97279ed2
...
...
@@ -12,7 +12,7 @@
#ifndef VP9_DECODER_VP9_DSUBEXP_H_
#define VP9_DECODER_VP9_DSUBEXP_H_
#include "vp
9/decoder
/vp9_reader.h"
#include "vp
x_dsp
/vp9_reader.h"
#ifdef __cplusplus
extern
"C"
{
...
...
vp9/encoder/vp9_cost.c
View file @
97279ed2
...
...
@@ -7,6 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include <assert.h>
#include "vp9/encoder/vp9_cost.h"
...
...
vp9/encoder/vp9_cost.h
View file @
97279ed2
...
...
@@ -11,7 +11,7 @@
#ifndef VP9_ENCODER_VP9_COST_H_
#define VP9_ENCODER_VP9_COST_H_
#include "vp
9/common
/vp9_prob.h"
#include "vp
x_dsp
/vp9_prob.h"
#ifdef __cplusplus
extern
"C"
{
...
...
vp9/encoder/vp9_subexp.h
View file @
97279ed2
...
...
@@ -16,7 +16,7 @@
extern
"C"
{
#endif
#include "vp
9/common
/vp9_prob.h"
#include "vp
x_dsp
/vp9_prob.h"
struct
vp9_writer
;
...
...
vp9/encoder/vp9_writer.h
View file @
97279ed2
...
...
@@ -13,7 +13,7 @@
#include "vpx_ports/mem.h"
#include "vp
9/common
/vp9_prob.h"
#include "vp
x_dsp
/vp9_prob.h"
#ifdef __cplusplus
extern
"C"
{
...
...
vp9/vp9_common.mk
View file @
97279ed2
...
...
@@ -38,8 +38,6 @@ VP9_COMMON_SRCS-yes += common/vp9_mv.h
VP9_COMMON_SRCS-yes
+=
common/vp9_onyxc_int.h
VP9_COMMON_SRCS-yes
+=
common/vp9_pred_common.h
VP9_COMMON_SRCS-yes
+=
common/vp9_pred_common.c
VP9_COMMON_SRCS-yes
+=
common/vp9_prob.h
VP9_COMMON_SRCS-yes
+=
common/vp9_prob.c
VP9_COMMON_SRCS-yes
+=
common/vp9_quant_common.h
VP9_COMMON_SRCS-yes
+=
common/vp9_reconinter.h
VP9_COMMON_SRCS-yes
+=
common/vp9_reconintra.h
...
...
vp9/vp9_dx_iface.c
View file @
97279ed2
...
...
@@ -17,6 +17,7 @@
#include "vpx/internal/vpx_codec_internal.h"
#include "vpx/vp8dx.h"
#include "vpx/vpx_decoder.h"
#include "vpx_dsp/vp9_read_bit_buffer.h"
#include "vpx_util/vpx_thread.h"
#include "vp9/common/vp9_alloccommon.h"
...
...
@@ -24,7 +25,6 @@
#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_decodeframe.h"
#include "vp9/decoder/vp9_read_bit_buffer.h"
#include "vp9/vp9_iface_common.h"
...
...
vp9/vp9dx.mk
View file @
97279ed2
...
...
@@ -21,10 +21,6 @@ VP9_DX_SRCS-yes += decoder/vp9_decodemv.c
VP9_DX_SRCS-yes
+=
decoder/vp9_decodeframe.c
VP9_DX_SRCS-yes
+=
decoder/vp9_decodeframe.h
VP9_DX_SRCS-yes
+=
decoder/vp9_detokenize.c
VP9_DX_SRCS-yes
+=
decoder/vp9_reader.h
VP9_DX_SRCS-yes
+=
decoder/vp9_reader.c
VP9_DX_SRCS-yes
+=
decoder/vp9_read_bit_buffer.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_dthread.c
...
...
vp
9/common
/vp9_prob.c
→
vp
x_dsp
/vp9_prob.c
View file @
97279ed2
...
...
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "
vp9/common
/vp9_prob.h"
#include "
.
/vp9_prob.h"
const
uint8_t
vp9_norm
[
256
]
=
{
0
,
7
,
6
,
6
,
5
,
5
,
5
,
5
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
...
...
vp
9/common
/vp9_prob.h
→
vp
x_dsp
/vp9_prob.h
View file @
97279ed2
...
...
@@ -12,11 +12,10 @@
#define VP9_COMMON_VP9_PROB_H_
#include "./vpx_config.h"
#include "./vpx_dsp_common.h"
#include "vpx_ports/mem.h"
#include "vp9/common/vp9_common.h"
#ifdef __cplusplus
extern
"C"
{
#endif
...
...
vp
9/decoder
/vp9_read_bit_buffer.c
→
vp
x_dsp
/vp9_read_bit_buffer.c
View file @
97279ed2
...
...
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "
vp9/decoder
/vp9_read_bit_buffer.h"
#include "
.
/vp9_read_bit_buffer.h"
size_t
vp9_rb_bytes_read
(
struct
vp9_read_bit_buffer
*
rb
)
{
return
(
rb
->
bit_offset
+
7
)
>>
3
;
...
...
vp
9/decoder
/vp9_read_bit_buffer.h
→
vp
x_dsp
/vp9_read_bit_buffer.h
View file @
97279ed2
File moved
vp
9/decoder
/vp9_reader.c
→
vp
x_dsp
/vp9_reader.c
View file @
97279ed2
...
...
@@ -7,12 +7,12 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "./vp9_prob.h"
#include "./vp9_reader.h"
#include "vpx_ports/mem.h"
#include "vpx_mem/vpx_mem.h"
#include "vp9/decoder/vp9_reader.h"
int
vp9_reader_init
(
vp9_reader
*
r
,
const
uint8_t
*
buffer
,
size_t
size
,
...
...
vp
9/decoder
/vp9_reader.h
→
vp
x_dsp
/vp9_reader.h
View file @
97279ed2
...
...
@@ -18,8 +18,7 @@
#include "vpx_ports/mem.h"
#include "vpx/vp8dx.h"
#include "vpx/vpx_integer.h"
#include "vp9/common/vp9_prob.h"
#include "vpx_dsp/vp9_prob.h"
#ifdef __cplusplus
extern
"C"
{
...
...
vpx_dsp/vpx_dsp.mk
View file @
97279ed2
...
...
@@ -13,6 +13,17 @@ DSP_SRCS-yes += vpx_dsp_common.h
DSP_SRCS-$(HAVE_MSA)
+=
mips/macros_msa.h
# bit reader
DSP_SRCS-yes
+=
vp9_prob.h
DSP_SRCS-yes
+=
vp9_prob.c
ifeq
($(CONFIG_DECODERS),yes)
DSP_SRCS-yes
+=
vp9_reader.h
DSP_SRCS-yes
+=
vp9_reader.c
DSP_SRCS-yes
+=
vp9_read_bit_buffer.c
DSP_SRCS-yes
+=
vp9_read_bit_buffer.h
endif
# loop filters
DSP_SRCS-yes
+=
loopfilter.c
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment