* 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"
static unsigned int seed_x = 521288629;
static unsigned int seed_y = 362436069;
-static unsigned inline int fast_rand( )
+static inline unsigned int fast_rand( )
{
static unsigned int a = 18000, b = 30903;
seed_x = a * ( seed_x & 65535 ) + ( seed_x >> 16 );
// Foward declarations
static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index );
+static void producer_close( mlt_producer this );
/** Initialise.
*/
{
// Callback registration
this->get_frame = producer_get_frame;
+ 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 );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
// Calculate the size of the image
int size = *width * *height * 2;
// Generate random noise
while ( p != *buffer )
{
- value = fast_rand( );
+ value = fast_rand( ) & 0xff;
*( -- p ) = 128;
- *( -- p ) = value & 0xff;
- *( -- p ) = 128;
- *( -- p ) = ( ( value & 0xff00 ) >> 8 ) & 0xf0;
+ *( -- 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 );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
int size = 0;
{
int16_t *p = *buffer + size / 2;
while ( p != *buffer )
- *( -- p ) = fast_rand( ) & 0xff;
+ *( -- p ) = fast_rand( ) & 0x0f00;
}
// Set the buffer for destruction
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_properties_set_double( properties, "aspect_ratio", 0 );
// 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
return 0;
}
+static void producer_close( mlt_producer this )
+{
+ this->close = NULL;
+ mlt_producer_close( this );
+ free( this );
+}