* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Dan Dennedy <dan@dennedy.org>
*
- * 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>
via the argument, but keep it simple.
*/
-mlt_consumer consumer_sdl_init( char *arg )
+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 );
// 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 )
{
// Create the queue
this->queue = mlt_deque_init( );
mlt_service service = MLT_CONSUMER_SERVICE( parent );
this->properties = MLT_SERVICE_PROPERTIES( service );
- // Default display aspect ratio
- double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
-
// Set the default volume
mlt_properties_set_double( this->properties, "volume", 1.0 );
this->height = mlt_properties_get_int( this->properties, "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;
this->running = 1;
this->joined = 0;
- this->width = mlt_properties_get_int( this->properties, "width" );
- this->height = mlt_properties_get_int( this->properties, "height" );
+ 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" );
// Attach a colour space converter
if ( preview_off && !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 );
+ mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( parent ) );
+ mlt_filter filter = mlt_factory_filter( profile, "avcolour_space", NULL );
+ if ( filter )
+ {
+ 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;
}
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 ( this->sdl_screen == NULL && display_off == 0 )
+ {
+ if ( mlt_properties_get_int( this->properties, "fullscreen" ) )
+ {
+ const SDL_VideoInfo *vi = SDL_GetVideoInfo();
+ this->window_width = vi->current_w;
+ this->window_height = vi->current_h;
+ this->sdl_flags |= SDL_FULLSCREEN;
+ SDL_ShowCursor( SDL_DISABLE );
+ }
this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+ }
pthread_create( &this->thread, NULL, consumer_thread, this );
}
// Kill the thread and clean up
this->joined = 1;
this->running = 0;
- pthread_join( this->thread, NULL );
+ if ( this->thread )
+ pthread_join( this->thread, NULL );
// internal cleanup
if ( this->sdl_overlay != NULL )
this->sdl_overlay = NULL;
if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) )
+ {
+ pthread_mutex_lock( &this->audio_mutex );
+ pthread_cond_broadcast( &this->audio_cond );
+ pthread_mutex_unlock( &this->audio_mutex );
SDL_QuitSubSystem( SDL_INIT_AUDIO );
+ }
if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
SDL_Quit( );
this->rect.x = ( this->window_width - this->rect.w ) / 2;
this->rect.y = ( this->window_height - this->rect.h ) / 2;
+ this->rect.x -= this->rect.x % 2;
mlt_properties_set_int( this->properties, "rect_x", this->rect.x );
mlt_properties_set_int( this->properties, "rect_y", this->rect.y );
// Get the consumer
mlt_consumer consumer = &this->parent;
+ // Convenience functionality
+ int terminate_on_pause = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "terminate_on_pause" );
+ int terminated = 0;
+
// Video thread
pthread_t thread;
struct timespec tm = { 0, 100000 };
// Loop until told not to
- while( this->running )
+ while( !terminated && this->running )
{
// Get a frame from the attached producer
frame = mlt_consumer_rt_frame( consumer );
+ // Check for termination
+ if ( terminate_on_pause && frame != NULL )
+ terminated = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0.0;
+
// Ensure that we have a frame
if ( frame != NULL )
{
}
}
+ this->running = 0;
+
// Kill the video thread
if ( init_video == 0 )
{