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
af36c1f2
Commit
af36c1f2
authored
Nov 06, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Nov 06, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Using pd->dqcoeff instead of pd->qcoeff in the decoder."
parents
bfdfeb62
a1dc97be
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_decodframe.c
+11
-11
vp9/decoder/vp9_detokenize.c
vp9/decoder/vp9_detokenize.c
+3
-3
No files found.
vp9/decoder/vp9_decodframe.c
View file @
af36c1f2
...
...
@@ -248,7 +248,7 @@ static void alloc_tile_storage(VP9D_COMP *pbi, int tile_cols) {
static
void
inverse_transform_block
(
MACROBLOCKD
*
xd
,
int
plane
,
int
block
,
BLOCK_SIZE
plane_bsize
,
TX_SIZE
tx_size
)
{
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
plane
];
int16_t
*
const
qcoeff
=
BLOCK_OFFSET
(
pd
->
qcoeff
,
block
);
int16_t
*
const
dqcoeff
=
BLOCK_OFFSET
(
pd
->
d
qcoeff
,
block
);
const
int
stride
=
pd
->
dst
.
stride
;
const
int
eob
=
pd
->
eobs
[
block
];
if
(
eob
>
0
)
{
...
...
@@ -261,35 +261,35 @@ static void inverse_transform_block(MACROBLOCKD* xd, int plane, int block,
case
TX_4X4
:
tx_type
=
get_tx_type_4x4
(
pd
->
plane_type
,
xd
,
raster_block
);
if
(
tx_type
==
DCT_DCT
)
xd
->
itxm_add
(
qcoeff
,
dst
,
stride
,
eob
);
xd
->
itxm_add
(
d
qcoeff
,
dst
,
stride
,
eob
);
else
vp9_iht4x4_16_add
(
qcoeff
,
dst
,
stride
,
tx_type
);
vp9_iht4x4_16_add
(
d
qcoeff
,
dst
,
stride
,
tx_type
);
break
;
case
TX_8X8
:
tx_type
=
get_tx_type_8x8
(
pd
->
plane_type
,
xd
);
vp9_iht8x8_add
(
tx_type
,
qcoeff
,
dst
,
stride
,
eob
);
vp9_iht8x8_add
(
tx_type
,
d
qcoeff
,
dst
,
stride
,
eob
);
break
;
case
TX_16X16
:
tx_type
=
get_tx_type_16x16
(
pd
->
plane_type
,
xd
);
vp9_iht16x16_add
(
tx_type
,
qcoeff
,
dst
,
stride
,
eob
);
vp9_iht16x16_add
(
tx_type
,
d
qcoeff
,
dst
,
stride
,
eob
);
break
;
case
TX_32X32
:
tx_type
=
DCT_DCT
;
vp9_idct32x32_add
(
qcoeff
,
dst
,
stride
,
eob
);
vp9_idct32x32_add
(
d
qcoeff
,
dst
,
stride
,
eob
);
break
;
default:
assert
(
!
"Invalid transform size"
);
}
if
(
eob
==
1
)
{
vpx_memset
(
qcoeff
,
0
,
2
*
sizeof
(
qcoeff
[
0
]));
vpx_memset
(
dqcoeff
,
0
,
2
*
sizeof
(
d
qcoeff
[
0
]));
}
else
{
if
(
tx_type
==
DCT_DCT
&&
tx_size
<=
TX_16X16
&&
eob
<=
10
)
vpx_memset
(
qcoeff
,
0
,
4
*
(
4
<<
tx_size
)
*
sizeof
(
qcoeff
[
0
]));
vpx_memset
(
dqcoeff
,
0
,
4
*
(
4
<<
tx_size
)
*
sizeof
(
d
qcoeff
[
0
]));
else
if
(
tx_size
==
TX_32X32
&&
eob
<=
34
)
vpx_memset
(
qcoeff
,
0
,
256
*
sizeof
(
qcoeff
[
0
]));
vpx_memset
(
dqcoeff
,
0
,
256
*
sizeof
(
d
qcoeff
[
0
]));
else
vpx_memset
(
qcoeff
,
0
,
(
16
<<
(
tx_size
<<
1
))
*
sizeof
(
qcoeff
[
0
]));
vpx_memset
(
dqcoeff
,
0
,
(
16
<<
(
tx_size
<<
1
))
*
sizeof
(
d
qcoeff
[
0
]));
}
}
}
...
...
@@ -1335,7 +1335,7 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
cm
->
fc
=
cm
->
frame_contexts
[
cm
->
frame_context_idx
];
vp9_zero
(
cm
->
counts
);
for
(
i
=
0
;
i
<
MAX_MB_PLANE
;
++
i
)
vp9_zero
(
xd
->
plane
[
i
].
qcoeff
);
vp9_zero
(
xd
->
plane
[
i
].
d
qcoeff
);
xd
->
corrupted
=
0
;
new_fb
->
corrupted
=
read_compressed_header
(
pbi
,
data
,
first_partition_size
);
...
...
vp9/decoder/vp9_detokenize.c
View file @
af36c1f2
...
...
@@ -74,7 +74,7 @@ static const vp9_prob cat6_prob[15] = {
#define WRITE_COEF_CONTINUE(val, token) \
{ \
qcoeff_ptr[scan[c]] = vp9_read_and_apply_sign(r, val) * \
d
qcoeff_ptr[scan[c]] = vp9_read_and_apply_sign(r, val) * \
dq[c > 0] / (1 + (tx_size == TX_32X32)); \
INCREMENT_COUNT(token); \
token_cache[scan[c]] = vp9_pt_energy_class[token]; \
...
...
@@ -89,7 +89,7 @@ static const vp9_prob cat6_prob[15] = {
static
int
decode_coefs
(
VP9_COMMON
*
cm
,
const
MACROBLOCKD
*
xd
,
vp9_reader
*
r
,
int
block_idx
,
PLANE_TYPE
type
,
int
seg_eob
,
int16_t
*
qcoeff_ptr
,
PLANE_TYPE
type
,
int
seg_eob
,
int16_t
*
d
qcoeff_ptr
,
TX_SIZE
tx_size
,
const
int16_t
*
dq
,
int
pt
,
uint8_t
*
token_cache
)
{
const
FRAME_CONTEXT
*
const
fc
=
&
cm
->
fc
;
...
...
@@ -223,7 +223,7 @@ int vp9_decode_block_tokens(VP9_COMMON *cm, MACROBLOCKD *xd,
pd
->
left_context
+
loff
);
eob
=
decode_coefs
(
cm
,
xd
,
r
,
block
,
pd
->
plane_type
,
seg_eob
,
BLOCK_OFFSET
(
pd
->
qcoeff
,
block
),
pd
->
plane_type
,
seg_eob
,
BLOCK_OFFSET
(
pd
->
d
qcoeff
,
block
),
tx_size
,
pd
->
dequant
,
pt
,
token_cache
);
set_contexts
(
xd
,
pd
,
plane_bsize
,
tx_size
,
eob
>
0
,
aoff
,
loff
);
...
...
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