* 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 "producer_noise.h"
+#include <framework/mlt_producer.h>
#include <framework/mlt_frame.h>
#include <framework/mlt_pool.h>
/** Random number generator
*/
-static unsigned int seed_x = 521288629;
-static unsigned int seed_y = 362436069;
+typedef struct
+{
+ unsigned int x;
+ unsigned int y;
+} rand_seed;
+
+static void init_seed( rand_seed* seed, int init )
+{
+ // Use the initial value to initialize the seed to arbitrary values.
+ // This causes the algorithm to produce consistent results each time for the same frame number.
+ seed->x = 521288629 + init - ( init << 16 );
+ seed->y = 362436069 - init + ( init << 16 );
+}
-static unsigned inline int fast_rand( )
+static inline unsigned int fast_rand( rand_seed* seed )
{
- static unsigned int a = 18000, b = 30903;
- seed_x = a * ( seed_x & 65535 ) + ( seed_x >> 16 );
- seed_y = b * ( seed_y & 65535 ) + ( seed_y >> 16 );
- return ( ( seed_x << 16 ) + ( seed_y & 65535 ) );
+ static unsigned int a = 18000, b = 30903;
+ seed->x = a * ( seed->x & 65535 ) + ( seed->x >> 16 );
+ seed->y = b * ( seed->y & 65535 ) + ( seed->y >> 16 );
+ return ( ( seed->x << 16 ) + ( seed->y & 65535 ) );
}
// Foward declarations
/** Initialise.
*/
-mlt_producer producer_noise_init( void *arg )
+mlt_producer producer_noise_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
{
// Create a new producer object
- mlt_producer this = mlt_producer_new( );
+ mlt_producer this = mlt_producer_new( profile );
// Initialise the producer
if ( this != NULL )
{
- // Synthetic - aspect ratio of 1
- mlt_properties_set_double( mlt_producer_properties( this ), "aspect_ratio", 1 );
-
// Callback registration
this->get_frame = producer_get_frame;
- this->close = producer_close;
+ this->close = ( mlt_destructor )producer_close;
}
return this;
static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
{
- // Obtain properties of frame
- mlt_properties properties = mlt_frame_properties( frame );
+ // Choose suitable out values if nothing specific requested
+ if ( *width <= 0 )
+ *width = mlt_service_profile( MLT_PRODUCER_SERVICE( mlt_frame_get_original_producer( frame ) ) )->width;
+ if ( *height <= 0 )
+ *height = mlt_service_profile( MLT_PRODUCER_SERVICE( mlt_frame_get_original_producer( frame ) ) )->height;
// Calculate the size of the image
int size = *width * *height * 2;
*buffer = mlt_pool_alloc( size );
// Update the frame
- mlt_properties_set_data( properties, "image", *buffer, size, mlt_pool_release, NULL );
- mlt_properties_set_int( properties, "width", *width );
- mlt_properties_set_int( properties, "height", *height );
+ mlt_frame_set_image( frame, *buffer, size, mlt_pool_release );
// Before we write to the image, make sure we have one
if ( *buffer != NULL )
// Value to hold a random number
uint32_t value;
+ // Initialize seed from the frame number.
+ rand_seed seed;
+ init_seed( &seed, mlt_frame_get_position( frame ) );
+
// Generate random noise
while ( p != *buffer )
{
- value = fast_rand( ) & 0xff;
+ value = fast_rand( &seed ) & 0xff;
*( -- p ) = 128;
*( -- p ) = value < 16 ? 16 : value > 240 ? 240 : value;
}
static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
{
- // Get the frame properties
- mlt_properties properties = mlt_frame_properties( frame );
-
int size = 0;
// Correct the returns if necessary
*samples = *samples <= 0 ? 1920 : *samples;
*channels = *channels <= 0 ? 2 : *channels;
*frequency = *frequency <= 0 ? 48000 : *frequency;
+ *format = mlt_audio_s16;
// Calculate the size of the buffer
size = *samples * *channels * sizeof( int16_t );
if ( *buffer != NULL )
{
int16_t *p = *buffer + size / 2;
- while ( p != *buffer )
- *( -- p ) = fast_rand( ) & 0x0f00;
+ rand_seed seed;
+ init_seed( &seed, mlt_frame_get_position( frame ) );
+ while ( p != *buffer )
+ *( -- p ) = fast_rand( &seed ) & 0x0f00;
}
// Set the buffer for destruction
- mlt_properties_set_data( properties, "audio", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
+ mlt_frame_set_audio( frame, *buffer, *format, size, mlt_pool_release );
return 0;
}
static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index )
{
// Generate a frame
- *frame = mlt_frame_init( );
+ *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( this ) );
// Check that we created a frame and initialise it
if ( *frame != NULL )
{
// Obtain properties of frame
- mlt_properties properties = mlt_frame_properties( *frame );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
- // Aspect ratio is 1?
- mlt_properties_set_double( properties, "aspect_ratio", 1.0 );
+ // Aspect ratio is whatever it needs to be
+ mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( this ) );
+ mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
// Set producer-specific frame properties
mlt_properties_set_int( properties, "progressive", 1 );
mlt_frame_push_get_image( *frame, producer_get_image );
// Specify the audio
- ( *frame )->get_audio = producer_get_audio;
+ mlt_frame_push_audio( *frame, producer_get_audio );
}
// Calculate the next timecode
projects / mlt / blobdiff