Moving back to SWS_BICUBIC for high quality mode (during export mostly). This provides a sharper image when enlarging images than SWS_LANCZOS, and only has a slight performance disadvantage.

jonoomph · jonoomph · commit d6a4cb1dec3d · 2019-11-17T16:34:50.000-06:00
diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
@@ -1339,7 +1339,7 @@ void FFmpegReader::ProcessVideoPacket(int64_t requested_frame) {
 
 		int scale_mode = SWS_FAST_BILINEAR;
 		if (openshot::Settings::Instance()->HIGH_QUALITY_SCALING) {
-			scale_mode = SWS_LANCZOS;
+			scale_mode = SWS_BICUBIC;
 		}
 		SwsContext *img_convert_ctx = sws_getContext(info.width, info.height, AV_GET_CODEC_PIXEL_FORMAT(pStream, pCodecCtx), width,
 															  height, PIX_FMT_RGBA, scale_mode, NULL, NULL, NULL);
diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp
@@ -2111,7 +2111,7 @@ void FFmpegWriter::OutputStreamInfo() {
 void FFmpegWriter::InitScalers(int source_width, int source_height) {
 	int scale_mode = SWS_FAST_BILINEAR;
 	if (openshot::Settings::Instance()->HIGH_QUALITY_SCALING) {
-		scale_mode = SWS_LANCZOS;
+		scale_mode = SWS_BICUBIC;
 	}
 
 	// Init software rescalers vector (many of them, one for each thread)

Original file line number	Diff line number	Diff line change
`@@ -1339,7 +1339,7 @@ void FFmpegReader::ProcessVideoPacket(int64_t requested_frame) {`
`1339`	`1339`
`1340`	`1340`	`int scale_mode = SWS_FAST_BILINEAR;`
`1341`	`1341`	`if (openshot::Settings::Instance()->HIGH_QUALITY_SCALING) {`
`1342`		`- scale_mode = SWS_LANCZOS;`
	`1342`	`+ scale_mode = SWS_BICUBIC;`
`1343`	`1343`	`}`
`1344`	`1344`	`SwsContext *img_convert_ctx = sws_getContext(info.width, info.height, AV_GET_CODEC_PIXEL_FORMAT(pStream, pCodecCtx), width,`
`1345`	`1345`	`height, PIX_FMT_RGBA, scale_mode, NULL, NULL, NULL);`
Original file line number	Diff line number	Diff line change
`@@ -2111,7 +2111,7 @@ void FFmpegWriter::OutputStreamInfo() {`
`2111`	`2111`	`void FFmpegWriter::InitScalers(int source_width, int source_height) {`
`2112`	`2112`	`int scale_mode = SWS_FAST_BILINEAR;`
`2113`	`2113`	`if (openshot::Settings::Instance()->HIGH_QUALITY_SCALING) {`
`2114`		`- scale_mode = SWS_LANCZOS;`
	`2114`	`+ scale_mode = SWS_BICUBIC;`
`2115`	`2115`	`}`
`2116`	`2116`
`2117`	`2117`	`// Init software rescalers vector (many of them, one for each thread)`