mlt_frame mlt_frame_init( mlt_service service )
{
// Allocate a frame
- mlt_frame self = calloc( sizeof( struct mlt_frame_s ), 1 );
+ mlt_frame self = calloc( 1, sizeof( struct mlt_frame_s ) );
if ( self != NULL )
{
}
/** Get the time position of this frame.
+ *
+ * This position is not necessarily the position as the original
+ * producer knows it. It could be the position that the playlist,
+ * multitrack, or tractor producer set.
*
* \public \memberof mlt_frame_s
* \param self a frame
* \return the position
+ * \see mlt_frame_original_position
*/
mlt_position mlt_frame_get_position( mlt_frame self )
return pos < 0 ? 0 : pos;
}
+/** Get the original time position of this frame.
+ *
+ * This is the position that the original producer set on the frame.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return the position
+ */
+
+mlt_position mlt_frame_original_position( mlt_frame self )
+{
+ int pos = mlt_properties_get_position( MLT_FRAME_PROPERTIES( self ), "original_position" );
+ return pos < 0 ? 0 : pos;
+}
+
/** Set the time position of this frame.
*
* \public \memberof mlt_frame_s
int mlt_frame_set_position( mlt_frame self, mlt_position value )
{
+ // Only set the original_position the first time.
+ if ( ! mlt_properties_get( MLT_FRAME_PROPERTIES( self ), "original_position" ) )
+ mlt_properties_set_position( MLT_FRAME_PROPERTIES( self ), "original_position", value );
return mlt_properties_set_position( MLT_FRAME_PROPERTIES( self ), "_position", value );
}
case mlt_image_yuv422: return "yuv422";
case mlt_image_yuv420p: return "yuv420p";
case mlt_image_opengl: return "opengl";
+ case mlt_image_glsl: return "glsl";
+ case mlt_image_glsl_texture: return "glsl_texture";
}
return "invalid";
}
height += 1;
switch ( format )
{
- case mlt_image_none:
- if ( bpp ) *bpp = 0;
- return 0;
case mlt_image_rgb24:
if ( bpp ) *bpp = 3;
return width * height * 3;
case mlt_image_yuv420p:
if ( bpp ) *bpp = 3 / 2;
return width * height * 3 / 2;
+ default:
+ if ( bpp ) *bpp = 0;
+ return 0;
}
return 0;
}
-/** Get the image associated to the frame.
- *
- * You should express the desired format, width, and height as inputs. As long
- * as the loader producer was used to generate this or the imageconvert filter
- * was attached, then you will get the image back in the format you desire.
- * However, you do not always get the width and height you request depending
- * on properties and filters. You do not need to supply a pre-allocated
- * buffer, but you should always supply the desired image format.
- *
- * \public \memberof mlt_frame_s
- * \param self a frame
- * \param[out] buffer an image buffer
- * \param[in,out] format the image format
- * \param[in,out] width the horizontal size in pixels
- * \param[in,out] height the vertical size in pixels
- * \param writable whether or not you will need to be able to write to the memory returned in \p buffer
- * \return true if error
- * \todo Better describe the width and height as inputs.
- */
-
-int mlt_frame_get_image( mlt_frame self, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
+static int generate_test_image( mlt_properties properties, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
{
- mlt_properties properties = MLT_FRAME_PROPERTIES( self );
- mlt_get_image get_image = mlt_frame_pop_get_image( self );
mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL );
mlt_image_format requested_format = *format;
- int error = 0;
+ int error = 1;
- if ( get_image )
- {
- mlt_properties_set_int( properties, "image_count", mlt_properties_get_int( properties, "image_count" ) - 1 );
- error = get_image( self, buffer, format, width, height, writable );
- if ( !error && *buffer )
- {
- mlt_properties_set_int( properties, "width", *width );
- mlt_properties_set_int( properties, "height", *height );
- if ( self->convert_image && *buffer && requested_format != mlt_image_none )
- self->convert_image( self, buffer, format, requested_format );
- mlt_properties_set_int( properties, "format", *format );
- }
- else
- {
- // Cause the image to be loaded from test card or fallback (white) below.
- mlt_frame_get_image( self, buffer, format, width, height, writable );
- }
- }
- else if ( mlt_properties_get_data( properties, "image", NULL ) )
- {
- *format = mlt_properties_get_int( properties, "format" );
- *buffer = mlt_properties_get_data( properties, "image", NULL );
- *width = mlt_properties_get_int( properties, "width" );
- *height = mlt_properties_get_int( properties, "height" );
- if ( self->convert_image && *buffer && requested_format != mlt_image_none )
- {
- self->convert_image( self, buffer, format, requested_format );
- mlt_properties_set_int( properties, "format", *format );
- }
- }
- else if ( producer )
+ if ( producer )
{
mlt_frame test_frame = NULL;
mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &test_frame, 0 );
if ( test_frame )
{
mlt_properties test_properties = MLT_FRAME_PROPERTIES( test_frame );
- mlt_properties_set( test_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) );
- mlt_frame_get_image( test_frame, buffer, format, width, height, writable );
mlt_properties_set_data( properties, "test_card_frame", test_frame, 0, ( mlt_destructor )mlt_frame_close, NULL );
- mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) );
-// 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_int( properties, "format", *format );
+ mlt_properties_set( test_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) );
+ error = mlt_frame_get_image( test_frame, buffer, format, width, height, writable );
+ if ( !error && buffer && *buffer )
+ {
+ mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) );
+ mlt_properties_set_int( properties, "width", *width );
+ mlt_properties_set_int( properties, "height", *height );
+ if ( test_frame->convert_image && requested_format != mlt_image_none )
+ test_frame->convert_image( test_frame, buffer, format, requested_format );
+ mlt_properties_set_int( properties, "format", *format );
+ }
}
else
{
mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
- mlt_frame_get_image( self, buffer, format, width, height, writable );
}
}
- else
+ if ( error && buffer && *format != mlt_image_none )
{
- register uint8_t *p;
- register uint8_t *q;
int size = 0;
*width = *width == 0 ? 720 : *width;
mlt_properties_set_int( properties, "format", *format );
mlt_properties_set_int( properties, "width", *width );
mlt_properties_set_int( properties, "height", *height );
- mlt_properties_set_int( properties, "aspect_ratio", 0 );
+ mlt_properties_set_double( properties, "aspect_ratio", 1.0 );
switch( *format )
{
- case mlt_image_none:
- size = 0;
- *buffer = NULL;
- break;
case mlt_image_rgb24:
size *= 3;
size += *width * 3;
size *= 2;
size += *width * 2;
*buffer = mlt_pool_alloc( size );
- p = *buffer;
- q = p + size;
- while ( p != NULL && p != q )
+ if ( *buffer )
{
- *p ++ = 235;
- *p ++ = 128;
+ register uint8_t *p = *buffer;
+ register uint8_t *q = p + size;
+ while ( p != NULL && p != q )
+ {
+ *p ++ = 235;
+ *p ++ = 128;
+ }
}
break;
case mlt_image_yuv420p:
- size = size * 3 / 2;
- *buffer = mlt_pool_alloc( size );
+ *buffer = mlt_pool_alloc( size * 3 / 2 );
if ( *buffer )
- memset( *buffer, 255, size );
+ {
+ memset( *buffer, 235, size );
+ memset( *buffer + size, 128, size / 2 );
+ }
+ break;
+ default:
+ size = 0;
break;
}
-
mlt_properties_set_data( properties, "image", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
mlt_properties_set_int( properties, "test_image", 1 );
+ error = 0;
+ }
+ return error;
+}
+
+
+/** Get the image associated to the frame.
+ *
+ * You should express the desired format, width, and height as inputs. As long
+ * as the loader producer was used to generate this or the imageconvert filter
+ * was attached, then you will get the image back in the format you desire.
+ * However, you do not always get the width and height you request depending
+ * on properties and filters. You do not need to supply a pre-allocated
+ * buffer, but you should always supply the desired image format.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param[out] buffer an image buffer
+ * \param[in,out] format the image format
+ * \param[in,out] width the horizontal size in pixels
+ * \param[in,out] height the vertical size in pixels
+ * \param writable whether or not you will need to be able to write to the memory returned in \p buffer
+ * \return true if error
+ * \todo Better describe the width and height as inputs.
+ */
+
+int mlt_frame_get_image( mlt_frame self, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
+{
+ mlt_properties properties = MLT_FRAME_PROPERTIES( self );
+ mlt_get_image get_image = mlt_frame_pop_get_image( self );
+ mlt_image_format requested_format = *format;
+ int error = 0;
+
+ if ( get_image )
+ {
+ mlt_properties_set_int( properties, "image_count", mlt_properties_get_int( properties, "image_count" ) - 1 );
+ error = get_image( self, buffer, format, width, height, writable );
+ if ( !error && buffer && *buffer )
+ {
+ mlt_properties_set_int( properties, "width", *width );
+ mlt_properties_set_int( properties, "height", *height );
+ if ( self->convert_image && requested_format != mlt_image_none )
+ self->convert_image( self, buffer, format, requested_format );
+ mlt_properties_set_int( properties, "format", *format );
+ }
+ else
+ {
+ error = generate_test_image( properties, buffer, format, width, height, writable );
+ }
+ }
+ else if ( mlt_properties_get_data( properties, "image", NULL ) && buffer )
+ {
+ *format = mlt_properties_get_int( properties, "format" );
+ *buffer = mlt_properties_get_data( properties, "image", NULL );
+ *width = mlt_properties_get_int( properties, "width" );
+ *height = mlt_properties_get_int( properties, "height" );
+ if ( self->convert_image && *buffer && requested_format != mlt_image_none )
+ {
+ self->convert_image( self, buffer, format, requested_format );
+ mlt_properties_set_int( properties, "format", *format );
+ }
+ }
+ else
+ {
+ error = generate_test_image( properties, buffer, format, width, height, writable );
}
return error;
case mlt_audio_s32le: return "s32le";
case mlt_audio_float: return "float";
case mlt_audio_f32le: return "f32le";
+ case mlt_audio_u8: return "u8";
}
return "invalid";
}
case mlt_audio_s32: return samples * channels * sizeof( int32_t );
case mlt_audio_f32le:
case mlt_audio_float: return samples * channels * sizeof( float );
+ case mlt_audio_u8: return samples * channels;
}
return 0;
}
// Make an 8-bit buffer large enough to hold rendering
int size = w * h;
+ if ( size <= 0 )
+ return NULL;
unsigned char *bitmap = ( unsigned char* )mlt_pool_alloc( size );
if ( bitmap != NULL )
memset( bitmap, 0, size );
+ else
+ return NULL;
mlt_properties_set_data( properties, "waveform", bitmap, size, ( mlt_destructor )mlt_pool_release, NULL );
// Render vertical lines
void mlt_frame_write_ppm( mlt_frame frame )
{
- int width;
- int height;
+ int width = 0;
+ int height = 0;
mlt_image_format format = mlt_image_rgb24;
uint8_t *image;
FILE *file;
char filename[16];
- sprintf( filename, "frame-%05d.ppm", mlt_frame_get_position( frame ) );
+ sprintf( filename, "frame-%05d.ppm", (int)mlt_frame_get_position( frame ) );
file = fopen( filename, "wb" );
if ( !file )
return;
int size;
mlt_properties_inherit( new_props, properties );
+
+ // Carry over some special data properties for the multi consumer.
+ mlt_properties_set_data( new_props, "_producer",
+ mlt_frame_get_original_producer( self ), 0, NULL, NULL );
+ mlt_properties_set_data( new_props, "movit.convert",
+ mlt_properties_get_data( properties, "movit.convert", NULL), 0, NULL, NULL );
+
if ( is_deep )
{
data = mlt_properties_get_data( properties, "audio", &size );
projects / mlt / blobdiff