Commit fe3f2109 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review

Merge "Fix comments and color format"

parents ccffe318 ecbca31a
......@@ -781,7 +781,7 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm,
cm->subsampling_x,
cm->subsampling_y))
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
"Referenced frame has incompatible color space");
"Referenced frame has incompatible color format");
}
resize_context_buffers(cm, width, height);
......@@ -1324,7 +1324,7 @@ static size_t read_uncompressed_header(VP9Decoder *pbi,
} else {
// NOTE: The intra-only frame header does not include the specification
// of either the color format or color sub-sampling in profile 0. VP9
// specifies that the default color space should be YUV 4:2:0 in this
// specifies that the default color format should be YUV 4:2:0 in this
// case (normative).
cm->color_space = BT_601;
cm->subsampling_y = cm->subsampling_x = 1;
......
......@@ -3436,13 +3436,13 @@ int vp9_receive_raw_frame(VP9_COMP *cpi, unsigned int frame_flags,
if ((cm->profile == PROFILE_0 || cm->profile == PROFILE_2) &&
(subsampling_x != 1 || subsampling_y != 1)) {
vpx_internal_error(&cm->error, VPX_CODEC_INVALID_PARAM,
"Non-4:2:0 color space requires profile 1 or 3");
"Non-4:2:0 color format requires profile 1 or 3");
res = -1;
}
if ((cm->profile == PROFILE_1 || cm->profile == PROFILE_3) &&
(subsampling_x == 1 && subsampling_y == 1)) {
vpx_internal_error(&cm->error, VPX_CODEC_INVALID_PARAM,
"4:2:0 color space requires profile 0 or 2");
"4:2:0 color format requires profile 0 or 2");
res = -1;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment