X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Fproducer_ppm.c;h=0121579065dcc265bfaeab8fceb88fc2333bfd7c;hb=09fa7c28706d6eaa3125582d9c052359664d23c1;hp=ca1947172c319fbb86e4ab144ecf32c2bdff5029;hpb=092636b85449e57fd33ffd4954a2de23c2a5f81c;p=melted diff --git a/src/modules/core/producer_ppm.c b/src/modules/core/producer_ppm.c index ca19471..0121579 100644 --- a/src/modules/core/producer_ppm.c +++ b/src/modules/core/producer_ppm.c @@ -3,41 +3,61 @@ * 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_ppm.h" +#include #include + #include #include +typedef struct producer_ppm_s *producer_ppm; + +struct producer_ppm_s +{ + struct mlt_producer_s parent; + char *command; + FILE *video; + FILE *audio; + uint64_t expected; +}; + 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 ); if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 ) { mlt_producer producer = &this->parent; + 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 ) + { + mlt_properties_set( properties, "resource", command ); this->command = strdup( command ); + } + else + { + mlt_properties_set( properties, "resource", "ppm test" ); + } return producer; } @@ -48,61 +68,52 @@ mlt_producer producer_ppm_init( void *command ) 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 ); - // Get the RGB image - uint8_t *rgb = mlt_properties_get_data( properties, "image", NULL ); + 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 - *width = mlt_properties_get_int( properties, "width" ); - *height = mlt_properties_get_int( properties, "height" ); + // Get width and height + *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; + // Convert to requested format + if ( *format == mlt_image_yuv422 ) + { + uint8_t *image = mlt_pool_alloc( *width * ( *height + 1 ) * 2 ); + mlt_convert_rgb24_to_yuv422( rgb, *width, *height, *width * 3, image ); + mlt_properties_set_data( properties, "image", image, *width * ( *height + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL ); + *buffer = image; + } + else if ( *format == mlt_image_rgb24 ) + { + *buffer = rgb; + } } - else if ( *format == mlt_image_rgb24 ) + else { - *buffer = rgb; + mlt_frame_get_image( this, buffer, format, width, height, writable ); } return 0; } -static void producer_ppm_position( producer_ppm this, uint64_t requested ) -{ - if ( requested != this->expected ) - { - if ( this->video != NULL ) - pclose( this->video ); - this->video = NULL; - if ( this->audio != NULL ) - pclose( this->audio ); - this->audio = NULL; - } - - // This is the next frame we expect - this->expected = mlt_producer_frame( &this->parent ) + 1; -} - FILE *producer_ppm_run_video( producer_ppm this ) { if ( this->video == NULL ) { if ( this->command == NULL ) { - this->video = popen( "image2raw -n -a -r 3 -ppm /usr/share/pixmaps/*.png", "r" ); + this->video = popen( "image2raw -k -r 25 -ppm /usr/share/pixmaps/*.png", "r" ); } 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 -", this->command, position, fps ); + sprintf( command, "ffmpeg -i \"%s\" -ss %f -f imagepipe -r %f -img ppm - 2>/dev/null", this->command, position, fps ); this->video = popen( command, "r" ); } } @@ -117,18 +128,40 @@ FILE *producer_ppm_run_audio( producer_ppm this ) { char command[ 1024 ]; float position = mlt_producer_position( &this->parent ); - sprintf( command, "ffmpeg -i \"%s\" -ss %f -f s16le -ar 48000 -ac 2 -", this->command, position ); + sprintf( command, "ffmpeg -i \"%s\" -ss %f -f s16le -ar 48000 -ac 2 - 2>/dev/null", this->command, position ); this->audio = popen( command, "r" ); } } return this->audio; } +static void producer_ppm_position( producer_ppm this, uint64_t requested ) +{ + if ( requested != this->expected ) + { + if ( this->video != NULL ) + pclose( this->video ); + this->video = NULL; + if ( this->audio != NULL ) + pclose( this->audio ); + this->audio = NULL; + } + + // This is the next frame we expect + this->expected = mlt_producer_frame( &this->parent ) + 1; + + // Open the pipe + this->video = producer_ppm_run_video( this ); + + // Open the audio pipe + this->audio = producer_ppm_run_audio( this ); + +} 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 ); @@ -143,7 +176,10 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma *buffer = malloc( size ); // Read it - fread( *buffer, size, 1, pipe ); + if ( pipe != NULL ) + 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 ); @@ -151,6 +187,19 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma return 0; } +static int read_ppm_header( FILE *video, int *width, int *height ) +{ + int count = 0; + { + char temp[ 132 ]; + fgets( temp, 132, video ); + fgets( temp, 132, video ); + count += sscanf( temp, "%d %d", width, height ); + fgets( temp, 132, video ); + } + return count; +} + static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index ) { producer_ppm this = producer->child; @@ -158,50 +207,51 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i 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 ) ); - // Open the pipe - FILE *video = producer_ppm_run_video( this ); - - // Open the audio pipe - FILE *audio = producer_ppm_run_audio( this ); - // 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 && fscanf( video, "P6\n%d %d\n255\n", &width, &height ) == 2 ) + 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 ); // Pass the data on the frame properties - mlt_properties_set_data( properties, "image", image, width * height * 3, free, NULL ); + mlt_properties_set_data( properties, "image", image, width * ( height + 1 ) * 3, ( mlt_destructor )mlt_pool_release, NULL ); 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 ); } - - // Read the audio - if ( audio != NULL ) + else { - // Set the audio pipe - mlt_properties_set_data( properties, "audio.pipe", audio, 0, NULL, NULL ); - - // Hmm - register audio callback - ( *frame )->get_audio = producer_get_audio; + // Push the image callback + mlt_frame_push_get_image( *frame, producer_get_image ); } + // Set the audio pipe + mlt_properties_set_data( properties, "audio.pipe", audio, 0, NULL, NULL ); + + // Hmm - register audio callback + mlt_frame_push_audio( *frame, producer_get_audio ); + // Update timecode on the frame we're creating - mlt_frame_set_timecode( *frame, mlt_producer_position( producer ) ); + mlt_frame_set_position( *frame, mlt_producer_position( producer ) ); // Calculate the next timecode mlt_producer_prepare_next( producer ); @@ -221,4 +271,3 @@ static void producer_close( mlt_producer parent ) mlt_producer_close( parent ); free( this ); } -