[Mlt-devel] SF.net SVN: mlt: [991] trunk/mlt/src/modules/avformat/producer_avformat.c
Brought to you by:
ddennedy,
lilo_booter
From: <dde...@us...> - 2007-06-26 06:57:12
|
Revision: 991 http://mlt.svn.sourceforge.net/mlt/?rev=991&view=rev Author: ddennedy Date: 2007-06-25 23:57:09 -0700 (Mon, 25 Jun 2007) Log Message: ----------- producer_avformat.c: bugfix audio sync with some codecs and revert unnecessary precautions that introduce inefficiency 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 2007-06-12 06:00:29 UTC (rev 990) +++ trunk/mlt/src/modules/avformat/producer_avformat.c 2007-06-26 06:57:09 UTC (rev 991) @@ -617,17 +617,8 @@ // Decode the image if ( must_decode || int_position >= req_position ) - { -#ifdef FF_INPUT_BUFFER_PADDING_SIZE - uint8_t *inbuf = mlt_pool_alloc( pkt.size + FF_INPUT_BUFFER_PADDING_SIZE ); - memcpy( inbuf, pkt.data, pkt.size ); - inbuf[ pkt.size ] = 0; - ret = avcodec_decode_video( codec_context, av_frame, &got_picture, inbuf, pkt.size ); - mlt_pool_release( inbuf ); -#else ret = avcodec_decode_video( codec_context, av_frame, &got_picture, pkt.data, pkt.size ); -#endif - } + if ( got_picture ) { // Handle ignore @@ -888,7 +879,7 @@ { int ret = 0; int got_audio = 0; - int16_t *temp = mlt_pool_alloc( sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE ); + int16_t *temp = av_malloc( sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE ); av_init_packet( &pkt ); @@ -904,24 +895,20 @@ // Read a packet ret = av_read_frame( context, &pkt ); - int len = pkt.size; - uint8_t *ptr = pkt.data; - int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE; + int len = pkt.size; + uint8_t *ptr = pkt.data; // We only deal with audio from the selected audio_index while ( ptr != NULL && ret >= 0 && pkt.stream_index == index && len > 0 ) { + int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE; + // Decode the audio #if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(29<<8)+0)) - uint8_t *inbuf = mlt_pool_alloc( len + FF_INPUT_BUFFER_PADDING_SIZE ); - memcpy( inbuf, ptr, len ); - inbuf[ len ] = 0; - ret = avcodec_decode_audio2( codec_context, temp, &data_size, inbuf, len ); - mlt_pool_release( inbuf ); + ret = avcodec_decode_audio2( codec_context, temp, &data_size, ptr, len ); #else ret = avcodec_decode_audio( codec_context, temp, &data_size, ptr, len ); #endif - if ( ret < 0 ) { ret = 0; @@ -981,7 +968,7 @@ mlt_properties_set_int( properties, "_audio_used", audio_used ); // Release the temporary audio - mlt_pool_release( temp ); + av_free( temp ); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |