* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Charles Yates <charles.yates@pandora.be>
*
- * 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
// 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;
{
// 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 );
{
// 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 )
{
// 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 ];
// 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" );
// 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
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 );
}
// We're finished with this packet regardless
int len = pkt.size;
uint8_t *ptr = pkt.data;
- int data_size;
+ int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE;
// We only deal with audio from the selected audio_index
while ( ptr != NULL && ret >= 0 && pkt.stream_index == index && len > 0 )
{
// Decode the audio
+#ifdef FF_INPUT_BUFFER_PADDING_SIZE
+ 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 );
+#else
ret = avcodec_decode_audio( codec_context, temp, &data_size, ptr, len );
+#endif
if ( ret < 0 )
{
projects / melted / blobdiff