* 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
*/
// Local header files
#include "consumer_libdv.h"
+#include "producer_libdv.h"
// mlt Header files
#include <framework/mlt_frame.h>
if ( this != NULL && mlt_consumer_init( this, NULL ) == 0 )
{
// Get properties from the consumer
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
// Assign close callback
this->close = consumer_close;
static int consumer_start( mlt_consumer this )
{
// Get the properties
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
// Check that we're not already running
if ( !mlt_properties_get_int( properties, "running" ) )
{
// Allocate a thread
pthread_t *thread = calloc( 1, sizeof( pthread_t ) );
- pthread_attr_t thread_attributes;
// Assign the thread to properties
mlt_properties_set_data( properties, "thread", thread, sizeof( pthread_t ), free, NULL );
// Set the running state
mlt_properties_set_int( properties, "running", 1 );
- // Inherit the scheduling priority
- pthread_attr_init( &thread_attributes );
- pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
-
// Create the thread
- pthread_create( thread, &thread_attributes, consumer_thread, this );
+ pthread_create( thread, NULL, consumer_thread, this );
}
return 0;
}
static int consumer_stop( mlt_consumer this )
{
// Get the properties
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
// Check that we're running
if ( mlt_properties_get_int( properties, "running" ) )
static int consumer_is_stopped( mlt_consumer this )
{
// Get the properties
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
return !mlt_properties_get_int( properties, "running" );
}
static dv_encoder_t *libdv_get_encoder( mlt_consumer this, mlt_frame frame )
{
// Get the properties of the consumer
- mlt_properties this_properties = mlt_consumer_properties( this );
+ mlt_properties this_properties = MLT_CONSUMER_PROPERTIES( this );
// Obtain the dv_encoder
dv_encoder_t *encoder = mlt_properties_get_data( this_properties, "dv_encoder", NULL );
dv_encoder_t *encoder = libdv_get_encoder( this, frame );
// Get the properties of the consumer
- mlt_properties this_properties = mlt_consumer_properties( this );
+ mlt_properties this_properties = MLT_CONSUMER_PROPERTIES( this );
// This will hold the size of the dv frame
int size = 0;
// Is the image rendered
- int rendered = mlt_properties_get_int( mlt_frame_properties( frame ), "rendered" );
+ int rendered = mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "rendered" );
// Get width and height
int width = mlt_properties_get_int( this_properties, "width" );
uint8_t *image = NULL;
// Get the image
+ mlt_events_fire( this_properties, "consumer-frame-show", frame, NULL );
mlt_frame_get_image( frame, &image, &fmt, &width, &height, 0 );
// Check that we get what we expected
else
{
// Calculate the size of the dv frame
- size = height == 576 ? frame_size_625_50 : frame_size_525_60;
+ size = height == 576 ? FRAME_SIZE_625_50 : FRAME_SIZE_525_60;
}
// Process the frame
else if ( encoder != NULL )
{
// Calculate the size of the dv frame (duplicate of previous)
- size = height == 576 ? frame_size_625_50 : frame_size_525_60;
+ size = height == 576 ? FRAME_SIZE_625_50 : FRAME_SIZE_525_60;
}
return size;
static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_frame frame )
{
// Get the properties of the consumer
- mlt_properties this_properties = mlt_consumer_properties( this );
+ mlt_properties this_properties = MLT_CONSUMER_PROPERTIES( this );
// Get the properties of the frame
- mlt_properties frame_properties = mlt_frame_properties( frame );
+ mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
// Obtain the dv_encoder
dv_encoder_t *encoder = libdv_get_encoder( this, frame );
// Default audio args
mlt_audio_format fmt = mlt_audio_pcm;
int channels = 2;
- int frequency = 48000;
+ int frequency = mlt_properties_get_int( this_properties, "frequency" );
int samples = mlt_sample_calculator( mlt_properties_get_double( this_properties, "fps" ), frequency, count );
int16_t *pcm = NULL;
time_t start = time( NULL );
int height = mlt_properties_get_int( this_properties, "height" );
int is_pal = height == 576;
- int is_wide = mlt_properties_get_double( frame_properties, "fps" ) == ( ( double ) 16.0 / 9.0 );
+ int is_wide = mlt_properties_get_int( this_properties, "display_ratio_num" ) == 16;
// Temporary - audio buffer allocation
int16_t *audio_buffers[ 4 ];
for ( j = 0; j < channels; j++ )
audio_buffers[ j ][ i ] = *pcm ++;
}
+ else
+ {
+ for ( j = 0; j < channels; j++ )
+ memset( audio_buffers[ j ], 0, 2 * DV_AUDIO_MAX_SAMPLES );
+ }
// Encode audio on frame
dv_encode_full_audio( encoder, audio_buffers, channels, frequency, dv_frame );
static void consumer_output( mlt_consumer this, uint8_t *dv_frame, int size, mlt_frame frame )
{
// Get the properties
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
FILE *output = stdout;
char *target = mlt_properties_get( properties, "target" );
mlt_consumer this = arg;
// Get the properties
- mlt_properties properties = mlt_consumer_properties( this );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
+
+ // Get the terminate_on_pause property
+ int top = mlt_properties_get_int( properties, "terminate_on_pause" );
// Get the handling methods
int ( *video )( mlt_consumer, uint8_t *, mlt_frame ) = mlt_properties_get_data( properties, "video", NULL );
int ( *output )( mlt_consumer, uint8_t *, int, mlt_frame ) = mlt_properties_get_data( properties, "output", NULL );
// Allocate a single PAL frame for encoding
- uint8_t *dv_frame = mlt_pool_alloc( frame_size_625_50 );
+ uint8_t *dv_frame = mlt_pool_alloc( FRAME_SIZE_625_50 );
// Frame and size
mlt_frame frame = NULL;
// Check that we have a frame to work with
if ( frame != NULL )
{
+ // Terminate on pause
+ if ( top && mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0 )
+ {
+ mlt_frame_close( frame );
+ break;
+ }
+
// Obtain the dv_encoder
if ( libdv_get_encoder( this, frame ) != NULL )
{
// Tidy up
mlt_pool_release( dv_frame );
+ mlt_consumer_stopped( this );
+
return NULL;
}
projects / melted / blobdiff