Improve colorspace handling (work in progress)

[mlt] / src / framework / mlt_frame.c

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index 0b9abf2076f1879e29e49442e604b21b34f5dfb5..2053cc847c7bc6675ae8cb41caaf1bdaa22b1253 100644 (file)
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -351,6 +351,9 @@ 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";
 }
@@ -387,7 +390,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
        {
                mlt_properties_set_int( properties, "image_count", mlt_properties_get_int( properties, "image_count" ) - 1 );
                error = get_image( this, buffer, format, width, height, writable );
-               if ( !error )
+               if ( !error && *buffer )
                {
                        mlt_properties_set_int( properties, "width", *width );
                        mlt_properties_set_int( properties, "height", *height );
@@ -407,7 +410,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
                *buffer = mlt_properties_get_data( properties, "image", NULL );
                *width = mlt_properties_get_int( properties, "width" );
                *height = mlt_properties_get_int( properties, "height" );
-               if ( this->convert_image )
+               if ( this->convert_image && *buffer )
                        this->convert_image( this, buffer, format, requested_format );
        }
        else if ( producer )
@@ -455,6 +458,7 @@ 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 );
@@ -462,6 +466,7 @@ 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;
@@ -493,9 +498,6 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
                mlt_properties_set_int( properties, "test_image", 1 );
        }
 
-       mlt_properties_set_int( properties, "scaled_width", *width );
-       mlt_properties_set_int( properties, "scaled_height", *height );
-
        return error;
 }
 
@@ -517,7 +519,7 @@ uint8_t *mlt_frame_get_alpha_mask( mlt_frame this )
                        alpha = mlt_properties_get_data( &this->parent, "alpha", NULL );
                if ( alpha == NULL )
                {
-                       int size = mlt_properties_get_int( &this->parent, "scaled_width" ) * mlt_properties_get_int( &this->parent, "scaled_height" );
+                       int size = mlt_properties_get_int( &this->parent, "width" ) * mlt_properties_get_int( &this->parent, "height" );
                        alpha = mlt_pool_alloc( size );
                        memset( alpha, 255, size );
                        mlt_properties_set_data( &this->parent, "alpha", alpha, size, mlt_pool_release, NULL );
@@ -692,11 +694,19 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h )
        int16_t *pcm = NULL;
        mlt_properties properties = MLT_FRAME_PROPERTIES( this );
        mlt_audio_format format = mlt_audio_s16;
-       int frequency = 32000; // lower frequency available?
+       int frequency = 16000;
        int channels = 2;
-       double fps = mlt_profile_fps( NULL );
+       mlt_producer producer = mlt_frame_get_original_producer( this );
+       double fps = mlt_producer_get_fps( mlt_producer_cut_parent( producer ) );
        int samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( this ) );
 
+       // Increase audio resolution proportional to requested image size
+       while ( samples < w )
+       {
+               frequency += 16000;
+               samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( this ) );
+       }
+
        // Get the pcm data
        mlt_frame_get_audio( this, (void**)&pcm, &format, &frequency, &channels, &samples );
 
@@ -709,33 +719,34 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h )
 
        // Render vertical lines
        int16_t *ubound = pcm + samples * channels;
-       int skip = samples / w - 1;
+       int skip = samples / w;
+       skip = !skip ? 1 : skip;
+       unsigned char gray = 0xFF / skip;
        int i, j, k;
 
        // Iterate sample stream and along x coordinate
-       for ( i = 0; i < w && pcm < ubound; i++ )
+       for ( i = 0; pcm < ubound; i++ )
        {
                // pcm data has channels interleaved
-               for ( j = 0; j < channels; j++ )
+               for ( j = 0; j < channels; j++, pcm++ )
                {
                        // Determine sample's magnitude from 2s complement;
                        int pcm_magnitude = *pcm < 0 ? ~(*pcm) + 1 : *pcm;
                        // The height of a line is the ratio of the magnitude multiplied by
-                       // half the vertical resolution
-                       int height = ( int )( ( double )( pcm_magnitude ) / 32768 * h / 2 );
-                       // Determine the starting y coordinate - left channel above center,
-                       // right channel below - currently assumes 2 channels
-                       int displacement = ( h / 2 ) - ( 1 - j ) * height;
+                       // the vertical resolution of a single channel
+                               int height = h * pcm_magnitude / channels / 2 / 32768;
+                       // Determine the starting y coordinate - left top, right bottom
+                       int displacement = h * (j * 2 + 1) / channels / 2 - ( *pcm < 0 ? 0 : height );
                        // Position buffer pointer using y coordinate, stride, and x coordinate
-                       unsigned char *p = &bitmap[ i + displacement * w ];
+                       unsigned char *p = bitmap + i / skip + displacement * w;
 
                        // Draw vertical line
-                       for ( k = 0; k < height; k++ )
-                               p[ w * k ] = 0xFF;
-
-                       pcm++;
+                       for ( k = 0; k < height + 1; k++ )
+                               if ( *pcm < 0 )
+                                       p[ w * k ] = ( k == 0 ) ? 0xFF : p[ w * k ] + gray;
+                               else
+                                       p[ w * k ] = ( k == height ) ? 0xFF : p[ w * k ] + gray;
                }
-               pcm += skip * channels;
        }
 
        return bitmap;
@@ -812,7 +823,7 @@ int mlt_sample_calculator( float fps, int frequency, int64_t position )
  * \bug Will this break when mlt_position is converted to double?
  */
 
-inline int64_t mlt_sample_calculator_to_now( float fps, int frequency, int64_t position )
+int64_t mlt_sample_calculator_to_now( float fps, int frequency, int64_t position )
 {
        int64_t samples = 0;