Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
cba0a5db
Commit
cba0a5db
authored
May 07, 2013
by
Dmitry Kovalev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing unused code + little cleanup.
Change-Id: I81c19a8f19cfb5c7183609656ade833d72feb500
parent
0bfcd307
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
34 deletions
+8
-34
vp9/common/vp9_blockd.h
vp9/common/vp9_blockd.h
+0
-5
vp9/common/vp9_entropy.c
vp9/common/vp9_entropy.c
+0
-5
vp9/common/vp9_entropy.h
vp9/common/vp9_entropy.h
+0
-2
vp9/decoder/vp9_decodemv.c
vp9/decoder/vp9_decodemv.c
+1
-13
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_decodframe.c
+7
-9
No files found.
vp9/common/vp9_blockd.h
View file @
cba0a5db
...
...
@@ -316,11 +316,6 @@ struct macroblockd_plane {
#define BLOCK_OFFSET(x, i, n) ((x) + (i) * (n))
#define MB_SUBBLOCK_FIELD(x, field, i) (\
((i) < 16) ? BLOCK_OFFSET((x)->plane[0].field, (i), 16) : \
((i) < 20) ? BLOCK_OFFSET((x)->plane[1].field, ((i) - 16), 16) : \
BLOCK_OFFSET((x)->plane[2].field, ((i) - 20), 16))
typedef
struct
macroblockd
{
struct
macroblockd_plane
plane
[
MAX_MB_PLANE
];
...
...
vp9/common/vp9_entropy.c
View file @
cba0a5db
...
...
@@ -8,9 +8,6 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include <stdio.h>
#include "vp9/common/vp9_entropy.h"
#include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_onyxc_int.h"
...
...
@@ -19,8 +16,6 @@
#include "vpx/vpx_integer.h"
#include "vp9/common/vp9_coefupdateprobs.h"
const
int
vp9_i8x8_block
[
4
]
=
{
0
,
2
,
8
,
10
};
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
,
...
...
vp9/common/vp9_entropy.h
View file @
cba0a5db
...
...
@@ -16,8 +16,6 @@
#include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_common.h"
extern
const
int
vp9_i8x8_block
[
4
];
/* Coefficient token alphabet */
#define ZERO_TOKEN 0
/* 0 Extra Bits 0+0 */
...
...
vp9/decoder/vp9_decodemv.c
View file @
cba0a5db
...
...
@@ -97,7 +97,7 @@ static TX_SIZE select_txfm_size(VP9_COMMON *cm, vp9_reader *r,
return
txfm_size
;
}
extern
const
int
vp9_i8x8_block
[
4
];
static
void
kfread_modes
(
VP9D_COMP
*
pbi
,
MODE_INFO
*
m
,
int
mi_row
,
int
mi_col
,
vp9_reader
*
r
)
{
...
...
@@ -403,14 +403,6 @@ unsigned int vp9_mv_cont_count[5][4] = {
};
#endif
static
const
unsigned
char
mbsplit_fill_count
[
4
]
=
{
8
,
8
,
4
,
1
};
static
const
unsigned
char
mbsplit_fill_offset
[
4
][
16
]
=
{
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
,
11
,
12
,
13
,
14
,
15
},
{
0
,
1
,
4
,
5
,
8
,
9
,
12
,
13
,
2
,
3
,
6
,
7
,
10
,
11
,
14
,
15
},
{
0
,
1
,
4
,
5
,
2
,
3
,
6
,
7
,
8
,
9
,
12
,
13
,
10
,
11
,
14
,
15
},
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
,
11
,
12
,
13
,
14
,
15
}
};
static
void
read_switchable_interp_probs
(
VP9D_COMP
*
const
pbi
,
vp9_reader
*
r
)
{
VP9_COMMON
*
const
cm
=
&
pbi
->
common
;
int
i
,
j
;
...
...
@@ -881,10 +873,6 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
mbmi
->
uv_mode
=
read_uv_mode
(
r
,
cm
->
fc
.
uv_mode_prob
[
mbmi
->
mode
]);
cm
->
fc
.
uv_mode_counts
[
mbmi
->
mode
][
mbmi
->
uv_mode
]
++
;
}
/*
if (cm->current_video_frame == 1)
printf("mode: %d skip: %d\n", mbmi->mode, mbmi->mb_skip_coeff);
*/
if
(
cm
->
txfm_mode
==
TX_MODE_SELECT
&&
mbmi
->
mb_skip_coeff
==
0
&&
((
mbmi
->
ref_frame
==
INTRA_FRAME
&&
mbmi
->
mode
!=
I4X4_PRED
)
||
...
...
vp9/decoder/vp9_decodframe.c
View file @
cba0a5db
...
...
@@ -9,7 +9,6 @@
*/
#include <assert.h>
#include <stdio.h>
#include "vp9/decoder/vp9_onyxd_int.h"
#include "vp9/common/vp9_common.h"
...
...
@@ -250,10 +249,10 @@ static void decode_atom_intra(VP9D_COMP *pbi, MACROBLOCKD *xd,
for
(
i
=
0
;
i
<
bc
;
i
++
)
{
int
b_mode
=
xd
->
mode_info_context
->
bmi
[
i
].
as_mode
.
first
;
uint8_t
*
dst
;
dst
=
raster_block_offset_uint8
(
xd
,
bsize
,
0
,
i
,
xd
->
plane
[
0
].
dst
.
buf
,
xd
->
plane
[
0
].
dst
.
stride
);
uint8_t
*
dst
=
raster_block_offset_uint8
(
xd
,
bsize
,
0
,
i
,
xd
->
plane
[
0
].
dst
.
buf
,
xd
->
plane
[
0
].
dst
.
stride
);
vp9_intra4x4_predict
(
xd
,
i
,
bsize
,
b_mode
,
dst
,
xd
->
plane
[
0
].
dst
.
stride
);
// TODO(jingning): refactor to use foreach_transformed_block_in_plane_
...
...
@@ -459,12 +458,12 @@ static void decode_modes_sb(VP9D_COMP *pbi, int mi_row, int mi_col,
break
;
case
PARTITION_HORZ
:
decode_modes_b
(
pbi
,
mi_row
,
mi_col
,
r
,
subsize
);
if
(
(
mi_row
+
bs
)
<
pc
->
mi_rows
)
if
(
mi_row
+
bs
<
pc
->
mi_rows
)
decode_modes_b
(
pbi
,
mi_row
+
bs
,
mi_col
,
r
,
subsize
);
break
;
case
PARTITION_VERT
:
decode_modes_b
(
pbi
,
mi_row
,
mi_col
,
r
,
subsize
);
if
(
(
mi_col
+
bs
)
<
pc
->
mi_cols
)
if
(
mi_col
+
bs
<
pc
->
mi_cols
)
decode_modes_b
(
pbi
,
mi_row
,
mi_col
+
bs
,
r
,
subsize
);
break
;
case
PARTITION_SPLIT
:
...
...
@@ -884,9 +883,8 @@ static void decode_tile(VP9D_COMP *pbi, vp9_reader *r) {
vpx_memset
(
&
pc
->
left_context
,
0
,
sizeof
(
pc
->
left_context
));
vpx_memset
(
pc
->
left_seg_context
,
0
,
sizeof
(
pc
->
left_seg_context
));
for
(
mi_col
=
pc
->
cur_tile_mi_col_start
;
mi_col
<
pc
->
cur_tile_mi_col_end
;
mi_col
+=
8
)
{
mi_col
<
pc
->
cur_tile_mi_col_end
;
mi_col
+=
8
)
decode_modes_sb
(
pbi
,
mi_row
,
mi_col
,
r
,
BLOCK_SIZE_SB64X64
);
}
}
}
...
...
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