diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-01-14 14:14:34 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-14 14:14:34 -0800 |
| commit | 829a01dbb730cd4039a4c21c8eacc63dff5946c7 (patch) | |
| tree | a1c71a6e689736579ed289203abfeddb6e8495be /vp9/encoder | |
| parent | c7d6c0c5a85d70a5a0e619cb41a6c5df35224f35 (diff) | |
| parent | e94b415c3479129944a69fafbeacf550fb9237b7 (diff) | |
| download | libvpx-829a01dbb730cd4039a4c21c8eacc63dff5946c7.tar libvpx-829a01dbb730cd4039a4c21c8eacc63dff5946c7.tar.gz libvpx-829a01dbb730cd4039a4c21c8eacc63dff5946c7.tar.bz2 libvpx-829a01dbb730cd4039a4c21c8eacc63dff5946c7.zip | |
Merge "Add encoder control for setting color space"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 19bcfd2b6..3f4ed94d6 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1055,7 +1055,7 @@ static void write_bitdepth_colorspace_sampling( vp9_wb_write_bit(wb, cm->bit_depth == VPX_BITS_10 ? 0 : 1); } vp9_wb_write_literal(wb, cm->color_space, 3); - if (cm->color_space != SRGB) { + if (cm->color_space != VPX_CS_SRGB) { vp9_wb_write_bit(wb, 0); // 0: [16, 235] (i.e. xvYCC), 1: [0, 255] if (cm->profile == PROFILE_1 || cm->profile == PROFILE_3) { assert(cm->subsampling_x != 1 || cm->subsampling_y != 1); diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 632cc45e1..7cfe0de90 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -1264,6 +1264,7 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { if (cm->profile != oxcf->profile) cm->profile = oxcf->profile; cm->bit_depth = oxcf->bit_depth; + cm->color_space = oxcf->color_space; if (cm->profile <= PROFILE_1) assert(cm->bit_depth == VPX_BITS_8); diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 7becba788..a41284af0 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -231,7 +231,7 @@ typedef struct VP9EncoderConfig { #if CONFIG_VP9_HIGHBITDEPTH int use_highbitdepth; #endif - COLOR_SPACE color_space; + vpx_color_space_t color_space; } VP9EncoderConfig; static INLINE int is_lossless_requested(const VP9EncoderConfig *cfg) { |