Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
ed5a993a
Commit
ed5a993a
authored
Nov 11, 2013
by
Dmitry Kovalev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Calculating transform block offsets (x and y) only once.
Change-Id: I4b5106bdc08fd4551339b968c13428a8f43122e2
parent
a33a84b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
36 deletions
+31
-36
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_decodframe.c
+22
-22
vp9/decoder/vp9_detokenize.c
vp9/decoder/vp9_detokenize.c
+8
-13
vp9/decoder/vp9_detokenize.h
vp9/decoder/vp9_detokenize.h
+1
-1
No files found.
vp9/decoder/vp9_decodframe.c
View file @
ed5a993a
...
...
@@ -243,31 +243,30 @@ static void alloc_tile_storage(VP9D_COMP *pbi, int tile_rows, int tile_cols) {
}
static
void
inverse_transform_block
(
MACROBLOCKD
*
xd
,
int
plane
,
int
block
,
BLOCK_SIZE
plane_bsize
,
TX_SIZE
tx_size
)
{
TX_SIZE
tx_size
,
int
x
,
int
y
)
{
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
plane
];
int16_t
*
const
dqcoeff
=
BLOCK_OFFSET
(
pd
->
dqcoeff
,
block
);
const
int
stride
=
pd
->
dst
.
stride
;
const
int
eob
=
pd
->
eobs
[
block
];
if
(
eob
>
0
)
{
TX_TYPE
tx_type
;
const
int
raster_block
=
txfrm_block_to_raster_block
(
plane_bsize
,
tx_size
,
block
);
uint8_t
*
const
dst
=
raster_block_offset_uint8
(
plane_bsize
,
raster_block
,
pd
->
dst
.
buf
,
stride
);
const
int
plane_type
=
pd
->
plane_type
;
const
int
stride
=
pd
->
dst
.
stride
;
int16_t
*
const
dqcoeff
=
BLOCK_OFFSET
(
pd
->
dqcoeff
,
block
);
uint8_t
*
const
dst
=
&
pd
->
dst
.
buf
[
4
*
y
*
stride
+
4
*
x
];
switch
(
tx_size
)
{
case
TX_4X4
:
tx_type
=
get_tx_type_4x4
(
p
d
->
plane_type
,
xd
,
raster_
block
);
tx_type
=
get_tx_type_4x4
(
p
lane_type
,
xd
,
block
);
if
(
tx_type
==
DCT_DCT
)
xd
->
itxm_add
(
dqcoeff
,
dst
,
stride
,
eob
);
else
vp9_iht4x4_16_add
(
dqcoeff
,
dst
,
stride
,
tx_type
);
break
;
case
TX_8X8
:
tx_type
=
get_tx_type_8x8
(
p
d
->
p
lane_type
,
xd
);
tx_type
=
get_tx_type_8x8
(
plane_type
,
xd
);
vp9_iht8x8_add
(
tx_type
,
dqcoeff
,
dst
,
stride
,
eob
);
break
;
case
TX_16X16
:
tx_type
=
get_tx_type_16x16
(
p
d
->
p
lane_type
,
xd
);
tx_type
=
get_tx_type_16x16
(
plane_type
,
xd
);
vp9_iht16x16_add
(
tx_type
,
dqcoeff
,
dst
,
stride
,
eob
);
break
;
case
TX_32X32
:
...
...
@@ -308,17 +307,16 @@ static void predict_and_reconstruct_intra_block(int plane, int block,
const
uint8_t
*
band_translate
[
2
]
=
{
args
->
band_translate
[
0
],
args
->
band_translate
[
1
]
};
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
plane
];
MODE_INFO
*
const
mi
=
xd
->
mi_8x8
[
0
];
const
int
raster_block
=
txfrm_block_to_raster_block
(
plane_bsize
,
tx_size
,
block
);
uint8_t
*
const
dst
=
raster_block_offset_uint8
(
plane_bsize
,
raster_block
,
pd
->
dst
.
buf
,
pd
->
dst
.
stride
);
const
MB_PREDICTION_MODE
mode
=
(
plane
==
0
)
?
((
mi
->
mbmi
.
sb_type
<
BLOCK_8X8
)
?
mi
->
bmi
[
raster_block
].
as_mode
:
mi
->
mbmi
.
mode
)
:
mi
->
mbmi
.
uv_mode
;
?
((
mi
->
mbmi
.
sb_type
<
BLOCK_8X8
)
?
mi
->
bmi
[
block
].
as_mode
:
mi
->
mbmi
.
mode
)
:
mi
->
mbmi
.
uv_mode
;
int
x
,
y
;
uint8_t
*
dst
;
txfrm_block_to_raster_xy
(
plane_bsize
,
tx_size
,
block
,
&
x
,
&
y
);
dst
=
&
pd
->
dst
.
buf
[
4
*
y
*
pd
->
dst
.
stride
+
4
*
x
];
if
(
xd
->
mb_to_right_edge
<
0
||
xd
->
mb_to_bottom_edge
<
0
)
extend_for_intra
(
xd
,
plane_bsize
,
plane
,
block
,
tx_size
);
...
...
@@ -328,9 +326,9 @@ static void predict_and_reconstruct_intra_block(int plane, int block,
dst
,
pd
->
dst
.
stride
,
dst
,
pd
->
dst
.
stride
);
if
(
!
mi
->
mbmi
.
skip_coeff
)
{
vp9_decode_block_tokens
(
cm
,
xd
,
plane
,
block
,
plane_bsize
,
tx_size
,
vp9_decode_block_tokens
(
cm
,
xd
,
plane
,
block
,
plane_bsize
,
x
,
y
,
tx_size
,
args
->
r
,
args
->
token_cache
,
band_translate
);
inverse_transform_block
(
xd
,
plane
,
block
,
plane_bsize
,
tx_size
);
inverse_transform_block
(
xd
,
plane
,
block
,
tx_size
,
x
,
y
);
}
}
...
...
@@ -352,12 +350,14 @@ static void reconstruct_inter_block(int plane, int block,
const
uint8_t
*
band_translate
[
2
]
=
{
args
->
band_translate
[
0
],
args
->
band_translate
[
1
]
};
int
x
,
y
;
txfrm_block_to_raster_xy
(
plane_bsize
,
tx_size
,
block
,
&
x
,
&
y
);
*
args
->
eobtotal
+=
vp9_decode_block_tokens
(
cm
,
xd
,
plane
,
block
,
plane_bsize
,
tx_size
,
plane_bsize
,
x
,
y
,
tx_size
,
args
->
r
,
args
->
token_cache
,
band_translate
);
inverse_transform_block
(
xd
,
plane
,
block
,
plane_bsize
,
tx_size
);
inverse_transform_block
(
xd
,
plane
,
block
,
tx_size
,
x
,
y
);
}
static
void
set_offsets
(
VP9_COMMON
*
const
cm
,
MACROBLOCKD
*
const
xd
,
...
...
vp9/decoder/vp9_detokenize.c
View file @
ed5a993a
...
...
@@ -218,24 +218,19 @@ static int decode_coefs(VP9_COMMON *cm, const MACROBLOCKD *xd,
int
vp9_decode_block_tokens
(
VP9_COMMON
*
cm
,
MACROBLOCKD
*
xd
,
int
plane
,
int
block
,
BLOCK_SIZE
plane_bsize
,
TX_SIZE
tx_size
,
vp9_reader
*
r
,
int
x
,
int
y
,
TX_SIZE
tx_size
,
vp9_reader
*
r
,
uint8_t
*
token_cache
,
const
uint8_t
*
band_translate
[
2
])
{
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
plane
];
const
int
seg_eob
=
get_tx_eob
(
&
cm
->
seg
,
xd
->
mi_8x8
[
0
]
->
mbmi
.
segment_id
,
tx_size
);
int
aoff
,
loff
,
eob
,
pt
;
txfrm_block_to_raster_xy
(
plane_bsize
,
tx_size
,
block
,
&
aoff
,
&
loff
);
pt
=
get_entropy_context
(
tx_size
,
pd
->
above_context
+
aoff
,
pd
->
left_context
+
loff
);
eob
=
decode_coefs
(
cm
,
xd
,
r
,
block
,
pd
->
plane_type
,
seg_eob
,
BLOCK_OFFSET
(
pd
->
dqcoeff
,
block
),
tx_size
,
pd
->
dequant
,
pt
,
token_cache
,
band_translate
[
tx_size
!=
TX_4X4
]);
set_contexts
(
xd
,
pd
,
plane_bsize
,
tx_size
,
eob
>
0
,
aoff
,
loff
);
const
int
pt
=
get_entropy_context
(
tx_size
,
pd
->
above_context
+
x
,
pd
->
left_context
+
y
);
const
int
eob
=
decode_coefs
(
cm
,
xd
,
r
,
block
,
pd
->
plane_type
,
seg_eob
,
BLOCK_OFFSET
(
pd
->
dqcoeff
,
block
),
tx_size
,
pd
->
dequant
,
pt
,
token_cache
,
band_translate
[
tx_size
!=
TX_4X4
]);
set_contexts
(
xd
,
pd
,
plane_bsize
,
tx_size
,
eob
>
0
,
x
,
y
);
pd
->
eobs
[
block
]
=
eob
;
return
eob
;
}
...
...
vp9/decoder/vp9_detokenize.h
View file @
ed5a993a
...
...
@@ -17,7 +17,7 @@
int
vp9_decode_block_tokens
(
VP9_COMMON
*
cm
,
MACROBLOCKD
*
xd
,
int
plane
,
int
block
,
BLOCK_SIZE
plane_bsize
,
TX_SIZE
tx_size
,
vp9_reader
*
r
,
int
x
,
int
y
,
TX_SIZE
tx_size
,
vp9_reader
*
r
,
uint8_t
*
token_cache
,
const
uint8_t
*
band_translate
[
2
]);
...
...
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