Make FFmpeg the primary image converter if available.

Except on OS X.

diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c
index 1cee5f9c2f72162bb09f24869e55cf9ccf9ce7c1..cc52483be9661ab64f8617c862d24c5a819e8e72 100644 (file)
--- a/src/modules/avformat/filter_avcolour_space.c
+++ b/src/modules/avformat/filter_avcolour_space.c
@@ -35,15 +35,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-static inline int is_big_endian( )
+#if 0 // This test might come in handy elsewhere someday.
+static int is_big_endian( )
 {
        union { int i; char c[ 4 ]; } big_endian_test;
        big_endian_test.i = 1;
 
        return big_endian_test.c[ 0 ] != 1;
 }
+#endif
 
-static inline int convert_mlt_to_av_cs( mlt_image_format format )
+static int convert_mlt_to_av_cs( mlt_image_format format )
 {
        int value = 0;
 
@@ -63,14 +65,14 @@ static inline int convert_mlt_to_av_cs( mlt_image_format format )
                        value = PIX_FMT_YUV420P;
                        break;
                case mlt_image_none:
-                       mlt_log_error( NULL, "[filter avcolour_space] Invalid format\n" );
+                       mlt_log_error( NULL, "[filter avcolor_space] Invalid format\n" );
                        break;
        }
 
        return value;
 }
 
