/*
* 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 library is free software; you can redistribute it and/or
#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;
int height;
int playing;
int sdl_flags;
- SDL_Surface *sdl_screen;
SDL_Rect rect;
uint8_t *buffer;
int last_position;
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, profile ) == 0 )
// Default window size
double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
- this->window_width = ( double )this->height * display_ratio;
+ this->window_width = ( double )this->height * display_ratio + 0.5;
this->window_height = this->height;
if ( sdl_started == 0 && preview_off == 0 )
{
- if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
+ 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;
SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
SDL_EnableUNICODE( 1 );
}
- else if ( preview_off == 0 )
- {
- if ( SDL_GetVideoSurface( ) != NULL )
- {
- this->sdl_screen = SDL_GetVideoSurface( );
- }
- }
- 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_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, NULL, consumer_thread, this );
}
{
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;
SDL_Quit( );
pthread_mutex_unlock( &mlt_sdl_mutex );
}
-
- this->sdl_screen = NULL;
}
return 0;
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;
row = image + stride * row_index;
for ( x = 0; x < rect.w; x ++ )
{
- q = row + ( ( ( 32768 + 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;
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;
row = image + stride * row_index;
for ( x = 0; x < rect.w; x ++ )
{
- q = row + ( ( ( 32768 + 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;
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;
row = image + stride * row_index;
for ( x = 0; x < rect.w; x ++ )
{
- q = row + ( ( ( 32768 + 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;
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;
row = image + stride * row_index;
for ( x = 0; x < rect.w; x ++ )
{
- q = row + ( ( ( 32768 + 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;
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;
}
}
- if ( this->sdl_screen == NULL || changed )
+ if ( !SDL_GetVideoSurface() || changed )
{
// 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 );
- pthread_mutex_unlock( &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 );
- uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
- SDL_FillRect( this->sdl_screen, NULL, color >> 8 );
- changed = 1;
+ 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_frame_get_original_producer( frame ) &&
!mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "refresh" ) )
{
sdl_unlock_display( );
+ mlt_cocoa_autorelease_close( pool );
if ( unlock != NULL ) unlock( );
struct timespec tm = { 0, 100000 };
nanosleep( &tm, NULL );
// Get the image, width and height
mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
- mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
if ( image != NULL )
{
mlt_properties_set_int( this->properties, "rect_h", this->rect.h );
}
- if ( !mlt_consumer_is_stopped( &this->parent ) && SDL_GetVideoSurface( ) != NULL && this->sdl_screen != NULL && this->sdl_screen->pixels != NULL )
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ SDL_Surface *screen = SDL_GetVideoSurface( );
+ if ( !mlt_consumer_is_stopped( &this->parent ) && screen && screen->pixels )
{
- 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 1;
}
// Specify the SDL Version
SDL_VERSION( &wm.version );
+#ifndef __DARWIN__
// Get the wm structure
if ( SDL_GetWMInfo( &wm ) == 1 )
{
-#ifndef __DARWIN__
+#ifndef WIN32
// Check that we have the X11 wm
if ( wm.subsystem == SDL_SYSWM_X11 )
{
}
#endif
}
+#endif
return changed;
}
projects / mlt / blobdiff