Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
ce52b0f8
Commit
ce52b0f8
authored
Jan 09, 2015
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added plumbing for setting color space
Change-Id: If64052cc6e404abc8a64a889f42930d14fad21d3
parent
ecbca31a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.c
+1
-1
vp9/encoder/vp9_encoder.h
vp9/encoder/vp9_encoder.h
+1
-0
vp9/vp9_cx_iface.c
vp9/vp9_cx_iface.c
+4
-1
No files found.
vp9/encoder/vp9_encoder.c
View file @
ce52b0f8
...
...
@@ -607,7 +607,7 @@ static void init_config(struct VP9_COMP *cpi, VP9EncoderConfig *oxcf) {
#if CONFIG_VP9_HIGHBITDEPTH
cm
->
use_highbitdepth
=
oxcf
->
use_highbitdepth
;
#endif
cm
->
color_space
=
UNKNOWN
;
cm
->
color_space
=
oxcf
->
color_space
;
cm
->
width
=
oxcf
->
width
;
cm
->
height
=
oxcf
->
height
;
...
...
vp9/encoder/vp9_encoder.h
View file @
ce52b0f8
...
...
@@ -231,6 +231,7 @@ typedef struct VP9EncoderConfig {
#if CONFIG_VP9_HIGHBITDEPTH
int
use_highbitdepth
;
#endif
COLOR_SPACE
color_space
;
}
VP9EncoderConfig
;
static
INLINE
int
is_lossless_requested
(
const
VP9EncoderConfig
*
cfg
)
{
...
...
vp9/vp9_cx_iface.c
View file @
ce52b0f8
...
...
@@ -41,6 +41,7 @@ struct vp9_extracfg {
AQ_MODE
aq_mode
;
unsigned
int
frame_periodic_boost
;
vpx_bit_depth_t
bit_depth
;
COLOR_SPACE
color_space
;
vp9e_tune_content
content
;
};
...
...
@@ -64,6 +65,7 @@ static struct vp9_extracfg default_extra_cfg = {
NO_AQ
,
// aq_mode
0
,
// frame_periodic_delta_q
VPX_BITS_8
,
// Bit depth
UNKNOWN
,
// Color Space
VP9E_CONTENT_DEFAULT
// content
};
...
...
@@ -294,7 +296,7 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx,
cfg
->
g_bit_depth
==
VPX_BITS_8
)
{
ERROR
(
"Codec bit-depth 8 not supported in profile > 1"
);
}
RANGE_CHECK
(
extra_cfg
,
color_space
,
UNKNOWN
,
SRGB
);
return
VPX_CODEC_OK
;
}
...
...
@@ -437,6 +439,7 @@ static vpx_codec_err_t set_encoder_config(
oxcf
->
firstpass_mb_stats_in
=
cfg
->
rc_firstpass_mb_stats_in
;
#endif
oxcf
->
color_space
=
extra_cfg
->
color_space
;
oxcf
->
arnr_max_frames
=
extra_cfg
->
arnr_max_frames
;
oxcf
->
arnr_strength
=
extra_cfg
->
arnr_strength
;
...
...
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