Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
a8e1d66b
Commit
a8e1d66b
authored
Feb 21, 2014
by
Alex Converse
Committed by
Gerrit Code Review
Feb 21, 2014
Browse files
Merge "Stop gating non420 features with a configure flag."
parents
bc28ee7b
6e3cf6ec
Changes
7
Hide whitespace changes
Inline
Side-by-side
test/datarate_test.cc
View file @
a8e1d66b
...
...
@@ -381,7 +381,6 @@ TEST_P(DatarateTestVP9, BasicRateTargeting) {
}
}
#if CONFIG_NON420
// Check basic rate targeting,
TEST_P
(
DatarateTestVP9
,
BasicRateTargeting444
)
{
::
libvpx_test
::
Y4mVideoSource
video
(
"rush_hour_444.y4m"
,
0
,
140
);
...
...
@@ -410,7 +409,6 @@ TEST_P(DatarateTestVP9, BasicRateTargeting444) {
<<
cfg_
.
rc_target_bitrate
<<
" "
<<
effective_datarate_
;
}
}
#endif
// Check that (1) the first dropped frame gets earlier and earlier
// as the drop frame threshold is increased, and (2) that the total number of
...
...
test/test_vectors.cc
View file @
a8e1d66b
...
...
@@ -161,9 +161,7 @@ const char *kVP9TestVectors[kNumVp9TestVectors] = {
"vp90-2-11-size-351x287.webm"
,
"vp90-2-11-size-351x288.webm"
,
"vp90-2-11-size-352x287.webm"
,
"vp90-2-12-droppable_1.ivf"
,
"vp90-2-12-droppable_2.ivf"
,
"vp90-2-12-droppable_3.ivf"
,
#if CONFIG_NON420
"vp91-2-04-yv444.webm"
#endif
};
#endif // CONFIG_VP9_DECODER
...
...
test/test_vectors.h
View file @
a8e1d66b
...
...
@@ -21,11 +21,7 @@ extern const char *kVP8TestVectors[kNumVp8TestVectors];
#endif
#if CONFIG_VP9_DECODER
#if CONFIG_NON420
const
int
kNumVp9TestVectors
=
223
;
#else
const
int
kNumVp9TestVectors
=
222
;
#endif
extern
const
char
*
kVP9TestVectors
[
kNumVp9TestVectors
];
#endif // CONFIG_VP9_DECODER
...
...
test/vp9_lossless_test.cc
View file @
a8e1d66b
...
...
@@ -73,7 +73,6 @@ TEST_P(LossLessTest, TestLossLessEncoding) {
EXPECT_GE
(
psnr_lossless
,
kMaxPsnr
);
}
#if CONFIG_NON420
TEST_P
(
LossLessTest
,
TestLossLessEncoding444
)
{
libvpx_test
::
Y4mVideoSource
video
(
"rush_hour_444.y4m"
,
0
,
10
);
...
...
@@ -90,7 +89,6 @@ TEST_P(LossLessTest, TestLossLessEncoding444) {
const
double
psnr_lossless
=
GetMinPsnr
();
EXPECT_GE
(
psnr_lossless
,
kMaxPsnr
);
}
#endif
VP9_INSTANTIATE_TEST_CASE
(
LossLessTest
,
ALL_TEST_MODES
);
}
// namespace
vp9/common/vp9_loopfilter.c
View file @
a8e1d66b
...
...
@@ -868,7 +868,6 @@ void vp9_setup_mask(VP9_COMMON *const cm, const int mi_row, const int mi_col,
assert
(
!
(
lfm
->
int_4x4_uv
&
lfm
->
above_uv
[
TX_16X16
]));
}
#if CONFIG_NON420
static
uint8_t
build_lfi
(
const
loop_filter_info_n
*
lfi_n
,
const
MB_MODE_INFO
*
mbmi
)
{
const
int
seg
=
mbmi
->
segment_id
;
...
...
@@ -1046,7 +1045,6 @@ static void filter_block_plane_non420(VP9_COMMON *cm,
dst
->
buf
+=
8
*
dst
->
stride
;
}
}
#endif
void
vp9_filter_block_plane
(
VP9_COMMON
*
const
cm
,
struct
macroblockd_plane
*
const
plane
,
...
...
@@ -1206,10 +1204,8 @@ void vp9_loop_filter_rows(const YV12_BUFFER_CONFIG *frame_buffer,
const
int
num_planes
=
y_only
?
1
:
MAX_MB_PLANE
;
int
mi_row
,
mi_col
;
LOOP_FILTER_MASK
lfm
;
#if CONFIG_NON420
int
use_420
=
y_only
||
(
xd
->
plane
[
1
].
subsampling_y
==
1
&&
xd
->
plane
[
1
].
subsampling_x
==
1
);
#endif
for
(
mi_row
=
start
;
mi_row
<
stop
;
mi_row
+=
MI_BLOCK_SIZE
)
{
MODE_INFO
**
mi_8x8
=
cm
->
mi_grid_visible
+
mi_row
*
cm
->
mode_info_stride
;
...
...
@@ -1220,22 +1216,16 @@ void vp9_loop_filter_rows(const YV12_BUFFER_CONFIG *frame_buffer,
setup_dst_planes
(
xd
,
frame_buffer
,
mi_row
,
mi_col
);
// TODO(JBB): Make setup_mask work for non 420.
#if CONFIG_NON420
if
(
use_420
)
#endif
vp9_setup_mask
(
cm
,
mi_row
,
mi_col
,
mi_8x8
+
mi_col
,
cm
->
mode_info_stride
,
&
lfm
);
for
(
plane
=
0
;
plane
<
num_planes
;
++
plane
)
{
#if CONFIG_NON420
if
(
use_420
)
#endif
vp9_filter_block_plane
(
cm
,
&
xd
->
plane
[
plane
],
mi_row
,
&
lfm
);
#if CONFIG_NON420
else
filter_block_plane_non420
(
cm
,
&
xd
->
plane
[
plane
],
mi_8x8
+
mi_col
,
mi_row
,
mi_col
);
#endif
}
}
}
...
...
vp9/vp9_dx_iface.c
View file @
a8e1d66b
...
...
@@ -159,11 +159,7 @@ static vpx_codec_err_t vp9_peek_si(const uint8_t *data, unsigned int data_sz,
if
(
frame_marker
!=
VP9_FRAME_MARKER
)
return
VPX_CODEC_UNSUP_BITSTREAM
;
#if CONFIG_NON420
if
(
version
>
1
)
return
VPX_CODEC_UNSUP_BITSTREAM
;
#else
if
(
version
!=
0
)
return
VPX_CODEC_UNSUP_BITSTREAM
;
#endif
if
(
vp9_rb_read_bit
(
&
rb
))
{
// show an existing frame
return
VPX_CODEC_OK
;
...
...
vpxenc.c
View file @
a8e1d66b
...
...
@@ -1553,11 +1553,9 @@ int main(int argc, const char **argv_) {
if
(
!
input
.
filename
)
usage_exit
();
#if CONFIG_NON420
/* Decide if other chroma subsamplings than 4:2:0 are supported */
if
(
global
.
codec
->
fourcc
==
VP9_FOURCC
)
input
.
only_i420
=
0
;
#endif
for
(
pass
=
global
.
pass
?
global
.
pass
-
1
:
0
;
pass
<
global
.
passes
;
pass
++
)
{
int
frames_in
=
0
,
seen_frames
=
0
;
...
...
Write
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!
Cancel
Please
register
or
sign in
to comment