Revert new image types.

I think we can just use frame properties.

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index 2053cc847c7bc6675ae8cb41caaf1bdaa22b1253..1a49e74ac1d5094b958d04c31b9325833586b95e 100644 (file)
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -351,9 +351,6 @@ const char * mlt_image_format_name( mlt_image_format format )
                case mlt_image_yuv422:  return "yuv422";
                case mlt_image_yuv420p: return "yuv420p";
                case mlt_image_opengl:  return "opengl";
-               case mlt_image_rgb24_full:  return "rgb24_full";
-               case mlt_image_rgb24a_full: return "rgb24a_full";
-               case mlt_image_yuv422_709:  return "yuv422_709";
        }
        return "invalid";
 }
@@ -458,7 +455,6 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
                                *buffer = NULL;
                                break;
                        case mlt_image_rgb24:
-                       case mlt_image_rgb24_full:
                                size *= 3;
                                size += *width * 3;
                                *buffer = mlt_pool_alloc( size );
@@ -466,7 +462,6 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
                                        memset( *buffer, 255, size );
                                break;
                        case mlt_image_rgb24a:
-                       case mlt_image_rgb24a_full:
                        case mlt_image_opengl:
                                size *= 4;
                                size += *width * 4;

diff --git a/src/framework/mlt_types.h b/src/framework/mlt_types.h
index b549f4c859c3db7872f78e6fe3ffa8ff7aeb2e12..05c7bf5c95e839b9c317ae70543bdcfb5a964c30 100644 (file)
--- a/src/framework/mlt_types.h
+++ b/src/framework/mlt_types.h
@@ -40,10 +40,7 @@ typedef enum
        mlt_image_rgb24a,  /**< 8-bit RGB with alpha channel */
        mlt_image_yuv422,  /**< 8-bit YUV 4:2:2 packed */
        mlt_image_yuv420p, /**< 8-bit YUV 4:2:0 planar */
-       mlt_image_opengl,  /**< suitable for OpenGL texture */
-       mlt_image_rgb24_full,  /**< 8-bit RGB */
-       mlt_image_rgb24a_full, /**< 8-bit RGB with alpha channel */
-       mlt_image_yuv422_709,  /**< 8-bit YUV 4:2:2 packed */
+       mlt_image_opengl   /**< suitable for OpenGL texture */
 }
 mlt_image_format;
 

diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c
index 392485b887ff07d2d16f3f73500491528093325a..d908987c98e2f3ebb374d4789ccb4629ab0a905e 100644 (file)
--- a/src/modules/avformat/filter_avcolour_space.c
+++ b/src/modules/avformat/filter_avcolour_space.c
@@ -52,16 +52,13 @@ static int convert_mlt_to_av_cs( mlt_image_format format )
        switch( format )
        {
                case mlt_image_rgb24:
-               case mlt_image_rgb24_full:
                        value = PIX_FMT_RGB24;
                        break;
                case mlt_image_rgb24a:
                case mlt_image_opengl:
-               case mlt_image_rgb24a_full:
                        value = PIX_FMT_RGBA;
                        break;
                case mlt_image_yuv422:
-               case mlt_image_yuv422_709:
                        value = PIX_FMT_YUYV422;
                        break;
                case mlt_image_yuv420p:

diff --git a/src/modules/avformat/filter_swscale.c b/src/modules/avformat/filter_swscale.c
index 5afc17713332282a64ec314983ce18c63324bd05..a82b5e7ccd5d1338040e0ea9af4cc973a4029178 100644 (file)
--- a/src/modules/avformat/filter_swscale.c
+++ b/src/modules/avformat/filter_swscale.c
@@ -43,16 +43,13 @@ static inline int convert_mlt_to_av_cs( mlt_image_format format )
        switch( format )
        {
                case mlt_image_rgb24:
-               case mlt_image_rgb24_full:
                        value = PIX_FMT_RGB24;
                        break;
                case mlt_image_rgb24a:
-               case mlt_image_rgb24a_full:
                case mlt_image_opengl:
                        value = PIX_FMT_RGB32;
                        break;
                case mlt_image_yuv422:
-               case mlt_image_yuv422_709:
                        value = PIX_FMT_YUYV422;
                        break;
                case mlt_image_yuv420p:

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index fc44b902c4c5677c46f66d033f6653512459def1..c99d711e0bcc4708189a4496bd76c2ac6fd0d1ec 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -480,7 +480,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                mlt_properties_set_data( properties, "image", image_copy, image_size, mlt_pool_release, NULL );
                // We're going to pass the copy on
                *buffer = image_copy;
-               *format = this->alpha ? mlt_image_rgb24a_full : mlt_image_rgb24_full;
+               *format = this->alpha ? mlt_image_rgb24a : mlt_image_rgb24;
                mlt_log_debug( MLT_PRODUCER_SERVICE( &this->parent ), "%dx%d (%s)\n",
                        this->width, this->height, mlt_image_format_name( *format ) );
        }

diff --git a/src/modules/qimage/producer_qimage.c b/src/modules/qimage/producer_qimage.c
index 218691abda7ce64dd73b564aa8c9c00844d156f4..66d0833395da078b38c4226f0b4a3e844931fa1e 100644 (file)
--- a/src/modules/qimage/producer_qimage.c
+++ b/src/modules/qimage/producer_qimage.c
@@ -202,7 +202,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                mlt_properties_set_data( properties, "image", image_copy, image_size, mlt_pool_release, NULL );
                // We're going to pass the copy on
                *buffer = image_copy;
-               *format = this->has_alpha ? mlt_image_rgb24a_full : mlt_image_rgb24_full;
+               *format = this->has_alpha ? mlt_image_rgb24a : mlt_image_rgb24;
                mlt_log_debug( MLT_PRODUCER_SERVICE( &this->parent ), "%dx%d (%s)\n", 
                        this->current_width, this->current_height, mlt_image_format_name( *format ) );
        }

diff --git a/src/modules/sdl/producer_sdl_image.c b/src/modules/sdl/producer_sdl_image.c
index 2355f6533ef88631bd13bd9a33faad0ceed198f5..0d6246643488e79289e86df0cf250976e3471e2b 100644 (file)
--- a/src/modules/sdl/producer_sdl_image.c
+++ b/src/modules/sdl/producer_sdl_image.c
@@ -60,13 +60,13 @@ static int producer_get_image( mlt_frame frame, uint8_t **image, mlt_image_forma
        switch( surface->format->BitsPerPixel )
        {
                case 32:
-                       *format = mlt_image_rgb24a_full;
+                       *format = mlt_image_rgb24a;
                        image_size = *width * *height * 4;
                        *image = mlt_pool_alloc( image_size );
                        memcpy( *image, surface->pixels, image_size );
                        break;
                case 24:
-                       *format = mlt_image_rgb24_full;
+                       *format = mlt_image_rgb24;
                        *image = mlt_pool_alloc( image_size );
                        memcpy( *image, surface->pixels, image_size );
                        break;