X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=e3e4f3f4ae25146ecc444aca1fca25884a3346a5;hb=c3ed1af8d2f360901ec37c4f5862fd9d60a0ddcd;hp=5593c6b93996a4390765e8344b3cc94bc7788319;hpb=6fd39f9d2c31ef1cb5672caf0f69a519708793a4;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 5593c6b..e3e4f3f 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -200,6 +200,8 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for mlt_properties properties = mlt_frame_properties( this ); mlt_get_image get_image = mlt_frame_pop_get_image( this ); mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL ); + + *width = *width >> 1 << 1; if ( get_image != NULL ) { @@ -226,6 +228,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL ); mlt_properties_set_int( properties, "width", *width ); mlt_properties_set_int( properties, "height", *height ); + mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) ); mlt_properties_set( properties, "rescale.interp", "none" ); mlt_properties_set( properties, "scale", "off" ); } @@ -339,13 +342,14 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for return 0; } -unsigned char *mlt_frame_get_waveform( mlt_frame this, double fps, int w, int h ) +unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h ) { int16_t *pcm = NULL; mlt_properties properties = mlt_frame_properties( this ); mlt_audio_format format = mlt_audio_pcm; int frequency = 32000; // lower frequency available? int channels = 2; + double fps = mlt_properties_get_double( properties, "fps" ); int samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( this ) ); // Get the pcm data