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
fc31ae47
Commit
fc31ae47
authored
May 13, 2013
by
Jingning Han
Committed by
Gerrit Code Review
May 13, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Move get_sb_index to vp9_blockd.h" into experimental
parents
e5f71520
2117d4ee
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
26 deletions
+31
-26
vp9/common/vp9_blockd.h
vp9/common/vp9_blockd.h
+29
-0
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_decodframe.c
+1
-6
vp9/encoder/vp9_bitstream.c
vp9/encoder/vp9_bitstream.c
+1
-0
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encodeframe.c
+0
-20
No files found.
vp9/common/vp9_blockd.h
View file @
fc31ae47
...
@@ -401,10 +401,39 @@ typedef struct macroblockd {
...
@@ -401,10 +401,39 @@ typedef struct macroblockd {
int
sb_index
;
// index of 32x32 block inside the 64x64 block
int
sb_index
;
// index of 32x32 block inside the 64x64 block
int
mb_index
;
// index of 16x16 block inside the 32x32 block
int
mb_index
;
// index of 16x16 block inside the 32x32 block
int
b_index
;
// index of 8x8 block inside the 16x16 block
int
b_index
;
// index of 8x8 block inside the 16x16 block
#if CONFIG_AB4X4
int
ab_index
;
// index of 4x4 block inside the 8x8 block
#endif
int
q_index
;
int
q_index
;
}
MACROBLOCKD
;
}
MACROBLOCKD
;
static
int
*
get_sb_index
(
MACROBLOCKD
*
xd
,
BLOCK_SIZE_TYPE
subsize
)
{
switch
(
subsize
)
{
case
BLOCK_SIZE_SB64X32
:
case
BLOCK_SIZE_SB32X64
:
case
BLOCK_SIZE_SB32X32
:
return
&
xd
->
sb_index
;
case
BLOCK_SIZE_SB32X16
:
case
BLOCK_SIZE_SB16X32
:
case
BLOCK_SIZE_MB16X16
:
return
&
xd
->
mb_index
;
case
BLOCK_SIZE_SB16X8
:
case
BLOCK_SIZE_SB8X16
:
case
BLOCK_SIZE_SB8X8
:
return
&
xd
->
b_index
;
#if CONFIG_AB4X4
case
BLOCK_SIZE_SB8X4
:
case
BLOCK_SIZE_SB4X8
:
case
BLOCK_SIZE_AB4X4
:
return
&
xd
->
ab_index
;
#endif
default:
assert
(
0
);
return
NULL
;
}
}
static
INLINE
void
update_partition_context
(
MACROBLOCKD
*
xd
,
static
INLINE
void
update_partition_context
(
MACROBLOCKD
*
xd
,
BLOCK_SIZE_TYPE
sb_type
,
BLOCK_SIZE_TYPE
sb_type
,
BLOCK_SIZE_TYPE
sb_size
)
{
BLOCK_SIZE_TYPE
sb_size
)
{
...
...
vp9/decoder/vp9_decodframe.c
View file @
fc31ae47
...
@@ -468,12 +468,7 @@ static void decode_modes_sb(VP9D_COMP *pbi, int mi_row, int mi_col,
...
@@ -468,12 +468,7 @@ static void decode_modes_sb(VP9D_COMP *pbi, int mi_row, int mi_col,
case
PARTITION_SPLIT
:
case
PARTITION_SPLIT
:
for
(
n
=
0
;
n
<
4
;
n
++
)
{
for
(
n
=
0
;
n
<
4
;
n
++
)
{
int
j
=
n
>>
1
,
i
=
n
&
0x01
;
int
j
=
n
>>
1
,
i
=
n
&
0x01
;
if
(
subsize
==
BLOCK_SIZE_SB32X32
)
*
(
get_sb_index
(
xd
,
subsize
))
=
n
;
xd
->
sb_index
=
n
;
else
if
(
subsize
==
BLOCK_SIZE_MB16X16
)
xd
->
mb_index
=
n
;
else
xd
->
b_index
=
n
;
decode_modes_sb
(
pbi
,
mi_row
+
j
*
bs
,
mi_col
+
i
*
bs
,
r
,
subsize
);
decode_modes_sb
(
pbi
,
mi_row
+
j
*
bs
,
mi_col
+
i
*
bs
,
r
,
subsize
);
}
}
break
;
break
;
...
...
vp9/encoder/vp9_bitstream.c
View file @
fc31ae47
...
@@ -905,6 +905,7 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
...
@@ -905,6 +905,7 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
case
PARTITION_SPLIT
:
case
PARTITION_SPLIT
:
for
(
n
=
0
;
n
<
4
;
n
++
)
{
for
(
n
=
0
;
n
<
4
;
n
++
)
{
int
j
=
n
>>
1
,
i
=
n
&
0x01
;
int
j
=
n
>>
1
,
i
=
n
&
0x01
;
*
(
get_sb_index
(
xd
,
subsize
))
=
n
;
write_modes_sb
(
cpi
,
m
+
j
*
bs
*
mis
+
i
*
bs
,
bc
,
tok
,
tok_end
,
write_modes_sb
(
cpi
,
m
+
j
*
bs
*
mis
+
i
*
bs
,
bc
,
tok
,
tok_end
,
mi_row
+
j
*
bs
,
mi_col
+
i
*
bs
,
subsize
);
mi_row
+
j
*
bs
,
mi_col
+
i
*
bs
,
subsize
);
}
}
...
...
vp9/encoder/vp9_encodeframe.c
View file @
fc31ae47
...
@@ -765,26 +765,6 @@ static PICK_MODE_CONTEXT *get_block_context(MACROBLOCK *x,
...
@@ -765,26 +765,6 @@ static PICK_MODE_CONTEXT *get_block_context(MACROBLOCK *x,
}
}
}
}
static
int
*
get_sb_index
(
MACROBLOCKD
*
xd
,
BLOCK_SIZE_TYPE
subsize
)
{
switch
(
subsize
)
{
case
BLOCK_SIZE_SB64X32
:
case
BLOCK_SIZE_SB32X64
:
case
BLOCK_SIZE_SB32X32
:
return
&
xd
->
sb_index
;
case
BLOCK_SIZE_SB32X16
:
case
BLOCK_SIZE_SB16X32
:
case
BLOCK_SIZE_MB16X16
:
return
&
xd
->
mb_index
;
case
BLOCK_SIZE_SB16X8
:
case
BLOCK_SIZE_SB8X16
:
case
BLOCK_SIZE_SB8X8
:
return
&
xd
->
b_index
;
default:
assert
(
0
);
return
NULL
;
}
}
static
BLOCK_SIZE_TYPE
*
get_sb_partitioning
(
MACROBLOCK
*
x
,
static
BLOCK_SIZE_TYPE
*
get_sb_partitioning
(
MACROBLOCK
*
x
,
BLOCK_SIZE_TYPE
bsize
)
{
BLOCK_SIZE_TYPE
bsize
)
{
MACROBLOCKD
*
xd
=
&
x
->
e_mbd
;
MACROBLOCKD
*
xd
=
&
x
->
e_mbd
;
...
...
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