From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 7 Mar 2017 23:28:18 +0000 (+0100)
Subject: Don't try to check Cb and Cr positioning for output formats, as they should be non... 
X-Git-Tag: 1.5.0~4
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=06b6e60952d58b700fa95be16496cc9c2a1af346

Don't try to check Cb and Cr positioning for output formats, as they should be non-subsampled anyway.
---

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 3d4fc6f..90fadb7 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -109,12 +109,8 @@ void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat
 		assert(output_ycbcr_format.luma_coefficients == ycbcr_format.luma_coefficients);
 		assert(output_ycbcr_format.full_range == ycbcr_format.full_range);
 		assert(output_ycbcr_format.num_levels == ycbcr_format.num_levels);
-		assert(output_ycbcr_format.chroma_subsampling_x == ycbcr_format.chroma_subsampling_x);
-		assert(output_ycbcr_format.chroma_subsampling_y == ycbcr_format.chroma_subsampling_y);
-		assert(fabs(output_ycbcr_format.cb_x_position - ycbcr_format.cb_x_position) < 1e-3);
-		assert(fabs(output_ycbcr_format.cb_y_position - ycbcr_format.cb_y_position) < 1e-3);
-		assert(fabs(output_ycbcr_format.cr_x_position - ycbcr_format.cr_x_position) < 1e-3);
-		assert(fabs(output_ycbcr_format.cr_y_position - ycbcr_format.cr_y_position) < 1e-3);
+		assert(output_ycbcr_format.chroma_subsampling_x == 1);
+		assert(output_ycbcr_format.chroma_subsampling_y == 1);
 	} else {
 		output_ycbcr_format = ycbcr_format;
 	}
@@ -127,12 +123,8 @@ void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat
 void EffectChain::change_ycbcr_output_format(const YCbCrFormat &ycbcr_format)
 {
 	assert(num_output_color_ycbcr > 0);
-	assert(output_ycbcr_format.chroma_subsampling_x == ycbcr_format.chroma_subsampling_x);
-	assert(output_ycbcr_format.chroma_subsampling_y == ycbcr_format.chroma_subsampling_y);
-	assert(fabs(output_ycbcr_format.cb_x_position - ycbcr_format.cb_x_position) < 1e-3);
-	assert(fabs(output_ycbcr_format.cb_y_position - ycbcr_format.cb_y_position) < 1e-3);
-	assert(fabs(output_ycbcr_format.cr_x_position - ycbcr_format.cr_x_position) < 1e-3);
-	assert(fabs(output_ycbcr_format.cr_y_position - ycbcr_format.cr_y_position) < 1e-3);
+	assert(output_ycbcr_format.chroma_subsampling_x == 1);
+	assert(output_ycbcr_format.chroma_subsampling_y == 1);
 
 	output_ycbcr_format = ycbcr_format;
 	if (finalized) {