Thread: [Mlt-devel] SF.net SVN: mlt:[1183] trunk/mlt/src/modules/avformat/producer_avformat.c
Brought to you by:
ddennedy,
lilo_booter
From: <dde...@us...> - 2008-10-02 04:49:23
|
Revision: 1183 http://mlt.svn.sourceforge.net/mlt/?rev=1183&view=rev Author: ddennedy Date: 2008-10-02 04:49:20 +0000 (Thu, 02 Oct 2008) Log Message: ----------- producer_avformat.c: bugfix reading file over http. Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-09-22 20:39:51 UTC (rev 1182) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-10-02 04:49:20 UTC (rev 1183) @@ -292,7 +292,7 @@ mlt_properties_set_double( properties, "_start_time", context->start_time ); // Check if we're seekable (something funny about mpeg here :-/) - if ( strcmp( file, "pipe:" ) && strncmp( file, "http://", 6 ) ) + if ( strcmp( file, "pipe:" ) && strncmp( file, "http://", 6 ) && strncmp( file, "udp:", 4 ) && strncmp( file, "tcp:", 4 ) && strncmp( file, "rtsp:", 5 ) && strncmp( file, "rtp:", 4 ) ) { mlt_properties_set_int( properties, "seekable", av_seek_frame( context, -1, mlt_properties_get_double( properties, "_start_time" ), AVSEEK_FLAG_BACKWARD ) >= 0 ); mlt_properties_set_data( properties, "dummy_context", context, 0, producer_file_close, NULL ); @@ -333,7 +333,7 @@ mlt_properties_set_int(properties, "meta.attr.track.markup", context->track ); // We're going to cheat here - for a/v files, we will have two contexts (reasoning will be clear later) - if ( av == 0 && !av_bypass && audio_index != -1 && video_index != -1 ) + if ( av == 0 && audio_index != -1 && video_index != -1 ) { // We'll use the open one as our video_context mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-10-20 23:26:42
|
Revision: 1188 http://mlt.svn.sourceforge.net/mlt/?rev=1188&view=rev Author: ddennedy Date: 2008-10-20 23:26:39 +0000 (Mon, 20 Oct 2008) Log Message: ----------- producer_avformat.c: bugfix Ogg Vorbis files and possibly others that report invalid pts on some packets Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-10-20 17:42:07 UTC (rev 1187) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-10-20 23:26:39 UTC (rev 1188) @@ -989,9 +989,12 @@ } // If we're behind, ignore this packet - float current_pts = av_q2d( stream->time_base ) * pkt.pts; - if ( seekable && ( !ignore && current_pts <= ( real_timecode - 0.02 ) ) ) - ignore = 1; + if ( pkt.pts >= 0 ) + { + float current_pts = av_q2d( stream->time_base ) * pkt.pts; + if ( seekable && ( !ignore && current_pts <= ( real_timecode - 0.02 ) ) ) + ignore = 1; + } } // We're finished with this packet regardless This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-10-27 05:16:21
|
Revision: 1206 http://mlt.svn.sourceforge.net/mlt/?rev=1206&view=rev Author: ddennedy Date: 2008-10-27 05:16:09 +0000 (Mon, 27 Oct 2008) Log Message: ----------- producer_avformat.c: bugfix regression with audio_index and video_index in last release when I added the feature to close file on init with re-open on first use. Also, added some exception handling around index values. Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-10-27 04:46:03 UTC (rev 1205) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-10-27 05:16:09 UTC (rev 1206) @@ -80,6 +80,10 @@ mlt_properties_set_data( properties, "dummy_context", NULL, 0, NULL, NULL ); mlt_properties_set_data( properties, "audio_context", NULL, 0, NULL, NULL ); mlt_properties_set_data( properties, "video_context", NULL, 0, NULL, NULL ); + + // Default the user-selectable indices from the auto-detected indices + mlt_properties_set_int( properties, "audio_index", mlt_properties_get_int( properties, "_audio_index" ) ); + mlt_properties_set_int( properties, "video_index", mlt_properties_get_int( properties, "_video_index" ) ); } } } @@ -303,8 +307,8 @@ av_bypass = 1; // Store selected audio and video indexes on properties - mlt_properties_set_int( properties, "audio_index", audio_index ); - mlt_properties_set_int( properties, "video_index", video_index ); + mlt_properties_set_int( properties, "_audio_index", audio_index ); + mlt_properties_set_int( properties, "_video_index", video_index ); mlt_properties_set_int( properties, "_last_position", -1 ); // Fetch the width, height and aspect ratio @@ -687,21 +691,29 @@ int index = mlt_properties_get_int( properties, "video_index" ); // Reopen the file if necessary - if ( !context && index != -1 ) + if ( !context && index > -1 ) { mlt_events_block( properties, this ); producer_open( this, mlt_service_profile( MLT_PRODUCER_SERVICE(this) ), mlt_properties_get( properties, "resource" ) ); context = mlt_properties_get_data( properties, "video_context", NULL ); - index = mlt_properties_get_int( properties, "video_index" ); mlt_properties_set_data( properties, "dummy_context", NULL, 0, NULL, NULL ); mlt_events_unblock( properties, this ); } + // Exception handling for video_index + if ( context && index >= (int) context->nb_streams ) + { + for ( index = context->nb_streams - 1; index >= 0 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_VIDEO; --index ); + } + if ( context && index > -1 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_VIDEO ) + index = -1; + mlt_properties_set_int( properties, "video_index", index ); + // Get the frame properties mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame ); - if ( context != NULL && index != -1 ) + if ( context != NULL && index > -1 ) { // Get the video stream AVStream *stream = context->streams[ index ]; @@ -1050,19 +1062,27 @@ int index = mlt_properties_get_int( properties, "audio_index" ); // Reopen the file if necessary - if ( !context && index != -1 ) + if ( !context && index > -1 ) { mlt_events_block( properties, this ); producer_open( this, mlt_service_profile( MLT_PRODUCER_SERVICE(this) ), mlt_properties_get( properties, "resource" ) ); context = mlt_properties_get_data( properties, "audio_context", NULL ); - index = mlt_properties_get_int( properties, "audio_index" ); mlt_properties_set_data( properties, "dummy_context", NULL, 0, NULL, NULL ); mlt_events_unblock( properties, this ); } + // Exception handling for audio_index + if ( context && index >= (int) context->nb_streams ) + { + for ( index = context->nb_streams - 1; index >= 0 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_AUDIO; --index ); + } + if ( context && index > -1 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_AUDIO ) + index = -1; + mlt_properties_set_int( properties, "audio_index", index ); + // Deal with audio context - if ( context != NULL && index != -1 ) + if ( context != NULL && index > -1 ) { // Get the frame properties mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-10-27 05:28:05
|
Revision: 1207 http://mlt.svn.sourceforge.net/mlt/?rev=1207&view=rev Author: ddennedy Date: 2008-10-27 05:28:01 +0000 (Mon, 27 Oct 2008) Log Message: ----------- producer_avformat.c: optimize slightly the stream index bugfix and update the video informational properties on the producer when the video index changes. Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-10-27 05:16:09 UTC (rev 1206) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-10-27 05:28:01 UTC (rev 1207) @@ -705,11 +705,25 @@ if ( context && index >= (int) context->nb_streams ) { for ( index = context->nb_streams - 1; index >= 0 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_VIDEO; --index ); + mlt_properties_set_int( properties, "video_index", index ); } if ( context && index > -1 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_VIDEO ) + { index = -1; - mlt_properties_set_int( properties, "video_index", index ); + mlt_properties_set_int( properties, "video_index", index ); + } + // Update the video properties if the index changed + if ( index > -1 && index != mlt_properties_get_int( properties, "_video_index" ) ) + { + // Fetch the width, height and aspect ratio + AVCodecContext *codec_context = context->streams[ index ]->codec; + mlt_properties_set_int( properties, "_video_index", index ); + mlt_properties_set_int( properties, "width", codec_context->width ); + mlt_properties_set_int( properties, "height", codec_context->height ); + mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) ); + } + // Get the frame properties mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame ); @@ -1076,10 +1090,13 @@ if ( context && index >= (int) context->nb_streams ) { for ( index = context->nb_streams - 1; index >= 0 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_AUDIO; --index ); + mlt_properties_set_int( properties, "audio_index", index ); } if ( context && index > -1 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_AUDIO ) + { index = -1; - mlt_properties_set_int( properties, "audio_index", index ); + mlt_properties_set_int( properties, "audio_index", index ); + } // Deal with audio context if ( context != NULL && index > -1 ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-10-27 23:58:48
|
Revision: 1208 http://mlt.svn.sourceforge.net/mlt/?rev=1208&view=rev Author: j-b-m Date: 2008-10-27 23:58:39 +0000 (Mon, 27 Oct 2008) Log Message: ----------- producer_avformat.c: Fix crash / corruption when changing audio or video index Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-10-27 05:28:01 UTC (rev 1207) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-10-27 23:58:39 UTC (rev 1208) @@ -719,6 +719,7 @@ // Fetch the width, height and aspect ratio AVCodecContext *codec_context = context->streams[ index ]->codec; mlt_properties_set_int( properties, "_video_index", index ); + mlt_properties_set_data( properties, "video_codec", NULL, 0, NULL, NULL ); mlt_properties_set_int( properties, "width", codec_context->width ); mlt_properties_set_int( properties, "height", codec_context->height ); mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) ); @@ -1098,6 +1099,12 @@ mlt_properties_set_int( properties, "audio_index", index ); } + // Update the audio properties if the index changed + if ( index > -1 && index != mlt_properties_get_int( properties, "_audio_index" ) ) { + mlt_properties_set_int( properties, "_audio_index", index ); + mlt_properties_set_data( properties, "audio_codec", NULL, 0, NULL, NULL ); + } + // Deal with audio context if ( context != NULL && index > -1 ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-11-08 07:20:20
|
Revision: 1225 http://mlt.svn.sourceforge.net/mlt/?rev=1225&view=rev Author: ddennedy Date: 2008-11-08 07:20:15 +0000 (Sat, 08 Nov 2008) Log Message: ----------- producer_avformat.c: rework the aspect ratio detection to try to fetch it from the codec and/or the stream in newer versions of ffmpeg. This fixes aspect handling for raw DV but still not yet for DV AVIs without the vprp chunk. Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-07 18:06:27 UTC (rev 1224) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-08 07:20:15 UTC (rev 1225) @@ -160,6 +160,50 @@ } } +static double get_aspect_ratio( AVStream *stream, AVCodecContext *codec_context ) +{ + double aspect_ratio = 1.0; + + if ( codec_context->codec_id == CODEC_ID_DVVIDEO ) + { + AVRational ar = +// #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) +// stream->sample_aspect_ratio; +// #else + codec_context->sample_aspect_ratio; +// #endif + // Override FFmpeg's notion of DV aspect ratios, which are + // based upon a width of 704. Since we do not have a normaliser + // that crops (nor is cropping 720 wide ITU-R 601 video always desirable) + // we just coerce the values to facilitate a passive behaviour through + // the rescale normaliser when using equivalent producers and consumers. + // = display_aspect / (width * height) + if ( ar.num == 10 && ar.den == 11 ) + aspect_ratio = 8.0/9.0; // 4:3 NTSC + else if ( ar.num == 59 && ar.den == 54 ) + aspect_ratio = 16.0/15.0; // 4:3 PAL + else if ( ar.num == 40 && ar.den == 33 ) + aspect_ratio = 32.0/27.0; // 16:9 NTSC + else if ( ar.num == 118 && ar.den == 81 ) + aspect_ratio = 64.0/45.0; // 16:9 PAL + } + else + { + AVRational codec_sar = codec_context->sample_aspect_ratio; + AVRational stream_sar = +#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) + stream->sample_aspect_ratio; +#else + { 0, 1 }; +#endif + if ( codec_sar.num > 0 ) + aspect_ratio = av_q2d( codec_sar ); + else if ( stream_sar.num > 0 ) + aspect_ratio = av_q2d( stream_sar ); + } + return aspect_ratio; +} + /** Open the file. */ @@ -317,7 +361,8 @@ AVCodecContext *codec_context = context->streams[ video_index ]->codec; mlt_properties_set_int( properties, "width", codec_context->width ); mlt_properties_set_int( properties, "height", codec_context->height ); - mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) ); + mlt_properties_set_double( properties, "aspect_ratio", + get_aspect_ratio( context->streams[ video_index ], codec_context ) ); } // Read Metadata @@ -704,31 +749,21 @@ // Exception handling for video_index if ( context && index >= (int) context->nb_streams ) { + // Get the last video stream for ( index = context->nb_streams - 1; index >= 0 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_VIDEO; --index ); mlt_properties_set_int( properties, "video_index", index ); } if ( context && index > -1 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_VIDEO ) { + // Invalidate the video stream index = -1; mlt_properties_set_int( properties, "video_index", index ); } - // Update the video properties if the index changed - if ( index > -1 && index != mlt_properties_get_int( properties, "_video_index" ) ) - { - // Fetch the width, height and aspect ratio - AVCodecContext *codec_context = context->streams[ index ]->codec; - mlt_properties_set_int( properties, "_video_index", index ); - mlt_properties_set_data( properties, "video_codec", NULL, 0, NULL, NULL ); - mlt_properties_set_int( properties, "width", codec_context->width ); - mlt_properties_set_int( properties, "height", codec_context->height ); - mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) ); - } - // Get the frame properties mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame ); - if ( context != NULL && index > -1 ) + if ( context && index > -1 ) { // Get the video stream AVStream *stream = context->streams[ index ]; @@ -739,6 +774,19 @@ // Get the codec AVCodec *codec = mlt_properties_get_data( properties, "video_codec", NULL ); + // Update the video properties if the index changed + if ( index != mlt_properties_get_int( properties, "_video_index" ) ) + { + // Reset the video properties if the index changed + mlt_properties_set_int( properties, "_video_index", index ); + mlt_properties_set_data( properties, "video_codec", NULL, 0, NULL, NULL ); + mlt_properties_set_int( properties, "width", codec_context->width ); + mlt_properties_set_int( properties, "height", codec_context->height ); + mlt_properties_set_double( properties, "aspect_ratio", + get_aspect_ratio( context->streams[ index ], codec_context ) ); + codec = NULL; + } + // Initialise the codec if necessary if ( codec == NULL ) { @@ -774,48 +822,10 @@ if ( codec != NULL ) { double source_fps = 0; - int norm_aspect_ratio = mlt_properties_get_int( properties, "norm_aspect_ratio" ); double force_aspect_ratio = mlt_properties_get_double( properties, "force_aspect_ratio" ); - double aspect_ratio; + double aspect_ratio = ( force_aspect_ratio > 0.0 ) ? + force_aspect_ratio : get_aspect_ratio( stream, codec_context ); - if ( strcmp( codec_context->codec->name, "dvvideo" ) == 0 ) - { - // Override FFmpeg's notion of DV aspect ratios, which are - // based upon a width of 704. Since we do not have a normaliser - // that crops (nor is cropping 720 wide ITU-R 601 video always desirable) - // we just coerce the values to facilitate a passive behaviour through - // the rescale normaliser when using equivalent producers and consumers. - // = display_aspect / (width * height) - if ( codec_context->sample_aspect_ratio.num == 10 && - codec_context->sample_aspect_ratio.den == 11 ) - force_aspect_ratio = 8.0/9.0; // 4:3 NTSC - else if ( codec_context->sample_aspect_ratio.num == 59 && - codec_context->sample_aspect_ratio.den == 54 ) - force_aspect_ratio = 16.0/15.0; // 4:3 PAL - else if ( codec_context->sample_aspect_ratio.num == 40 && - codec_context->sample_aspect_ratio.den == 33 ) - force_aspect_ratio = 32.0/27.0; // 16:9 NTSC - else if ( codec_context->sample_aspect_ratio.num == 118 && - codec_context->sample_aspect_ratio.den == 81 ) - force_aspect_ratio = 64.0/45.0; // 16:9 PAL - } - - // XXX: We won't know the real aspect ratio until an image is decoded - // but we do need it now (to satisfy filter_resize) - take a guess based - // on pal/ntsc - if ( force_aspect_ratio > 0.0 ) - { - aspect_ratio = force_aspect_ratio; - } - else if ( !norm_aspect_ratio && codec_context->sample_aspect_ratio.num > 0 ) - { - aspect_ratio = av_q2d( codec_context->sample_aspect_ratio ); - } - else - { - aspect_ratio = 1.0; - } - // Determine the fps source_fps = ( double )codec_context->time_base.den / ( codec_context->time_base.num == 0 ? 1 : codec_context->time_base.num ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-11-08 07:21:39
|
Revision: 1226 http://mlt.svn.sourceforge.net/mlt/?rev=1226&view=rev Author: ddennedy Date: 2008-11-08 07:21:29 +0000 (Sat, 08 Nov 2008) Log Message: ----------- producer_avformat.c: inadvertantly left something commented in the previous commit. Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-08 07:20:15 UTC (rev 1225) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-08 07:21:29 UTC (rev 1226) @@ -167,11 +167,11 @@ if ( codec_context->codec_id == CODEC_ID_DVVIDEO ) { AVRational ar = -// #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) -// stream->sample_aspect_ratio; -// #else +#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) + stream->sample_aspect_ratio; +#else codec_context->sample_aspect_ratio; -// #endif +#endif // Override FFmpeg's notion of DV aspect ratios, which are // based upon a width of 704. Since we do not have a normaliser // that crops (nor is cropping 720 wide ITU-R 601 video always desirable) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-11-08 09:08:10
|
Revision: 1227 http://mlt.svn.sourceforge.net/mlt/?rev=1227&view=rev Author: ddennedy Date: 2008-11-08 09:08:06 +0000 (Sat, 08 Nov 2008) Log Message: ----------- producer_avformat.c: bugfix detection of aspect ratio for DV AVI (applies to raw and quicktime files as well). Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-08 07:21:29 UTC (rev 1226) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-08 09:08:06 UTC (rev 1227) @@ -160,32 +160,70 @@ } } -static double get_aspect_ratio( AVStream *stream, AVCodecContext *codec_context ) +static inline int dv_is_pal( AVPacket *pkt ) { + return pkt->data[3] & 0x80; +} + +static int dv_is_wide( AVPacket *pkt ) +{ + int i = 80 /* block size */ *3 /* VAUX starts at block 3 */ +3 /* skip block header */; + + for ( ; i < pkt->size; i += 5 /* packet size */ ) + { + if ( pkt->data[ i ] == 0x61 ) + { + uint8_t x = pkt->data[ i + 2 ] & 0x7; + return ( x == 2 ) || ( x == 7 ); + } + } + return 0; +} + +static double get_aspect_ratio( AVStream *stream, AVCodecContext *codec_context, AVPacket *pkt ) +{ double aspect_ratio = 1.0; if ( codec_context->codec_id == CODEC_ID_DVVIDEO ) { - AVRational ar = + if ( pkt ) + { + if ( dv_is_pal( pkt ) ) + { + aspect_ratio = dv_is_wide( pkt ) + ? 64.0/45.0 // 16:9 PAL + : 16.0/15.0; // 4:3 PAL + } + else + { + aspect_ratio = dv_is_wide( pkt ) + ? 32.0/27.0 // 16:9 NTSC + : 8.0/9.0; // 4:3 NTSC + } + } + else + { + AVRational ar = #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) - stream->sample_aspect_ratio; + stream->sample_aspect_ratio; #else - codec_context->sample_aspect_ratio; + codec_context->sample_aspect_ratio; #endif - // Override FFmpeg's notion of DV aspect ratios, which are - // based upon a width of 704. Since we do not have a normaliser - // that crops (nor is cropping 720 wide ITU-R 601 video always desirable) - // we just coerce the values to facilitate a passive behaviour through - // the rescale normaliser when using equivalent producers and consumers. - // = display_aspect / (width * height) - if ( ar.num == 10 && ar.den == 11 ) - aspect_ratio = 8.0/9.0; // 4:3 NTSC - else if ( ar.num == 59 && ar.den == 54 ) - aspect_ratio = 16.0/15.0; // 4:3 PAL - else if ( ar.num == 40 && ar.den == 33 ) - aspect_ratio = 32.0/27.0; // 16:9 NTSC - else if ( ar.num == 118 && ar.den == 81 ) - aspect_ratio = 64.0/45.0; // 16:9 PAL + // Override FFmpeg's notion of DV aspect ratios, which are + // based upon a width of 704. Since we do not have a normaliser + // that crops (nor is cropping 720 wide ITU-R 601 video always desirable) + // we just coerce the values to facilitate a passive behaviour through + // the rescale normaliser when using equivalent producers and consumers. + // = display_aspect / (width * height) + if ( ar.num == 10 && ar.den == 11 ) + aspect_ratio = 8.0/9.0; // 4:3 NTSC + else if ( ar.num == 59 && ar.den == 54 ) + aspect_ratio = 16.0/15.0; // 4:3 PAL + else if ( ar.num == 40 && ar.den == 33 ) + aspect_ratio = 32.0/27.0; // 16:9 NTSC + else if ( ar.num == 118 && ar.den == 81 ) + aspect_ratio = 64.0/45.0; // 16:9 PAL + } } else { @@ -361,8 +399,28 @@ AVCodecContext *codec_context = context->streams[ video_index ]->codec; mlt_properties_set_int( properties, "width", codec_context->width ); mlt_properties_set_int( properties, "height", codec_context->height ); - mlt_properties_set_double( properties, "aspect_ratio", - get_aspect_ratio( context->streams[ video_index ], codec_context ) ); + + if ( codec_context->codec_id == CODEC_ID_DVVIDEO ) + { + // Fetch the first frame of DV so we can read it directly + AVPacket pkt; + int ret = 0; + while ( ret >= 0 ) + { + ret = av_read_frame( context, &pkt ); + if ( ret >= 0 && pkt.stream_index == video_index && pkt.size > 0 ) + { + mlt_properties_set_double( properties, "aspect_ratio", + get_aspect_ratio( context->streams[ video_index ], codec_context, &pkt ) ); + break; + } + } + } + else + { + mlt_properties_set_double( properties, "aspect_ratio", + get_aspect_ratio( context->streams[ video_index ], codec_context, NULL ) ); + } } // Read Metadata @@ -782,8 +840,9 @@ mlt_properties_set_data( properties, "video_codec", NULL, 0, NULL, NULL ); mlt_properties_set_int( properties, "width", codec_context->width ); mlt_properties_set_int( properties, "height", codec_context->height ); + // TODO: get the first usable AVPacket and reset the stream position mlt_properties_set_double( properties, "aspect_ratio", - get_aspect_ratio( context->streams[ index ], codec_context ) ); + get_aspect_ratio( context->streams[ index ], codec_context, NULL ) ); codec = NULL; } @@ -824,7 +883,7 @@ double source_fps = 0; double force_aspect_ratio = mlt_properties_get_double( properties, "force_aspect_ratio" ); double aspect_ratio = ( force_aspect_ratio > 0.0 ) ? - force_aspect_ratio : get_aspect_ratio( stream, codec_context ); + force_aspect_ratio : mlt_properties_get_double( properties, "aspect_ratio" ); // Determine the fps source_fps = ( double )codec_context->time_base.den / ( codec_context->time_base.num == 0 ? 1 : codec_context->time_base.num ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-11-13 22:53:22
|
Revision: 1237 http://mlt.svn.sourceforge.net/mlt/?rev=1237&view=rev Author: ddennedy Date: 2008-11-13 22:53:18 +0000 (Thu, 13 Nov 2008) Log Message: ----------- producer_avformat.c: bugfix (kdenlive-347) segfault when resolution is not known until after first frame is decoded. Also, bugfix segfault when video_index or audio_index are -1 (invalid). Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-13 22:45:44 UTC (rev 1236) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-13 22:53:18 UTC (rev 1237) @@ -551,6 +551,45 @@ #endif } +/** Allocate the image buffer and set it on the frame. +*/ + +static int allocate_buffer( mlt_properties frame_properties, AVCodecContext *codec_context, uint8_t **buffer, mlt_image_format *format, int *width, int *height ) +{ + int size = 0; + + if ( codec_context->width == 0 || codec_context->height == 0 ) + return size; + + *width = codec_context->width; + *height = codec_context->height; + mlt_properties_set_int( frame_properties, "width", *width ); + mlt_properties_set_int( frame_properties, "height", *height ); + + switch ( *format ) + { + case mlt_image_yuv420p: + size = *width * 3 * ( *height + 1 ) / 2; + break; + case mlt_image_rgb24: + size = *width * ( *height + 1 ) * 3; + break; + default: + *format = mlt_image_yuv422; + size = *width * ( *height + 1 ) * 2; + break; + } + + // Construct the output image + *buffer = mlt_pool_alloc( size ); + if ( *buffer ) + mlt_properties_set_data( frame_properties, "image", *buffer, size, (mlt_destructor)mlt_pool_release, NULL ); + else + size = 0; + + return size; +} + /** Get an image from a frame. */ @@ -605,40 +644,12 @@ // Get the seekable status int seekable = mlt_properties_get_int( properties, "seekable" ); - // Generate the size in bytes - int size = 0; - // Hopefully provide better support for streams... int av_bypass = mlt_properties_get_int( properties, "av_bypass" ); // Determines if we have to decode all frames in a sequence int must_decode = 1; - // Set the result arguments that we know here (only *buffer is now required) - *width = codec_context->width; - *height = codec_context->height; - - switch ( *format ) - { - case mlt_image_yuv420p: - size = *width * 3 * ( *height + 1 ) / 2; - break; - case mlt_image_rgb24: - size = *width * ( *height + 1 ) * 3; - break; - default: - *format = mlt_image_yuv422; - size = *width * ( *height + 1 ) * 2; - break; - } - - // Set this on the frame properties - mlt_properties_set_int( frame_properties, "width", *width ); - mlt_properties_set_int( frame_properties, "height", *height ); - - // Construct the output image - *buffer = mlt_pool_alloc( size ); - // Temporary hack to improve intra frame only must_decode = strcmp( codec_context->codec->name, "mjpeg" ) && strcmp( codec_context->codec->name, "rawvideo" ) && @@ -685,10 +696,10 @@ if ( av_frame != NULL && got_picture && ( paused || current_position >= req_position ) && av_bypass == 0 ) { // Duplicate it - convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height ); - - // Set this on the frame properties - mlt_properties_set_data( frame_properties, "image", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL ); + if ( allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) ) + convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height ); + else + mlt_frame_get_image( frame, buffer, format, width, height, writable ); } else { @@ -753,12 +764,18 @@ // Now handle the picture if we have one if ( got_picture ) { - mlt_properties_set_int( frame_properties, "progressive", !av_frame->interlaced_frame ); - mlt_properties_set_int( properties, "top_field_first", av_frame->top_field_first ); - convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height ); - mlt_properties_set_data( frame_properties, "image", *buffer, size, (mlt_destructor)mlt_pool_release, NULL ); - mlt_properties_set_int( properties, "_current_position", int_position ); - mlt_properties_set_int( properties, "_got_picture", 1 ); + if ( allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) ) + { + convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height ); + mlt_properties_set_int( frame_properties, "progressive", !av_frame->interlaced_frame ); + mlt_properties_set_int( properties, "top_field_first", av_frame->top_field_first ); + mlt_properties_set_int( properties, "_current_position", int_position ); + mlt_properties_set_int( properties, "_got_picture", 1 ); + } + else + { + got_picture = 0; + } } } if ( !got_picture ) @@ -873,12 +890,13 @@ { // Remember that we can't use this later mlt_properties_set_int( properties, "video_index", -1 ); + index = -1; } avformat_unlock( ); } // No codec, no show... - if ( codec != NULL ) + if ( codec && index > -1 ) { double source_fps = 0; double force_aspect_ratio = mlt_properties_get_double( properties, "force_aspect_ratio" ); @@ -1169,7 +1187,8 @@ } // Update the audio properties if the index changed - if ( index > -1 && index != mlt_properties_get_int( properties, "_audio_index" ) ) { + if ( index > -1 && index != mlt_properties_get_int( properties, "_audio_index" ) ) + { mlt_properties_set_int( properties, "_audio_index", index ); mlt_properties_set_data( properties, "audio_codec", NULL, 0, NULL, NULL ); } @@ -1207,12 +1226,13 @@ { // Remember that we can't use this later mlt_properties_set_int( properties, "audio_index", -1 ); + index = -1; } avformat_unlock( ); } // No codec, no show... - if ( codec != NULL ) + if ( codec && index > -1 ) { mlt_frame_push_audio( frame, producer_get_audio ); mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-11-25 03:48:05
|
Revision: 1243 http://mlt.svn.sourceforge.net/mlt/?rev=1243&view=rev Author: ddennedy Date: 2008-11-25 03:48:01 +0000 (Tue, 25 Nov 2008) Log Message: ----------- producer_avformat.c: fix to previous commit to still allow compilation on version of libavcodec older than 51.71.0 (untested). Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-25 03:32:21 UTC (rev 1242) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-25 03:48:01 UTC (rev 1243) @@ -1044,6 +1044,7 @@ mlt_properties_set_data( properties, "decode_buffer", decode_buffer, 0, ( mlt_destructor )mlt_pool_release, NULL ); } +#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0)) // Check for format converter buffer and create if necessary if ( resample && convert && convert_buffer == NULL ) { @@ -1053,6 +1054,7 @@ // And store it on properties for reuse mlt_properties_set_data( properties, "convert_buffer", convert_buffer, 0, ( mlt_destructor )mlt_pool_release, NULL ); } +#endif // Seek if necessary if ( position != expected ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-11-25 21:02:41
|
Revision: 1244 http://mlt.svn.sourceforge.net/mlt/?rev=1244&view=rev Author: ddennedy Date: 2008-11-25 21:02:20 +0000 (Tue, 25 Nov 2008) Log Message: ----------- producer_avformat.c: bugfix r1242 segfault due to improper audio decoder memory allocation. Also fix logical bug with resampling on channels > 2 Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-25 03:48:01 UTC (rev 1243) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-11-25 21:02:20 UTC (rev 1244) @@ -999,7 +999,7 @@ int paused = 0; // Check for resample and create if necessary - if ( resample == NULL && ( *frequency != codec_context->sample_rate || codec_context->channels <= 2 ) ) + if ( resample == NULL && codec_context->channels <= 2 ) { // Create the resampler resample = audio_resample_init( *channels, codec_context->channels, *frequency, codec_context->sample_rate ); @@ -1038,10 +1038,10 @@ if ( decode_buffer == NULL ) { // Allocate the audio buffer - decode_buffer = mlt_pool_alloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) ); + decode_buffer = av_malloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) ); // And store it on properties for reuse - mlt_properties_set_data( properties, "decode_buffer", decode_buffer, 0, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_data( properties, "decode_buffer", decode_buffer, 0, ( mlt_destructor )av_free, NULL ); } #if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-12-14 05:14:36
|
Revision: 1265 http://mlt.svn.sourceforge.net/mlt/?rev=1265&view=rev Author: ddennedy Date: 2008-12-14 05:14:34 +0000 (Sun, 14 Dec 2008) Log Message: ----------- producer_avformat.c: bugfix (kdenlive-432) segfault when reusing previous AVFrame (paused or idling on last frame) but the previos AVFrame was invalid (not got_picture before erroring out). Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-12-12 19:10:00 UTC (rev 1264) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-12-14 05:14:34 UTC (rev 1265) @@ -714,10 +714,7 @@ // Construct an AVFrame for YUV422 conversion if ( av_frame == NULL ) - { av_frame = avcodec_alloc_frame( ); - mlt_properties_set_data( properties, "av_frame", av_frame, 0, av_free, NULL ); - } while( ret >= 0 && !got_picture ) { @@ -774,6 +771,7 @@ mlt_properties_set_int( properties, "top_field_first", av_frame->top_field_first ); mlt_properties_set_int( properties, "_current_position", int_position ); mlt_properties_set_int( properties, "_got_picture", 1 ); + mlt_properties_set_data( properties, "av_frame", av_frame, 0, av_free, NULL ); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-12-18 04:42:56
|
Revision: 1267 http://mlt.svn.sourceforge.net/mlt/?rev=1267&view=rev Author: ddennedy Date: 2008-12-18 04:42:53 +0000 (Thu, 18 Dec 2008) Log Message: ----------- producer_avformat.c: add support for AVOptions as properties. Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-12-16 08:36:14 UTC (rev 1266) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-12-18 04:42:53 UTC (rev 1267) @@ -25,6 +25,7 @@ // ffmpeg Header files #include <avformat.h> +#include <opt.h> #ifdef SWSCALE # include <swscale.h> #endif @@ -797,6 +798,26 @@ return 0; } +/** Process properties as AVOptions and apply to AV context obj +*/ + +static void apply_properties( void *obj, mlt_properties properties, int flags ) +{ + int i; + int count = mlt_properties_count( properties ); + for ( i = 0; i < count; i++ ) + { + const char *opt_name = mlt_properties_get_name( properties, i ); + const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags ); + if ( opt != NULL ) +#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0) + av_set_string2( obj, opt_name, mlt_properties_get( properties, opt_name), 0 ); +#else + av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) ); +#endif + } +} + /** Set up video handling. */ @@ -820,6 +841,9 @@ context = mlt_properties_get_data( properties, "video_context", NULL ); mlt_properties_set_data( properties, "dummy_context", NULL, 0, NULL, NULL ); mlt_events_unblock( properties, this ); + + // Process properties as AVOptions + apply_properties( context, properties, AV_OPT_FLAG_DECODING_PARAM ); } // Exception handling for video_index @@ -894,6 +918,9 @@ index = -1; } avformat_unlock( ); + + // Process properties as AVOptions + apply_properties( codec_context, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM ); } // No codec, no show... @@ -1293,6 +1320,9 @@ index = -1; } avformat_unlock( ); + + // Process properties as AVOptions + apply_properties( codec_context, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM ); } // No codec, no show... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-12-21 21:07:33
|
Revision: 1282 http://mlt.svn.sourceforge.net/mlt/?rev=1282&view=rev Author: ddennedy Date: 2008-12-21 21:07:27 +0000 (Sun, 21 Dec 2008) Log Message: ----------- producer_avformat.c: add a bunch of metadata about the media under the properties key prefix "meta.media." Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2008-12-21 17:49:03 UTC (rev 1281) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2008-12-21 21:07:27 UTC (rev 1282) @@ -98,34 +98,73 @@ /** Find the default streams. */ -static void find_default_streams( AVFormatContext *context, int *audio_index, int *video_index ) +static mlt_properties find_default_streams( mlt_properties meta_media, AVFormatContext *context, int *audio_index, int *video_index ) { int i; + char key[200]; + mlt_properties_set_int( meta_media, "meta.media.nb_streams", context->nb_streams ); + // Allow for multiple audio and video streams in the file and select first of each (if available) for( i = 0; i < context->nb_streams; i++ ) { // Get the codec context - AVCodecContext *codec_context = context->streams[ i ]->codec; + AVStream *stream = context->streams[ i ]; + if ( ! stream ) continue; + AVCodecContext *codec_context = stream->codec; + if ( ! codec_context ) continue; + AVCodec *codec = avcodec_find_decoder( codec_context->codec_id ); + if ( ! codec ) continue; - if ( avcodec_find_decoder( codec_context->codec_id ) == NULL ) - continue; + snprintf( key, sizeof(key), "meta.media.%d.stream.type", i ); // Determine the type and obtain the first index of each type - switch( codec_context->codec_type ) + switch( codec_context->codec_type ) { case CODEC_TYPE_VIDEO: if ( *video_index < 0 ) *video_index = i; + mlt_properties_set( meta_media, key, "video" ); + snprintf( key, sizeof(key), "meta.media.%d.stream.frame_rate", i ); + mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->r_frame_rate ) ); + snprintf( key, sizeof(key), "meta.media.%d.stream.sample_aspect_ratio", i ); + mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->sample_aspect_ratio ) ); + snprintf( key, sizeof(key), "meta.media.%d.codec.pix_fmt", i ); + mlt_properties_set( meta_media, key, avcodec_get_pix_fmt_name( codec_context->pix_fmt ) ); + snprintf( key, sizeof(key), "meta.media.%d.codec.sample_aspect_ratio", i ); + mlt_properties_set_double( meta_media, key, av_q2d( codec_context->sample_aspect_ratio ) ); break; case CODEC_TYPE_AUDIO: if ( *audio_index < 0 ) *audio_index = i; + mlt_properties_set( meta_media, key, "audio" ); + snprintf( key, sizeof(key), "meta.media.%d.codec.sample_fmt", i ); + mlt_properties_set( meta_media, key, avcodec_get_sample_fmt_name( codec_context->sample_fmt ) ); + snprintf( key, sizeof(key), "meta.media.%d.codec.sample_rate", i ); + mlt_properties_set_int( meta_media, key, codec_context->sample_rate ); + snprintf( key, sizeof(key), "meta.media.%d.codec.channels", i ); + mlt_properties_set_int( meta_media, key, codec_context->channels ); break; default: break; } +// snprintf( key, sizeof(key), "meta.media.%d.stream.time_base", i ); +// mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->time_base ) ); + snprintf( key, sizeof(key), "meta.media.%d.codec.name", i ); + mlt_properties_set( meta_media, key, codec->name ); + snprintf( key, sizeof(key), "meta.media.%d.codec.long_name", i ); + mlt_properties_set( meta_media, key, codec->long_name ); + snprintf( key, sizeof(key), "meta.media.%d.codec.bit_rate", i ); + mlt_properties_set_int( meta_media, key, codec_context->bit_rate ); +// snprintf( key, sizeof(key), "meta.media.%d.codec.time_base", i ); +// mlt_properties_set_double( meta_media, key, av_q2d( codec_context->time_base ) ); + snprintf( key, sizeof(key), "meta.media.%d.codec.profile", i ); + mlt_properties_set_int( meta_media, key, codec_context->profile ); + snprintf( key, sizeof(key), "meta.media.%d.codec.level", i ); + mlt_properties_set_int( meta_media, key, codec_context->level ); } + + return meta_media; } /** Producer file destructor. @@ -376,7 +415,7 @@ } // Find default audio and video streams - find_default_streams( context, &audio_index, &video_index ); + find_default_streams( properties, context, &audio_index, &video_index ); if ( context->start_time != AV_NOPTS_VALUE ) mlt_properties_set_double( properties, "_start_time", context->start_time ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-01-24 06:46:15
|
Revision: 1324 http://mlt.svn.sourceforge.net/mlt/?rev=1324&view=rev Author: ddennedy Date: 2009-01-24 06:46:11 +0000 (Sat, 24 Jan 2009) Log Message: ----------- producer_avformat.c: add version check to use AVCodec->long_name Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2009-01-23 01:36:44 UTC (rev 1323) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2009-01-24 06:46:11 UTC (rev 1324) @@ -191,8 +191,10 @@ // mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->time_base ) ); snprintf( key, sizeof(key), "meta.media.%d.codec.name", i ); mlt_properties_set( meta_media, key, codec->name ); +#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(55<<8)+0)) snprintf( key, sizeof(key), "meta.media.%d.codec.long_name", i ); mlt_properties_set( meta_media, key, codec->long_name ); +#endif snprintf( key, sizeof(key), "meta.media.%d.codec.bit_rate", i ); mlt_properties_set_int( meta_media, key, codec_context->bit_rate ); // snprintf( key, sizeof(key), "meta.media.%d.codec.time_base", i ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-03-10 23:35:22
|
Revision: 1377 http://mlt.svn.sourceforge.net/mlt/?rev=1377&view=rev Author: ddennedy Date: 2009-03-10 23:35:15 +0000 (Tue, 10 Mar 2009) Log Message: ----------- producer_avformat.c: add backwards compatibility macro for PIX_FMT_YUYV422 Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2009-03-10 05:55:27 UTC (rev 1376) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2009-03-10 23:35:15 UTC (rev 1377) @@ -40,6 +40,10 @@ #include <pthread.h> #include <math.h> +#if LIBAVUTIL_VERSION_INT < (50<<16) +#define PIX_FMT_YUYV422 PIX_FMT_YUV422 +#endif + void avformat_lock( ); void avformat_unlock( ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-04-09 07:17:22
|
Revision: 1385 http://mlt.svn.sourceforge.net/mlt/?rev=1385&view=rev Author: ddennedy Date: 2009-04-09 07:17:17 +0000 (Thu, 09 Apr 2009) Log Message: ----------- producer_avformat.c: bugfix building on some older versions. Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2009-04-09 07:14:23 UTC (rev 1384) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2009-04-09 07:17:17 UTC (rev 1385) @@ -634,8 +634,8 @@ else { AVPicture output; - avpicture_fill( &output, buffer, PIX_FMT_YUV422, width, height ); - img_convert( &output, PIX_FMT_YUV422, (AVPicture *)frame, pix_fmt, width, height ); + avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height ); + img_convert( &output, PIX_FMT_YUYV422, (AVPicture *)frame, pix_fmt, width, height ); } #endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-04-30 07:25:18
|
Revision: 1415 http://mlt.svn.sourceforge.net/mlt/?rev=1415&view=rev Author: ddennedy Date: 2009-04-30 07:25:11 +0000 (Thu, 30 Apr 2009) Log Message: ----------- producer_avformat.c: improve audio synchronization after seek (including in point) Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2009-04-18 19:24:03 UTC (rev 1414) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2009-04-30 07:25:11 UTC (rev 1415) @@ -1185,8 +1185,14 @@ } else if ( position < expected || position - expected >= 12 ) { + int64_t timestamp = ( int64_t )( real_timecode * AV_TIME_BASE + 0.5 ); + if ( context->start_time != AV_NOPTS_VALUE ) + timestamp += context->start_time; + if ( timestamp < 0 ) + timestamp = 0; + // Set to the real timecode - if ( av_seek_frame( context, -1, mlt_properties_get_double( properties, "_start_time" ) + real_timecode * 1000000.0, AVSEEK_FLAG_BACKWARD ) != 0 ) + if ( av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD ) != 0 ) paused = 1; // Clear the usage in the audio buffer @@ -1288,8 +1294,14 @@ // If we're behind, ignore this packet if ( pkt.pts >= 0 ) { - float current_pts = av_q2d( stream->time_base ) * pkt.pts; - if ( seekable && ( !ignore && current_pts <= ( real_timecode - 0.02 ) ) ) + double current_pts = av_q2d( stream->time_base ) * pkt.pts; + double source_fps = mlt_properties_get_double( properties, "source_fps" ); + int req_position = ( int )( real_timecode * source_fps + 0.5 ); + int int_position = ( int )( current_pts * source_fps + 0.5 ); + + if ( context->start_time != AV_NOPTS_VALUE ) + int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE + 0.5 ); + if ( seekable && !ignore && int_position < req_position ) ignore = 1; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-05-05 06:20:31
|
Revision: 1419 http://mlt.svn.sourceforge.net/mlt/?rev=1419&view=rev Author: ddennedy Date: 2009-05-05 06:20:22 +0000 (Tue, 05 May 2009) Log Message: ----------- Improve seek performance with dnxhd and huffyuv codecs. Signed-off-by: Dan Dennedy <da...@de...> Modified Paths: -------------- trunk/mlt/src/modules/avformat/producer_avformat.c Modified: trunk/mlt/src/modules/avformat/producer_avformat.c =================================================================== --- trunk/mlt/src/modules/avformat/producer_avformat.c 2009-05-03 00:09:47 UTC (rev 1418) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2009-05-05 06:20:22 UTC (rev 1419) @@ -740,9 +740,11 @@ int must_decode = 1; // Temporary hack to improve intra frame only - must_decode = strcmp( codec_context->codec->name, "mjpeg" ) && - strcmp( codec_context->codec->name, "rawvideo" ) && - strcmp( codec_context->codec->name, "dvvideo" ); + must_decode = strcmp( codec_context->codec->name, "dnxhd" ) && + strcmp( codec_context->codec->name, "dvvideo" ) && + strcmp( codec_context->codec->name, "huffyuv" ) && + strcmp( codec_context->codec->name, "mjpeg" ) && + strcmp( codec_context->codec->name, "rawvideo" ); // Seek if necessary if ( position != expected ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |