Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
libvpx
Commits
1c75e77b
Commit
1c75e77b
authored
12 years ago
by
Paul Wilkins
Browse files
Options
Download
Patches
Plain Diff
Remove TX size segment feature
Change-Id: I0d226e4cb240caced37230f46905bf69b46e0cce
parent
d8ffee45
v1.14.0-linphone
1.4.X
experimental
feature/update_to_v1.9.0-linphone
feature/uwp_nuget
forest
frame_parallel
highbitdepth
indianrunnerduck
javanwhistlingduck
khakicampbell
linphone
linphone-android
linphone-old
longtailedduck
m29-baseline
m31-baseline
m49-2623
m52-2743
m54-2840
m56-2924
m66-3359
m68-3440
mandarinduck
mcw
mcw2
nextgen
nextgenv2
pcs-2013
playground
sandbox/Jingning/experimental
sandbox/Jingning/transcode
sandbox/Jingning/vpx
sandbox/aconverse@google.com/ansbench
sandbox/debargha/playground
sandbox/hkuang/frame_parallel
sandbox/hkuang@google.com/decode
sandbox/jimbankoski@google.com/proposed-aom
sandbox/jingning@google.com/decoder_test_suite
sandbox/jingning@google.com/experimental
sandbox/jzern@google.com/test
sandbox/wangch@google.com/vp9
sandbox/yaowu@google.com/mergeaom
stable-vp9-decoder
v1.12.0-linphone
v1.6.1_linphone
v1.7.0-linphone
v1.9.0-linphone
v1.9.0
v1.9.0-rc1
v1.8.2
v1.8.1
v1.8.0
v1.7.0
v1.6.1
v1.6.0
v1.5.0
v1.4.0
v1.3.0
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
vp9/common/vp9_blockd.h
+1
-2
vp9/common/vp9_blockd.h
vp9/common/vp9_seg_common.c
+2
-9
vp9/common/vp9_seg_common.c
vp9/common/vp9_seg_common.h
+0
-2
vp9/common/vp9_seg_common.h
with
3 additions
and
13 deletions
vp9/common/vp9_blockd.h
+
1
−
2
View file @
1c75e77b
...
@@ -109,8 +109,7 @@ typedef enum {
...
@@ -109,8 +109,7 @@ typedef enum {
SEG_LVL_ALT_LF
=
1
,
// Use alternate loop filter value...
SEG_LVL_ALT_LF
=
1
,
// Use alternate loop filter value...
SEG_LVL_REF_FRAME
=
2
,
// Optional Segment reference frame
SEG_LVL_REF_FRAME
=
2
,
// Optional Segment reference frame
SEG_LVL_SKIP
=
3
,
// Optional Segment (0,0) + skip mode
SEG_LVL_SKIP
=
3
,
// Optional Segment (0,0) + skip mode
SEG_LVL_TRANSFORM
=
4
,
// Block transform size.
SEG_LVL_MAX
=
4
// Number of MB level features supported
SEG_LVL_MAX
=
5
// Number of MB level features supported
}
SEG_LVL_FEATURES
;
}
SEG_LVL_FEATURES
;
// Segment level features.
// Segment level features.
...
...
This diff is collapsed.
Click to expand it.
vp9/common/vp9_seg_common.c
+
2
−
9
View file @
1c75e77b
...
@@ -12,9 +12,8 @@
...
@@ -12,9 +12,8 @@
#include
"vp9/common/vp9_blockd.h"
#include
"vp9/common/vp9_blockd.h"
#include
"vp9/common/vp9_seg_common.h"
#include
"vp9/common/vp9_seg_common.h"
static
const
int
segfeaturedata_signed
[
SEG_LVL_MAX
]
=
{
1
,
1
,
0
,
0
,
0
};
static
const
int
segfeaturedata_signed
[
SEG_LVL_MAX
]
=
{
1
,
1
,
0
,
0
};
static
const
int
seg_feature_data_max
[
SEG_LVL_MAX
]
=
static
const
int
seg_feature_data_max
[
SEG_LVL_MAX
]
=
{
MAXQ
,
63
,
0xf
,
0xf
};
{
MAXQ
,
63
,
0xf
,
0xf
,
TX_SIZE_MAX_SB
-
1
};
// These functions provide access to new segment level features.
// These functions provide access to new segment level features.
// Eventually these function may be "optimized out" but for the moment,
// 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) {
...
@@ -103,10 +102,4 @@ int vp9_check_segref_inter(MACROBLOCKD *xd, int segment_id) {
~
(
1
<<
INTRA_FRAME
))
?
1
:
0
;
~
(
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
// TBD? Functions to read and write segment data with range / validity checking
This diff is collapsed.
Click to expand it.
vp9/common/vp9_seg_common.h
+
0
−
2
View file @
1c75e77b
...
@@ -57,7 +57,5 @@ int vp9_check_segref(const MACROBLOCKD *xd,
...
@@ -57,7 +57,5 @@ int vp9_check_segref(const MACROBLOCKD *xd,
int
vp9_check_segref_inter
(
MACROBLOCKD
*
xd
,
int
segment_id
);
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_
#endif // VP9_COMMON_VP9_SEG_COMMON_H_
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets