X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fproducer_avformat.c;h=aad08028d533393ef9dc3a93b313daa4e0d050e5;hb=f43a615fe4a7071bea580c43af05887576d146e1;hp=9491d64e00a643af16c772f64e1be94d8471bcd1;hpb=15ab35c0a9f93aaaad74cd04832dac18bab78903;p=melted diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index 9491d64..aad0802 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -165,7 +165,7 @@ static int producer_open( mlt_producer this, char *file ) mlt_properties properties = MLT_PRODUCER_PROPERTIES( this ); // We will treat everything with the producer fps - double fps = mlt_properties_get_double( properties, "fps" ); + double fps = mlt_producer_get_fps( this ); // Lock the mutex now avformat_lock( ); @@ -203,11 +203,13 @@ static int producer_open( mlt_producer this, char *file ) params->width = 640; params->height = 480; params->time_base= (AVRational){1,25}; - params->device = file; + // params->device = file; params->channels = 2; params->sample_rate = 48000; } + // XXX: this does not work anymore since avdevice + // TODO: make producer_avddevice? // Parse out params mrl = strchr( file, '?' ); while ( mrl ) @@ -272,9 +274,9 @@ static int producer_open( mlt_producer this, char *file ) if ( context->duration != AV_NOPTS_VALUE ) { // This isn't going to be accurate for all formats - mlt_position frames = ( mlt_position )( ( ( double )context->duration / ( double )AV_TIME_BASE ) * fps ); - mlt_properties_set_position( properties, "out", frames - 2 ); - mlt_properties_set_position( properties, "length", frames - 1 ); + mlt_position frames = ( mlt_position )( ( ( double )context->duration / ( double )AV_TIME_BASE ) * fps + 0.5 ); + mlt_properties_set_position( properties, "out", frames - 1 ); + mlt_properties_set_position( properties, "length", frames ); } // Find default audio and video streams @@ -368,14 +370,7 @@ static int producer_open( mlt_producer this, char *file ) static double producer_time_of_frame( mlt_producer this, mlt_position position ) { - // Get the properties - mlt_properties properties = MLT_PRODUCER_PROPERTIES( this ); - - // Obtain the fps - double fps = mlt_properties_get_double( properties, "fps" ); - - // Do the calc - return ( double )position / fps; + return ( double )position / mlt_producer_get_fps( this ); } static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt, mlt_image_format format, int width, int height ) @@ -489,10 +484,10 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // 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" ); + double fps = mlt_producer_get_fps( this ); // This is the physical frame position in the source - int req_position = ( int )( position / fps * source_fps ); + int req_position = ( int )( position / fps * source_fps + 0.5 ); // Get the seekable status int seekable = mlt_properties_get_int( properties, "seekable" ); @@ -552,7 +547,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form else if ( seekable && ( position < expected || position - expected >= 12 ) ) { // Calculate the timestamp for the requested frame - int64_t timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE ); + int64_t timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE + 0.5 ); if ( ( uint64_t )context->start_time != AV_NOPTS_VALUE ) timestamp += context->start_time; if ( must_decode ) @@ -572,7 +567,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 ); @@ -583,8 +580,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 ); @@ -604,10 +601,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form if ( ret >= 0 && pkt.stream_index == index && pkt.size > 0 ) { // Determine time code of the packet - int_position = ( int )( av_q2d( stream->time_base ) * pkt.dts * source_fps ); + int_position = ( int )( av_q2d( stream->time_base ) * pkt.dts * source_fps + 0.5 ); if ( context->start_time != AV_NOPTS_VALUE ) - int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE ); - + int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE + 0.5 ); int last_position = mlt_properties_get_int( properties, "_last_position" ); if ( int_position == last_position ) int_position = last_position + 1; @@ -615,17 +611,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // 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 @@ -653,6 +640,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form 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 ); } // We're finished with this packet regardless @@ -742,7 +730,7 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) } else { - int is_pal = mlt_properties_get_double( properties, "fps" ) == 25.0; + int is_pal = mlt_producer_get_fps( this ) == 25.0; aspect_ratio = is_pal ? 59.0/54.0 : 10.0/11.0; } @@ -750,10 +738,10 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) source_fps = ( double )codec_context->time_base.den / ( codec_context->time_base.num == 0 ? 1 : codec_context->time_base.num ); // We'll use fps if it's available - if ( source_fps > 0 && source_fps < 30 ) + if ( source_fps > 0 ) mlt_properties_set_double( properties, "source_fps", source_fps ); else - mlt_properties_set_double( properties, "source_fps", mlt_properties_get_double( properties, "fps" ) ); + mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( this ) ); mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio ); // Set the width and height @@ -885,7 +873,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 ); @@ -901,24 +889,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 = 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; @@ -978,7 +962,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 {