* 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_ppm.h"
+#include <framework/mlt_producer.h>
#include <framework/mlt_frame.h>
+
#include <stdlib.h>
#include <string.h>
static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index );
static void producer_close( mlt_producer parent );
-mlt_producer producer_ppm_init( void *command )
+mlt_producer producer_ppm_init( mlt_profile profile, mlt_service_type type, const char *id, char *command )
{
- producer_ppm this = calloc( sizeof( struct producer_ppm_s ), 1 );
+ producer_ppm this = calloc( 1, sizeof( struct producer_ppm_s ) );
if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
{
mlt_producer producer = &this->parent;
- mlt_properties properties = mlt_producer_properties( producer );
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
producer->get_frame = producer_get_frame;
- producer->close = producer_close;
+ producer->close = ( mlt_destructor )producer_close;
if ( command != NULL )
{
static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
{
// Get the frames properties
- mlt_properties properties = mlt_frame_properties( this );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( this );
if ( mlt_properties_get_int( properties, "has_image" ) )
{
// Get the RGB image
- uint8_t *rgb = mlt_properties_get_data( properties, "image", NULL );
-
- // Get width and height
+ *buffer = mlt_properties_get_data( properties, "image", NULL );
*width = mlt_properties_get_int( properties, "width" );
*height = mlt_properties_get_int( properties, "height" );
-
- // Convert to requested format
- if ( *format == mlt_image_yuv422 )
- {
- uint8_t *image = malloc( *width * *height * 2 );
- mlt_convert_rgb24_to_yuv422( rgb, *width, *height, *width * 3, image );
- mlt_properties_set_data( properties, "image", image, *width * *height * 2, free, NULL );
- *buffer = image;
- }
- else if ( *format == mlt_image_rgb24 )
- {
- *buffer = rgb;
- }
+ *format = mlt_image_rgb24;
}
else
{
char command[ 1024 ];
float fps = mlt_producer_get_fps( &this->parent );
float position = mlt_producer_position( &this->parent );
- sprintf( command, "ffmpeg -i \"%s\" -ss %f -f imagepipe -r %f -img ppm - 2>/dev/null", this->command, position, fps );
+ sprintf( command, "ffmpeg -i \"%s\" -ss %f -f image2pipe -r %f -vcodec ppm - 2>/dev/null", this->command, position, fps );
this->video = popen( command, "r" );
}
}
static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
{
// Get the frames properties
- mlt_properties properties = mlt_frame_properties( this );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( this );
FILE *pipe = mlt_properties_get_data( properties, "audio.pipe", NULL );
// Read it
if ( pipe != NULL )
- fread( *buffer, size, 1, pipe );
+ size = fread( *buffer, size, 1, pipe );
else
memset( *buffer, 0, size );
// Pass the data on the frame properties
- mlt_properties_set_data( properties, "audio", *buffer, size, free, NULL );
+ mlt_frame_set_audio( this, *buffer, *format, size, free );
return 0;
}
int count = 0;
{
char temp[ 132 ];
- fgets( temp, 132, video );
- fgets( temp, 132, video );
+ char *ignore = fgets( temp, 132, video );
+ ignore = fgets( temp, 132, video );
count += sscanf( temp, "%d %d", width, height );
- fgets( temp, 132, video );
+ ignore = fgets( temp, 132, video );
}
return count;
}
int height;
// Construct a test frame
- *frame = mlt_frame_init( );
+ *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
// Are we at the position expected?
producer_ppm_position( this, mlt_producer_frame( producer ) );
// Get the frames properties
- mlt_properties properties = mlt_frame_properties( *frame );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
FILE *video = this->video;
FILE *audio = this->audio;
// Read the video
if ( video != NULL && read_ppm_header( video, &width, &height ) == 2 )
{
-
// Allocate an image
- uint8_t *image = malloc( width * height * 3 );
+ uint8_t *image = mlt_pool_alloc( width * ( height + 1 ) * 3 );
// Read it
- fread( image, width * height * 3, 1, video );
+ size_t ignore;
+ ignore = fread( image, width * height * 3, 1, video );
// Pass the data on the frame properties
- mlt_properties_set_data( properties, "image", image, width * height * 3, free, NULL );
+ mlt_frame_set_image( *frame, image, width * ( height + 1 ) * 3, mlt_pool_release );
mlt_properties_set_int( properties, "width", width );
mlt_properties_set_int( properties, "height", height );
mlt_properties_set_int( properties, "has_image", 1 );
+ mlt_properties_set_int( properties, "progressive", 1 );
+ mlt_properties_set_double( properties, "aspect_ratio", 1 );
// Push the image callback
mlt_frame_push_get_image( *frame, producer_get_image );
mlt_properties_set_data( properties, "audio.pipe", audio, 0, NULL, NULL );
// Hmm - register audio callback
- ( *frame )->get_audio = producer_get_audio;
+ mlt_frame_push_audio( *frame, producer_get_audio );
// Update timecode on the frame we're creating
mlt_frame_set_position( *frame, mlt_producer_position( producer ) );
mlt_producer_close( parent );
free( this );
}
-
projects / mlt / blobdiff