Attachment #215925 for bug #247532

View | Details | Raw Unified | Return to bug 247532
Collapse All | Expand All

Lines 2-9 Link Here

(-)multimedia/libopenshot/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= libopenshot	3	PORTNAME= libopenshot
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.2.5-4	5	DISTVERSION= 0.2.5-106
6	DISTVERSIONSUFFIX= -gf1e5c9c	6	DISTVERSIONSUFFIX= -g517f289
7	CATEGORIES= multimedia	7	CATEGORIES= multimedia
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9		9

Lines 1-3 Link Here

(-)multimedia/libopenshot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1583463600	1	TIMESTAMP = 1592888400
2	SHA256 (OpenShot-libopenshot-v0.2.5-4-gf1e5c9c_GH0.tar.gz) = 15c17c3d8af02db5b94e18d295766d20ad59e24d041a25082a45e5d741731a98	2	SHA256 (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = e8cce2ce90a16798519522cb0bca21a8b1367bca3608694552d951bf03350aaa
3	SIZE (OpenShot-libopenshot-v0.2.5-4-gf1e5c9c_GH0.tar.gz) = 10295823	3	SIZE (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = 10303100

Lines 1-6 Link Here

(-)multimedia/libopenshot/files/patch-src_CMakeLists.txt (-2 / +2 lines)
1	--- src/CMakeLists.txt.orig 2020-03-03 09:00:23 UTC	1	--- src/CMakeLists.txt.orig 2020-06-18 10:04:32 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -363,7 +363,13 @@ if (TARGET RESVG::resvg)	3	@@ -361,7 +361,13 @@ if (TARGET RESVG::resvg)
4	set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1")	4	set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1")
5	endif()	5	endif()
6		6




--- src/FFmpegWriter.cpp.orig	2020-06-18 10:04:32 UTC
+++ src/FFmpegWriter.cpp
@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
 		AVCodec *new_codec;

 #else // not ffmpeg 3
 		new_codec = avcodec_find_encoder_by_name(codec.c_str());
 #endif // HAVE_HW_ACCEL
@@ -554,6 +554,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
 						else {
 							av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0);
 						}
+						break;
 					case AV_CODEC_ID_HEVC :
 						c->bit_rate = 0;
 						if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) {
@@ -562,6 +563,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
 							av_opt_set_int(c->priv_data, "forced-idr",1,0);
 						}
 						break;
+					default:
+						break;
 				}
 #endif
 		} else {
@@ -1447,7 +1450,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
 		adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
 		fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);
 		if (adapter_num < 3 && adapter_num >=0) {

 				snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
 				// Maybe 127 is better because the first card would be 1?!
 				adapter_ptr = adapter;
@@ -1455,17 +1458,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
 				adapter_ptr = NULL;
 #elif defined(__APPLE__)
 				adapter_ptr = NULL;

Return to bug 247532

Lines 1-4 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (-3 / +20 lines)
1	--- src/FFmpegWriter.cpp.orig 2020-03-03 09:00:23 UTC	1	--- src/FFmpegWriter.cpp.orig 2020-06-18 10:04:32 UTC
2	+++ src/FFmpegWriter.cpp	2	+++ src/FFmpegWriter.cpp
3	@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std	3	@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
4	AVCodec *new_codec;	4	AVCodec *new_codec;
Lines 21-27 Link Here
21	#else // not ffmpeg 3	21	#else // not ffmpeg 3
22	new_codec = avcodec_find_encoder_by_name(codec.c_str());	22	new_codec = avcodec_find_encoder_by_name(codec.c_str());
23	#endif // HAVE_HW_ACCEL	23	#endif // HAVE_HW_ACCEL
24	@@ -1367,7 +1367,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	24	@@ -554,6 +554,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
		25	else {
		26	av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0);
		27	}
		28	+ break;
		29	case AV_CODEC_ID_HEVC :
		30	c->bit_rate = 0;
		31	if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) {
		32	@@ -562,6 +563,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
		33	av_opt_set_int(c->priv_data, "forced-idr",1,0);
		34	}
		35	break;
		36	+ default:
		37	+ break;
		38	}
		39	#endif
		40	} else {
		41	@@ -1447,7 +1450,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
25	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;	42	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
26	fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);	43	fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);
27	if (adapter_num < 3 && adapter_num >=0) {	44	if (adapter_num < 3 && adapter_num >=0) {
Lines 30-36 Link Here
30	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);	47	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
31	// Maybe 127 is better because the first card would be 1?!	48	// Maybe 127 is better because the first card would be 1?!
32	adapter_ptr = adapter;	49	adapter_ptr = adapter;
33	@@ -1375,17 +1375,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	50	@@ -1455,17 +1458,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
34	adapter_ptr = NULL;	51	adapter_ptr = NULL;
35	#elif defined(__APPLE__)	52	#elif defined(__APPLE__)
36	adapter_ptr = NULL;	53	adapter_ptr = NULL;