calc image size as largest of two image size calculation methods

[mlt] / src / modules / avformat / filter_avcolour_space.c

diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c
index 72177f7ce42a0070b30dae316ca3512755ef5be3..5bf53ea415d1d993a722aa78c6c0c5c1a28c931d 100644 (file)
--- a/src/modules/avformat/filter_avcolour_space.c
+++ b/src/modules/avformat/filter_avcolour_space.c
@@ -77,6 +77,7 @@ static void set_luma_transfer( struct SwsContext *context, int colorspace, int u
 {
 #if defined(SWSCALE) && (LIBSWSCALE_VERSION_INT >= ((0<<16)+(7<<8)+2))
        int *coefficients;
+       const int *new_coefficients;
        int full_range;
        int brightness, contrast, saturation;
 
@@ -92,16 +93,19 @@ static void set_luma_transfer( struct SwsContext *context, int colorspace, int u
                case 470:
                case 601:
                case 624:
-                       coefficients = sws_getCoefficients( SWS_CS_ITU601 );
+                       new_coefficients = sws_getCoefficients( SWS_CS_ITU601 );
                        break;
                case 240:
-                       coefficients = sws_getCoefficients( SWS_CS_SMPTE240M );
+                       new_coefficients = sws_getCoefficients( SWS_CS_SMPTE240M );
                        break;
                case 709:
-                       coefficients = sws_getCoefficients( SWS_CS_ITU709 );
+                       new_coefficients = sws_getCoefficients( SWS_CS_ITU709 );
+                       break;
+               default:
+                       new_coefficients = coefficients;
                        break;
                }
-               sws_setColorspaceDetails( context, coefficients, full_range, coefficients, full_range,
+               sws_setColorspaceDetails( context, new_coefficients, full_range, new_coefficients, full_range,
                        brightness, contrast, saturation );
        }
 #endif
@@ -113,7 +117,7 @@ static void av_convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in_fmt
        AVPicture input;
        AVPicture output;
 #ifdef SWSCALE
-       int flags = SWS_BILINEAR | SWS_ACCURATE_RND;
+       int flags = SWS_BICUBIC | SWS_ACCURATE_RND;
 
        if ( out_fmt == PIX_FMT_YUYV422 )
                flags |= SWS_FULL_CHR_H_INP;
@@ -132,10 +136,13 @@ static void av_convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in_fmt
 #ifdef SWSCALE
        struct SwsContext *context = sws_getContext( width, height, in_fmt,
                width, height, out_fmt, flags, NULL, NULL, NULL);
-       set_luma_transfer( context, colorspace, use_full_range );
-       sws_scale( context, input.data, input.linesize, 0, height,
-               output.data, output.linesize);
-       sws_freeContext( context );
+       if ( context )
+       {
+               set_luma_transfer( context, colorspace, use_full_range );
+               sws_scale( context, (const uint8_t* const*) input.data, input.linesize, 0, height,
+                       output.data, output.linesize);
+               sws_freeContext( context );
+       }
 #else
        img_convert( &output, out_fmt, &input, in_fmt, width, height );
 #endif
@@ -162,7 +169,8 @@ static int convert_image( mlt_frame frame, uint8_t **image, mlt_image_format *fo
 
                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 );
+               int size = FFMAX( avpicture_get_size( out_fmt, width, height ),
+                       mlt_image_format_size( output_format, width, height, NULL ) );
                uint8_t *output = mlt_pool_alloc( size );
 
                if ( *format == mlt_image_rgb24a || *format == mlt_image_opengl )
@@ -190,8 +198,7 @@ static int convert_image( mlt_frame frame, uint8_t **image, mlt_image_format *fo
                                                        }
                                                        while ( --n > 0 );
                                }
-                               mlt_properties_set_data( properties, "alpha", alpha, len, mlt_pool_release, NULL );
-                               frame->get_alpha_mask = NULL;
+                               mlt_frame_set_alpha( frame, alpha, len, mlt_pool_release );
                        }
                }
 
@@ -208,7 +215,7 @@ static int convert_image( mlt_frame frame, uint8_t **image, mlt_image_format *fo
                av_convert_image( output, *image, out_fmt, in_fmt, width, height, colorspace, force_full_luma );
                *image = output;
                *format = output_format;
-               mlt_properties_set_data( properties, "image", output, size, mlt_pool_release, NULL );
+               mlt_frame_set_image( frame, output, size, mlt_pool_release );
                mlt_properties_set_int( properties, "format", output_format );
 
                if ( output_format == mlt_image_rgb24a || output_format == mlt_image_opengl )
@@ -246,7 +253,7 @@ static int convert_image( mlt_frame frame, uint8_t **image, mlt_image_format *fo
 
 /* TODO: The below is not working because swscale does not have
  * adjustable coefficients yet for RGB->YUV */
-
+#if 0
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        int error = 0;
@@ -282,6 +289,7 @@ static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format
        
        return error;
 }
+#endif
 
 /** Filter processing.
 */