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 37f0db1524d650d23f96ed6ecf49f4ac43c2175d..5bf53ea415d1d993a722aa78c6c0c5c1a28c931d 100644 (file)
--- a/src/modules/avformat/filter_avcolour_space.c
+++ b/src/modules/avformat/filter_avcolour_space.c
@@ -77,7 +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 = coefficients;
+       const int *new_coefficients;
        int full_range;
        int brightness, contrast, saturation;
 
@@ -101,6 +101,9 @@ static void set_luma_transfer( struct SwsContext *context, int colorspace, int u
                case 709:
                        new_coefficients = sws_getCoefficients( SWS_CS_ITU709 );
                        break;
+               default:
+                       new_coefficients = coefficients;
+                       break;
                }
                sws_setColorspaceDetails( context, new_coefficients, full_range, new_coefficients, full_range,
                        brightness, contrast, saturation );
@@ -114,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;
@@ -133,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, (const uint8_t* const*) 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
@@ -163,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 )
@@ -192,7 +199,6 @@ static int convert_image( mlt_frame frame, uint8_t **image, mlt_image_format *fo
                                                        while ( --n > 0 );
                                }
                                mlt_frame_set_alpha( frame, alpha, len, mlt_pool_release );
-                               frame->get_alpha_mask = NULL;
                        }
                }