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
ccc0577a
Commit
ccc0577a
authored
Apr 04, 2013
by
John Koleszar
Committed by
Gerrit Code Review
Apr 04, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Remove special case vp9_decode_coefs_4x4" into experimental
parents
9b9136f8
1e5f25ec
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
22 deletions
+2
-22
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_decodframe.c
+2
-9
vp9/decoder/vp9_detokenize.c
vp9/decoder/vp9_detokenize.c
+0
-9
vp9/decoder/vp9_detokenize.h
vp9/decoder/vp9_detokenize.h
+0
-4
No files found.
vp9/decoder/vp9_decodframe.c
View file @
ccc0577a
...
...
@@ -353,7 +353,7 @@ static void decode_8x8(VP9D_COMP *pbi, MACROBLOCKD *xd,
static
void
decode_4x4
(
VP9D_COMP
*
pbi
,
MACROBLOCKD
*
xd
,
BOOL_DECODER
*
const
bc
)
{
TX_TYPE
tx_type
;
int
i
,
eobtotal
=
0
;
int
i
;
MB_PREDICTION_MODE
mode
=
xd
->
mode_info_context
->
mbmi
.
mode
;
#if 0 // def DEC_DEBUG
if (dec_debug) {
...
...
@@ -405,9 +405,6 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd,
xd
->
mode_info_context
->
bmi
[
i
].
as_mode
.
context
=
b
->
bmi
.
as_mode
.
context
=
vp9_find_bpred_context
(
xd
,
b
);
#endif
if
(
!
xd
->
mode_info_context
->
mbmi
.
mb_skip_coeff
)
eobtotal
+=
vp9_decode_coefs_4x4
(
pbi
,
xd
,
bc
,
PLANE_TYPE_Y_WITH_DC
,
i
);
vp9_intra4x4_predict
(
xd
,
b
,
b_mode
,
b
->
predictor
);
tx_type
=
get_tx_type_4x4
(
xd
,
i
);
if
(
tx_type
!=
DCT_DCT
)
{
...
...
@@ -420,9 +417,6 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd,
*
(
b
->
base_dst
)
+
b
->
dst
,
16
,
b
->
dst_stride
,
xd
->
eobs
[
i
]);
}
}
if
(
!
xd
->
mode_info_context
->
mbmi
.
mb_skip_coeff
)
{
vp9_decode_mb_tokens_4x4_uv
(
pbi
,
xd
,
bc
);
}
vp9_build_intra_predictors_mbuv
(
xd
);
xd
->
itxm_add_uv_block
(
xd
->
qcoeff
+
16
*
16
,
xd
->
block
[
16
].
dequant
,
...
...
@@ -819,8 +813,7 @@ static void decode_mb(VP9D_COMP *pbi, MACROBLOCKD *xd,
if
(
xd
->
mode_info_context
->
mbmi
.
mb_skip_coeff
)
{
vp9_reset_mb_tokens_context
(
xd
);
}
else
if
(
!
bool_error
(
bc
))
{
if
(
mode
!=
B_PRED
)
eobtotal
=
vp9_decode_mb_tokens
(
pbi
,
xd
,
bc
);
eobtotal
=
vp9_decode_mb_tokens
(
pbi
,
xd
,
bc
);
}
//mode = xd->mode_info_context->mbmi.mode;
...
...
vp9/decoder/vp9_detokenize.c
View file @
ccc0577a
...
...
@@ -531,15 +531,6 @@ static int decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd,
return
c
;
}
int
vp9_decode_coefs_4x4
(
VP9D_COMP
*
dx
,
MACROBLOCKD
*
xd
,
BOOL_DECODER
*
const
bc
,
PLANE_TYPE
type
,
int
i
)
{
const
int
segment_id
=
xd
->
mode_info_context
->
mbmi
.
segment_id
;
const
int
seg_eob
=
get_eob
(
xd
,
segment_id
,
16
);
return
decode_coefs_4x4
(
dx
,
xd
,
bc
,
type
,
i
,
seg_eob
);
}
static
int
decode_mb_tokens_4x4_uv
(
VP9D_COMP
*
const
dx
,
MACROBLOCKD
*
const
xd
,
BOOL_DECODER
*
const
bc
,
...
...
vp9/decoder/vp9_detokenize.h
View file @
ccc0577a
...
...
@@ -14,10 +14,6 @@
#include "vp9/decoder/vp9_onyxd_int.h"
int
vp9_decode_coefs_4x4
(
VP9D_COMP
*
dx
,
MACROBLOCKD
*
xd
,
BOOL_DECODER
*
const
bc
,
PLANE_TYPE
type
,
int
i
);
int
vp9_decode_mb_tokens
(
VP9D_COMP
*
const
,
MACROBLOCKD
*
const
,
BOOL_DECODER
*
const
);
...
...
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