Added new profiles system: mlt_profile, MLT_PROFILE, and profiles documents.
[melted] / src / framework / mlt_frame.c
index 9c6922b..52de88d 100644 (file)
@@ -3,25 +3,27 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
 #include "mlt_frame.h"
 #include "mlt_producer.h"
 #include "mlt_factory.h"
+#include "mlt_profile.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,9 +39,6 @@ mlt_frame mlt_frame_init( )
 
        if ( this != NULL )
        {
-               // Get the normalisation
-               char *normalisation = mlt_environment( "MLT_NORMALISATION" );
-
                // Initialise the properties
                mlt_properties properties = &this->parent;
                mlt_properties_init( properties, this );
@@ -47,24 +46,11 @@ mlt_frame mlt_frame_init( )
                // Set default properties on the frame
                mlt_properties_set_position( properties, "_position", 0.0 );
                mlt_properties_set_data( properties, "image", NULL, 0, NULL, NULL );
-
-               if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) )
-               {
-                       mlt_properties_set_int( properties, "width", 720 );
-                       mlt_properties_set_int( properties, "height", 576 );
-                       mlt_properties_set_int( properties, "normalised_width", 720 );
-                       mlt_properties_set_int( properties, "normalised_height", 576 );
-                       mlt_properties_set_double( properties, "aspect_ratio", 59.0/54.0 );
-               }
-               else
-               {
-                       mlt_properties_set_int( properties, "width", 720 );
-                       mlt_properties_set_int( properties, "height", 480 );
-                       mlt_properties_set_int( properties, "normalised_width", 720 );
-                       mlt_properties_set_int( properties, "normalised_height", 480 );
-                       mlt_properties_set_double( properties, "aspect_ratio", 10.0/11.0 );
-               }
-
+               mlt_properties_set_int( properties, "width", mlt_profile_get()->width );
+               mlt_properties_set_int( properties, "height", mlt_profile_get()->height );
+               mlt_properties_set_int( properties, "normalised_width", mlt_profile_get()->width );
+               mlt_properties_set_int( properties, "normalised_height", mlt_profile_get()->height );
+               mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( NULL ) );
                mlt_properties_set_data( properties, "audio", NULL, 0, NULL, NULL );
                mlt_properties_set_data( properties, "alpha", NULL, 0, NULL, NULL );
 
@@ -532,31 +518,24 @@ void mlt_frame_close( mlt_frame this )
 int mlt_convert_yuv422_to_rgb24a( uint8_t *yuv, uint8_t *rgba, unsigned int total )
 {
        int ret = 0;
-       int yy, uu, vv, ug_plus_vg, ub, vr;
+       int yy, uu, vv;
        int r,g,b;
        total /= 2;
        while (total--) 
        {
-               yy = yuv[0] << 8;
-               uu = yuv[1] - 128;
-               vv = yuv[3] - 128;
-               ug_plus_vg = uu * 88 + vv * 183;
-               ub = uu * 454;
-               vr = vv * 359;
-               r = (yy + vr) >> 8;
-               g = (yy - ug_plus_vg) >> 8;
-               b = (yy + ub) >> 8;
-               rgba[0] = r < 0 ? 0 : (r > 255 ? 255 : (unsigned char)r);
-               rgba[1] = g < 0 ? 0 : (g > 255 ? 255 : (unsigned char)g);
-               rgba[2] = b < 0 ? 0 : (b > 255 ? 255 : (unsigned char)b);
+               yy = yuv[0];
+               uu = yuv[1];
+               vv = yuv[3];
+               YUV2RGB(yy, uu, vv, r, g, b);
+               rgba[0] = r;
+               rgba[1] = g;
+               rgba[2] = b;
                rgba[3] = 255;
-               yy = yuv[2] << 8;
-               r = (yy + vr) >> 8;
-               g = (yy - ug_plus_vg) >> 8;
-               b = (yy + ub) >> 8;
-               rgba[4] = r < 0 ? 0 : (r > 255 ? 255 : (unsigned char)r);
-               rgba[5] = g < 0 ? 0 : (g > 255 ? 255 : (unsigned char)g);
-               rgba[6] = b < 0 ? 0 : (b > 255 ? 255 : (unsigned char)b);
+               yy = yuv[2];
+               YUV2RGB(yy, uu, vv, r, g, b);
+               rgba[4] = r;
+               rgba[5] = g;
+               rgba[6] = b;
                rgba[7] = 255;
                yuv += 4;
                rgba += 8;
@@ -572,6 +551,7 @@ int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stri
        register uint8_t *d = yuv;
        register int i, j;
 
+       if ( alpha )
        for ( i = 0; i < height; i++ )
        {
                register uint8_t *s = rgba + ( stride * i );
@@ -603,6 +583,39 @@ int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stri
                        *d++ = u0;
                }
        }
+       else
+       for ( i = 0; i < height; i++ )
+       {
+               register uint8_t *s = rgba + ( stride * i );
+               for ( j = 0; j < ( width / 2 ); j++ )
+               {
+                       r = *s++;
+                       g = *s++;
+                       b = *s++;
+                       s++;
+                       RGB2YUV (r, g, b, y0, u0 , v0);
+                       r = *s++;
+                       g = *s++;
+                       b = *s++;
+                       s++;
+                       RGB2YUV (r, g, b, y1, u1 , v1);
+                       *d++ = y0;
+                       *d++ = (u0+u1) >> 1;
+                       *d++ = y1;
+                       *d++ = (v0+v1) >> 1;
+               }
+               if ( width % 2 )
+               {
+                       r = *s++;
+                       g = *s++;
+                       b = *s++;
+                       s++;
+                       RGB2YUV (r, g, b, y0, u0 , v0);
+                       *d++ = y0;
+                       *d++ = u0;
+               }
+       }
+
        return ret;
 }
 
