* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Charles Yates
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "consumer_sdl.h"
+#include <framework/mlt_consumer.h>
#include <framework/mlt_frame.h>
#include <framework/mlt_deque.h>
#include <framework/mlt_factory.h>
#include <framework/mlt_filter.h>
+#include <framework/mlt_log.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <SDL/SDL_syswm.h>
#include <sys/time.h>
+extern pthread_mutex_t mlt_sdl_mutex;
+
/** This classes definition.
*/
uint8_t *buffer;
int last_position;
mlt_producer last_producer;
- int filtered;
};
/** Forward references to static functions.
via the argument, but keep it simple.
*/
-mlt_consumer consumer_sdl_still_init( char *arg )
+mlt_consumer consumer_sdl_still_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
{
// Create the consumer object
consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 );
// If no malloc'd and consumer init ok
- if ( this != NULL && mlt_consumer_init( &this->parent, this ) == 0 )
+ if ( this != NULL && mlt_consumer_init( &this->parent, this, profile ) == 0 )
{
// Get the parent consumer object
mlt_consumer parent = &this->parent;
mlt_service service = MLT_CONSUMER_SERVICE( parent );
this->properties = MLT_SERVICE_PROPERTIES( service );
- // Get the default display ratio
- double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
-
// We have stuff to clean up, so override the close method
parent->close = consumer_close;
// We're always going to run this in non-realtime mode
mlt_properties_set( this->properties, "real_time", "0" );
- // Default progressive true
- mlt_properties_set_int( this->properties, "progressive", 1 );
-
// Ensure we don't join on a non-running object
this->joined = 1;
mlt_properties_set_int( this->properties, "height", this->height );
}
- // Default window size
- this->window_width = ( double )this->height * display_ratio;
- this->window_height = this->height;
-
// Set the sdl flags
this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
int preview_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "preview_off" );
int sdl_started = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" );
- // Attach a colour space converter
- if ( !this->filtered )
- {
- mlt_filter filter = mlt_factory_filter( "avcolour_space", NULL );
- mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "forced", mlt_image_yuv422 );
- mlt_service_attach( MLT_CONSUMER_SERVICE( parent ), filter );
- mlt_filter_close( filter );
- this->filtered = 1;
- }
-
consumer_stop( parent );
this->last_position = -1;
this->width = mlt_properties_get_int( this->properties, "width" );
this->height = mlt_properties_get_int( this->properties, "height" );
+ // Default window size
+ double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
+ this->window_width = ( double )this->height * display_ratio;
+ this->window_height = this->height;
+
if ( sdl_started == 0 && preview_off == 0 )
{
if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
if ( SDL_GetVideoSurface( ) != NULL )
{
this->sdl_screen = SDL_GetVideoSurface( );
- consumer_get_dimensions( &this->window_width, &this->window_height );
}
}
if ( this->sdl_screen == NULL && preview_off == 0 )
+ {
+ pthread_mutex_lock( &mlt_sdl_mutex );
this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+ }
pthread_create( &this->thread, NULL, consumer_thread, this );
}
this->joined = 1;
if ( sdl_started == 0 && preview_off == 0 )
+ {
+ pthread_mutex_lock( &mlt_sdl_mutex );
SDL_Quit( );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+ }
this->sdl_screen = NULL;
}
static int sdl_lock_display( )
{
+ pthread_mutex_lock( &mlt_sdl_mutex );
SDL_Surface *screen = SDL_GetVideoSurface( );
- return screen != NULL && ( !SDL_MUSTLOCK( screen ) || SDL_LockSurface( screen ) >= 0 );
+ int result = screen != NULL && ( !SDL_MUSTLOCK( screen ) || SDL_LockSurface( screen ) >= 0 );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+ return result;
}
static void sdl_unlock_display( )
{
+ pthread_mutex_lock( &mlt_sdl_mutex );
SDL_Surface *screen = SDL_GetVideoSurface( );
if ( screen != NULL && SDL_MUSTLOCK( screen ) )
SDL_UnlockSurface( screen );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
}
static inline void display_1( SDL_Surface *screen, SDL_Rect rect, uint8_t *image, int width, int height )
{
// Generate the affine transform scaling values
+ if ( rect.w == 0 || rect.h == 0 ) return;
int scale_width = ( width << 16 ) / rect.w;
int scale_height = ( height << 16 ) / rect.h;
int stride = width * 3;
for ( y = 0; y < rect.h; y ++ )
{
p = start;
- row_index = ( scale_height * y ) >> 16;
+ row_index = ( 32768 + scale_height * y ) >> 16;
row = image + stride * row_index;
for ( x = 0; x < rect.w; x ++ )
{
- q = row + ( ( ( scale_width * x ) >> 16 ) * 3 );
+ q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 );
*p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) );
}
start += scanlength;
static inline void display_2( SDL_Surface *screen, SDL_Rect rect, uint8_t *image, int width, int height )
{
// Generate the affine transform scaling values
+ if ( rect.w == 0 || rect.h == 0 ) return;
int scale_width = ( width << 16 ) / rect.w;
int scale_height = ( height << 16 ) / rect.h;
int stride = width * 3;
for ( y = 0; y < rect.h; y ++ )
{
p = start;
- row_index = ( scale_height * y ) >> 16;
+ row_index = ( 32768 + scale_height * y ) >> 16;
row = image + stride * row_index;
for ( x = 0; x < rect.w; x ++ )
{
- q = row + ( ( ( scale_width * x ) >> 16 ) * 3 );
+ q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 );
*p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) );
}
start += scanlength;
static inline void display_3( SDL_Surface *screen, SDL_Rect rect, uint8_t *image, int width, int height )
{
// Generate the affine transform scaling values
+ if ( rect.w == 0 || rect.h == 0 ) return;
int scale_width = ( width << 16 ) / rect.w;
int scale_height = ( height << 16 ) / rect.h;
int stride = width * 3;
for ( y = 0; y < rect.h; y ++ )
{
p = start;
- row_index = ( scale_height * y ) >> 16;
+ row_index = ( 32768 + scale_height * y ) >> 16;
row = image + stride * row_index;
for ( x = 0; x < rect.w; x ++ )
{
- q = row + ( ( ( scale_width * x ) >> 16 ) * 3 );
+ q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 );
pixel = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) );
*p ++ = (pixel & 0xFF0000) >> 16;
*p ++ = (pixel & 0x00FF00) >> 8;
static inline void display_4( SDL_Surface *screen, SDL_Rect rect, uint8_t *image, int width, int height )
{
// Generate the affine transform scaling values
+ if ( rect.w == 0 || rect.h == 0 ) return;
int scale_width = ( width << 16 ) / rect.w;
int scale_height = ( height << 16 ) / rect.h;
int stride = width * 3;
for ( y = 0; y < rect.h; y ++ )
{
p = start;
- row_index = ( scale_height * y ) >> 16;
+ row_index = ( 32768 + scale_height * y ) >> 16;
row = image + stride * row_index;
for ( x = 0; x < rect.w; x ++ )
{
- q = row + ( ( ( scale_width * x ) >> 16 ) * 3 );
+ q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 );
*p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) );
}
start += scanlength;
{
SDL_Event event;
+ pthread_mutex_lock( &mlt_sdl_mutex );
changed = consumer_get_dimensions( &this->window_width, &this->window_height );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
while ( SDL_PollEvent( &event ) )
{
if ( this->sdl_screen == NULL || changed )
{
- // open SDL window
+ // open SDL window
+ pthread_mutex_lock( &mlt_sdl_mutex );
this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
if ( consumer_get_dimensions( &this->window_width, &this->window_height ) )
this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
- changed = 1;
- }
- else
- {
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+
+ uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
+ SDL_FillRect( this->sdl_screen, NULL, color >> 8 );
changed = 1;
}
if ( changed == 0 &&
this->last_position == mlt_frame_get_position( frame ) &&
- this->last_producer == mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "_producer", NULL ) )
+ this->last_producer == mlt_frame_get_original_producer( frame ) &&
+ !mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "refresh" ) )
{
sdl_unlock_display( );
if ( unlock != NULL ) unlock( );
+ struct timespec tm = { 0, 100000 };
+ nanosleep( &tm, NULL );
return 0;
}
// Update last frame shown info
this->last_position = mlt_frame_get_position( frame );
- this->last_producer = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "_producer", NULL );
+ this->last_producer = mlt_frame_get_original_producer( frame );
// Get the image, width and height
mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
if ( !mlt_consumer_is_stopped( &this->parent ) && SDL_GetVideoSurface( ) != NULL && this->sdl_screen != NULL && this->sdl_screen->pixels != NULL )
{
- memset( this->sdl_screen->pixels, 0, this->window_width * this->window_height * this->sdl_screen->format->BytesPerPixel );
-
switch( this->sdl_screen->format->BytesPerPixel )
{
case 1:
// Get the consumer
mlt_consumer consumer = &this->parent;
mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
-
- // internal intialization
mlt_frame frame = NULL;
- mlt_image_format vfmt = mlt_image_rgb24a;
- int height = this->height;
- int width = this->width;
- uint8_t *image = NULL;
// Allow the hosting app to provide the preview
int preview_off = mlt_properties_get_int( properties, "preview_off" );
- mlt_image_format preview_format = mlt_properties_get_int( properties, "preview_format" );
-
- // Check if a specific colour space has been requested
- if ( preview_off && preview_format != mlt_image_none )
- vfmt = preview_format;
// Loop until told not to
while( this->running )
}
else
{
+ mlt_image_format vfmt = mlt_image_rgb24a;
+ int height = this->height;
+ int width = this->width;
+ uint8_t *image = NULL;
+ mlt_image_format preview_format = mlt_properties_get_int( properties, "preview_format" );
+
+ // Check if a specific colour space has been requested
+ if ( preview_off && preview_format != mlt_image_none )
+ vfmt = preview_format;
+
mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "format", vfmt );
mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
projects / mlt / blobdiff