[Mlt-devel] mlt/src/framework mlt_consumer.c,1.63,1.64 mlt_consumer.h,1.15,1.16 mlt_producer.c,1.58,
Brought to you by:
ddennedy,
lilo_booter
Menu
▾
▴
[Mlt-devel] mlt/src/framework mlt_consumer.c,1.63,1.64 mlt_consumer.h,1.15,1.16 mlt_producer.c,1.58,1.59
|
From: Charles Y. <lil...@us...> - 2005-06-21 21:00:16
|
Update of /cvsroot/mlt/mlt/src/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24905/src/framework Modified Files: mlt_consumer.c mlt_consumer.h mlt_producer.c Log Message: src/framework/mlt_consumer.c src/framework/mlt_consumer.h + Added a general profile handling for size, aspect ratio and display ratio src/framework/mlt_producer.c + Correction to aspect ratio properties src/inigo/inigo.c + Minimalist support for sdl_preview (still not very good) src/modules/avformat/consumer_avformat.c + Takes consumer profile into account src/modules/core/filter_resize.c + Corrections for synthesised producers and aspect ratio (inherits from consumer) src/modules/core/producer_colour.c src/modules/core/producer_noise.c src/modules/gtk2/producer_pango.c + Ensures that resize picks up consumer aspect ratio src/modules/dv/consumer_libdv.c + Honour wide screen output src/modules/gtk2/producer_pixbuf.c + Correction for 1:1 aspect ratio src/modules/kino/Makefile src/modules/kino/avi.cc src/modules/kino/avi.h src/modules/kino/configure src/modules/kino/filehandler.cc + Attempt to allow mov dv files to provide audio src/modules/sdl/consumer_sdl.c src/modules/sdl/consumer_sdl_preview.c src/modules/sdl/consumer_sdl_still.c + Takes consumer profile into account Index: mlt_consumer.h =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_consumer.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- mlt_consumer.h 2 Feb 2005 12:29:07 -0000 1.15 +++ mlt_consumer.h 21 Jun 2005 20:59:37 -0000 1.16 @@ -75,5 +75,6 @@ extern int mlt_consumer_is_stopped( mlt_consumer self ); extern void mlt_consumer_stopped( mlt_consumer self ); extern void mlt_consumer_close( mlt_consumer ); +extern int mlt_consumer_profile( mlt_properties properties, char *profile ); #endif Index: mlt_producer.c =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_producer.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- mlt_producer.c 28 May 2005 13:46:29 -0000 1.58 +++ mlt_producer.c 21 Jun 2005 20:59:37 -0000 1.59 @@ -89,15 +89,15 @@ if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) ) { mlt_properties_set_double( properties, "fps", 25.0 ); - mlt_properties_set_int( properties, "frame_rate_den", 25 ); - mlt_properties_set_int( properties, "frame_rate_num", 1 ); + mlt_properties_set_int( properties, "frame_rate_num", 25 ); + mlt_properties_set_int( properties, "frame_rate_den", 1 ); mlt_properties_set_double( properties, "aspect_ratio", 59.0 / 54.0 ); } else { mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 ); - mlt_properties_set_int( properties, "frame_rate_den", 30000 ); - mlt_properties_set_int( properties, "frame_rate_num", 1001 ); + mlt_properties_set_int( properties, "frame_rate_num", 30000 ); + mlt_properties_set_int( properties, "frame_rate_den", 1001 ); mlt_properties_set_double( properties, "aspect_ratio", 10.0 / 11.0 ); } mlt_properties_set_double( properties, "_speed", 1.0 ); Index: mlt_consumer.c =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_consumer.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- mlt_consumer.c 4 Jun 2005 11:20:08 -0000 1.63 +++ mlt_consumer.c 21 Jun 2005 20:59:37 -0000 1.64 @@ -53,23 +53,33 @@ { mlt_properties_set( properties, "normalisation", "PAL" ); mlt_properties_set_double( properties, "fps", 25.0 ); - mlt_properties_set_int( properties, "frame_rate_den", 25 ); - mlt_properties_set_int( properties, "frame_rate_num", 1 ); + 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_den", 30000 ); - mlt_properties_set_int( properties, "frame_rate_num", 1001 ); + 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 @@ -166,6 +176,16 @@ // 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; @@ -327,6 +347,168 @@ 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 @@ -407,6 +589,10 @@ // 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 ) |