unsigned int invalid_pts_counter;
unsigned int invalid_dts_counter;
mlt_cache image_cache;
- int colorspace;
+ int yuv_colorspace, color_primaries;
int full_luma;
pthread_mutex_t video_mutex;
pthread_mutex_t audio_mutex;
AVFormatContext *format = self->video_format;
- // We will treat everything with the producer fps.
- // TODO: make this more flexible.
- double fps = mlt_profile_fps( profile );
-
// Get the duration
if ( !mlt_properties_get_int( properties, "_length_computed" ) )
{
if ( format->duration != AV_NOPTS_VALUE )
{
// This isn't going to be accurate for all formats
- mlt_position frames = ( mlt_position )( ( ( double )format->duration / ( double )AV_TIME_BASE ) * fps );
+ // We will treat everything with the producer fps.
+ mlt_position frames = ( mlt_position )( int )( format->duration *
+ profile->frame_rate_num / profile->frame_rate_den / AV_TIME_BASE);
mlt_properties_set_position( properties, "out", frames - 1 );
mlt_properties_set_position( properties, "length", frames );
mlt_properties_set_int( properties, "_length_computed", 1 );
int error = 0;
mlt_properties properties = MLT_PRODUCER_PROPERTIES( self->parent );
+ if ( !self->is_mutex_init )
+ {
+ pthread_mutex_init( &self->audio_mutex, NULL );
+ pthread_mutex_init( &self->video_mutex, NULL );
+ pthread_mutex_init( &self->packets_mutex, NULL );
+ pthread_mutex_init( &self->open_mutex, NULL );
+ self->is_mutex_init = 1;
+ }
+
// Lock the service
if ( take_lock )
{
- if ( !self->is_mutex_init )
- {
- pthread_mutex_init( &self->audio_mutex, NULL );
- pthread_mutex_init( &self->video_mutex, NULL );
- pthread_mutex_init( &self->packets_mutex, NULL );
- pthread_mutex_init( &self->open_mutex, NULL );
- self->is_mutex_init = 1;
- }
pthread_mutex_lock( &self->audio_mutex );
pthread_mutex_lock( &self->video_mutex );
}
self->audio_streams, self->audio_max_stream, self->total_channels, self->max_channel );
}
-static void set_luma_transfer( struct SwsContext *context, int colorspace, int use_full_range )
+static void set_luma_transfer( struct SwsContext *context, int yuv_colorspace, int use_full_range )
{
int *coefficients;
const int *new_coefficients;
// Don't change these from defaults unless explicitly told to.
if ( use_full_range >= 0 )
full_range = use_full_range;
- switch ( colorspace )
+ switch ( yuv_colorspace )
{
case 170:
case 470:
output.linesize[0] = width;
output.linesize[1] = width >> 1;
output.linesize[2] = width >> 1;
- set_luma_transfer( context, self->colorspace, -1 );
+ set_luma_transfer( context, self->yuv_colorspace, -1 );
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
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, self->colorspace, self->full_luma );
+ set_luma_transfer( context, self->yuv_colorspace, self->full_luma );
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
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, self->colorspace, self->full_luma );
+ set_luma_transfer( context, self->yuv_colorspace, self->full_luma );
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
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, self->colorspace, -1 );
+ set_luma_transfer( context, self->yuv_colorspace, -1 );
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
output.data, output.linesize);
sws_freeContext( context );
mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den );
// Set the YUV colorspace from override or detect
- self->colorspace = mlt_properties_get_int( properties, "force_colorspace" );
+ self->yuv_colorspace = mlt_properties_get_int( properties, "force_colorspace" );
#if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0)
- if ( ! self->colorspace )
+ if ( ! self->yuv_colorspace )
{
switch ( self->video_codec->colorspace )
{
case AVCOL_SPC_SMPTE240M:
- self->colorspace = 240;
+ self->yuv_colorspace = 240;
break;
case AVCOL_SPC_BT470BG:
case AVCOL_SPC_SMPTE170M:
- self->colorspace = 601;
+ self->yuv_colorspace = 601;
break;
case AVCOL_SPC_BT709:
- self->colorspace = 709;
+ self->yuv_colorspace = 709;
break;
default:
// This is a heuristic Charles Poynton suggests in "Digital Video and HDTV"
- self->colorspace = self->video_codec->width * self->video_codec->height > 750000 ? 709 : 601;
+ self->yuv_colorspace = self->video_codec->width * self->video_codec->height > 750000 ? 709 : 601;
break;
}
}
#endif
// Let apps get chosen colorspace
- mlt_properties_set_int( properties, "meta.media.colorspace", self->colorspace );
+ mlt_properties_set_int( properties, "meta.media.colorspace", self->yuv_colorspace );
+
+ switch ( self->video_codec->color_primaries )
+ {
+ case AVCOL_PRI_BT470BG:
+ self->color_primaries = 601625;
+ break;
+ case AVCOL_PRI_SMPTE170M:
+ case AVCOL_PRI_SMPTE240M:
+ self->color_primaries = 601525;
+ break;
+ case AVCOL_PRI_BT709:
+ case AVCOL_PRI_UNSPECIFIED:
+ default:
+ self->color_primaries = 709;
+ break;
+ }
self->full_luma = -1;
#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(72<<8)+2)
mlt_properties_set_int( properties, "meta.media.width", self->video_codec->width );
mlt_properties_set_int( properties, "meta.media.height", self->video_codec->height );
mlt_properties_set_double( frame_properties, "aspect_ratio", aspect_ratio );
- mlt_properties_set_int( frame_properties, "colorspace", self->colorspace );
+ mlt_properties_set_int( frame_properties, "colorspace", self->yuv_colorspace );
+ mlt_properties_set_int( frame_properties, "color_primaries", self->color_primaries );
+ mlt_properties_set_int( frame_properties, "full_luma", self->full_luma );
// Workaround 1088 encodings missing cropping info.
if ( self->video_codec->height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
#endif
}
-static void planar_to_interleaved( uint8_t *dest, uint8_t *src, int samples, int channels, int bytes_per_sample )
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+static void planar_to_interleaved( uint8_t *dest, AVFrame *src, int samples, int channels, int bytes_per_sample )
{
int s, c;
for ( s = 0; s < samples; s++ )
{
for ( c = 0; c < channels; c++ )
{
- memcpy( dest, src + ( c * samples + s ) * bytes_per_sample, bytes_per_sample );
+ memcpy( dest, &src->data[c][s * bytes_per_sample], bytes_per_sample );
dest += bytes_per_sample;
}
}
}
-
-static void planar_to_interleaved2( uint8_t *dest, AVFrame *src, int samples, int channels, int bytes_per_sample )
+#else
+static void planar_to_interleaved( uint8_t *dest, uint8_t *src, int samples, int channels, int bytes_per_sample )
{
int s, c;
for ( s = 0; s < samples; s++ )
{
for ( c = 0; c < channels; c++ )
{
- memcpy( dest, &src->data[c][s * bytes_per_sample], bytes_per_sample );
+ memcpy( dest, src + ( c * samples + s ) * bytes_per_sample, bytes_per_sample );
dest += bytes_per_sample;
}
}
}
+#endif
static int decode_audio( producer_avformat self, int *ignore, AVPacket pkt, int channels, int samples, double timecode, double fps )
{
case AV_SAMPLE_FMT_S32P:
case AV_SAMPLE_FMT_FLTP:
#if LIBAVCODEC_VERSION_MAJOR >= 55
- planar_to_interleaved2( dest, self->audio_frame, convert_samples, codec_context->channels, sizeof_sample );
+ planar_to_interleaved( dest, self->audio_frame, convert_samples, codec_context->channels, sizeof_sample );
#else
planar_to_interleaved( dest, decode_buffer, convert_samples, codec_context->channels, sizeof_sample );
#endif
index = 0;
index_max = FFMIN( MAX_AUDIO_STREAMS, context->nb_streams );
*channels = self->total_channels;
- *samples = mlt_sample_calculator( fps, FFMAX( self->max_frequency, *frequency ), position );
- *frequency = FFMAX( self->max_frequency, *frequency );
+ *samples = mlt_sample_calculator( fps, self->max_frequency, position );
+ *frequency = self->max_frequency;
}
// Initialize the buffers
av_free_packet( &self->pkt );
av_free( self->video_frame );
av_free( self->audio_frame );
- pthread_mutex_lock( &self->open_mutex );
+ if ( self->is_mutex_init )
+ pthread_mutex_lock( &self->open_mutex );
int i;
for ( i = 0; i < MAX_AUDIO_STREAMS; i++ )
{
if ( self->video_format )
av_close_input_file( self->video_format );
#endif
- pthread_mutex_unlock( &self->open_mutex );
+ if ( self->is_mutex_init )
+ pthread_mutex_unlock( &self->open_mutex );
#ifdef VDPAU
vdpau_producer_close( self );
#endif