mlt_frame new_frame = mlt_frame_init( NULL );
mlt_properties properties = MLT_FRAME_PROPERTIES( self );
mlt_properties new_props = MLT_FRAME_PROPERTIES( new_frame );
- int width = mlt_properties_get_int( properties, "width" );
- int height = mlt_properties_get_int( properties, "height" );
void *data, *copy;
int size;
mlt_properties_set_data( new_props, "movit.convert",
mlt_properties_get_data( properties, "movit.convert", NULL), 0, NULL, NULL );
- mlt_properties_set_int( new_props, "meta.media.width", width );
- mlt_properties_set_int( new_props, "meta.media.height", height );
-
if ( is_deep )
{
data = mlt_properties_get_data( properties, "audio", &size );
data = mlt_properties_get_data( properties, "image", &size );
if ( data )
{
+ int width = mlt_properties_get_int( properties, "width" );
+ int height = mlt_properties_get_int( properties, "height" );
+
if ( ! size )
size = mlt_image_format_size( mlt_properties_get_int( properties, "format" ),
width, height, NULL );
// put ideal number of samples into cloned frame
int deeply = index > 1 ? 1 : 0;
mlt_frame clone_frame = mlt_frame_clone( frame, deeply );
+ mlt_properties clone_props = MLT_FRAME_PROPERTIES( clone_frame );
int nested_samples = mlt_sample_calculator( nested_fps, frequency, nested_pos );
// -10 is an optimization to avoid tiny amounts of leftover samples
nested_samples = nested_samples > current_samples - 10 ? current_samples : nested_samples;
nested_size = 0;
}
mlt_frame_set_audio( clone_frame, prev_buffer, format, nested_size, mlt_pool_release );
- mlt_properties_set_int( MLT_FRAME_PROPERTIES(clone_frame), "audio_samples", nested_samples );
- mlt_properties_set_int( MLT_FRAME_PROPERTIES(clone_frame), "audio_frequency", frequency );
- mlt_properties_set_int( MLT_FRAME_PROPERTIES(clone_frame), "audio_channels", channels );
+ mlt_properties_set_int( clone_props, "audio_samples", nested_samples );
+ mlt_properties_set_int( clone_props, "audio_frequency", frequency );
+ mlt_properties_set_int( clone_props, "audio_channels", channels );
// chomp the audio
current_samples -= nested_samples;
current_size -= nested_size;
buffer += nested_size;
+ // Fix some things
+ mlt_properties_set_int( clone_props, "meta.media.width",
+ mlt_properties_get_int( MLT_FRAME_PROPERTIES(frame), "width" ) );
+ mlt_properties_set_int( clone_props, "meta.media.height",
+ mlt_properties_get_int( MLT_FRAME_PROPERTIES(frame), "height" ) );
+
// send frame to nested consumer
mlt_consumer_put_frame( nested, clone_frame );
mlt_properties_set_position( nested_props, "_multi_position", ++nested_pos );