#include <framework/mlt_cache.h>
// ffmpeg Header files
-#include <avformat.h>
-#include <opt.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/opt.h>
#ifdef SWSCALE
-# include <swscale.h>
+# include <libswscale/swscale.h>
#endif
#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
# include "audioconvert.h"
#endif
#ifdef VDPAU
-#include <vdpau.h>
+#include <libavcodec/vdpau.h>
#endif
// System header files
unsigned int invalid_pts_counter;
double resample_factor;
mlt_cache image_cache;
+ int colorspace;
#ifdef VDPAU
struct
{
*video_index = i;
mlt_properties_set( meta_media, key, "video" );
snprintf( key, sizeof(key), "meta.media.%d.stream.frame_rate", i );
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(42<<8)+0)
+ double ffmpeg_fps = av_q2d( context->streams[ i ]->avg_frame_rate );
+ if (ffmpeg_fps == 0) ffmpeg_fps = av_q2d( context->streams[ i ]->r_frame_rate );
+ mlt_properties_set_double( meta_media, key, ffmpeg_fps );
+#else
mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->r_frame_rate ) );
+#endif
+
#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
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 ) );
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 ) );
+#if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0)
+ snprintf( key, sizeof(key), "meta.media.%d.codec.colorspace", i );
+ switch ( codec_context->colorspace )
+ {
+ case AVCOL_SPC_SMPTE240M:
+ mlt_properties_set_int( meta_media, key, 240 );
+ break;
+ case AVCOL_SPC_BT470BG:
+ case AVCOL_SPC_SMPTE170M:
+ mlt_properties_set_int( meta_media, key, 601 );
+ break;
+ case AVCOL_SPC_BT709:
+ mlt_properties_set_int( meta_media, key, 709 );
+ break;
+ default:
+ // This is a heuristic Charles Poynton suggests in "Digital Video and HDTV"
+ mlt_properties_set_int( meta_media, key, codec_context->width * codec_context->height > 750000 ? 709 : 601 );
+ break;
+ }
+#endif
break;
case CODEC_TYPE_AUDIO:
if ( *audio_index < 0 )
return 0;
}
-static double get_aspect_ratio( AVStream *stream, AVCodecContext *codec_context, AVPacket *pkt )
+static double get_aspect_ratio( mlt_properties properties, AVStream *stream, AVCodecContext *codec_context, AVPacket *pkt )
{
double aspect_ratio = 1.0;
{
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
+ if ( dv_is_wide( pkt ) )
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 64 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 45 );
+ }
+ else
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 16 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 15 );
+ }
}
else
{
- aspect_ratio = dv_is_wide( pkt )
- ? 32.0/27.0 // 16:9 NTSC
- : 8.0/9.0; // 4:3 NTSC
+ if ( dv_is_wide( pkt ) )
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 32 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 27 );
+ }
+ else
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 8 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 9 );
+ }
}
}
else
// 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
+ {
+ // 4:3 NTSC
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 8 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 9 );
+ }
else if ( ar.num == 59 && ar.den == 54 )
- aspect_ratio = 16.0/15.0; // 4:3 PAL
+ {
+ // 4:3 PAL
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 16 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 15 );
+ }
else if ( ar.num == 40 && ar.den == 33 )
- aspect_ratio = 32.0/27.0; // 16:9 NTSC
+ {
+ // 16:9 NTSC
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 32 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 27 );
+ }
else if ( ar.num == 118 && ar.den == 81 )
- aspect_ratio = 64.0/45.0; // 16:9 PAL
+ {
+ // 16:9 PAL
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 64 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 45 );
+ }
}
}
else
{ 0, 1 };
#endif
if ( codec_sar.num > 0 )
- aspect_ratio = av_q2d( codec_sar );
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", codec_sar.num );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", codec_sar.den );
+ }
else if ( stream_sar.num > 0 )
- aspect_ratio = av_q2d( stream_sar );
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", stream_sar.num );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", stream_sar.den );
+ }
+ else
+ {
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_num", 1 );
+ mlt_properties_set_int( properties, "meta.media.sample_aspect_den", 1 );
+ }
}
+ AVRational ar = { mlt_properties_get_double( properties, "meta.media.sample_aspect_num" ), mlt_properties_get_double( properties, "meta.media.sample_aspect_den" ) };
+ aspect_ratio = av_q2d( ar );
+ mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
+
return aspect_ratio;
}
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 ) );
+ get_aspect_ratio( properties, 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 ) );
+ get_aspect_ratio( properties, context->streams[ video_index ], codec_context, NULL );
}
+#ifdef SWSCALE
+ struct SwsContext *context = sws_getContext( codec_context->width, codec_context->height, codec_context->pix_fmt,
+ codec_context->width, codec_context->height, PIX_FMT_YUYV422, SWS_BILINEAR, NULL, NULL, NULL);
+ if ( context )
+ sws_freeContext( context );
+ else
+ error = 1;
+#endif
}
// Read Metadata
this->resample_factor = 1.0;
}
-static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt, mlt_image_format *format, int width, int height )
+static void set_luma_transfer( struct SwsContext *context, int colorspace, int use_full_range )
+{
+#if defined(SWSCALE) && (LIBSWSCALE_VERSION_INT >= ((0<<16)+(7<<8)+2))
+ int *coefficients;
+ int full_range;
+ int brightness, contrast, saturation;
+
+ if ( sws_getColorspaceDetails( context, &coefficients, &full_range, &coefficients, &full_range,
+ &brightness, &contrast, &saturation ) != -1 )
+ {
+ // Don't change these from defaults unless explicitly told to.
+ if ( use_full_range >= 0 )
+ full_range = use_full_range;
+ switch ( colorspace )
+ {
+ case 170:
+ case 470:
+ case 601:
+ case 624:
+ coefficients = sws_getCoefficients( SWS_CS_ITU601 );
+ break;
+ case 240:
+ coefficients = sws_getCoefficients( SWS_CS_SMPTE240M );
+ break;
+ case 709:
+ coefficients = sws_getCoefficients( SWS_CS_ITU709 );
+ break;
+ }
+ sws_setColorspaceDetails( context, coefficients, full_range, coefficients, full_range,
+ brightness, contrast, saturation );
+ }
+#endif
+}
+
+static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
+ mlt_image_format *format, int width, int height, int colorspace )
{
#ifdef SWSCALE
+ int full_range = -1;
+ int flags = SWS_BILINEAR | SWS_ACCURATE_RND;
+
+#ifdef USE_MMX
+ flags |= SWS_CPU_CAPS_MMX;
+#endif
+#ifdef USE_SSE
+ flags |= SWS_CPU_CAPS_MMX2;
+#endif
+
if ( pix_fmt == PIX_FMT_RGB32 )
{
*format = mlt_image_rgb24a;
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
- width, height, PIX_FMT_RGBA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, PIX_FMT_RGBA, flags, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
+ set_luma_transfer( context, colorspace, full_range );
sws_scale( context, frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
else if ( *format == mlt_image_yuv420p )
{
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
- width, height, PIX_FMT_YUV420P, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, PIX_FMT_YUV420P, flags, NULL, NULL, NULL);
AVPicture output;
output.data[0] = buffer;
output.data[1] = buffer + width * height;
output.linesize[0] = width;
output.linesize[1] = width >> 1;
output.linesize[2] = width >> 1;
+ set_luma_transfer( context, colorspace, full_range );
sws_scale( context, frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
else if ( *format == mlt_image_rgb24 )
{
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
- width, height, PIX_FMT_RGB24, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, PIX_FMT_RGB24, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGB24, width, height );
+ set_luma_transfer( context, colorspace, full_range );
sws_scale( context, frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
else if ( *format == mlt_image_rgb24a || *format == mlt_image_opengl )
{
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
- width, height, PIX_FMT_RGBA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, PIX_FMT_RGBA, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
+ set_luma_transfer( context, colorspace, full_range );
sws_scale( context, frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
else
{
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
- width, height, PIX_FMT_YUYV422, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ width, height, PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
AVPicture output;
avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height );
+ set_luma_transfer( context, colorspace, full_range );
sws_scale( context, frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
*width = codec_context->width;
*height = codec_context->height;
- mlt_properties_set_int( frame_properties, "width", *width );
- mlt_properties_set_int( frame_properties, "height", *height );
if ( codec_context->pix_fmt == PIX_FMT_RGB32 )
size = *width * ( *height + 1 ) * 4;
{
// Get the producer
producer_avformat this = mlt_frame_pop_service( frame );
+ mlt_service_lock( MLT_PRODUCER_SERVICE(this->parent) );
mlt_producer producer = this->parent;
// Get the properties from the frame
if ( this->image_cache )
{
mlt_cache_item item = mlt_cache_get( this->image_cache, (void*) position );
- *buffer = mlt_cache_item_data( item, format );
+ *buffer = mlt_cache_item_data( item, (int*) format );
if ( *buffer )
{
// Set the resolution
*width = codec_context->width;
*height = codec_context->height;
- mlt_properties_set_int( frame_properties, "width", *width );
- mlt_properties_set_int( frame_properties, "height", *height );
+
+ // Workaround 1088 encodings missing cropping info.
+ if ( *height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
+ *height = 1080;
// Cache hit
int size;
}
mlt_properties_set_data( frame_properties, "avformat.image_cache", item, 0, ( mlt_destructor )mlt_cache_item_close, NULL );
mlt_properties_set_data( frame_properties, "image", *buffer, size, NULL, NULL );
- this->top_field_first = mlt_properties_get_int( frame_properties, "top_field_first" );
+ // this->top_field_first = mlt_properties_get_int( frame_properties, "top_field_first" );
+ this->got_picture = 1;
goto exit_get_image;
}
int ignore = 0;
// We may want to use the source fps if available
- double source_fps = mlt_properties_get_double( properties, "source_fps" );
+ double source_fps = mlt_properties_get_double( properties, "meta.media.frame_rate_num" ) /
+ mlt_properties_get_double( properties, "meta.media.frame_rate_den" );
double fps = mlt_producer_get_fps( producer );
// This is the physical frame position in the source
}
}
- // Duplicate the last image if necessary (see comment on rawvideo below)
- if ( this->av_frame && this->got_picture && this->seekable
+ // Duplicate the last image if necessary
+ if ( this->av_frame && this->av_frame->linesize[0] && this->got_picture && this->seekable
&& ( paused
|| this->current_position == req_position
|| ( !use_new_seek && this->current_position > req_position ) ) )
{
// Duplicate it
if ( ( image_size = allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) ) )
+ {
+ // Workaround 1088 encodings missing cropping info.
+ if ( *height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
+ *height = 1080;
#ifdef VDPAU
if ( this->vdpau && this->vdpau->buffer )
{
picture.linesize[0] = codec_context->width;
picture.linesize[1] = codec_context->width / 2;
picture.linesize[2] = codec_context->width / 2;
- convert_image( (AVFrame*) &picture, *buffer, PIX_FMT_YUV420P, format, *width, *height );
+ convert_image( (AVFrame*) &picture, *buffer,
+ PIX_FMT_YUV420P, format, *width, *height, this->colorspace );
}
else
#endif
- convert_image( this->av_frame, *buffer, codec_context->pix_fmt, format, *width, *height );
+ convert_image( this->av_frame, *buffer, codec_context->pix_fmt,
+ format, *width, *height, this->colorspace );
+ }
else
mlt_frame_get_image( frame, buffer, format, width, height, writable );
}
else if ( context->start_time != AV_NOPTS_VALUE )
pts -= context->start_time;
int_position = ( int )( av_q2d( stream->time_base) * pts * source_fps + 0.1 );
- mlt_log_verbose( MLT_PRODUCER_SERVICE(producer), "got frame %d, key %d\n", int_position, this->av_frame->key_frame );
+ mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "got frame %d, key %d\n", int_position, this->av_frame->key_frame );
}
// Handle ignore
if ( int_position < req_position )
}
}
mlt_log_debug( MLT_PRODUCER_SERVICE(producer), " got_pic %d key %d\n", got_picture, pkt.flags & PKT_FLAG_KEY );
- av_free_packet( &pkt );
- }
- else if ( ret >= 0 )
- {
- av_free_packet( &pkt );
}
// Now handle the picture if we have one
{
if ( ( image_size = allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) ) )
{
+ // Workaround 1088 encodings missing cropping info.
+ if ( *height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
+ *height = 1080;
#ifdef VDPAU
if ( this->vdpau )
{
VdpStatus status = vdp_surface_get_bits( render->surface, dest_format, planes, pitches );
if ( status == VDP_STATUS_OK )
{
- convert_image( (AVFrame*) &picture, *buffer, PIX_FMT_YUV420P, format, *width, *height );
+ convert_image( (AVFrame*) &picture, *buffer, PIX_FMT_YUV420P,
+ format, *width, *height, this->colorspace );
}
else
{
}
else
#endif
- convert_image( this->av_frame, *buffer, codec_context->pix_fmt, format, *width, *height );
+ convert_image( this->av_frame, *buffer, codec_context->pix_fmt,
+ format, *width, *height, this->colorspace );
this->top_field_first |= this->av_frame->top_field_first;
this->current_position = int_position;
this->got_picture = 1;
got_picture = 0;
}
}
+ if ( ret >= 0 )
+ av_free_packet( &pkt );
}
- if ( !got_picture )
- mlt_frame_get_image( frame, buffer, format, width, height, writable );
}
- // Very untidy - for rawvideo, the packet contains the frame, hence the free packet
- // above will break the pause behaviour - so we wipe the frame now
- if ( !strcmp( codec_context->codec->name, "rawvideo" ) )
- av_freep( &this->av_frame );
-
avformat_unlock();
if ( this->got_picture && image_size > 0 && this->image_cache )
mlt_cache_put( this->image_cache, (void*) position, image, *format, mlt_pool_release );
}
+ // Regardless of speed, we expect to get the next frame (cos we ain't too bright)
+ this->video_expected = position + 1;
+
exit_get_image:
// Set the progressive flag
if ( mlt_properties_get( properties, "force_progressive" ) )
mlt_properties_set_int( frame_properties, "progressive", !!mlt_properties_get_int( properties, "force_progressive" ) );
- else
+ else if ( this->av_frame )
mlt_properties_set_int( frame_properties, "progressive", !this->av_frame->interlaced_frame );
// Set the field order property for this frame
- mlt_properties_set_int( frame_properties, "top_field_first", this->top_field_first );
+ if ( mlt_properties_get( properties, "force_tff" ) )
+ mlt_properties_set_int( frame_properties, "top_field_first", !!mlt_properties_get_int( properties, "force_tff" ) );
+ else
+ mlt_properties_set_int( frame_properties, "top_field_first", this->top_field_first );
- // Regardless of speed, we expect to get the next frame (cos we ain't too bright)
- this->video_expected = position + 1;
+ // Set immutable properties of the selected track's (or overridden) source attributes.
+ mlt_properties_set_int( properties, "meta.media.top_field_first", this->top_field_first );
+ mlt_properties_set_int( properties, "meta.media.progressive", mlt_properties_get_int( frame_properties, "progressive" ) );
- return 0;
+ mlt_service_unlock( MLT_PRODUCER_SERVICE(this->parent) );
+
+ return !this->got_picture;
}
/** Process properties as AVOptions and apply to AV context obj
{
const char *opt_name = mlt_properties_get_name( properties, i );
const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );
- if ( opt )
+ if ( opt_name && mlt_properties_get( properties, opt_name ) )
+ {
+ if ( opt )
#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
- av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), 0, NULL );
+ av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), 0, NULL );
#elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
- av_set_string2( obj, opt_name, mlt_properties_get( properties, opt_name), 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) );
+ av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) );
#endif
+ }
}
}
mlt_properties_set_int( properties, "height", this->video_codec->height );
// For DV, we'll just use the saved aspect ratio
if ( codec_context->codec_id != CODEC_ID_DVVIDEO )
- mlt_properties_set_double( properties, "aspect_ratio", get_aspect_ratio( stream, this->video_codec, NULL ) );
+ get_aspect_ratio( properties, stream, this->video_codec, NULL );
// Determine the fps first from the codec
double source_fps = (double) this->video_codec->time_base.den /
if ( mlt_properties_get( properties, "force_fps" ) )
{
source_fps = mlt_properties_get_double( properties, "force_fps" );
- stream->time_base = av_d2q( source_fps, 255 );
+ stream->time_base = av_d2q( source_fps, 1024 );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_num", stream->time_base.num );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_den", stream->time_base.den );
}
else
{
// If the muxer reports a frame rate different than the codec
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(42<<8)+0)
+ double muxer_fps = av_q2d( stream->avg_frame_rate );
+ if ( muxer_fps == 0 ) muxer_fps = av_q2d( stream->r_frame_rate );
+#else
double muxer_fps = av_q2d( stream->r_frame_rate );
+#endif
// Choose the lesser - the wrong tends to be off by some multiple of 10
source_fps = FFMIN( source_fps, muxer_fps );
+ if ( source_fps >= 1.0 && ( source_fps < muxer_fps || isnan( muxer_fps ) ) )
+ {
+ mlt_properties_set_int( properties, "meta.media.frame_rate_num", this->video_codec->time_base.den );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_den", this->video_codec->time_base.num == 0 ? 1 : this->video_codec->time_base.num );
+ }
+ else if ( muxer_fps > 0 )
+ {
+ AVRational frame_rate = stream->r_frame_rate;
+ // With my samples when r_frame_rate != 1000 but avg_frame_rate is valid,
+ // avg_frame_rate gives some approximate value that does not well match the media.
+ // Also, on my sample where r_frame_rate = 1000, using avg_frame_rate directly
+ // results in some very choppy output, but some value slightly different works
+ // great.
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(42<<8)+0)
+ if ( av_q2d( stream->r_frame_rate ) >= 1000 && av_q2d( stream->avg_frame_rate ) > 0 )
+ frame_rate = av_d2q( av_q2d( stream->avg_frame_rate ), 1024 );
+#endif
+ mlt_properties_set_int( properties, "meta.media.frame_rate_num", frame_rate.num );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den );
+ }
+ else
+ {
+ source_fps = mlt_producer_get_fps( this->parent );
+ AVRational frame_rate = av_d2q( source_fps, 255 );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_num", frame_rate.num );
+ mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den );
+ }
}
- // We'll use fps if it's available
+ // source_fps is deprecated in favor of meta.media.frame_rate_num and .frame_rate_den
if ( source_fps > 0 )
mlt_properties_set_double( properties, "source_fps", source_fps );
else
mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( this->parent ) );
+
+ // Set the YUV colorspace from override or detect
+ this->colorspace = mlt_properties_get_int( properties, "force_colorspace" );
+#if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0)
+ if ( ! this->colorspace )
+ {
+ switch ( this->video_codec->colorspace )
+ {
+ case AVCOL_SPC_SMPTE240M:
+ this->colorspace = 240;
+ break;
+ case AVCOL_SPC_BT470BG:
+ case AVCOL_SPC_SMPTE170M:
+ this->colorspace = 601;
+ break;
+ case AVCOL_SPC_BT709:
+ this->colorspace = 709;
+ break;
+ default:
+ // This is a heuristic Charles Poynton suggests in "Digital Video and HDTV"
+ this->colorspace = this->video_codec->width * this->video_codec->height > 750000 ? 709 : 601;
+ break;
+ }
+ }
+#endif
+ // Let apps get chosen colorspace
+ mlt_properties_set_int( properties, "meta.media.colorspace", this->colorspace );
}
return this->video_codec && this->video_index > -1;
}
// Set the width and height
mlt_properties_set_int( frame_properties, "width", this->video_codec->width );
mlt_properties_set_int( frame_properties, "height", this->video_codec->height );
+ // real_width and real_height are deprecated in favor of meta.media.width and .height
+ mlt_properties_set_int( properties, "meta.media.width", this->video_codec->width );
+ mlt_properties_set_int( properties, "meta.media.height", this->video_codec->height );
mlt_properties_set_int( frame_properties, "real_width", this->video_codec->width );
mlt_properties_set_int( frame_properties, "real_height", this->video_codec->height );
mlt_properties_set_double( frame_properties, "aspect_ratio", aspect_ratio );
+ mlt_properties_set_int( frame_properties, "colorspace", this->colorspace );
+
+ // Workaround 1088 encodings missing cropping info.
+ if ( this->video_codec->height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
+ {
+ mlt_properties_set_int( properties, "meta.media.height", 1080 );
+ mlt_properties_set_int( frame_properties, "real_height", 1080 );
+ }
// Add our image operation
mlt_frame_push_service( frame, this );
timestamp = 0;
// Set to the real timecode
+ avformat_lock();
if ( av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD ) != 0 )
paused = 1;
+ avformat_unlock();
// Clear the usage in the audio buffer
int i = MAX_AUDIO_STREAMS + 1;
return paused;
}
-static int decode_audio( producer_avformat this, int *ignore, AVPacket *pkt, int channels, int samples, double timecode, double fps )
+static int decode_audio( producer_avformat this, int *ignore, AVPacket pkt, int channels, int samples, double timecode, double fps )
{
// Fetch the audio_format
AVFormatContext *context = this->audio_format;
// Get the current stream index
- int index = pkt->stream_index;
+ int index = pkt.stream_index;
// Get codec context
AVCodecContext *codec_context = this->audio_codec[ index ];
int16_t *decode_buffer = this->decode_buffer[ index ];
int audio_used = this->audio_used[ index ];
- uint8_t *ptr = pkt->data;
- int len = pkt->size;
+ uint8_t *ptr = pkt.data;
+ int len = pkt.size;
int ret = 0;
while ( ptr && ret >= 0 && len > 0 )
// Decode the audio
#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(26<<8)+0))
- ret = avcodec_decode_audio3( codec_context, decode_buffer, &data_size, pkt );
+ ret = avcodec_decode_audio3( codec_context, decode_buffer, &data_size, &pkt );
#elif (LIBAVCODEC_VERSION_INT >= ((51<<16)+(29<<8)+0))
ret = avcodec_decode_audio2( codec_context, decode_buffer, &data_size, ptr, len );
#else
#endif
if ( ret < 0 )
{
- ret = 0;
+ mlt_log_warning( MLT_PRODUCER_SERVICE(this->parent), "audio decoding error %d\n", ret );
break;
}
- len -= ret;
- ptr += ret;
+ pkt.size = len -= ret;
+ pkt.data = ptr += ret;
// If decoded successfully
if ( data_size > 0 )
// Copy to audio buffer while resampling
int16_t *source = decode_buffer;
int16_t *dest = &audio_buffer[ audio_used * channels ];
+ avformat_lock();
audio_used += audio_resample( resample, dest, source, convert_samples );
+ avformat_unlock();
}
else
{
}
// If we're behind, ignore this packet
- if ( pkt->pts >= 0 )
+ if ( pkt.pts >= 0 )
{
- double current_pts = av_q2d( context->streams[ index ]->time_base ) * pkt->pts;
+ double current_pts = av_q2d( context->streams[ index ]->time_base ) * pkt.pts;
int req_position = ( int )( timecode * fps + 0.5 );
int int_position = ( int )( current_pts * fps + 0.5 );
if ( context->start_time != AV_NOPTS_VALUE )
// Get the producer
producer_avformat this = mlt_frame_pop_audio( frame );
+ mlt_service_lock( MLT_PRODUCER_SERVICE(this->parent) );
+
// Obtain the frame number of this frame
mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( frame ), "avformat_position" );
AVPacket pkt;
av_init_packet( &pkt );
+
+ // If not resampling, give consumer more than requested.
+ // It requested number samples based on requested frame rate.
+ // Do not clean this up with a samples *= ...!
+ if ( this->audio_index != INT_MAX && ! this->audio_resample[ this->audio_index ] )
+ *samples = *samples * this->audio_codec[ this->audio_index ]->sample_rate / *frequency;
while ( ret >= 0 && !got_audio )
{
}
// Read a packet
+ avformat_lock();
ret = av_read_frame( context, &pkt );
+ avformat_unlock();
// We only deal with audio from the selected audio index
if ( ret >= 0 && pkt.data && pkt.size > 0 && ( pkt.stream_index == this->audio_index ||
( this->audio_index == INT_MAX && context->streams[ pkt.stream_index ]->codec->codec_type == CODEC_TYPE_AUDIO ) ) )
{
int channels2 = this->audio_index == INT_MAX ? this->audio_codec[pkt.stream_index]->channels : *channels;
- ret = decode_audio( this, &ignore, &pkt, channels2, *samples, real_timecode, fps );
+ ret = decode_audio( this, &ignore, pkt, channels2, *samples, real_timecode, fps );
}
av_free_packet( &pkt );
index = this->audio_index;
// Now handle the audio if we have enough
- if ( this->audio_used[ index ] >= *samples )
+ if ( this->audio_used[ index ] > 0 )
{
int16_t *src = this->audio_buffer[ index ];
+ *samples = this->audio_used[ index ] < *samples ? this->audio_used[ index ] : *samples;
memcpy( *buffer, src, *samples * *channels * sizeof(int16_t) );
this->audio_used[ index ] -= *samples;
memmove( src, &src[ *samples * *channels ], this->audio_used[ index ] * *channels * sizeof(int16_t) );
if ( !paused )
this->audio_expected = position + 1;
+ mlt_service_unlock( MLT_PRODUCER_SERVICE(this->parent) );
+
return 0;
}
// Handle all audio tracks
if ( this->audio_index > -1 &&
- !strcmp( mlt_properties_get( properties, "audio_index" ), "all" ) )
+ mlt_properties_get( properties, "audio_index" ) &&
+ !strcmp( mlt_properties_get( properties, "audio_index" ), "all" ) )
index = INT_MAX;
// Reopen the file if necessary
static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
{
// Access the private data
- mlt_cache_item cache_item = mlt_service_cache_get( MLT_PRODUCER_SERVICE(producer), "producer_avformat" );
+ mlt_service service = MLT_PRODUCER_SERVICE( producer );
+ mlt_cache_item cache_item = mlt_service_cache_get( service, "producer_avformat" );
producer_avformat this = mlt_cache_item_data( cache_item, NULL );
+ // If cache miss
+ if ( !this )
+ {
+ this = calloc( 1, sizeof( struct producer_avformat_s ) );
+ producer->child = this;
+ this->parent = producer;
+ mlt_service_cache_put( service, "producer_avformat", this, 0, (mlt_destructor) producer_avformat_close );
+ cache_item = mlt_service_cache_get( service, "producer_avformat" );
+ }
+
// Create an empty frame
- *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
+ *frame = mlt_frame_init( service);
if ( *frame )
+ {
mlt_properties_set_data( MLT_FRAME_PROPERTIES(*frame), "avformat_cache", cache_item, 0, (mlt_destructor) mlt_cache_item_close, NULL );
+ }
else
+ {
mlt_cache_item_close( cache_item );
+ return 1;
+ }
// Update timecode on the frame we're creating
mlt_frame_set_position( *frame, mlt_producer_position( producer ) );
// Set the position of this producer
mlt_properties_set_position( MLT_FRAME_PROPERTIES( *frame ), "avformat_position", mlt_producer_frame( producer ) );
- // If cache miss
- if ( !this )
- {
- this = calloc( 1, sizeof( struct producer_avformat_s ) );
- producer->child = this;
- this->parent = producer;
- mlt_service_cache_put( MLT_PRODUCER_SERVICE(producer), "producer_avformat", this, 0, (mlt_destructor) producer_avformat_close );
- }
-
// Set up the video
producer_set_up_video( this, *frame );
projects / mlt / blobdiff