summaryrefslogtreecommitdiff
path: root/vp10/encoder/encoder.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-09-16 20:26:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-09-16 20:26:10 +0000
commit623279169a5bd9b9dbc4467c8636bf5923c52fc2 (patch)
tree207a4774d26f416fb668ac782bcf85c74dbb0520 /vp10/encoder/encoder.c
parentc21ce82832b8f9ba754a86f37a565c6206c47543 (diff)
parenteeb5ef0a240cb7c69d5e92cdd9879032fb4bc5a7 (diff)
downloadlibvpx-623279169a5bd9b9dbc4467c8636bf5923c52fc2.tar
libvpx-623279169a5bd9b9dbc4467c8636bf5923c52fc2.tar.gz
libvpx-623279169a5bd9b9dbc4467c8636bf5923c52fc2.tar.bz2
libvpx-623279169a5bd9b9dbc4467c8636bf5923c52fc2.zip
Merge "Add support for color-range."
Diffstat (limited to 'vp10/encoder/encoder.c')
-rw-r--r--vp10/encoder/encoder.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/vp10/encoder/encoder.c b/vp10/encoder/encoder.c
index 58c6423cb..08ce94495 100644
--- a/vp10/encoder/encoder.c
+++ b/vp10/encoder/encoder.c
@@ -735,6 +735,7 @@ static void init_config(struct VP10_COMP *cpi, VP10EncoderConfig *oxcf) {
cm->use_highbitdepth = oxcf->use_highbitdepth;
#endif
cm->color_space = oxcf->color_space;
+ cm->color_range = oxcf->color_range;
cm->width = oxcf->width;
cm->height = oxcf->height;
@@ -1406,6 +1407,7 @@ void vp10_change_config(struct VP10_COMP *cpi, const VP10EncoderConfig *oxcf) {
cm->profile = oxcf->profile;
cm->bit_depth = oxcf->bit_depth;
cm->color_space = oxcf->color_space;
+ cm->color_range = oxcf->color_range;
if (cm->profile <= PROFILE_1)
assert(cm->bit_depth == VPX_BITS_8);
@@ -3624,6 +3626,7 @@ static void encode_frame_to_data_rate(VP10_COMP *cpi,
cm->frame_to_show = get_frame_new_buffer(cm);
cm->frame_to_show->color_space = cm->color_space;
+ cm->frame_to_show->color_range = cm->color_range;
// Pick the loop filter level for the frame.
loopfilter_frame(cpi, cm);