Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
c67ee5ea
Commit
c67ee5ea
authored
Dec 19, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Dec 19, 2013
Browse files
Merge "Converting vp9_treecoder.h to vp9_prob.{h, c}"
parents
e4b85c9e
b5c92618
Changes
15
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_blockd.h
View file @
c67ee5ea
...
...
@@ -24,7 +24,6 @@
#include
"vp9/common/vp9_mv.h"
#include
"vp9/common/vp9_scale.h"
#include
"vp9/common/vp9_seg_common.h"
#include
"vp9/common/vp9_treecoder.h"
#define BLOCK_SIZE_GROUPS 4
#define MBSKIP_CONTEXTS 3
...
...
vp9/common/vp9_entropy.c
View file @
c67ee5ea
...
...
@@ -16,25 +16,6 @@
#include
"vpx/vpx_integer.h"
DECLARE_ALIGNED
(
16
,
const
uint8_t
,
vp9_norm
[
256
])
=
{
0
,
7
,
6
,
6
,
5
,
5
,
5
,
5
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
DECLARE_ALIGNED
(
16
,
const
uint8_t
,
vp9_coefband_trans_8x8plus
[
1024
])
=
{
0
,
1
,
1
,
2
,
2
,
2
,
3
,
3
,
3
,
3
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
5
,
...
...
vp9/common/vp9_entropy.h
View file @
c67ee5ea
...
...
@@ -16,7 +16,6 @@
#include
"vp9/common/vp9_blockd.h"
#include
"vp9/common/vp9_common.h"
#include
"vp9/common/vp9_scan.h"
#include
"vp9/common/vp9_treecoder.h"
#include
"vp9/common/vp9_entropymode.h"
#define DIFF_UPDATE_PROB 252
...
...
vp9/common/vp9_entropymode.h
View file @
c67ee5ea
...
...
@@ -12,7 +12,6 @@
#define VP9_COMMON_VP9_ENTROPYMODE_H_
#include
"vp9/common/vp9_blockd.h"
#include
"vp9/common/vp9_treecoder.h"
#define TX_SIZE_CONTEXTS 2
#define SWITCHABLE_FILTERS 3 // number of switchable filters
...
...
vp9/common/vp9_entropymv.h
View file @
c67ee5ea
...
...
@@ -12,7 +12,6 @@
#ifndef VP9_COMMON_VP9_ENTROPYMV_H_
#define VP9_COMMON_VP9_ENTROPYMV_H_
#include
"vp9/common/vp9_treecoder.h"
#include
"./vpx_config.h"
#include
"vp9/common/vp9_blockd.h"
...
...
vp9/common/vp9_findnearmv.h
View file @
c67ee5ea
...
...
@@ -14,7 +14,6 @@
#include
"vp9/common/vp9_mv.h"
#include
"vp9/common/vp9_blockd.h"
#include
"vp9/common/vp9_treecoder.h"
#include
"vp9/common/vp9_onyxc_int.h"
#define LEFT_TOP_MARGIN ((VP9BORDERINPIXELS - VP9_INTERP_EXTEND) << 3)
...
...
vp9/common/vp9_pred_common.c
View file @
c67ee5ea
...
...
@@ -14,7 +14,6 @@
#include
"vp9/common/vp9_common.h"
#include
"vp9/common/vp9_pred_common.h"
#include
"vp9/common/vp9_seg_common.h"
#include
"vp9/common/vp9_treecoder.h"
static
INLINE
const
MB_MODE_INFO
*
get_mbmi
(
const
MODE_INFO
*
const
mi
)
{
return
(
mi
!=
NULL
)
?
&
mi
->
mbmi
:
NULL
;
...
...
vp9/common/vp9_prob.c
0 → 100644
View file @
c67ee5ea
/*
* Copyright (c) 2013 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.
*/
#include
"vp9/common/vp9_prob.h"
DECLARE_ALIGNED
(
16
,
const
uint8_t
,
vp9_norm
[
256
])
=
{
0
,
7
,
6
,
6
,
5
,
5
,
5
,
5
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
4
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
3
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
1
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
vp9/common/vp9_
treecoder
.h
→
vp9/common/vp9_
prob
.h
View file @
c67ee5ea
/*
* Copyright (c) 201
0
The WebM project authors. All Rights Reserved.
* Copyright (c) 201
3
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
...
...
@@ -8,11 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP9_COMMON_VP9_
TREECODER
_H_
#define VP9_COMMON_VP9_
TREECODER
_H_
#ifndef VP9_COMMON_VP9_
PROB
_H_
#define VP9_COMMON_VP9_
PROB
_H_
#include
"./vpx_config.h"
#include
"vpx_ports/mem.h"
#include
"vpx/vpx_integer.h"
#include
"vp9/common/vp9_common.h"
typedef
uint8_t
vp9_prob
;
...
...
@@ -107,5 +110,6 @@ static void tree_merge_probs(const vp9_tree_index *tree,
count_sat
,
max_update_factor
,
probs
);
}
DECLARE_ALIGNED
(
16
,
extern
const
uint8_t
,
vp9_norm
[
256
]);
#endif // VP9_COMMON_VP9_
TREECODER
_H_
#endif // VP9_COMMON_VP9_
PROB
_H_
vp9/common/vp9_seg_common.h
View file @
c67ee5ea
...
...
@@ -11,7 +11,7 @@
#ifndef VP9_COMMON_VP9_SEG_COMMON_H_
#define VP9_COMMON_VP9_SEG_COMMON_H_
#include
"vp9/common/vp9_
treecoder
.h"
#include
"vp9/common/vp9_
prob
.h"
#define SEGMENT_DELTADATA 0
#define SEGMENT_ABSDATA 1
...
...
vp9/decoder/vp9_dboolhuff.h
View file @
c67ee5ea
...
...
@@ -18,14 +18,12 @@
#include
"vpx_ports/mem.h"
#include
"vpx/vpx_integer.h"
#include
"vp9/common/vp9_
treecoder
.h"
#include
"vp9/common/vp9_
prob
.h"
typedef
size_t
BD_VALUE
;
#define BD_VALUE_SIZE ((int)sizeof(BD_VALUE) * CHAR_BIT)
DECLARE_ALIGNED
(
16
,
extern
const
uint8_t
,
vp9_norm
[
256
]);
typedef
struct
{
const
uint8_t
*
buffer_end
;
const
uint8_t
*
buffer
;
...
...
vp9/encoder/vp9_bitstream.c
View file @
c67ee5ea
...
...
@@ -23,7 +23,6 @@
#include
"vp9/common/vp9_pred_common.h"
#include
"vp9/common/vp9_entropy.h"
#include
"vp9/common/vp9_mvref_common.h"
#include
"vp9/common/vp9_treecoder.h"
#include
"vp9/common/vp9_systemdependent.h"
#include
"vp9/common/vp9_pragmas.h"
...
...
vp9/encoder/vp9_boolhuff.h
View file @
c67ee5ea
...
...
@@ -21,6 +21,8 @@
#include
"vpx_ports/mem.h"
#include
"vp9/common/vp9_prob.h"
typedef
struct
{
unsigned
int
lowvalue
;
unsigned
int
range
;
...
...
@@ -39,8 +41,6 @@ extern const unsigned int vp9_prob_cost[256];
void
vp9_start_encode
(
vp9_writer
*
bc
,
uint8_t
*
buffer
);
void
vp9_stop_encode
(
vp9_writer
*
bc
);
DECLARE_ALIGNED
(
16
,
extern
const
unsigned
char
,
vp9_norm
[
256
]);
static
void
vp9_write
(
vp9_writer
*
br
,
int
bit
,
int
probability
)
{
unsigned
int
split
;
int
count
=
br
->
count
;
...
...
vp9/encoder/vp9_treewriter.h
View file @
c67ee5ea
...
...
@@ -11,7 +11,6 @@
#ifndef VP9_ENCODER_VP9_TREEWRITER_H_
#define VP9_ENCODER_VP9_TREEWRITER_H_
#include
"vp9/common/vp9_treecoder.h"
#include
"vp9/encoder/vp9_boolhuff.h"
/* for now */
#define vp9_cost_zero(prob) (vp9_prob_cost[prob])
...
...
vp9/vp9_common.mk
View file @
c67ee5ea
...
...
@@ -39,6 +39,8 @@ 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
...
...
@@ -52,7 +54,6 @@ VP9_COMMON_SRCS-yes += common/vp9_systemdependent.h
VP9_COMMON_SRCS-yes
+=
common/vp9_textblit.h
VP9_COMMON_SRCS-yes
+=
common/vp9_tile_common.h
VP9_COMMON_SRCS-yes
+=
common/vp9_tile_common.c
VP9_COMMON_SRCS-yes
+=
common/vp9_treecoder.h
VP9_COMMON_SRCS-yes
+=
common/vp9_loopfilter.c
VP9_COMMON_SRCS-yes
+=
common/vp9_loopfilter_filters.c
VP9_COMMON_SRCS-yes
+=
common/vp9_mvref_common.c
...
...
Write
Preview
Supports
Markdown
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