/*
* consumer_sdl.c -- A Simple DirectMedia Layer consumer
- * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
+ * Copyright (C) 2003-2004, 2010 Ushodaya Enterprises Limited
* Author: Dan Dennedy <dan@dennedy.org>
*
* 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_Overlay *sdl_overlay;
SDL_Rect rect;
uint8_t *buffer;
mlt_consumer consumer_sdl_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 scaler (for now we'll use nearest)
mlt_properties_set( this->properties, "rescale", "nearest" );
+ mlt_properties_set( this->properties, "deinterlace_method", "onefield" );
+ mlt_properties_set_int( this->properties, "top_field_first", -1 );
// Default buffer for low latency
mlt_properties_set_int( this->properties, "buffer", 1 );
// Default audio buffer
- mlt_properties_set_int( this->properties, "audio_buffer", 512 );
+ mlt_properties_set_int( this->properties, "audio_buffer", 2048 );
// Ensure we don't join on a non-running object
this->joined = 1;
// process actual param
- if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 )
+ if ( arg && sscanf( arg, "%dx%d", &this->width, &this->height ) )
+ {
+ mlt_properties_set_int( this->properties, "_arg_size", 1 );
+ }
+ else
{
this->width = mlt_properties_get_int( this->properties, "width" );
this->height = mlt_properties_get_int( this->properties, "height" );
}
-
+
// Set the sdl flags
- this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
-
+ this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_DOUBLEBUF;
+#if !defined(__DARWIN__)
+ this->sdl_flags |= SDL_RESIZABLE;
+#endif
// Allow thread to be started/stopped
parent->start = consumer_start;
parent->stop = consumer_stop;
if ( !this->running )
{
- int video_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "video_off" );
- int preview_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "preview_off" );
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( parent );
+ int video_off = mlt_properties_get_int( properties, "video_off" );
+ int preview_off = mlt_properties_get_int( properties, "preview_off" );
int display_off = video_off | preview_off;
- int audio_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" );
- int sdl_started = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" );
+ int audio_off = mlt_properties_get_int( properties, "audio_off" );
+ int sdl_started = mlt_properties_get_int( properties, "sdl_started" );
+ char *output_display = mlt_properties_get( properties, "output_display" );
+ char *window_id = mlt_properties_get( properties, "window_id" );
+ char *audio_driver = mlt_properties_get( properties, "audio_driver" );
+ char *video_driver = mlt_properties_get( properties, "video_driver" );
+ char *audio_device = mlt_properties_get( properties, "audio_device" );
consumer_stop( parent );
this->running = 1;
this->joined = 0;
- if ( mlt_properties_get_int( this->properties, "width" ) > 0 )
- this->width = mlt_properties_get_int( this->properties, "width" );
- if ( mlt_properties_get_int( this->properties, "height" ) > 0 )
- this->height = mlt_properties_get_int( this->properties, "height" );
+ if ( output_display != NULL )
+ setenv( "DISPLAY", output_display, 1 );
+
+ if ( window_id != NULL )
+ setenv( "SDL_WINDOWID", window_id, 1 );
+
+ if ( video_driver != NULL )
+ setenv( "SDL_VIDEODRIVER", video_driver, 1 );
+
+ if ( audio_driver != NULL )
+ setenv( "SDL_AUDIODRIVER", audio_driver, 1 );
+
+ if ( audio_device != NULL )
+ setenv( "AUDIODEV", audio_device, 1 );
+
+ if ( ! mlt_properties_get_int( this->properties, "_arg_size" ) )
+ {
+ if ( mlt_properties_get_int( this->properties, "width" ) > 0 )
+ this->width = mlt_properties_get_int( this->properties, "width" );
+ if ( mlt_properties_get_int( this->properties, "height" ) > 0 )
+ this->height = mlt_properties_get_int( this->properties, "height" );
+ }
this->bpp = mlt_properties_get_int( this->properties, "bpp" );
if ( sdl_started == 0 && display_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 )
{
mlt_log_error( MLT_CONSUMER_SERVICE(parent), "Failed to initialize SDL: %s\n", SDL_GetError() );
return -1;
SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
SDL_EnableUNICODE( 1 );
-
-#ifndef __DARWIN__
- // Get the wm structure
- SDL_SysWMinfo wm;
- SDL_VERSION( &wm.version );
- // Only on X11
- if ( SDL_GetWMInfo( &wm ) == 1 && wm.subsystem == SDL_SYSWM_X11 )
- {
- // Set the x11_display property for use by VDPAU
- mlt_properties_set_int( this->properties, "x11_display", (int) wm.info.x11.display );
- mlt_log_verbose( MLT_CONSUMER_SERVICE(parent), "X11 Display = %p\n", wm.info.x11.display );
- char tmp[20];
- sprintf( tmp, "%p", wm.info.x11.display );
- mlt_environment_set( "x11_display", tmp );
- }
-#endif
- }
- else if ( display_off == 0 )
- {
- this->sdl_screen = SDL_GetVideoSurface( );
}
if ( audio_off == 0 )
SDL_InitSubSystem( SDL_INIT_AUDIO );
// 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 ( mlt_properties_get_int( this->properties, "_arg_size" ) )
+ {
+ this->window_width = this->width;
+ this->window_height = this->height;
+ }
+ else
+ {
+ 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 ( this->sdl_screen == NULL && display_off == 0 )
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ if ( !SDL_GetVideoSurface() && display_off == 0 )
{
if ( mlt_properties_get_int( this->properties, "fullscreen" ) )
{
- const SDL_VideoInfo *vi = SDL_GetVideoInfo();
+ const SDL_VideoInfo *vi;
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ vi = SDL_GetVideoInfo();
+ pthread_mutex_unlock( &mlt_sdl_mutex );
this->window_width = vi->current_w;
this->window_height = vi->current_h;
this->sdl_flags |= SDL_FULLSCREEN;
SDL_ShowCursor( SDL_DISABLE );
}
- 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 );
+ 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 );
}
// Kill the thread and clean up
this->joined = 1;
this->running = 0;
+#ifndef WIN32
if ( this->thread )
+#endif
pthread_join( this->thread, NULL );
// internal cleanup
SDL_QuitSubSystem( SDL_INIT_AUDIO );
}
- this->sdl_screen = NULL;
+ if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
+ {
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ SDL_Quit( );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+ }
}
return 0;
{
// Get the image, width and height
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 );
+ void *pool = mlt_cocoa_autorelease_init();
+
// Handle events
- if ( this->sdl_screen != NULL )
+ if ( SDL_GetVideoSurface() )
{
SDL_Event event;
this->sdl_overlay = NULL;
}
- if ( this->running && ( this->sdl_screen == NULL || changed ) )
+ if ( this->running && ( !SDL_GetVideoSurface() || changed ) )
{
// Force an overlay recreation
if ( this->sdl_overlay != NULL )
// open SDL window with video overlay, if possible
pthread_mutex_lock( &mlt_sdl_mutex );
- this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
- if ( consumer_get_dimensions( &this->window_width, &this->window_height ) )
- this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
+ consumer_get_dimensions( &this->window_width, &this->window_height );
+ SDL_Surface *screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
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 );
- SDL_Flip( this->sdl_screen );
+ if ( screen )
+ {
+ uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
+ SDL_FillRect( screen, NULL, color >> 8 );
+ SDL_Flip( screen );
+ }
}
if ( this->running )
mlt_properties_set_int( this->properties, "rect_w", this->rect.w );
mlt_properties_set_int( this->properties, "rect_h", this->rect.h );
- SDL_SetClipRect( this->sdl_screen, &this->rect );
+ SDL_SetClipRect( SDL_GetVideoSurface(), &this->rect );
}
- if ( this->running && this->sdl_screen != NULL && this->sdl_overlay == NULL )
+ if ( this->running && SDL_GetVideoSurface() && this->sdl_overlay == NULL )
{
- SDL_SetClipRect( this->sdl_screen, &this->rect );
- this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, this->sdl_screen );
+ SDL_SetClipRect( SDL_GetVideoSurface(), &this->rect );
+ this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, SDL_GetVideoSurface() );
}
- if ( this->running && this->sdl_screen != NULL && this->sdl_overlay != NULL )
+ if ( this->running && SDL_GetVideoSurface() && this->sdl_overlay != NULL )
{
this->buffer = this->sdl_overlay->pixels[ 0 ];
if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 )
if ( image != NULL )
memcpy( this->buffer, image, width * height * 2 );
SDL_UnlockYUVOverlay( this->sdl_overlay );
- SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect );
+ SDL_DisplayYUVOverlay( this->sdl_overlay, &SDL_GetVideoSurface()->clip_rect );
}
}
sdl_unlock_display();
+ mlt_cocoa_autorelease_close( pool );
+ mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
}
else if ( this->running )
{
vfmt = preview_format == mlt_image_none ? mlt_image_rgb24a : preview_format;
if ( !video_off )
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 );
}
}
else
{
- mlt_log_debug( MLT_CONSUMER_SERVICE(&this->parent), "dropped video frame\n" );
+ static int dropped = 0;
+ mlt_log_info( MLT_CONSUMER_SERVICE(&this->parent), "dropped video frame %d\n", ++dropped );
}
// This frame can now be closed
int init_audio = 1;
int init_video = 1;
mlt_frame frame = NULL;
- mlt_properties properties = NULL;
int duration = 0;
int64_t playtime = 0;
struct timespec tm = { 0, 100000 };
// Loop until told not to
- while( !terminated && this->running )
+ while( this->running )
{
// Get a frame from the attached producer
- frame = mlt_consumer_rt_frame( consumer );
+ frame = !terminated? mlt_consumer_rt_frame( consumer ) : NULL;
// Check for termination
- if ( terminate_on_pause && frame != NULL )
+ if ( terminate_on_pause && frame )
terminated = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0.0;
// Ensure that we have a frame
- if ( frame != NULL )
+ if ( frame )
{
- // Get the frame properties
- properties = MLT_FRAME_PROPERTIES( frame );
-
// Play audio
init_audio = consumer_play_audio( this, frame, init_audio, &duration );
}
// Set playtime for this frame
- mlt_properties_set_int( properties, "playtime", playtime );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "playtime", playtime );
while ( this->running && mlt_deque_count( this->queue ) > 15 )
nanosleep( &tm, NULL );
// Calculate the next playtime
playtime += ( duration * 1000 );
}
+ else if ( terminated )
+ {
+ if ( init_video || mlt_deque_count( this->queue ) == 0 )
+ break;
+ else
+ nanosleep( &tm, NULL );
+ }
}
this->running = 0;
+
+ // Unblock sdl_preview
+ if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "put_mode" ) == 1 )
+ {
+ frame = mlt_consumer_get_frame( consumer );
+ if ( frame )
+ mlt_frame_close( frame );
+ frame = NULL;
+ }
// Kill the video thread
if ( init_video == 0 )
while( mlt_deque_count( this->queue ) )
mlt_frame_close( mlt_deque_pop_back( this->queue ) );
- this->sdl_screen = NULL;
this->audio_avail = 0;
return NULL;
// 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
{
// Get the actual object
consumer_sdl this = parent->child;
- int sdl_started = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" );
// Stop the consumer
///mlt_consumer_stop( parent );
pthread_mutex_destroy( &this->audio_mutex );
pthread_cond_destroy( &this->audio_cond );
- if ( sdl_started == 0 )
- {
- pthread_mutex_lock( &mlt_sdl_mutex );
- SDL_Quit( );
- pthread_mutex_unlock( &mlt_sdl_mutex );
- }
-
// Finally clean up this
free( this );
}
projects / mlt / blobdiff