X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=8e6c5717b9064025a1adb03a619731a13835b347;hb=c7916079e06d985121842962b9736a6673e22dfe;hp=4859ebe14876320718ae162f65c2361c5817b8ad;hpb=fb82d2523dd0663478450016784f4ef40f1f1590;p=dcpomatic.git

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 4859ebe14..8e6c5717b 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -297,6 +297,15 @@ Image::crop_scale_window (
 		out->make_part_black (corner.x + cropped_size.width, out_size.width - cropped_size.width);
 	}
 
+	if (
+		video_range == VideoRange::VIDEO &&
+		out_video_range == VideoRange::FULL &&
+		av_pix_fmt_desc_get(_pixel_format)->flags & AV_PIX_FMT_FLAG_RGB
+	   ) {
+		/* libswscale will not convert video range for RGB sources, so we have to do it ourselves */
+		out->video_range_to_full_range ();
+	}
+
 	return out;
 }
 
@@ -1433,13 +1442,29 @@ Image::video_range_to_full_range ()
 		for (int y = 0; y < lines; ++y) {
 			uint8_t* q = p;
 			for (int x = 0; x < line_size()[0]; ++x) {
-				*q = int((*q - 16) * factor);
+				*q = clamp(lrintf((*q - 16) * factor), 0L, 255L);
 				++q;
 			}
 			p += stride()[0];
 		}
 		break;
 	}
+	case AV_PIX_FMT_RGB48LE:
+	{
+		float const factor = 65536.0 / 56064.0;
+		uint16_t* p = reinterpret_cast<uint16_t*>(data()[0]);
+		int const lines = sample_size(0).height;
+		for (int y = 0; y < lines; ++y) {
+			uint16_t* q = p;
+			int const line_size_pixels = line_size()[0] / 2;
+			for (int x = 0; x < line_size_pixels; ++x) {
+				*q = clamp(lrintf((*q - 4096) * factor), 0L, 65535L);
+				++q;
+			}
+			p += stride()[0] / 2;
+		}
+		break;
+	}
 	case AV_PIX_FMT_GBRP12LE:
 	{
 		float const factor = 4096.0 / 3504.0;
@@ -1450,7 +1475,7 @@ Image::video_range_to_full_range ()
 				uint16_t* q = p;
 				int const line_size_pixels = line_size()[c] / 2;
 				for (int x = 0; x < line_size_pixels; ++x) {
-					*q = int((*q - 256) * factor);
+					*q = clamp(lrintf((*q - 256) * factor), 0L, 4095L);
 					++q;
 				}
 			}