Skip to content
GitLab
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
c2da3654
Commit
c2da3654
authored
Jun 14, 2013
by
John Koleszar
Committed by
Gerrit Code Review
Jun 14, 2013
Browse files
Merge "Remove constant vp9_coef_update_prob table"
parents
0b7910b9
0f7a66e9
Changes
6
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_coefupdateprobs.h
deleted
100644 → 0
View file @
0b7910b9
/*
* 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_COMMON_VP9_COEFUPDATEPROBS_H_
#define VP9_COMMON_VP9_COEFUPDATEPROBS_H_
/* Update probabilities for the nodes in the token entropy tree.
Generated file included by vp9_entropy.c */
static
const
vp9_prob
vp9_coef_update_prob
[
UNCONSTRAINED_NODES
]
=
{
252
,
252
,
252
,
};
#endif // VP9_COMMON_VP9_COEFUPDATEPROBS_H__
vp9/common/vp9_entropy.c
View file @
c2da3654
...
...
@@ -14,7 +14,6 @@
#include
"vp9/common/vp9_entropymode.h"
#include
"vpx_mem/vpx_mem.h"
#include
"vpx/vpx_integer.h"
#include
"vp9/common/vp9_coefupdateprobs.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
,
...
...
vp9/common/vp9_entropy.h
View file @
c2da3654
...
...
@@ -220,6 +220,6 @@ static INLINE const int* get_scan_16x16(TX_TYPE tx_type) {
}
}
#include
"vp9/common/vp9_coefupdateprobs.h"
enum
{
VP9_COEF_UPDATE_PROB
=
252
};
#endif // VP9_COMMON_VP9_ENTROPY_H_
vp9/decoder/vp9_decodframe.c
View file @
c2da3654
...
...
@@ -580,7 +580,7 @@ static void read_coef_probs_common(FRAME_CONTEXT *fc, TX_SIZE tx_size,
for
(
m
=
mstart
;
m
<
entropy_nodes_update
;
m
++
)
{
vp9_prob
*
const
p
=
coef_probs
[
i
][
j
][
k
][
l
]
+
m
;
if
(
vp9_read
(
r
,
vp9_coef_update_prob
[
m
]
))
{
if
(
vp9_read
(
r
,
VP9_COEF_UPDATE_PROB
))
{
*
p
=
vp9_read_prob_diff_update
(
r
,
*
p
);
}
}
...
...
vp9/encoder/vp9_bitstream.c
View file @
c2da3654
...
...
@@ -1089,7 +1089,7 @@ static void update_coef_probs_common(vp9_writer* const bc, VP9_COMP *cpi,
for
(
t
=
tstart
;
t
<
entropy_nodes_update
;
++
t
)
{
vp9_prob
newp
=
new_frame_coef_probs
[
i
][
j
][
k
][
l
][
t
];
const
vp9_prob
oldp
=
old_frame_coef_probs
[
i
][
j
][
k
][
l
][
t
];
const
vp9_prob
upd
=
vp9_coef_update_prob
[
t
]
;
const
vp9_prob
upd
=
VP9_COEF_UPDATE_PROB
;
int
s
;
int
u
=
0
;
...
...
@@ -1131,7 +1131,7 @@ static void update_coef_probs_common(vp9_writer* const bc, VP9_COMP *cpi,
for
(
t
=
tstart
;
t
<
entropy_nodes_update
;
++
t
)
{
vp9_prob
newp
=
new_frame_coef_probs
[
i
][
j
][
k
][
l
][
t
];
vp9_prob
*
oldp
=
old_frame_coef_probs
[
i
][
j
][
k
][
l
]
+
t
;
const
vp9_prob
upd
=
vp9_coef_update_prob
[
t
]
;
const
vp9_prob
upd
=
VP9_COEF_UPDATE_PROB
;
int
s
;
int
u
=
0
;
if
(
l
>=
3
&&
k
==
0
)
...
...
vp9/vp9_common.mk
View file @
c2da3654
...
...
@@ -15,7 +15,6 @@ VP9_COMMON_SRCS-yes += common/vp9_ppflags.h
VP9_COMMON_SRCS-yes
+=
common/vp9_onyx.h
VP9_COMMON_SRCS-yes
+=
common/vp9_alloccommon.c
VP9_COMMON_SRCS-yes
+=
common/vp9_asm_com_offsets.c
VP9_COMMON_SRCS-yes
+=
common/vp9_coefupdateprobs.h
VP9_COMMON_SRCS-yes
+=
common/vp9_convolve.c
VP9_COMMON_SRCS-yes
+=
common/vp9_convolve.h
VP9_COMMON_SRCS-yes
+=
common/vp9_debugmodes.c
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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