#include "consumer_sdl.h"
#include <framework/mlt_frame.h>
#include <framework/mlt_deque.h>
+#include <framework/mlt_factory.h>
+#include <framework/mlt_filter.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
SDL_Rect rect;
uint8_t *buffer;
int bpp;
+ int filtered;
};
/** Forward references to static functions.
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" );
+ 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" );
+
consumer_stop( parent );
this->running = 1;
this->bpp = mlt_properties_get_int( this->properties, "bpp" );
- if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
+ // 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 );
+ this->filtered = 1;
+ }
+
+ if ( sdl_started == 0 && display_off == 0 )
{
if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
{
SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
SDL_EnableUNICODE( 1 );
}
- else
+ else if ( display_off == 0 )
{
- if ( SDL_GetVideoSurface( ) != NULL )
- {
- this->sdl_screen = SDL_GetVideoSurface( );
- consumer_get_dimensions( &this->window_width, &this->window_height );
- mlt_properties_set_int( this->properties, "changed", 0 );
- }
+ this->sdl_screen = SDL_GetVideoSurface( );
}
- if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) )
+ if ( audio_off == 0 )
SDL_InitSubSystem( SDL_INIT_AUDIO );
- this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+ if ( this->sdl_screen == NULL && display_off == 0 )
+ this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
pthread_create( &this->thread, NULL, consumer_thread, this );
}
// Just to be safe, wipe the stream first
memset( stream, 0, len );
- // Copy what we have into the stream
- memcpy( stream, this->audio_buffer, this->audio_avail );
-
// Mix the audio
SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
memset( &request, 0, sizeof( SDL_AudioSpec ) );
this->playing = 0;
request.freq = frequency;
- request.format = AUDIO_S16;
+ request.format = AUDIO_S16SYS;
request.channels = channels;
request.samples = audio_buffer;
request.callback = sdl_fill_audio;
uint8_t *image;
int changed = 0;
- if ( this->running && mlt_properties_get_int( properties, "video_off" ) == 0 )
+ int video_off = mlt_properties_get_int( properties, "video_off" );
+ int preview_off = mlt_properties_get_int( properties, "preview_off" );
+ mlt_image_format preview_format = mlt_properties_get_int( properties, "preview_format" );
+ int display_off = video_off | preview_off;
+
+ if ( this->running && display_off == 0 )
{
// Get the image, width and height
- mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
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 );
// Handle events
if ( this->sdl_screen != NULL )
{
SDL_Event event;
+ sdl_lock_display( );
changed = consumer_get_dimensions( &this->window_width, &this->window_height );
+ sdl_unlock_display( );
while ( SDL_PollEvent( &event ) )
{
}
}
+ sdl_lock_display();
+
if ( width != this->width || height != this->height )
{
if ( this->sdl_overlay != NULL )
this->sdl_overlay = NULL;
// open SDL window with video overlay, if possible
- sdl_lock_display();
this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
- sdl_unlock_display();
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 );
- //SDL_Flip( this->sdl_screen );
- mlt_properties_set_int( properties, "changed", 0 );
- }
- else if ( mlt_properties_get_int( properties, "changed" ) )
- {
- sdl_lock_display();
- this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
- SDL_SetClipRect( this->sdl_screen, &this->rect );
- sdl_unlock_display();
- mlt_properties_set_int( properties, "changed", 0 );
}
if ( this->running )
if ( this->running && this->sdl_screen != NULL && this->sdl_overlay == NULL )
{
SDL_SetClipRect( this->sdl_screen, &this->rect );
- SDL_Flip( this->sdl_screen );
- sdl_lock_display();
this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, this->sdl_screen );
- sdl_unlock_display();
}
if ( this->running && this->sdl_screen != NULL && this->sdl_overlay != NULL )
{
this->buffer = this->sdl_overlay->pixels[ 0 ];
- sdl_lock_display();
if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 )
{
if ( image != NULL )
SDL_UnlockYUVOverlay( this->sdl_overlay );
SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect );
}
- sdl_unlock_display();
}
+
+ sdl_unlock_display();
+ }
+ 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 );
}
return 0;
mlt_frame_close( mlt_deque_pop_back( this->queue ) );
this->sdl_screen = NULL;
- this->sdl_overlay = NULL;
this->audio_avail = 0;
return NULL;
SDL_VERSION( &wm.version );
// Lock the display
- sdl_lock_display();
+ //sdl_lock_display();
#ifndef __DARWIN__
// Get the wm structure
#endif
// Unlock the display
- sdl_unlock_display();
+ //sdl_unlock_display();
return changed;
}
projects / melted / blobdiff