Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
libvpx
Commits
1c75e77b
Commit
1c75e77b
authored
Mar 19, 2013
by
Paul Wilkins
Browse files
Remove TX size segment feature
Change-Id: I0d226e4cb240caced37230f46905bf69b46e0cce
parent
d8ffee45
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
13 deletions
+3
-13
vp9/common/vp9_blockd.h
vp9/common/vp9_blockd.h
+1
-2
vp9/common/vp9_seg_common.c
vp9/common/vp9_seg_common.c
+2
-9
vp9/common/vp9_seg_common.h
vp9/common/vp9_seg_common.h
+0
-2
No files found.
vp9/common/vp9_blockd.h
View file @
1c75e77b
...
...
@@ -109,8 +109,7 @@ typedef enum {
SEG_LVL_ALT_LF
=
1
,
// Use alternate loop filter value...
SEG_LVL_REF_FRAME
=
2
,
// Optional Segment reference frame
SEG_LVL_SKIP
=
3
,
// Optional Segment (0,0) + skip mode
SEG_LVL_TRANSFORM
=
4
,
// Block transform size.
SEG_LVL_MAX
=
5
// Number of MB level features supported
SEG_LVL_MAX
=
4
// Number of MB level features supported
}
SEG_LVL_FEATURES
;
// Segment level features.
...
...
vp9/common/vp9_seg_common.c
View file @
1c75e77b
...
...
@@ -12,9 +12,8 @@
#include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_seg_common.h"
static
const
int
segfeaturedata_signed
[
SEG_LVL_MAX
]
=
{
1
,
1
,
0
,
0
,
0
};
static
const
int
seg_feature_data_max
[
SEG_LVL_MAX
]
=
{
MAXQ
,
63
,
0xf
,
0xf
,
TX_SIZE_MAX_SB
-
1
};
static
const
int
segfeaturedata_signed
[
SEG_LVL_MAX
]
=
{
1
,
1
,
0
,
0
};
static
const
int
seg_feature_data_max
[
SEG_LVL_MAX
]
=
{
MAXQ
,
63
,
0xf
,
0xf
};
// These functions provide access to new segment level features.
// Eventually these function may be "optimized out" but for the moment,
...
...
@@ -103,10 +102,4 @@ int vp9_check_segref_inter(MACROBLOCKD *xd, int segment_id) {
~
(
1
<<
INTRA_FRAME
))
?
1
:
0
;
}
int
vp9_get_seg_tx_type
(
MACROBLOCKD
*
xd
,
int
segment_id
)
{
if
(
vp9_segfeature_active
(
xd
,
segment_id
,
SEG_LVL_TRANSFORM
))
return
vp9_get_segdata
(
xd
,
segment_id
,
SEG_LVL_TRANSFORM
);
else
return
TX_4X4
;
}
// TBD? Functions to read and write segment data with range / validity checking
vp9/common/vp9_seg_common.h
View file @
1c75e77b
...
...
@@ -57,7 +57,5 @@ int vp9_check_segref(const MACROBLOCKD *xd,
int
vp9_check_segref_inter
(
MACROBLOCKD
*
xd
,
int
segment_id
);
int
vp9_get_seg_tx_type
(
MACROBLOCKD
*
xd
,
int
segment_id
);
#endif // VP9_COMMON_VP9_SEG_COMMON_H_
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