From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Mon, 15 Oct 2018 20:03:17 +0000 (+0200)
Subject: Be more lenient in the 4:2:2 detection.
X-Git-Tag: 1.8.0~76^2~56
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=ec877bf1354fcd69120e080a6e796ff08133e06f

Be more lenient in the 4:2:2 detection.
---

diff --git a/vaapi_jpeg_decoder.cpp b/vaapi_jpeg_decoder.cpp
index 70b5f37..e11c031 100644
--- a/vaapi_jpeg_decoder.cpp
+++ b/vaapi_jpeg_decoder.cpp
@@ -332,11 +332,10 @@ shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
 		return nullptr;
 	}
 	if (dinfo.comp_info[0].h_samp_factor != 2 ||
-	    dinfo.comp_info[0].v_samp_factor != 2 ||
 	    dinfo.comp_info[1].h_samp_factor != 1 ||
-	    dinfo.comp_info[1].v_samp_factor != 2 ||
+	    dinfo.comp_info[1].v_samp_factor != dinfo.comp_info[0].v_samp_factor ||
 	    dinfo.comp_info[2].h_samp_factor != 1 ||
-	    dinfo.comp_info[2].v_samp_factor != 2) {
+	    dinfo.comp_info[2].v_samp_factor != dinfo.comp_info[0].v_samp_factor) {
 		fprintf(stderr, "Not 4:2:2. (Y=%dx%d, Cb=%dx%d, Cr=%dx%d)\n",
 			dinfo.comp_info[0].h_samp_factor, dinfo.comp_info[0].v_samp_factor,
 			dinfo.comp_info[1].h_samp_factor, dinfo.comp_info[1].v_samp_factor,