X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fproducer_avformat.c;h=bc7971243fb7e041062502a86327e54f9b463ac4;hb=642d69d110cb683b43857bb8385de38c58f5695d;hp=27478607a26370ce23a01a830d2f93989d572b5e;hpb=cef70011d08af33924ab3b97d628deefce47b953;p=melted diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index 2747860..bc79712 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.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 */ // Local header files @@ -285,7 +285,12 @@ static int producer_open( mlt_producer this, char *file ) // Check if we're seekable (something funny about mpeg here :-/) if ( strcmp( file, "pipe:" ) && strncmp( file, "http://", 6 ) ) + { 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 ); + av_open_input_file( &context, file, NULL, 0, NULL ); + av_find_stream_info( context ); + } else av_bypass = 1; @@ -324,7 +329,6 @@ static int producer_open( mlt_producer this, char *file ) { // We'll use the open one as our video_context mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL ); - av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD ); // And open again for our audio context av_open_input_file( &context, file, NULL, 0, NULL ); @@ -337,7 +341,6 @@ static int producer_open( mlt_producer this, char *file ) { // We only have a video context mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL ); - av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD ); } else if ( audio_index != -1 ) { @@ -466,9 +469,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // Obtain the expected frame numer mlt_position expected = mlt_properties_get_position( properties, "_video_expected" ); - // Calculate the real time code - double real_timecode = producer_time_of_frame( this, position ); - // Get the video stream AVStream *stream = context->streams[ index ]; @@ -487,9 +487,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // Special case ffwd handling int ignore = 0; - // Current time calcs - int current_position = mlt_properties_get_double( properties, "_current_position" ); - // We may want to use the source fps if available double source_fps = mlt_properties_get_double( properties, "source_fps" ); double fps = mlt_properties_get_double( properties, "fps" ); @@ -575,7 +572,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form } // Duplicate the last image if necessary (see comment on rawvideo below) - if ( av_frame != NULL && ( paused || mlt_properties_get_int( properties, "_current_position" ) >= req_position ) && av_bypass == 0 ) + int current_position = mlt_properties_get_int( properties, "_current_position" ); + int got_picture = mlt_properties_get_int( properties, "_got_picture" ); + 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 ); @@ -586,8 +585,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form else { int ret = 0; - int got_picture = 0; int int_position = 0; + got_picture = 0; av_init_packet( &pkt ); @@ -646,7 +645,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form mlt_properties_set_int( frame_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_double( properties, "_current_position", int_position ); + mlt_properties_set_int( properties, "_current_position", int_position ); + mlt_properties_set_int( properties, "_got_picture", 1 ); } // We're finished with this packet regardless @@ -879,7 +879,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form { 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 ); @@ -895,16 +895,20 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form // Read a packet ret = av_read_frame( context, &pkt ); - int len = pkt.size; - uint8_t *ptr = pkt.data; - int data_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)) + 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; @@ -964,7 +968,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form mlt_properties_set_int( properties, "_audio_used", audio_used ); // Release the temporary audio - mlt_pool_release( temp ); + av_free( temp ); } else {