if( p_snapshot )
{
+ /* Note: p_snapshot->p_data is directly used, not copied. Thus
+ do not free it here. */
p_pic = private_mediacontrol_createRGBPicture( p_snapshot->i_width,
- p_snapshot->i_height,
- VLC_FOURCC( 'p','n','g',' ' ),
- p_snapshot->date,
- p_snapshot->p_data,
- p_snapshot->i_datasize );
+ p_snapshot->i_height,
+ VLC_FOURCC( 'p','n','g',' ' ),
+ p_snapshot->date,
+ p_snapshot->p_data,
+ p_snapshot->i_datasize );
if( !p_pic )
{
- free( p_snapshot->p_data );
free( p_snapshot );
RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
}
return 0;
}
-mediacontrol_RGBPicture*
-private_mediacontrol_RGBPicture__alloc( int datasize )
-{
- mediacontrol_RGBPicture* pic;
-
- pic = ( mediacontrol_RGBPicture * )malloc( sizeof( mediacontrol_RGBPicture ) );
- if( ! pic )
- return NULL;
-
- pic->size = datasize;
- pic->data = ( char* )malloc( datasize * sizeof( char ) );
- return pic;
-}
-
void
mediacontrol_RGBPicture__free( mediacontrol_RGBPicture* pic )
{
free( exception );
}
+/**
+ * Allocates and initializes a mediacontrol_RGBPicture object.
+ *
+ * @param i_width: picture width
+ * @param i_height: picture width
+ * @param i_chroma: picture chroma
+ * @param l_date: picture timestamp
+ * @param p_data: pointer to the data. The data will be directly used, not copied.
+ * @param i_datasize: data size in bytes
+ *
+ * @return the new object, or NULL on error.
+ */
mediacontrol_RGBPicture*
private_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, int64_t l_date,
- char* p_data, int i_datasize )
+ char* p_data, int i_datasize )
{
mediacontrol_RGBPicture *retval;
- retval = private_mediacontrol_RGBPicture__alloc( i_datasize );
+ retval = ( mediacontrol_RGBPicture * )malloc( sizeof( mediacontrol_RGBPicture ) );
if( retval )
{
retval->width = i_width;
retval->type = i_chroma;
retval->date = l_date;
retval->size = i_datasize;
- memcpy( retval->data, p_data, i_datasize );
+ retval->data = p_data;
}
return retval;
}