-/*
- * mlt_frame.c -- interface for all frame classes
- * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
- * Author: Charles Yates <charles.yates@pandora.be>
+/**
+ * \file mlt_frame.c
+ * \brief interface for all frame classes
+ * \see mlt_frame_s
*
- * 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.
+ * Copyright (C) 2003-2009 Ushodaya Enterprises Limited
+ * \author Charles Yates <charles.yates@pandora.be>
*
- * This program is distributed in the hope that it will be useful,
+ * 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 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>
-
-typedef struct
-{
- mlt_image_format vfmt;
- int width;
- int height;
- uint8_t *image;
- uint8_t *alpha;
- mlt_audio_format afmt;
- int16_t *audio;
-}
-frame_test;
-
-static frame_test test_card = { mlt_image_none, 0, 0, NULL, NULL, mlt_audio_none, NULL };
+#include <math.h>
/** Constructor for a frame.
*/
-mlt_frame mlt_frame_init( )
+mlt_frame mlt_frame_init( mlt_service service )
{
// Allocate a frame
mlt_frame this = calloc( sizeof( struct mlt_frame_s ), 1 );
if ( this != NULL )
{
+ mlt_profile profile = mlt_service_profile( service );
+
// Initialise the properties
mlt_properties properties = &this->parent;
mlt_properties_init( properties, this );
// Set default properties on the frame
- mlt_properties_set_position( properties, "position", 0.0 );
+ mlt_properties_set_position( properties, "_position", 0.0 );
mlt_properties_set_data( properties, "image", NULL, 0, NULL, NULL );
- mlt_properties_set_int( properties, "width", 720 );
- mlt_properties_set_int( properties, "height", 576 );
- mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
+ mlt_properties_set_int( properties, "width", profile? profile->width : 720 );
+ mlt_properties_set_int( properties, "height", profile? profile->height : 576 );
+ mlt_properties_set_int( properties, "normalised_width", profile? profile->width : 720 );
+ mlt_properties_set_int( properties, "normalised_height", profile? profile->height : 576 );
+ 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 );
+
+ // Construct stacks for frames and methods
+ this->stack_image = mlt_deque_init( );
+ this->stack_audio = mlt_deque_init( );
+ this->stack_service = mlt_deque_init( );
}
+
return this;
}
mlt_properties mlt_frame_properties( mlt_frame this )
{
- return &this->parent;
+ return this != NULL ? &this->parent : NULL;
}
/** Check if we have a way to derive something other than a test card.
int mlt_frame_is_test_card( mlt_frame this )
{
- return ( this->stack_get_image_size == 0 && mlt_properties_get_data( mlt_frame_properties( this ), "image", NULL ) == NULL );
+ return mlt_deque_count( this->stack_image ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_image" );
}
-/** Check if we have a way to derive something than test audio.
+/** Check if we have a way to derive something other than test audio.
*/
int mlt_frame_is_test_audio( mlt_frame this )
{
- return this->get_audio == NULL;
+ return mlt_deque_count( this->stack_audio ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_audio" );
}
/** Get the aspect ratio of the frame.
double mlt_frame_get_aspect_ratio( mlt_frame this )
{
- return mlt_properties_get_double( mlt_frame_properties( this ), "aspect_ratio" );
+ return mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "aspect_ratio" );
}
/** Set the aspect ratio of the frame.
int mlt_frame_set_aspect_ratio( mlt_frame this, double value )
{
- return mlt_properties_set_double( mlt_frame_properties( this ), "aspect_ratio", value );
+ return mlt_properties_set_double( MLT_FRAME_PROPERTIES( this ), "aspect_ratio", value );
}
/** Get the position of this frame.
mlt_position mlt_frame_get_position( mlt_frame this )
{
- return mlt_properties_get_position( mlt_frame_properties( this ), "position" );
+ int pos = mlt_properties_get_position( MLT_FRAME_PROPERTIES( this ), "_position" );
+ return pos < 0 ? 0 : pos;
}
/** Set the position of this frame.
int mlt_frame_set_position( mlt_frame this, mlt_position value )
{
- return mlt_properties_set_position( mlt_frame_properties( this ), "position", value );
+ return mlt_properties_set_position( MLT_FRAME_PROPERTIES( this ), "_position", value );
}
/** Stack a get_image callback.
int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image )
{
- int ret = this->stack_get_image_size >= 10;
- if ( ret == 0 )
- this->stack_get_image[ this->stack_get_image_size ++ ] = get_image;
- return ret;
+ return mlt_deque_push_back( this->stack_image, get_image );
}
/** Pop a get_image callback.
mlt_get_image mlt_frame_pop_get_image( mlt_frame this )
{
- mlt_get_image result = NULL;
- if ( this->stack_get_image_size > 0 )
- result = this->stack_get_image[ -- this->stack_get_image_size ];
- return result;
+ return mlt_deque_pop_back( this->stack_image );
}
/** Push a frame.
int mlt_frame_push_frame( mlt_frame this, mlt_frame that )
{
- int ret = this->stack_frame_size >= 10;
- if ( ret == 0 )
- this->stack_frame[ this->stack_frame_size ++ ] = that;
- return ret;
+ return mlt_deque_push_back( this->stack_image, that );
}
/** Pop a frame.
mlt_frame mlt_frame_pop_frame( mlt_frame this )
{
- mlt_frame result = NULL;
- if ( this->stack_frame_size > 0 )
- result = this->stack_frame[ -- this->stack_frame_size ];
- return result;
+ return mlt_deque_pop_back( this->stack_image );
+}
+
+/** Push a service.
+*/
+
+int mlt_frame_push_service( mlt_frame this, void *that )
+{
+ return mlt_deque_push_back( this->stack_image, that );
+}
+
+/** Pop a service.
+*/
+
+void *mlt_frame_pop_service( mlt_frame this )
+{
+ return mlt_deque_pop_back( this->stack_image );
+}
+
+/** Push a service.
+*/
+
+int mlt_frame_push_service_int( mlt_frame this, int that )
+{
+ return mlt_deque_push_back_int( this->stack_image, that );
+}
+
+/** Pop a service.
+*/
+
+int mlt_frame_pop_service_int( mlt_frame this )
+{
+ return mlt_deque_pop_back_int( this->stack_image );
+}
+
+/** Push an audio item on the stack.
+*/
+
+int mlt_frame_push_audio( mlt_frame this, void *that )
+{
+ return mlt_deque_push_back( this->stack_audio, that );
+}
+
+/** Pop an audio item from the stack
+*/
+
+void *mlt_frame_pop_audio( mlt_frame this )
+{
+ return mlt_deque_pop_back( this->stack_audio );
+}
+
+/** Return the service stack
+*/
+
+mlt_deque mlt_frame_service_stack( mlt_frame this )
+{
+ return this->stack_service;
+}
+
+/** Replace image stack with the information provided.
+
+ This might prove to be unreliable and restrictive - the idea is that a transition
+ which normally uses two images may decide to only use the b frame (ie: in the case
+ of a composite where the b frame completely obscures the a frame).
+
+ The image must be writable and the destructor for the image itself must be taken
+ care of on another frame and that frame cannot have a replace applied to it...
+ Further it assumes that no alpha mask is in use.
+
+ For these reasons, it can only be used in a specific situation - when you have
+ multiple tracks each with their own transition and these transitions are applied
+ in a strictly reversed order (ie: highest numbered [lowest track] is processed
+ first).
+
+ More reliable approach - the cases should be detected during the process phase
+ and the upper tracks should simply not be invited to stack...
+*/
+
+void mlt_frame_replace_image( mlt_frame this, uint8_t *image, mlt_image_format format, int width, int height )
+{
+ // Remove all items from the stack
+ while( mlt_deque_pop_back( this->stack_image ) ) ;
+
+ // Update the information
+ mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "image", image, 0, NULL, NULL );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "width", width );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "height", height );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "format", format );
+ this->get_alpha_mask = NULL;
}
+/** Get the image associated to the frame.
+*/
+
int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
{
- mlt_properties properties = mlt_frame_properties( this );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( this );
mlt_get_image get_image = mlt_frame_pop_get_image( this );
-
+ mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL );
+ int error = 0;
+
if ( get_image != NULL )
{
- return get_image( this, buffer, format, width, height, writable );
+ mlt_properties_set_int( properties, "image_count", mlt_properties_get_int( properties, "image_count" ) - 1 );
+ mlt_position position = mlt_frame_get_position( this );
+ error = get_image( this, buffer, format, width, height, writable );
+ mlt_properties_set_int( properties, "width", *width );
+ mlt_properties_set_int( properties, "height", *height );
+ mlt_properties_set_int( properties, "format", *format );
+ mlt_frame_set_position( this, position );
}
else if ( mlt_properties_get_data( properties, "image", NULL ) != NULL )
{
- *format = mlt_image_yuv422;
+ *format = mlt_properties_get_int( properties, "format" );
*buffer = mlt_properties_get_data( properties, "image", NULL );
*width = mlt_properties_get_int( properties, "width" );
*height = mlt_properties_get_int( properties, "height" );
}
+ else if ( producer != NULL )
+ {
+ mlt_frame test_frame = NULL;
+ mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &test_frame, 0 );
+ if ( test_frame != NULL )
+ {
+ mlt_properties test_properties = MLT_FRAME_PROPERTIES( test_frame );
+ mlt_properties_set_double( test_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
+ mlt_properties_set( test_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) );
+ mlt_frame_get_image( test_frame, buffer, format, width, height, writable );
+ mlt_properties_set_data( properties, "test_card_frame", test_frame, 0, ( mlt_destructor )mlt_frame_close, NULL );
+ mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL );
+ mlt_properties_set_int( properties, "width", *width );
+ mlt_properties_set_int( properties, "height", *height );
+ mlt_properties_set_int( properties, "format", *format );
+ mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) );
+ }
+ else
+ {
+ mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
+ mlt_frame_get_image( this, buffer, format, width, height, writable );
+ }
+ }
else
{
- if ( test_card.vfmt != *format )
+ register uint8_t *p;
+ register uint8_t *q;
+ int size = 0;
+
+ *width = *width == 0 ? 720 : *width;
+ *height = *height == 0 ? 576 : *height;
+ size = *width * *height;
+
+ mlt_properties_set_int( properties, "format", *format );
+ mlt_properties_set_int( properties, "width", *width );
+ mlt_properties_set_int( properties, "height", *height );
+ mlt_properties_set_int( properties, "aspect_ratio", 0 );
+
+ switch( *format )
{
- uint8_t *p;
- uint8_t *q;
-
- test_card.vfmt = *format;
- test_card.width = *width == 0 ? 720 : *width;
- test_card.height = *height == 0 ? 576 : *height;
-
- switch( *format )
- {
- case mlt_image_none:
- break;
- case mlt_image_rgb24:
- test_card.image = realloc( test_card.image, test_card.width * test_card.height * 3 );
- memset( test_card.image, 255, test_card.width * test_card.height * 3 );
- break;
- case mlt_image_rgb24a:
- test_card.image = realloc( test_card.image, test_card.width * test_card.height * 4 );
- memset( test_card.image, 255, test_card.width * test_card.height * 4 );
- break;
- case mlt_image_yuv422:
- test_card.image = realloc( test_card.image, test_card.width * test_card.height * 2 );
- p = test_card.image;
- q = test_card.image + test_card.width * test_card.height * 2;
- while ( p != q )
- {
- *p ++ = 255;
- *p ++ = 128;
- }
- break;
- case mlt_image_yuv420p:
- test_card.image = realloc( test_card.image, test_card.width * test_card.height * 3 / 2 );
- memset( test_card.image, 255, test_card.width * test_card.height * 3 / 2 );
- break;
- }
+ case mlt_image_none:
+ size = 0;
+ *buffer = NULL;
+ break;
+ case mlt_image_rgb24:
+ size *= 3;
+ size += *width * 3;
+ *buffer = mlt_pool_alloc( size );
+ if ( *buffer )
+ memset( *buffer, 255, size );
+ break;
+ case mlt_image_rgb24a:
+ case mlt_image_opengl:
+ size *= 4;
+ size += *width * 4;
+ *buffer = mlt_pool_alloc( size );
+ if ( *buffer )
+ memset( *buffer, 255, size );
+ break;
+ case mlt_image_yuv422:
+ size *= 2;
+ size += *width * 2;
+ *buffer = mlt_pool_alloc( size );
+ p = *buffer;
+ q = p + size;
+ while ( p != NULL && p != q )
+ {
+ *p ++ = 235;
+ *p ++ = 128;
+ }
+ break;
+ case mlt_image_yuv420p:
+ size = size * 3 / 2;
+ *buffer = mlt_pool_alloc( size );
+ if ( *buffer )
+ memset( *buffer, 255, size );
+ break;
}
- *width = test_card.width;
- *height = test_card.height;
- *buffer = test_card.image;
+ mlt_properties_set_data( properties, "image", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
+ mlt_properties_set_int( properties, "test_image", 1 );
}
- return 0;
+ mlt_properties_set_int( properties, "scaled_width", *width );
+ mlt_properties_set_int( properties, "scaled_height", *height );
+
+ return error;
}
uint8_t *mlt_frame_get_alpha_mask( mlt_frame this )
{
- if ( this->get_alpha_mask != NULL )
- return this->get_alpha_mask( this );
- return test_card.alpha;
+ uint8_t *alpha = NULL;
+ if ( this != NULL )
+ {
+ if ( this->get_alpha_mask != NULL )
+ alpha = this->get_alpha_mask( this );
+ if ( alpha == NULL )
+ 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" );
+ alpha = mlt_pool_alloc( size );
+ memset( alpha, 255, size );
+ mlt_properties_set_data( &this->parent, "alpha", alpha, size, mlt_pool_release, NULL );
+ }
+ }
+ return alpha;
}
int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
{
- if ( this->get_audio != NULL )
+ mlt_get_audio get_audio = mlt_frame_pop_audio( this );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( this );
+ int hide = mlt_properties_get_int( properties, "test_audio" );
+
+ if ( hide == 0 && get_audio != NULL )
+ {
+ mlt_position position = mlt_frame_get_position( this );
+ get_audio( this, buffer, format, frequency, channels, samples );
+ mlt_frame_set_position( this, position );
+ }
+ else if ( mlt_properties_get_data( properties, "audio", NULL ) )
{
- return this->get_audio( this, buffer, format, frequency, channels, samples );
+ *buffer = mlt_properties_get_data( properties, "audio", NULL );
+ *frequency = mlt_properties_get_int( properties, "audio_frequency" );
+ *channels = mlt_properties_get_int( properties, "audio_channels" );
+ *samples = mlt_properties_get_int( properties, "audio_samples" );
}
else
{
- if ( *samples <= 0 )
- *samples = 1920;
- if ( *channels <= 0 )
- *channels = 2;
- if ( *frequency <= 0 )
- *frequency = 48000;
- if ( test_card.audio == NULL || test_card.afmt != *format )
+ int size = 0;
+ *samples = *samples <= 0 ? 1920 : *samples;
+ *channels = *channels <= 0 ? 2 : *channels;
+ *frequency = *frequency <= 0 ? 48000 : *frequency;
+ size = *samples * *channels * sizeof( int16_t );
+ *buffer = mlt_pool_alloc( size );
+ if ( *buffer != NULL )
+ memset( *buffer, 0, size );
+ mlt_properties_set_data( properties, "audio", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
+ mlt_properties_set_int( properties, "test_audio", 1 );
+ }
+
+ mlt_properties_set_int( properties, "audio_frequency", *frequency );
+ mlt_properties_set_int( properties, "audio_channels", *channels );
+ mlt_properties_set_int( properties, "audio_samples", *samples );
+
+ if ( mlt_properties_get( properties, "meta.volume" ) )
+ {
+ double value = mlt_properties_get_double( properties, "meta.volume" );
+
+ if ( value == 0.0 )
{
- test_card.afmt = *format;
- test_card.audio = realloc( test_card.audio, *samples * *channels * sizeof( int16_t ) );
- memset( test_card.audio, 0, *samples * *channels * sizeof( int16_t ) );
+ memset( *buffer, 0, *samples * *channels * 2 );
}
-
- *buffer = test_card.audio;
+ else if ( value != 1.0 )
+ {
+ int total = *samples * *channels;
+ int16_t *p = *buffer;
+ while ( total -- )
+ {
+ *p = *p * value;
+ p ++;
+ }
+ }
+
+ mlt_properties_set( properties, "meta.volume", NULL );
}
+
return 0;
}
+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_pcm;
+ int frequency = 32000; // lower frequency available?
+ int channels = 2;
+ double fps = mlt_profile_fps( NULL );
+ int samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( this ) );
+
+ // Get the pcm data
+ mlt_frame_get_audio( this, &pcm, &format, &frequency, &channels, &samples );
+
+ // Make an 8-bit buffer large enough to hold rendering
+ int size = w * h;
+ unsigned char *bitmap = ( unsigned char* )mlt_pool_alloc( size );
+ if ( bitmap != NULL )
+ memset( bitmap, 0, size );
+ mlt_properties_set_data( properties, "waveform", bitmap, size, ( mlt_destructor )mlt_pool_release, NULL );
+
+ // Render vertical lines
+ int16_t *ubound = pcm + samples * channels;
+ int skip = samples / w - 1;
+ int i, j, k;
+
+ // Iterate sample stream and along x coordinate
+ for ( i = 0; i < w && pcm < ubound; i++ )
+ {
+ // pcm data has channels interleaved
+ for ( j = 0; j < channels; j++ )
+ {
+ // 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;
+ // Position buffer pointer using y coordinate, stride, and x coordinate
+ unsigned char *p = &bitmap[ i + displacement * w ];
+
+ // Draw vertical line
+ for ( k = 0; k < height; k++ )
+ p[ w * k ] = 0xFF;
+
+ pcm++;
+ }
+ pcm += skip * channels;
+ }
+
+ return bitmap;
+}
+
+mlt_producer mlt_frame_get_original_producer( mlt_frame this )
+{
+ if ( this != NULL )
+ return mlt_properties_get_data( MLT_FRAME_PROPERTIES( this ), "_producer", NULL );
+ return NULL;
+}
+
void mlt_frame_close( mlt_frame this )
{
- mlt_properties_close( &this->parent );
- free( this );
+ if ( this != NULL && mlt_properties_dec_ref( MLT_FRAME_PROPERTIES( this ) ) <= 0 )
+ {
+ mlt_deque_close( this->stack_image );
+ mlt_deque_close( this->stack_audio );
+ while( mlt_deque_peek_back( this->stack_service ) )
+ mlt_service_close( mlt_deque_pop_back( this->stack_service ) );
+ mlt_deque_close( this->stack_service );
+ mlt_properties_close( &this->parent );
+ free( this );
+ }
}
/***** convenience functions *****/
-#define RGB2YUV(r, g, b, y, u, v)\
- y = (306*r + 601*g + 117*b) >> 10;\
- u = ((-172*r - 340*g + 512*b) >> 10) + 128;\
- v = ((512*r - 429*g - 83*b) >> 10) + 128;\
- y = y < 0 ? 0 : y;\
- u = u < 0 ? 0 : u;\
- v = v < 0 ? 0 : v;\
- y = y > 255 ? 255 : y;\
- u = u > 255 ? 255 : u;\
- v = v > 255 ? 255 : v
+
+int mlt_convert_yuv422_to_rgb24a( uint8_t *yuv, uint8_t *rgba, unsigned int total )
+{
+ int ret = 0;
+ int yy, uu, vv;
+ int r,g,b;
+ total /= 2;
+ while (total--)
+ {
+ 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];
+ YUV2RGB(yy, uu, vv, r, g, b);
+ rgba[4] = r;
+ rgba[5] = g;
+ rgba[6] = b;
+ rgba[7] = 255;
+ yuv += 4;
+ rgba += 8;
+ }
+ return ret;
+}
int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha )
{
register uint8_t *d = yuv;
register int i, j;
+ if ( alpha )
for ( i = 0; i < height; i++ )
{
register uint8_t *s = rgba + ( stride * i );
*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;
}
return ret;
}
+int mlt_convert_bgr24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha )
+{
+ int ret = 0;
+ register int y0, y1, u0, u1, v0, v1;
+ register int r, g, b;
+ register uint8_t *d = yuv;
+ register int i, j;
+
+ if ( alpha )
+ 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++;
+ *alpha++ = *s++;
+ RGB2YUV (r, g, b, y0, u0 , v0);
+ b = *s++;
+ g = *s++;
+ r = *s++;
+ *alpha++ = *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++;
+ *alpha++ = *s++;
+ RGB2YUV (r, g, b, y0, u0 , v0);
+ *d++ = y0;
+ *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;
+}
+
+int mlt_convert_bgr24_to_yuv422( uint8_t *rgb, int width, int height, int stride, uint8_t *yuv )
+{
+ int ret = 0;
+ register int y0, y1, u0, u1, v0, v1;
+ register int r, g, b;
+ register uint8_t *d = yuv;
+ register int i, j;
+
+ for ( i = 0; i < height; i++ )
+ {
+ register uint8_t *s = rgb + ( stride * i );
+ for ( j = 0; j < ( width / 2 ); j++ )
+ {
+ b = *s++;
+ g = *s++;
+ r = *s++;
+ RGB2YUV (r, g, b, y0, u0 , v0);
+ b = *s++;
+ g = *s++;
+ r = *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++;
+ RGB2YUV (r, g, b, y0, u0 , v0);
+ *d++ = y0;
+ *d++ = u0;
+ }
+ }
+ return ret;
+}
+
+int mlt_convert_argb_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha )
+{
+ int ret = 0;
+ register int y0, y1, u0, u1, v0, v1;
+ register int r, g, b;
+ register uint8_t *d = yuv;
+ register int i, j;
+
+ if ( alpha )
+ for ( i = 0; i < height; i++ )
+ {
+ register uint8_t *s = rgba + ( stride * i );
+ for ( j = 0; j < ( width / 2 ); j++ )
+ {
+ *alpha++ = *s++;
+ r = *s++;
+ g = *s++;
+ b = *s++;
+ RGB2YUV (r, g, b, y0, u0 , v0);
+ *alpha++ = *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 )
+ {
+ *alpha++ = *s++;
+ r = *s++;
+ g = *s++;
+ b = *s++;
+ RGB2YUV (r, g, b, y0, u0 , v0);
+ *d++ = y0;
+ *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;
+}
+
int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int stride, uint8_t *yuv )
{
int ret = 0;
return ret;
}
-int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight )
+uint8_t *mlt_resize_alpha( uint8_t *input, int owidth, int oheight, int iwidth, int iheight, uint8_t alpha_value )
{
- int ret = 0;
- int width_src = 0, height_src = 0;
- int width_dest = 0, height_dest = 0;
- mlt_image_format format_src = mlt_image_yuv422, format_dest = mlt_image_yuv422;
- uint8_t *p_src, *p_dest;
- int i, j;
- int stride_src;
- int stride_dest;
- int x_src = 0, y_src = 0;
+ uint8_t *output = NULL;
- // optimization point - no work to do
- if ( ( x < 0 && -x >= width_src ) || ( y < 0 && -y >= height_src ) )
- return ret;
-
- format_src = mlt_image_yuv422;
- format_dest = mlt_image_yuv422;
-
- //fprintf( stderr, "call get_image on frame a\n"), fflush( stderr );
- mlt_frame_get_image( this, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ );
- //fprintf( stderr, "call get_image on frame b\n"), fflush( stderr );
- mlt_frame_get_image( that, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ );
-
- //fprintf( stderr, "mlt_frame_composite_yuv %dx%d -> %dx%d\n", width_src, height_src, width_dest, height_dest );
- //fflush(stderr);
- //return ret;
- stride_src = width_src * 2;
- stride_dest = width_dest * 2;
-
- // crop overlay off the left edge of frame
- if ( x < 0 )
- {
- x_src = -x;
- width_src -= x_src;
- x = 0;
- }
-
- // crop overlay beyond right edge of frame
- else if ( x + width_src > width_dest )
- width_src = width_dest - x;
-
- // crop overlay off the top edge of the frame
- if ( y < 0 )
+ if ( input != NULL && ( iwidth != owidth || iheight != oheight ) && ( owidth > 6 && oheight > 6 ) )
{
- y_src = -y;
- height_src -= y_src;
- }
- // crop overlay below bottom edge of frame
- else if ( y + height_src > height_dest )
- height_src = height_dest - y;
-
- // offset pointer into overlay buffer based on cropping
- p_src += x_src * 2 + y_src * stride_src;
+ uint8_t *out_line;
+ int offset_x = ( owidth - iwidth ) / 2;
+ int offset_y = ( oheight - iheight ) / 2;
+ int iused = iwidth;
- // offset pointer into frame buffer based upon positive, even coordinates only!
-// if ( interlaced && y % 2 )
-// ++y;
- p_dest += ( x < 0 ? 0 : x ) * 2 + ( y < 0 ? 0 : y ) * stride_dest;
+ output = mlt_pool_alloc( owidth * oheight );
+ memset( output, alpha_value, owidth * oheight );
- // Get the alpha channel of the overlay
- uint8_t *p_alpha = mlt_frame_get_alpha_mask( that );
+ offset_x -= offset_x % 2;
- // offset pointer into alpha channel based upon cropping
- if ( p_alpha )
- p_alpha += x_src + y_src * stride_src / 2;
+ out_line = output + offset_y * owidth;
+ out_line += offset_x;
- uint8_t *p = p_src;
- uint8_t *q = p_dest;
- uint8_t *o = p_dest;
- uint8_t *z = p_alpha;
+ // Loop for the entirety of our output height.
+ while ( iheight -- )
+ {
+ // We're in the input range for this row.
+ memcpy( out_line, input, iused );
- uint8_t Y;
- uint8_t UV;
- uint8_t a;
- float value;
-
- // now do the compositing only to cropped extents
- for ( i = 0; i < height_src; i++ )
- {
- p = p_src;
- q = p_dest;
- o = p_dest;
- z = p_alpha;
-
- for ( j = 0; j < width_src; j ++ )
- {
- Y = *p ++;
- UV = *p ++;
- a = ( z == NULL ) ? 255 : *z ++;
- value = ( weight * ( float ) a / 255.0 );
- *o ++ = (uint8_t)( Y * value + *q++ * ( 1 - value ) );
- *o ++ = (uint8_t)( UV * value + *q++ * ( 1 - value ) );
- }
+ // Move to next input line
+ input += iwidth;
- p_src += stride_src;
- p_dest += stride_dest;
- if ( p_alpha )
- p_alpha += stride_src / 2;
+ // Move to next output line
+ out_line += owidth;
+ }
}
- return ret;
-}
-
-void *memfill( void *dst, void *src, int l, int elements )
-{
- int i = 0;
- if ( l == 2 )
- {
- uint8_t *p = dst;
- uint8_t *src1 = src;
- uint8_t *src2 = src + 1;
- for ( i = 0; i < elements; i ++ )
- {
- *p ++ = *src1;
- *p ++ = *src2;
- }
- dst = p;
- }
- else
- {
- for ( i = 0; i < elements; i ++ )
- dst = memcpy( dst, src, l ) + l;
- }
- return dst;
+ return output;
}
void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input, int iwidth, int iheight )
// Calculate strides
int istride = iwidth * 2;
int ostride = owidth * 2;
+ int offset_x = ( owidth - iwidth );
+ int offset_y = ( oheight - iheight ) / 2;
+ uint8_t *in_line = input;
+ uint8_t *out_line;
+ int size = owidth * oheight;
+ uint8_t *p = output;
+
+ // Optimisation point
+ if ( output == NULL || input == NULL || ( owidth <= 6 || oheight <= 6 || iwidth <= 6 || oheight <= 6 ) )
+ {
+ return;
+ }
+ else if ( iwidth == owidth && iheight == oheight )
+ {
+ memcpy( output, input, iheight * istride );
+ return;
+ }
- iwidth = iwidth - ( iwidth % 4 );
- owidth = owidth - ( owidth % 4 );
- iheight = iheight - ( iheight % 2 );
- oheight = oheight - ( oheight % 2 );
-
- // Coordinates (0,0 is middle of output)
- int y;
-
- // Calculate ranges
- int out_x_range = owidth / 2;
- int out_y_range = oheight / 2;
- int in_x_range = iwidth / 2 < out_x_range ? iwidth / 2 : out_x_range;
- int in_y_range = iheight / 2 < out_y_range ? iheight / 2 : out_y_range;
-
- // Output pointers
- uint8_t *out_line = output;
- uint8_t *out_ptr = out_line;
+ while( size -- )
+ {
+ *p ++ = 16;
+ *p ++ = 128;
+ }
- // Calculate a middle and possibly invalid pointer in the input
- uint8_t *in_middle = input + istride * ( iheight / 2 ) + ( iwidth / 2 ) * 2;
- int in_line = - in_y_range * istride - in_x_range * 2;
+ offset_x -= offset_x % 4;
- uint8_t black[ 2 ] = { 16, 128 };
+ out_line = output + offset_y * ostride;
+ out_line += offset_x;
// Loop for the entirety of our output height.
- for ( y = - out_y_range; y < out_y_range ; y ++ )
+ while ( iheight -- )
{
- // Start at the beginning of the line
- out_ptr = out_line;
-
- if ( abs( y ) < iheight / 2 )
- {
- // Fill the outer part with black
- out_ptr = memfill( out_ptr, black, 2, out_x_range - in_x_range );
-
- // We're in the input range for this row.
- memcpy( out_ptr, in_middle + in_line, 2 * iwidth );
- out_ptr += 2 * iwidth;
+ // We're in the input range for this row.
+ memcpy( out_line, in_line, iwidth * 2 );
- // Fill the outer part with black
- out_ptr = memfill( out_ptr, black, 2, out_x_range - in_x_range );
-
- // Move to next input line
- in_line += istride;
- }
- else
- {
- // Fill whole line with black
- out_ptr = memfill( out_ptr, black, 2, owidth );
- }
+ // Move to next input line
+ in_line += istride;
- // Move to next output line
- out_line += ostride;
+ // Move to next output line
+ out_line += ostride;
}
}
uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight )
{
// Get properties
- mlt_properties properties = mlt_frame_properties( this );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( this );
// Get the input image, width and height
uint8_t *input = mlt_properties_get_data( properties, "image", NULL );
+ uint8_t *alpha = mlt_frame_get_alpha_mask( this );
+
int iwidth = mlt_properties_get_int( properties, "width" );
int iheight = mlt_properties_get_int( properties, "height" );
// If width and height are correct, don't do anything
if ( iwidth != owidth || iheight != oheight )
{
+ uint8_t alpha_value = mlt_properties_get_int( properties, "resize_alpha" );
+
// Create the output image
- uint8_t *output = malloc( owidth * oheight * 2 );
+ uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
// Call the generic resize
mlt_resize_yuv422( output, owidth, oheight, input, iwidth, iheight );
// Now update the frame
- mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL );
+ mlt_properties_set_data( properties, "image", output, owidth * ( oheight + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
mlt_properties_set_int( properties, "width", owidth );
mlt_properties_set_int( properties, "height", oheight );
+ // We should resize the alpha too
+ alpha = mlt_resize_alpha( alpha, owidth, oheight, iwidth, iheight, alpha_value );
+ if ( alpha != NULL )
+ {
+ mlt_properties_set_data( properties, "alpha", alpha, owidth * oheight, ( mlt_destructor )mlt_pool_release, NULL );
+ this->get_alpha_mask = NULL;
+ }
+
// Return the output
return output;
}
-
// No change, return input
return input;
}
uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
{
// Get properties
- mlt_properties properties = mlt_frame_properties( this );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( this );
// Get the input image, width and height
uint8_t *input = mlt_properties_get_data( properties, "image", NULL );
if ( iwidth != owidth || iheight != oheight )
{
// Create the output image
- uint8_t *output = malloc( owidth * oheight * 2 );
+ uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
// Calculate strides
int istride = iwidth * 2;
iwidth = iwidth - ( iwidth % 4 );
- // Coordinates (0,0 is middle of output)
- int y, x;
-
// Derived coordinates
int dy, dx;
int in_y_range = iheight / 2;
// Output pointers
- uint8_t *out_line = output;
- uint8_t *out_ptr;
+ register uint8_t *out_line = output;
+ register uint8_t *out_ptr;
// Calculate a middle pointer
uint8_t *in_middle = input + istride * in_y_range + in_x_range * 2;
uint8_t *in_line;
- uint8_t *in_ptr;
// Generate the affine transform scaling values
- float scale_width = ( float )iwidth / ( float )owidth;
- float scale_height = ( float )iheight / ( float )oheight;
+ register int scale_width = ( iwidth << 16 ) / owidth;
+ register int scale_height = ( iheight << 16 ) / oheight;
+ register int base = 0;
+
+ int outer = out_x_range * scale_width;
+ int bottom = out_y_range * scale_height;
// Loop for the entirety of our output height.
- for ( y = - out_y_range; y < out_y_range ; y ++ )
+ for ( dy = - bottom; dy < bottom; dy += scale_height )
{
- // Calculate the derived y value
- dy = scale_height * y;
-
// Start at the beginning of the line
out_ptr = out_line;
-
+
// Pointer to the middle of the input line
- in_line = in_middle + dy * istride;
-
+ in_line = in_middle + ( dy >> 16 ) * istride;
+
// Loop for the entirety of our output row.
- for ( x = - out_x_range; x < out_x_range; x += 1 )
+ for ( dx = - outer; dx < outer; dx += scale_width )
{
- // Calculated the derived x
- dx = scale_width * x;
-
- // Check if x and y are in the valid input range.
- if ( abs( dx ) < in_x_range && abs( dy ) < in_y_range )
- {
- // We're in the input range for this row.
- in_ptr = in_line + ( dx >> 1 ) * 4 + 2 * ( x & 1 );
- *out_ptr ++ = *in_ptr ++;
- *out_ptr ++ = *in_ptr ++;
- }
- else
- {
- // We're not in the input range for this row.
- *out_ptr ++ = 16;
- *out_ptr ++ = 128;
- }
+ base = dx >> 15;
+ base &= 0xfffffffe;
+ *out_ptr ++ = *( in_line + base );
+ base &= 0xfffffffc;
+ *out_ptr ++ = *( in_line + base + 1 );
+ dx += scale_width;
+ base = dx >> 15;
+ base &= 0xfffffffe;
+ *out_ptr ++ = *( in_line + base );
+ base &= 0xfffffffc;
+ *out_ptr ++ = *( in_line + base + 3 );
}
// Move to next output line
}
// Now update the frame
- mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL );
+ mlt_properties_set_data( properties, "image", output, owidth * ( oheight + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
mlt_properties_set_int( properties, "width", owidth );
mlt_properties_set_int( properties, "height", oheight );
return input;
}
-int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
+int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, float weight_end, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
{
int ret = 0;
- int16_t *p_src, *p_dest;
int16_t *src, *dest;
- //static int16_t *extra_src = NULL, *extra_dest = NULL;
- static int extra_src_samples = 0, extra_dest_samples = 0;
- int frequency_src = 0, frequency_dest = 0;
- int channels_src = 0, channels_dest = 0;
- int samples_src = 0, samples_dest = 0;
+ int frequency_src = *frequency, frequency_dest = *frequency;
+ int channels_src = *channels, channels_dest = *channels;
+ int samples_src = *samples, samples_dest = *samples;
int i, j;
+ double d = 0, s = 0;
+
+ mlt_frame_get_audio( that, &src, format, &frequency_src, &channels_src, &samples_src );
+ mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest );
+
+ int silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "silent_audio" );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "silent_audio", 0 );
+ if ( silent )
+ memset( dest, 0, samples_dest * channels_dest * sizeof( int16_t ) );
+
+ silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( that ), "silent_audio" );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( that ), "silent_audio", 0 );
+ if ( silent )
+ memset( src, 0, samples_src * channels_src * sizeof( int16_t ) );
- mlt_frame_get_audio( this, &p_dest, format, &frequency_dest, &channels_dest, &samples_dest );
- //fprintf( stderr, "frame dest samples %d channels %d position %f\n", samples_dest, channels_dest, mlt_properties_get_position( mlt_frame_properties( this ), "position" ) );
- mlt_frame_get_audio( that, &p_src, format, &frequency_src, &channels_src, &samples_src );
- //fprintf( stderr, "frame src samples %d channels %d\n", samples_src, channels_src );
if ( channels_src > 6 )
channels_src = 0;
if ( channels_dest > 6 )
if ( samples_dest > 4000 )
samples_dest = 0;
-#if 0
- // Append new samples to leftovers
- if ( extra_dest_samples > 0 )
- {
- fprintf( stderr, "prepending %d samples to dest\n", extra_dest_samples );
- dest = realloc( extra_dest, ( samples_dest + extra_dest_samples ) * 2 * channels_dest );
- memcpy( &extra_dest[ extra_dest_samples * channels_dest ], p_dest, samples_dest * 2 * channels_dest );
- }
- else
- dest = p_dest;
- if ( extra_src_samples > 0 )
+ // determine number of samples to process
+ *samples = samples_src < samples_dest ? samples_src : samples_dest;
+ *channels = channels_src < channels_dest ? channels_src : channels_dest;
+ *buffer = dest;
+ *frequency = frequency_dest;
+
+ // Compute a smooth ramp over start to end
+ float weight = weight_start;
+ float weight_step = ( weight_end - weight_start ) / *samples;
+
+ if ( src == dest )
{
- fprintf( stderr, "prepending %d samples to src\n", extra_src_samples );
- src = realloc( extra_src, ( samples_src + extra_src_samples ) * 2 * channels_src );
- memcpy( &extra_src[ extra_src_samples * channels_src ], p_src, samples_src * 2 * channels_src );
+ *samples = samples_src;
+ *channels = channels_src;
+ *buffer = src;
+ *frequency = frequency_src;
+ return ret;
}
- else
- src = p_src;
-#else
- src = p_src;
- dest = p_dest;
-#endif
-
- // determine number of samples to process
- if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples )
- *samples = samples_src + extra_src_samples;
- else if ( samples_dest + extra_dest_samples < samples_src + extra_src_samples )
- *samples = samples_dest + extra_dest_samples;
-
- *channels = channels_src < channels_dest ? channels_src : channels_dest;
- *buffer = p_dest;
// Mixdown
for ( i = 0; i < *samples; i++ )
{
for ( j = 0; j < *channels; j++ )
{
- double d = (double) dest[ i * channels_dest + j ];
- double s = (double) src[ i * channels_src + j ];
+ if ( j < channels_dest )
+ d = (double) dest[ i * channels_dest + j ];
+ if ( j < channels_src )
+ s = (double) src[ i * channels_src + j ];
dest[ i * channels_dest + j ] = s * weight + d * ( 1.0 - weight );
}
+ weight += weight_step;
}
- // We have to copy --sigh
- if ( dest != p_dest )
- memcpy( p_dest, dest, *samples * 2 * *channels );
+ return ret;
+}
-#if 0
- // Store the leftovers
- if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples )
+// Replacement for broken mlt_frame_audio_mix - this filter uses an inline low pass filter
+// to allow mixing without volume hacking
+int mlt_frame_combine_audio( mlt_frame this, mlt_frame that, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
+{
+ int ret = 0;
+ int16_t *src, *dest;
+ int frequency_src = *frequency, frequency_dest = *frequency;
+ int channels_src = *channels, channels_dest = *channels;
+ int samples_src = *samples, samples_dest = *samples;
+ int i, j;
+ double vp[ 6 ];
+ double b_weight = 1.0;
+
+ if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "meta.mixdown" ) )
+ b_weight = 1.0 - mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "meta.volume" );
+
+ mlt_frame_get_audio( that, &src, format, &frequency_src, &channels_src, &samples_src );
+ mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest );
+
+ int silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "silent_audio" );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "silent_audio", 0 );
+ if ( silent )
+ memset( dest, 0, samples_dest * channels_dest * sizeof( int16_t ) );
+
+ silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( that ), "silent_audio" );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( that ), "silent_audio", 0 );
+ if ( silent )
+ memset( src, 0, samples_src * channels_src * sizeof( int16_t ) );
+
+ if ( src == dest )
{
- extra_dest_samples = ( samples_dest + extra_dest_samples ) - ( samples_src + extra_src_samples );
- size_t size = extra_dest_samples * 2 * channels_dest;
- fprintf( stderr, "storing %d samples from dest\n", extra_dest_samples );
- if ( extra_dest )
- free( extra_dest );
- extra_dest = malloc( size );
- if ( extra_dest )
- memcpy( extra_dest, &p_dest[ ( samples_dest - extra_dest_samples - 1 ) * channels_dest ], size );
- else
- extra_dest_samples = 0;
- }
- else if ( samples_dest + extra_dest_samples < samples_src + extra_src_samples )
- {
- extra_src_samples = ( samples_src + extra_src_samples ) - ( samples_dest + extra_dest_samples );
- size_t size = extra_src_samples * 2 * channels_src;
- fprintf( stderr, "storing %d samples from src\n", extra_dest_samples );
- if ( extra_src )
- free( extra_src );
- extra_src = malloc( size );
- if ( extra_src )
- memcpy( extra_src, &p_src[ ( samples_src - extra_src_samples - 1 ) * channels_src ], size );
- else
- extra_src_samples = 0;
+ *samples = samples_src;
+ *channels = channels_src;
+ *buffer = src;
+ *frequency = frequency_src;
+ return ret;
+ }
+
+ // determine number of samples to process
+ *samples = samples_src < samples_dest ? samples_src : samples_dest;
+ *channels = channels_src < channels_dest ? channels_src : channels_dest;
+ *buffer = dest;
+ *frequency = frequency_dest;
+
+ for ( j = 0; j < *channels; j++ )
+ vp[ j ] = ( double )dest[ j ];
+
+ double Fc = 0.5;
+ double B = exp(-2.0 * M_PI * Fc);
+ double A = 1.0 - B;
+ double v;
+
+ for ( i = 0; i < *samples; i++ )
+ {
+ for ( j = 0; j < *channels; j++ )
+ {
+ v = ( double )( b_weight * dest[ i * channels_dest + j ] + src[ i * channels_src + j ] );
+ v = v < -32767 ? -32767 : v > 32768 ? 32768 : v;
+ vp[ j ] = dest[ i * channels_dest + j ] = ( int16_t )( v * A + vp[ j ] * B );
+ }
}
-#endif
-
+
return ret;
}
+/* Will this break when mlt_position is converted to double? -Zach */
int mlt_sample_calculator( float fps, int frequency, int64_t position )
{
int samples = 0;
- if ( fps > 29 && fps <= 30 )
+ if ( ( int )( fps * 100 ) == 2997 )
{
samples = frequency / 30;
return samples;
}
+int64_t mlt_sample_calculator_to_now( float fps, int frequency, int64_t frame )
+{
+ int64_t samples = 0;
+
+ // TODO: Correct rules for NTSC and drop the * 100 hack
+ if ( ( int )( fps * 100 ) == 2997 )
+ {
+ samples = ( ( double )( frame * frequency ) / 30 );
+ switch( frequency )
+ {
+ case 48000:
+ samples += 2 * ( frame / 5 );
+ break;
+ case 44100:
+ samples += frame + ( frame / 2 ) - ( frame / 30 ) + ( frame / 300 );
+ break;
+ case 32000:
+ samples += ( 2 * frame ) - ( frame / 4 ) - ( frame / 29 );
+ break;
+ }
+ }
+ else if ( fps != 0 )
+ {
+ samples = ( ( frame * frequency ) / ( int )fps );
+ }
+
+ return samples;
+}
projects / mlt / blobdiff