media-libs/mlt : version bump

5 files changed, 161 insertions, 0 deletions

diff --git a/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch b/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch
new file mode 100644
index 00000000..c2bc1946
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch
@@ -0,0 +1,56 @@
+From f0628d1fe7f61a267f1adad8824b9a2083e3376a Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Fri, 31 May 2019 19:03:32 -0700
+Subject: [PATCH] Fix #453 bad aspect ratio computed resulting in black.
+
+This occured when the s, width, or height properties are supplied with
+no "aspect."
+---
+ src/modules/avformat/consumer_avformat.c | 34 +++++++++++++-----------
+ 1 file changed, 18 insertions(+), 16 deletions(-)
+
+diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
+index 738f5a972..dd2719997 100644
+--- a/src/modules/avformat/consumer_avformat.c
++++ b/src/modules/avformat/consumer_avformat.c
+@@ -271,22 +271,24 @@ mlt_consumer consumer_avformat_init( mlt_profile profile, char *arg )
+ static void recompute_aspect_ratio( mlt_properties properties )
+ {
+ 	double ar = mlt_properties_get_double( properties, "aspect" );
+-	AVRational rational = av_d2q( ar, 255 );
+-	int width = mlt_properties_get_int( properties, "width" );
+-	int height = mlt_properties_get_int( properties, "height" );
+-
+-	// Update the profile and properties as well since this is an alias
+-	// for mlt properties that correspond to profile settings
+-	mlt_properties_set_int( properties, "display_aspect_num", rational.num );
+-	mlt_properties_set_int( properties, "display_aspect_den", rational.den );
+-
+-	// Now compute the sample aspect ratio
+-	rational = av_d2q( ar * height / FFMAX(width, 1), 255 );
+-
+-	// Update the profile and properties as well since this is an alias
+-	// for mlt properties that correspond to profile settings
+-	mlt_properties_set_int( properties, "sample_aspect_num", rational.num );
+-	mlt_properties_set_int( properties, "sample_aspect_den", rational.den );
++	if (ar > 0.0) {
++		AVRational rational = av_d2q( ar, 255 );
++		int width = mlt_properties_get_int( properties, "width" );
++		int height = mlt_properties_get_int( properties, "height" );
++	
++		// Update the profile and properties as well since this is an alias
++		// for mlt properties that correspond to profile settings
++		mlt_properties_set_int( properties, "display_aspect_num", rational.num );
++		mlt_properties_set_int( properties, "display_aspect_den", rational.den );
++	
++		// Now compute the sample aspect ratio
++		rational = av_d2q( ar * height / FFMAX(width, 1), 255 );
++	
++		// Update the profile and properties as well since this is an alias
++		// for mlt properties that correspond to profile settings
++		mlt_properties_set_int( properties, "sample_aspect_num", rational.num );
++		mlt_properties_set_int( properties, "sample_aspect_den", rational.den );
++	}
+ }
+ 
+ static void color_trc_from_colorspace( mlt_properties properties )
diff --git a/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch b/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch
new file mode 100644
index 00000000..946d06ae
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch
@@ -0,0 +1,22 @@
+From 434dbcf62048cc1220c425c2adc77697b4d40ffb Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Mardelle <jb@kdenlive.org>
+Date: Mon, 10 Jun 2019 18:18:44 +0200
+Subject: [PATCH] Fix multi consumer doesn't correctly handle in point
+
+---
+ src/modules/core/consumer_multi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/core/consumer_multi.c b/src/modules/core/consumer_multi.c
+index 4bb16ddf5..d9b5fbc0f 100644
+--- a/src/modules/core/consumer_multi.c
++++ b/src/modules/core/consumer_multi.c
+@@ -304,7 +304,7 @@ static void foreach_consumer_start( mlt_consumer consumer )
+ 		if ( nested )
+ 		{
+ 			mlt_properties nested_props = MLT_CONSUMER_PROPERTIES(nested);
+-			mlt_properties_set_position( nested_props, "_multi_position", 0 );
++			mlt_properties_set_position( nested_props, "_multi_position", mlt_properties_get_position( properties, "in" ) );
+ 			mlt_properties_set_data( nested_props, "_multi_audio", NULL, 0, NULL, NULL );
+ 			mlt_properties_set_int( nested_props, "_multi_samples", 0 );
+ 			mlt_consumer_start( nested );
diff --git a/media-libs/mlt/files/mlt-6.16.0-crop-filter.patch b/media-libs/mlt/files/mlt-6.16.0-crop-filter.patch
new file mode 100644
index 00000000..d42da685
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.16.0-crop-filter.patch
@@ -0,0 +1,31 @@
+From f6225b7f4cd5e9b6011ca79c3849dc9e286a7acb Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Mon, 13 May 2019 11:44:13 -0700
+Subject: [PATCH] Fix crop filter not working with color producer.
+
+Fixes https://github.com/mltframework/shotcut/issues/737
+---
+ src/modules/core/producer_colour.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/modules/core/producer_colour.c b/src/modules/core/producer_colour.c
+index e1cfe5284..67d36dfb2 100644
+--- a/src/modules/core/producer_colour.c
++++ b/src/modules/core/producer_colour.c
+@@ -1,6 +1,6 @@
+ /*
+  * producer_colour.c
+- * Copyright (C) 2003-2018 Meltytech, LLC
++ * Copyright (C) 2003-2019 Meltytech, LLC
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -248,6 +248,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
+ 		mlt_properties_set_int( properties, "progressive", 1 );
+ 		mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) );
+ 		mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
++		mlt_properties_set_int( properties, "meta.media.width", profile->width );
++		mlt_properties_set_int( properties, "meta.media.height", profile->height );
+ 
+ 		// colour is an alias for resource
+ 		if ( mlt_properties_get( producer_props, "colour" ) != NULL )
diff --git a/media-libs/mlt/files/mlt-6.16.0-mlt_consumer-race-condition.patch b/media-libs/mlt/files/mlt-6.16.0-mlt_consumer-race-condition.patch
new file mode 100644
index 00000000..7fd1c577
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.16.0-mlt_consumer-race-condition.patch
@@ -0,0 +1,30 @@
+From 9b89b781b9d06181c8d486605ed4c2b3089d64d6 Mon Sep 17 00:00:00 2001
+From: alcinos <nicolas.carion@ens-lyon.fr>
+Date: Wed, 1 May 2019 23:50:41 +0200
+Subject: [PATCH] Fix race in mlt_consumer
+
+---
+ src/framework/mlt_consumer.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
+index 491bc5e99..0e36bde3c 100644
+--- a/src/framework/mlt_consumer.c
++++ b/src/framework/mlt_consumer.c
+@@ -31,6 +31,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/time.h>
++#include <stdatomic.h>
+ 
+ /** Define this if you want an automatic deinterlace (if necessary) when the
+  * consumer's producer is not running at normal speed.
+@@ -65,7 +66,7 @@ typedef struct
+ 	double fps;
+ 	int channels;
+ 	int frequency;
+-	int speed;
++	atomic_int speed;
+ 	/* additional fields added for the parallel work queue */
+ 	mlt_deque worker_threads;
+ 	pthread_mutex_t done_mutex;
diff --git a/media-libs/mlt/files/mlt-6.16.0-rotoscoping-interpolation.patch b/media-libs/mlt/files/mlt-6.16.0-rotoscoping-interpolation.patch
new file mode 100644
index 00000000..935a2d13
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.16.0-rotoscoping-interpolation.patch
@@ -0,0 +1,22 @@
+From ddf6983b4aaaf662944b84103dd4412aff45a428 Mon Sep 17 00:00:00 2001
+From: alcinos <nicolas.carion@ens-lyon.fr>
+Date: Fri, 10 May 2019 23:20:22 +0200
+Subject: [PATCH] Fix interpolation in rotoscoping filter
+
+---
+ src/modules/plusgpl/filter_rotoscoping.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/plusgpl/filter_rotoscoping.c b/src/modules/plusgpl/filter_rotoscoping.c
+index 0667929cd..70e3a093b 100644
+--- a/src/modules/plusgpl/filter_rotoscoping.c
++++ b/src/modules/plusgpl/filter_rotoscoping.c
+@@ -572,7 +572,7 @@ static mlt_frame filter_process( mlt_filter filter, mlt_frame frame )
+             int c2 = json2BCurves( keyframe, &p2 );
+ 
+             // range 0-1
+-            double position = ( time - pos1 ) / (double)( pos2 - pos1 + 1 );
++            double position = ( time - pos1 ) / (double)( pos2 - pos1 );
+ 
+             count = MIN( c1, c2 );  // additional points are ignored
+             points = mlt_pool_alloc( count * sizeof( BPointF ) );