-static inline void av_convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in_fmt, int width, int height )
+static void av_convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in_fmt, int width, int height )
 {
        AVPicture input;
        AVPicture output;
@@ -90,7 +92,6 @@ static inline void av_convert_image( uint8_t *out, uint8_t *in, int out_fmt, int
 /** Do it :-).
 */
 
-// static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 static int convert_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, mlt_image_format output_format )
 {
        mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
@@ -100,124 +101,50 @@ static int convert_image( mlt_frame frame, uint8_t **image, mlt_image_format *fo
 
        if ( *format != output_format )
        {
-               mlt_log_debug( NULL, "[filter avcolour_space] %s -> %s\n",
+               mlt_log_debug( NULL, "[filter avcolor_space] %s -> %s\n",
                        mlt_image_format_name( *format ), mlt_image_format_name( output_format ) );
-               if ( output_format != mlt_image_opengl )
+
+               int in_fmt = convert_mlt_to_av_cs( *format );
+               int out_fmt = convert_mlt_to_av_cs( output_format );
+               int size = avpicture_get_size( out_fmt, width, height );
+               uint8_t *output = mlt_pool_alloc( size );
+
+               if ( *format == mlt_image_rgb24a || *format == mlt_image_opengl )
                {
-                       int in_fmt = convert_mlt_to_av_cs( *format );
-                       int out_fmt = convert_mlt_to_av_cs( output_format );
-                       int size = avpicture_get_size( out_fmt, width, height );
-                       uint8_t *output = mlt_pool_alloc( size );
-                       av_convert_image( output, *image, out_fmt, in_fmt, width, height );
-       
-                       // Special case for alpha rgb input
-                       //if ( *format == mlt_image_rgb24a || *format == mlt_image_opengl )
-if (0)
+                       register int len = width * height;
+                       uint8_t *alpha = mlt_pool_alloc( len );
+
+                       if ( alpha )
                        {
-                               register uint8_t *alpha = mlt_frame_get_alpha_mask( frame );
-                               register int len = width * height;
-                               register uint8_t *bits = *image;
+                               // Extract the alpha mask from the RGBA image using Duff's Device
+                               register uint8_t *s = *image + 3; // start on the alpha component
+                               register uint8_t *d = alpha;
                                register int n = ( len + 7 ) / 8;
-       
-                               if( !is_big_endian( ) )
-                                       bits += 3;
-       
-                               // Extract alpha mask from the image using Duff's Device
-                               switch( len % 8 )
+
+                               switch ( len % 8 )
                                {
-                                       case 0: do { *alpha ++ = *bits; bits += 4;
-                                       case 7:          *alpha ++ = *bits; bits += 4;
-                                       case 6:          *alpha ++ = *bits; bits += 4;
-                                       case 5:          *alpha ++ = *bits; bits += 4;
-                                       case 4:          *alpha ++ = *bits; bits += 4;
-                                       case 3:          *alpha ++ = *bits; bits += 4;
-                                       case 2:          *alpha ++ = *bits; bits += 4;
-                                       case 1:          *alpha ++ = *bits; bits += 4;
+                                       case 0: do { *d++ = *s; s += 4;
+                                       case 7:          *d++ = *s; s += 4;
+                                       case 6:          *d++ = *s; s += 4;
+                                       case 5:          *d++ = *s; s += 4;
+                                       case 4:          *d++ = *s; s += 4;
+                                       case 3:          *d++ = *s; s += 4;
+                                       case 2:          *d++ = *s; s += 4;
+                                       case 1:          *d++ = *s; s += 4;
                                                        }
-                                                       while( --n );
-                               }
-                       }
-       
-                       // Update the output
-                       *image = output;
-                       *format = output_format;
-                       mlt_properties_set_data( properties, "image", output, size, mlt_pool_release, NULL );
-                       mlt_properties_set_int( properties, "format", output_format );
-       
-                       // Special case for alpha rgb output
-//                     if ( output_format == mlt_image_rgb24a )
-if (0)
-                       {
-                               // Fetch the alpha
-                               register uint8_t *alpha = mlt_frame_get_alpha_mask( frame );
-       
-                               if ( alpha != NULL )
-                               {
-                                       register uint8_t *bits = *image;
-                                       register int len = width * height;
-                                       register int n = ( len + 7 ) / 8;
-                                       
-                                       if( !is_big_endian( ) )
-                                               bits += 3;
-       
-                                       // Merge the alpha mask into the RGB image using Duff's Device
-                                       switch( len % 8 )
-                                       {
-                                               case 0: do { *bits = *alpha++; bits += 4;
-                                               case 7:          *bits = *alpha++; bits += 4;
-                                               case 6:          *bits = *alpha++; bits += 4;
-                                               case 5:          *bits = *alpha++; bits += 4;
-                                               case 4:          *bits = *alpha++; bits += 4;
-                                               case 3:          *bits = *alpha++; bits += 4;
-                                               case 2:          *bits = *alpha++; bits += 4;
-                                               case 1:          *bits = *alpha++; bits += 4;
-                                                               }
-                                                               while( --n );
-                                       }
+                                                       while ( --n > 0 );
                                }
+                               mlt_properties_set_data( properties, "alpha", alpha, len, mlt_pool_release, NULL );
+                               frame->get_alpha_mask = NULL;
                        }
                }
-               else if ( *format == mlt_image_yuv422 ) // && output_format == mlt_image_opengl
-               {
-                       int size = width * height * 4;
-                       uint8_t *output = mlt_pool_alloc( size );
-                       int h = height;
-                       int w = width;
-                       uint8_t *o = output + size;
-                       int ostride = w * 4;
-                       uint8_t *p = *image;
-                       uint8_t *alpha = mlt_frame_get_alpha_mask( frame ) + width * height;
-                       int r, g, b;
-
-                       while( h -- )
-                       {
-                               w = width;
-                               o -= ostride;
-                               alpha -= width;
-                               while( w >= 2 )
-                               {
-                                       YUV2RGB( *p, *( p + 1 ), *( p + 3 ), r, g, b );
-                                       *o ++ = r;
-                                       *o ++ = g;
-                                       *o ++ = b;
-                                       *o ++ = *alpha ++;
-                                       YUV2RGB( *( p + 2 ), *( p + 1 ), *( p + 3 ), r, g, b );
-                                       *o ++ = r;
-                                       *o ++ = g;
-                                       *o ++ = b;
-                                       *o ++ = *alpha ++;
-                                       w -= 2;
-                                       p += 4;
-                               }
-                               o -= ostride;
-                               alpha -= width;
-                       }
 
-                       mlt_properties_set_data( properties, "image", output, size, mlt_pool_release, NULL );
-                       mlt_properties_set_int( properties, "format", output_format );
-                       *image = output;
-                       *format = output_format;
-               }
+               // Update the output
+               av_convert_image( output, *image, out_fmt, in_fmt, width, height );
+               *image = output;
+               *format = output_format;
+               mlt_properties_set_data( properties, "image", output, size, mlt_pool_release, NULL );
+               mlt_properties_set_int( properties, "format", output_format );
        }
        return error;
 }

diff --git a/src/modules/core/producer_loader.c b/src/modules/core/producer_loader.c
index 3fe633f881af6dbb6d54626afd8ceaeed1d8676e..4d1c4afccecc02fcf5999d8f537c1f3a794da382 100644 (file)
--- a/src/modules/core/producer_loader.c
+++ b/src/modules/core/producer_loader.c
@@ -181,7 +181,11 @@ mlt_producer producer_loader_init( mlt_profile profile, mlt_service_type type, c
        
        // Always let the image and audio be converted
        int created = 0;
-       create_filter( profile, producer, "imageconvert", &created );
+#ifndef __DARWIN__
+       create_filter( profile, producer, "avcolor_space", &created );
+       if ( !created )
+#endif
+               create_filter( profile, producer, "imageconvert", &created );
        create_filter( profile, producer, "audioconvert", &created );
 
        // Now make sure we don't lose our identity