* Copyright (C) 2003-2004 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>
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 );
// 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;
mlt_service service = MLT_CONSUMER_SERVICE( parent );
this->properties = MLT_SERVICE_PROPERTIES( service );
- // Get the default display ratio
- double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
-
// We have stuff to clean up, so override the close method
parent->close = consumer_close;
mlt_properties_set_int( this->properties, "height", this->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;
// Attach a colour space converter
if ( !this->filtered )
{
- mlt_filter filter = mlt_factory_filter( "avcolour_space", NULL );
+ mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( parent ) );
+ mlt_filter filter = mlt_factory_filter( profile, "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->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;
+ this->window_height = this->height;
+
if ( sdl_started == 0 && preview_off == 0 )
{
if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
if ( SDL_GetVideoSurface( ) != NULL )
{
this->sdl_screen = SDL_GetVideoSurface( );
- consumer_get_dimensions( &this->window_width, &this->window_height );
}
}
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;
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 ) * 3 );
*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;
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 ) * 3 );
*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;
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 ) * 3 );
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;
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 ) * 3 );
*p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) );
}
start += scanlength;
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 );
+ uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
+ SDL_FillRect( this->sdl_screen, NULL, color >> 8 );
changed = 1;
}
else
if ( !mlt_consumer_is_stopped( &this->parent ) && SDL_GetVideoSurface( ) != NULL && this->sdl_screen != NULL && this->sdl_screen->pixels != NULL )
{
- memset( this->sdl_screen->pixels, 0, this->window_width * this->window_height * this->sdl_screen->format->BytesPerPixel );
-
switch( this->sdl_screen->format->BytesPerPixel )
{
case 1:
projects / melted / blobdiff