@@ -653,6 +666,7 @@ int mlt_convert_bgr24a_to_yuv422( uint8_t *rgba, int width, int height, int stri
        register uint8_t *d = yuv;
        register int i, j;
 
+       if ( alpha )
        for ( i = 0; i < height; i++ )
        {
                register uint8_t *s = rgba + ( stride * i );
@@ -684,6 +698,38 @@ int mlt_convert_bgr24a_to_yuv422( uint8_t *rgba, int width, int height, int stri
                        *d++ = u0;
                }
        }
+       else
+       for ( i = 0; i < height; i++ )
+       {
+               register uint8_t *s = rgba + ( stride * i );
+               for ( j = 0; j < ( width / 2 ); j++ )
+               {
+                       b = *s++;
+                       g = *s++;
+                       r = *s++;
+                       s++;
+                       RGB2YUV (r, g, b, y0, u0 , v0);
+                       b = *s++;
+                       g = *s++;
+                       r = *s++;
+                       s++;
+                       RGB2YUV (r, g, b, y1, u1 , v1);
+                       *d++ = y0;
+                       *d++ = (u0+u1) >> 1;
+                       *d++ = y1;
+                       *d++ = (v0+v1) >> 1;
+               }
+               if ( width % 2 )
+               {
+                       b = *s++;
+                       g = *s++;
+                       r = *s++;
+                       s++;
+                       RGB2YUV (r, g, b, y0, u0 , v0);
+                       *d++ = y0;
+                       *d++ = u0;
+               }
+       }
        return ret;
 }
 
@@ -734,6 +780,7 @@ int mlt_convert_argb_to_yuv422( uint8_t *rgba, int width, int height, int stride
        register uint8_t *d = yuv;
        register int i, j;
 
+       if ( alpha )
        for ( i = 0; i < height; i++ )
        {
                register uint8_t *s = rgba + ( stride * i );
@@ -765,6 +812,38 @@ int mlt_convert_argb_to_yuv422( uint8_t *rgba, int width, int height, int stride
                        *d++ = u0;
                }
        }
+       else
+       for ( i = 0; i < height; i++ )
+       {
+               register uint8_t *s = rgba + ( stride * i );
+               for ( j = 0; j < ( width / 2 ); j++ )
+               {
+                       s++;
+                       r = *s++;
+                       g = *s++;
+                       b = *s++;
+                       RGB2YUV (r, g, b, y0, u0 , v0);
+                       s++;
+                       r = *s++;
+                       g = *s++;
+                       b = *s++;
+                       RGB2YUV (r, g, b, y1, u1 , v1);
+                       *d++ = y0;
+                       *d++ = (u0+u1) >> 1;
+                       *d++ = y1;
+                       *d++ = (v0+v1) >> 1;
+               }
+               if ( width % 2 )
+               {
+                       s++;
+                       r = *s++;
+                       g = *s++;
+                       b = *s++;
+                       RGB2YUV (r, g, b, y0, u0 , v0);
+                       *d++ = y0;
+                       *d++ = u0;
+               }
+       }
        return ret;
 }