/*
* consumer_sdl_still.c -- A Simple DirectMedia Layer consumer
- * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
+ * Copyright (C) 2003-2004, 2010 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 <pthread.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_syswm.h>
+#include <SDL.h>
+#include <SDL_syswm.h>
#include <sys/time.h>
+#include "consumer_sdl_osx.h"
+
+extern pthread_mutex_t mlt_sdl_mutex;
/** This classes definition.
*/
int running;
int window_width;
int window_height;
- float aspect_ratio;
- float display_aspect;
- double last_frame_aspect;
int width;
int height;
int playing;
int sdl_flags;
- SDL_Surface *sdl_screen;
SDL_Rect rect;
uint8_t *buffer;
int last_position;
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 );
+ consumer_sdl this = calloc( 1, sizeof( struct consumer_sdl_s ) );
// 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;
- // Attach a colour space converter
- 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( &this->parent ), filter );
- mlt_filter_close( filter );
+ // get a handle on properties
+ mlt_service service = MLT_CONSUMER_SERVICE( parent );
+ this->properties = MLT_SERVICE_PROPERTIES( service );
// We have stuff to clean up, so override the close method
parent->close = consumer_close;
- // get a handle on properties
- mlt_service service = mlt_consumer_service( parent );
- this->properties = mlt_service_properties( service );
-
// Default scaler (for now we'll use nearest)
mlt_properties_set( this->properties, "rescale", "nearest" );
// 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 );
-
- // Get sample aspect ratio
- this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" );
-
// Ensure we don't join on a non-running object
this->joined = 1;
- // Default display aspect ratio
- this->display_aspect = 4.0 / 3.0;
-
// process actual param
if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 )
{
this->width = mlt_properties_get_int( this->properties, "width" );
this->height = mlt_properties_get_int( this->properties, "height" );
}
-
- // Default window size
- this->window_width = ( float )this->height * this->display_aspect;
- this->window_height = this->height;
+ else
+ {
+ mlt_properties_set_int( this->properties, "width", this->width );
+ mlt_properties_set_int( this->properties, "height", this->height );
+ }
// Set the sdl flags
this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
if ( !this->running )
{
- pthread_attr_t thread_attributes;
-
+ 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" );
+
consumer_stop( parent );
this->last_position = -1;
this->joined = 0;
// Allow the user to force resizing to window size
- if ( mlt_properties_get_int( this->properties, "resize" ) )
+ 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 + 0.5;
+ this->window_height = this->height;
+
+ if ( sdl_started == 0 && preview_off == 0 )
{
- mlt_properties_set_int( this->properties, "width", this->width );
- mlt_properties_set_int( this->properties, "height", this->height );
- }
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ int ret = SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+ if ( ret < 0 )
+ {
+ fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
+ return -1;
+ }
- //this->width = this->height * this->display_aspect;
+ SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
+ SDL_EnableUNICODE( 1 );
+ }
- // Inherit the scheduling priority
- pthread_attr_init( &thread_attributes );
- pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ if ( !SDL_GetVideoSurface() && preview_off == 0 )
+ SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
- pthread_create( &this->thread, &thread_attributes, consumer_thread, this );
+ pthread_create( &this->thread, NULL, consumer_thread, this );
}
return 0;
if ( this->joined == 0 )
{
+ 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" );
+
// Kill the thread and clean up
this->running = 0;
pthread_join( this->thread, NULL );
this->joined = 1;
+
+ if ( sdl_started == 0 && preview_off == 0 )
+ {
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ SDL_Quit( );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+ }
}
return 0;
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;
+ int stride = width * 4;
int x, y, row_index;
uint8_t *q, *row;
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 ) * 4 );
*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;
+ int stride = width * 4;
int x, y, row_index;
uint8_t *q, *row;
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 ) * 4 );
*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;
+ int stride = width * 4;
int x, y, row_index;
uint8_t *q, *row;
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 ) * 4 );
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;
+ int stride = width * 4;
int x, y, row_index;
uint8_t *q, *row;
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 ) * 4 );
*p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) );
}
start += scanlength;
// Get the properties of this consumer
mlt_properties properties = this->properties;
- mlt_image_format vfmt = mlt_image_rgb24;
+ mlt_image_format vfmt = mlt_image_rgb24a;
int height = this->height;
int width = this->width;
uint8_t *image = NULL;
int changed = 0;
+ double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
void ( *lock )( void ) = mlt_properties_get_data( properties, "app_lock", NULL );
void ( *unlock )( void ) = mlt_properties_get_data( properties, "app_unlock", NULL );
if ( lock != NULL ) lock( );
-
+ void *pool = mlt_cocoa_autorelease_init();
sdl_lock_display();
// Handle events
- if ( this->sdl_screen != NULL )
+ if ( SDL_GetVideoSurface() )
{
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 || mlt_properties_get_int( properties, "changed" ) == 2 )
+ if ( !SDL_GetVideoSurface() || changed )
{
- // open SDL window
- 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 );
+ // open SDL window
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ consumer_get_dimensions( &this->window_width, &this->window_height );
+ SDL_Surface *screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
- changed = 1;
- mlt_properties_set_int( properties, "changed", 0 );
- }
- else
- {
- changed = mlt_properties_get_int( properties, "changed" ) | mlt_properties_get_int( mlt_frame_properties( frame ), "refresh" );
- mlt_properties_set_int( properties, "changed", 0 );
+ if ( screen )
+ {
+ uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
+ SDL_FillRect( screen, NULL, color >> 8 );
+ changed = 1;
+ }
+ pthread_mutex_unlock( &mlt_sdl_mutex );
}
-
-
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "test_audio", 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( );
+ mlt_cocoa_autorelease_close( pool );
+ 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
- if ( image == NULL )
- {
- mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
-
- // I would like to provide upstream scaling here, but this is incorrect
- // Something? (or everything?) is too sensitive to aspect ratio
- //width = this->rect.w;
- //height = this->rect.h;
- //mlt_properties_set( mlt_frame_properties( frame ), "distort", "true" );
- //mlt_properties_set_int( mlt_frame_properties( frame ), "normalised_width", width );
- //mlt_properties_set_int( mlt_frame_properties( frame ), "normalised_height", height );
-
- mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
- }
+ mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
- if ( 1 )
+ if ( image != NULL )
{
char *rescale = mlt_properties_get( properties, "rescale" );
if ( rescale != NULL && strcmp( rescale, "none" ) )
{
- float this_aspect = this->display_aspect / ( ( float )this->window_width / ( float )this->window_height );
+ double this_aspect = display_ratio / ( ( double )this->window_width / ( double )this->window_height );
this->rect.w = this_aspect * this->window_width;
this->rect.h = this->window_height;
if ( this->rect.w > this->window_width )
}
else
{
- float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height;
+ double frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height;
this->rect.w = frame_aspect * this->window_height;
this->rect.h = this->window_height;
if ( this->rect.w > this->window_width )
mlt_properties_set_int( this->properties, "rect_h", this->rect.h );
}
- if ( this->sdl_screen != NULL )
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ SDL_Surface *screen = SDL_GetVideoSurface( );
+ if ( !mlt_consumer_is_stopped( &this->parent ) && screen && screen->pixels )
{
- memset( this->sdl_screen->pixels, 0, this->window_width * this->window_height * this->sdl_screen->format->BytesPerPixel );
-
- switch( this->sdl_screen->format->BytesPerPixel )
+ switch( screen->format->BytesPerPixel )
{
case 1:
- display_1( this->sdl_screen, this->rect, image, width, height );
+ display_1( screen, this->rect, image, width, height );
break;
case 2:
- display_2( this->sdl_screen, this->rect, image, width, height );
+ display_2( screen, this->rect, image, width, height );
break;
case 3:
- display_3( this->sdl_screen, this->rect, image, width, height );
+ display_3( screen, this->rect, image, width, height );
break;
case 4:
- display_4( this->sdl_screen, this->rect, image, width, height );
+ display_4( screen, this->rect, image, width, height );
break;
default:
- fprintf( stderr, "Unsupported video depth %d\n", this->sdl_screen->format->BytesPerPixel );
+ fprintf( stderr, "Unsupported video depth %d\n", screen->format->BytesPerPixel );
break;
}
// Flip it into sight
- SDL_Flip( this->sdl_screen );
+ SDL_Flip( screen );
}
+ pthread_mutex_unlock( &mlt_sdl_mutex );
sdl_unlock_display();
-
+ mlt_cocoa_autorelease_close( pool );
if ( unlock != NULL ) unlock( );
+ mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
- return 0;
+ return 1;
}
/** Threaded wrapper for pipe.
// Get the consumer
mlt_consumer consumer = &this->parent;
-
- // internal intialization
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
mlt_frame frame = NULL;
- struct timespec tm = { 0, 400000 };
-
- if ( mlt_properties_get_int( mlt_consumer_properties( consumer ), "sdl_started" ) == 0 )
- {
- if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
- {
- fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
- return NULL;
- }
- SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
- SDL_EnableUNICODE( 1 );
- }
- else
- {
- mlt_properties_set_int( mlt_consumer_properties( consumer ), "changed", 2 );
- if ( SDL_GetVideoSurface( ) != NULL )
- {
- this->sdl_screen = SDL_GetVideoSurface( );
- consumer_get_dimensions( &this->window_width, &this->window_height );
- mlt_properties_set_int( mlt_consumer_properties( consumer ), "changed", 0 );
- }
- }
+ // Allow the hosting app to provide the preview
+ int preview_off = mlt_properties_get_int( properties, "preview_off" );
// Loop until told not to
while( this->running )
frame = mlt_consumer_rt_frame( consumer );
// Ensure that we have a frame
- if ( frame != NULL )
+ if ( this->running && frame != NULL )
{
- consumer_play_video( this, frame );
+ if ( preview_off == 0 )
+ {
+ consumer_play_video( this, frame );
+ }
+ 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 );
+ }
mlt_frame_close( frame );
- nanosleep( &tm, NULL );
+ }
+ else
+ {
+ if ( frame ) mlt_frame_close( frame );
+ this->running = 0;
}
}
- if ( mlt_properties_get_int( mlt_consumer_properties( consumer ), "sdl_started" ) == 0 )
- SDL_Quit( );
-
- this->sdl_screen = NULL;
-
return NULL;
}
// Specify the SDL Version
SDL_VERSION( &wm.version );
+#ifndef __DARWIN__
// Get the wm structure
if ( SDL_GetWMInfo( &wm ) == 1 )
{
+#ifndef WIN32
// Check that we have the X11 wm
if ( wm.subsystem == SDL_SYSWM_X11 )
{
*width = attr.width;
*height = attr.height;
}
+#endif
}
+#endif
return changed;
}