Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
1623f635
Commit
1623f635
authored
Jan 27, 2016
by
Yaowu Xu
Committed by
Gerrit Code Review
Jan 27, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Correct comments that refer to VP9."
parents
51d3121f
7dd8b4c3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
vp10/common/x86/vp10_fwd_dct32x32_impl_sse2.h
vp10/common/x86/vp10_fwd_dct32x32_impl_sse2.h
+1
-1
vp10/decoder/decodeframe.c
vp10/decoder/decodeframe.c
+1
-1
vp10/decoder/decoder.c
vp10/decoder/decoder.c
+2
-2
vp10/vp10_cx_iface.c
vp10/vp10_cx_iface.c
+6
-6
vp10/vp10_dx_iface.c
vp10/vp10_dx_iface.c
+1
-1
No files found.
vp10/common/x86/vp10_fwd_dct32x32_impl_sse2.h
View file @
1623f635
...
...
@@ -3099,7 +3099,7 @@ void FDCT32x32_2D(const int16_t *input,
tr2_6
=
_mm_sub_epi16
(
tr2_6
,
tr2_6_0
);
tr2_7
=
_mm_sub_epi16
(
tr2_7
,
tr2_7_0
);
// ... and here.
// PS: also change code in vp
9
/encoder/
vp9_
dct.c
// PS: also change code in vp
10
/encoder/dct.c
tr2_0
=
_mm_add_epi16
(
tr2_0
,
kOne
);
tr2_1
=
_mm_add_epi16
(
tr2_1
,
kOne
);
tr2_2
=
_mm_add_epi16
(
tr2_2
,
kOne
);
...
...
vp10/decoder/decodeframe.c
View file @
1623f635
...
...
@@ -1972,7 +1972,7 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
read_bitdepth_colorspace_sampling
(
cm
,
rb
);
}
else
{
// NOTE: The intra-only frame header does not include the specification
// of either the color format or color sub-sampling in profile 0. VP
9
// of either the color format or color sub-sampling in profile 0. VP
10
// specifies that the default color format should be YUV 4:2:0 in this
// case (normative).
cm
->
color_space
=
VPX_CS_BT_601
;
...
...
vp10/decoder/decoder.c
View file @
1623f635
...
...
@@ -158,7 +158,7 @@ vpx_codec_err_t vp10_copy_reference_dec(VP10Decoder *pbi,
/* TODO(jkoleszar): The decoder doesn't have any real knowledge of what the
* encoder is using the frame buffers for. This is just a stub to keep the
* vpxenc --test-decode functionality working, and will be replaced in a
* later commit that adds VP
9
-specific controls for this functionality.
* later commit that adds VP
10
-specific controls for this functionality.
*/
if
(
ref_frame_flag
==
VPX_LAST_FLAG
)
{
const
YV12_BUFFER_CONFIG
*
const
cfg
=
get_ref_frame
(
cm
,
0
);
...
...
@@ -190,7 +190,7 @@ vpx_codec_err_t vp10_set_reference_dec(VP10_COMMON *cm,
// TODO(jkoleszar): The decoder doesn't have any real knowledge of what the
// encoder is using the frame buffers for. This is just a stub to keep the
// vpxenc --test-decode functionality working, and will be replaced in a
// later commit that adds VP
9
-specific controls for this functionality.
// later commit that adds VP
10
-specific controls for this functionality.
if
(
ref_frame_flag
==
VPX_LAST_FLAG
)
{
ref_buf
=
&
cm
->
frame_refs
[
0
];
}
else
if
(
ref_frame_flag
==
VPX_GOLD_FLAG
)
{
...
...
vp10/vp10_cx_iface.c
View file @
1623f635
...
...
@@ -198,7 +198,7 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx,
// Only accept the default value for range checking.
RANGE_CHECK
(
cfg
,
ss_number_layers
,
1
,
1
);
RANGE_CHECK
(
cfg
,
ts_number_layers
,
1
,
1
);
// VP
9
does not support a lower bound on the keyframe interval in
// VP
10
does not support a lower bound on the keyframe interval in
// automatic keyframe placement mode.
if
(
cfg
->
kf_mode
!=
VPX_KF_DISABLED
&&
cfg
->
kf_min_dist
!=
cfg
->
kf_max_dist
&&
...
...
@@ -220,9 +220,9 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx,
RANGE_CHECK
(
extra_cfg
,
content
,
VPX_CONTENT_DEFAULT
,
VPX_CONTENT_INVALID
-
1
);
// TODO(yaowu): remove this when ssim tuning is implemented for vp
9
// TODO(yaowu): remove this when ssim tuning is implemented for vp
10
if
(
extra_cfg
->
tuning
==
VPX_TUNE_SSIM
)
ERROR
(
"Option --tune=ssim is not currently supported in VP
9
."
);
ERROR
(
"Option --tune=ssim is not currently supported in VP
10
."
);
if
(
cfg
->
g_pass
==
VPX_RC_LAST_PASS
)
{
const
size_t
packet_sz
=
sizeof
(
FIRSTPASS_STATS
);
...
...
@@ -429,7 +429,7 @@ static vpx_codec_err_t set_encoder_config(
oxcf
->
frame_periodic_boost
=
extra_cfg
->
frame_periodic_boost
;
/*
printf("Current VP
9
Settings: \n");
printf("Current VP
10
Settings: \n");
printf("target_bandwidth: %d\n", oxcf->target_bandwidth);
printf("noise_sensitivity: %d\n", oxcf->noise_sensitivity);
printf("sharpness: %d\n", oxcf->sharpness);
...
...
@@ -854,7 +854,7 @@ static int write_superframe_index(vpx_codec_alg_priv_t *ctx) {
return
index_sz
;
}
// vp
9
uses 10,000,000 ticks/second as time stamp
// vp
10
uses 10,000,000 ticks/second as time stamp
#define TICKS_PER_SEC 10000000LL
static
int64_t
timebase_units_to_ticks
(
const
vpx_rational_t
*
timebase
,
...
...
@@ -1143,7 +1143,7 @@ static vpx_codec_err_t ctrl_set_roi_map(vpx_codec_alg_priv_t *ctx,
(
void
)
ctx
;
(
void
)
args
;
// TODO(yaowu): Need to re-implement and test for VP
9
.
// TODO(yaowu): Need to re-implement and test for VP
10
.
return
VPX_CODEC_INVALID_PARAM
;
}
...
...
vp10/vp10_dx_iface.c
View file @
1623f635
...
...
@@ -72,7 +72,7 @@ struct vpx_codec_alg_priv {
// BufferPool that holds all reference frames. Shared by all the FrameWorkers.
BufferPool
*
buffer_pool
;
// External frame buffer info to save for VP
9
common.
// External frame buffer info to save for VP
10
common.
void
*
ext_priv
;
// Private data associated with the external frame buffers.
vpx_get_frame_buffer_cb_fn_t
get_ext_fb_cb
;
vpx_release_frame_buffer_cb_fn_t
release_ext_fb_cb
;
...
...
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