X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Fproducer_noise.c;h=825f5912493f3def1b37289bad2838681275c373;hb=cdf8aba7c1a3ad2ea9a7226c932d7d7d38a6d1cc;hp=435e7e68c17d3b2b4ccc9f649fb3ca54abf305d4;hpb=59456c0f8d288d6bfa6df60d692b9209741ab02e;p=melted diff --git a/src/modules/core/producer_noise.c b/src/modules/core/producer_noise.c index 435e7e6..825f591 100644 --- a/src/modules/core/producer_noise.c +++ b/src/modules/core/producer_noise.c @@ -3,22 +3,22 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * 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 #include #include @@ -32,7 +32,7 @@ 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 ); @@ -47,7 +47,7 @@ static void producer_close( mlt_producer this ); /** 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( ); @@ -55,11 +55,6 @@ mlt_producer producer_noise_init( void *arg ) // Initialise the producer if ( this != NULL ) { - int is_pal = mlt_properties_get_int( mlt_producer_properties( this ), "normalised_height" ) == 576; - - // Synthetic - aspect ratio of 1 - mlt_properties_set_double( mlt_producer_properties( this ), "aspect_ratio", is_pal ? 59.0/54.0 : 10.0/11.0 ); - // Callback registration this->get_frame = producer_get_frame; this->close = ( mlt_destructor )producer_close; @@ -71,7 +66,7 @@ mlt_producer producer_noise_init( void *arg ) 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; @@ -111,7 +106,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form 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; @@ -143,22 +138,16 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form 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 ); - - // Obtain properties of producer - mlt_properties producer_props = mlt_producer_properties( this ); - - // Determine if we're producing PAL or NTSC - int is_pal = mlt_properties_get_double( producer_props, "fps" ) == 25.0; + mlt_properties properties = MLT_FRAME_PROPERTIES( *frame ); - // Aspect ratio is 1? - mlt_properties_set_double( properties, "aspect_ratio", is_pal ? 59.0/54.0 : 10.0/11.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 ); @@ -170,7 +159,7 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index 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