X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=1aab394c9d6c21bef9ff7754280dfb893d6a0809;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=3a839d2143e745d4cab8eff7e6d1b56882a88b6c;hpb=4b72d1071d80828a599085618bbba67a18d14e56;p=melted diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index 3a839d2..1aab394 100644 --- a/src/framework/mlt_consumer.c +++ b/src/framework/mlt_consumer.c @@ -3,19 +3,19 @@ * 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 "config.h" @@ -53,19 +53,33 @@ int mlt_consumer_init( mlt_consumer this, void *child ) { mlt_properties_set( properties, "normalisation", "PAL" ); mlt_properties_set_double( properties, "fps", 25.0 ); + mlt_properties_set_int( properties, "frame_rate_num", 25 ); + mlt_properties_set_int( properties, "frame_rate_den", 1 ); mlt_properties_set_int( properties, "width", 720 ); mlt_properties_set_int( properties, "height", 576 ); mlt_properties_set_int( properties, "progressive", 0 ); mlt_properties_set_double( properties, "aspect_ratio", 59.0 / 54.0 ); + mlt_properties_set_int( properties, "aspect_ratio_num", 59 ); + mlt_properties_set_int( properties, "aspect_ratio_den", 54 ); + mlt_properties_set_double( properties, "display_ratio", 4.0 / 3.0 ); + mlt_properties_set_int( properties, "display_ratio_num", 4 ); + mlt_properties_set_int( properties, "display_ratio_den", 3 ); } else { mlt_properties_set( properties, "normalisation", "NTSC" ); mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 ); + mlt_properties_set_int( properties, "frame_rate_num", 30000 ); + mlt_properties_set_int( properties, "frame_rate_den", 1001 ); mlt_properties_set_int( properties, "width", 720 ); mlt_properties_set_int( properties, "height", 480 ); mlt_properties_set_int( properties, "progressive", 0 ); mlt_properties_set_double( properties, "aspect_ratio", 10.0 / 11.0 ); + mlt_properties_set_int( properties, "aspect_ratio_num", 10 ); + mlt_properties_set_int( properties, "aspect_ratio_den", 11 ); + mlt_properties_set_double( properties, "display_ratio", 4.0 / 3.0 ); + mlt_properties_set_int( properties, "display_ratio_num", 4 ); + mlt_properties_set_int( properties, "display_ratio_den", 3 ); } // Default rescaler for all consumers @@ -162,6 +176,16 @@ int mlt_consumer_start( mlt_consumer this ) // Determine if there's a test card producer char *test_card = mlt_properties_get( properties, "test_card" ); + // Handle profiles + char *profile = mlt_properties_get( properties, "profile" ); + int profile_ok = mlt_consumer_profile( properties, profile ); + + // Check that everything is OK + if ( !profile_ok ) + fprintf( stderr, "Unrecognised profile %s - continuing with defaults.\n", mlt_properties_get( properties, "profile" ) ); + else if ( profile_ok < 0 ) + fprintf( stderr, "Recognised profile %s with warnings - trying to continue with some defaults.\n", mlt_properties_get( properties, "profile" ) ); + // Just to make sure nothing is hanging around... mlt_frame_close( this->put ); this->put = NULL; @@ -307,6 +331,7 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this ) // Aspect ratio and other jiggery pokery mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) ); mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" ) ); + mlt_properties_set( frame_properties, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) ); } // Return the frame @@ -322,6 +347,168 @@ static inline long time_difference( struct timeval *time1 ) return time1->tv_sec * 1000000 + time1->tv_usec - time2.tv_sec * 1000000 - time2.tv_usec; } +int mlt_consumer_profile( mlt_properties properties, char *profile ) +{ + double fps = mlt_properties_get_double( properties, "fps" ); + int recognised = 1; + double display_num = 0; + double display_den = 0; + double pixel_num = 0; + double pixel_den = 0; + int width = 0; + int height = 0; + + if ( fps == 25.0 && profile != NULL ) + { + width = 720; + height = 576; + display_num = 4; + display_den = 3; + pixel_num = 59; + pixel_den = 54; + + if ( !strcmp( profile, "dv_wide" ) ) + { + display_num = 16; + display_den = 9; + pixel_num = 118; + pixel_den = 81; + } + else if ( !strncmp( profile, "square_wide", 11 ) ) + { + display_num = 16; + display_den = 9; + pixel_num = 1; + pixel_den = 1; + width = 1024; + height = 576; + } + else if ( !strncmp( profile, "square", 6 ) ) + { + pixel_num = 1; + pixel_den = 1; + width = 768; + height = 576; + } + else if ( !strncmp( profile, "vcd", 3 ) ) + { + width = 352; + height = 288; + } + else if ( !strncmp( profile, "cvd", 3 ) ) + { + width = 352; + height = 576; + pixel_num = 59; + pixel_den = 27; + } + else if ( !strncmp( profile, "svcd_wide", 9 ) ) + { + width = 480; + height = 576; + pixel_num = 59; + pixel_den = 27; + display_num = 16; + display_den = 9; + } + else if ( !strncmp( profile, "svcd", 4 ) ) + { + width = 480; + height = 576; + pixel_num = 59; + pixel_den = 36; + } + else if ( strncmp( profile, "frame", 5 ) && strcmp( profile, "dv" ) ) + { + recognised = 0; + } + } + else if ( profile != NULL ) + { + width = 720; + height = 480; + display_num = 4; + display_den = 3; + pixel_num = 10; + pixel_den = 11; + + if ( !strcmp( profile, "dv_wide" ) ) + { + display_num = 16; + display_den = 9; + pixel_num = 40; + pixel_den = 33; + } + else if ( !strncmp( profile, "square_wide", 11 ) ) + { + display_num = 16; + display_den = 9; + pixel_num = 1; + pixel_den = 1; + width = 854; + height = 480; + } + else if ( !strncmp( profile, "square", 6 ) ) + { + pixel_num = 1; + pixel_den = 1; + width = 640; + height = 480; + } + else if ( !strncmp( profile, "vcd", 3 ) ) + { + width = 352; + height = 240; + } + else if ( !strncmp( profile, "cvd", 3 ) ) + { + width = 352; + height = 480; + pixel_num = 20; + pixel_den = 11; + } + else if ( !strncmp( profile, "svcd_wide", 9 ) ) + { + width = 480; + height = 480; + pixel_num = 20; + pixel_den = 11; + display_num = 16; + display_den = 9; + } + else if ( !strncmp( profile, "svcd", 4 ) ) + { + width = 480; + height = 480; + pixel_num = 15; + pixel_den = 11; + } + else if ( strncmp( profile, "frame", 5 ) && strcmp( profile, "dv" ) ) + { + recognised = 0; + } + } + + // If width (or any of the above are 0), we use defaults otherwise we switch to recognised + if ( width != 0 && recognised ) + { + if ( recognised && strchr( profile, ':' ) ) + if ( sscanf( strchr( profile, ':' ) + 1, "%dx%d", &width, &height ) != 2 ) + recognised = -1; + + mlt_properties_set_int( properties, "width", width ); + mlt_properties_set_int( properties, "height", height ); + mlt_properties_set_double( properties, "aspect_ratio", pixel_num / pixel_den ); + mlt_properties_set_int( properties, "aspect_ratio_num", pixel_num ); + mlt_properties_set_int( properties, "aspect_ratio_den", pixel_den ); + mlt_properties_set_double( properties, "display_ratio", display_num / display_den ); + mlt_properties_set_int( properties, "display_ratio_num", display_num ); + mlt_properties_set_int( properties, "display_ratio_den", display_den ); + } + + return recognised; +} + static void *consumer_read_ahead_thread( void *arg ) { // The argument is the consumer @@ -336,6 +523,8 @@ static void *consumer_read_ahead_thread( void *arg ) // See if video is turned off int video_off = mlt_properties_get_int( properties, "video_off" ); + int preview_off = mlt_properties_get_int( properties, "preview_off" ); + int preview_format = mlt_properties_get_int( properties, "preview_format" ); // Get the audio settings mlt_audio_format afmt = mlt_audio_pcm; @@ -368,6 +557,9 @@ static void *consumer_read_ahead_thread( void *arg ) int skip_next = 0; mlt_service lock_object = NULL; + if ( preview_off && preview_format != 0 ) + this->format = preview_format; + // Get the first frame frame = mlt_consumer_get_frame( this ); @@ -402,6 +594,10 @@ static void *consumer_read_ahead_thread( void *arg ) // Continue to read ahead while ( this->ahead ) { + // Fetch width/height again + width = mlt_properties_get_int( properties, "width" ); + height = mlt_properties_get_int( properties, "height" ); + // Put the current frame into the queue pthread_mutex_lock( &this->mutex ); while( this->ahead && mlt_deque_count( this->queue ) >= buffer ) @@ -432,6 +628,7 @@ static void *consumer_read_ahead_thread( void *arg ) // All non normal playback frames should be shown if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "_speed" ) != 1 ) { + mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "consumer_deinterlace", 1 ); skipped = 0; time_frame = 0; time_process = 0;