eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-16 12:50:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

super and sub sample from LIVIDO_PALETTE_YUV4444P to FMT_422

Browse Source
This commit is contained in:
niels
2015-01-11 14:55:58 +01:00
parent 958ff6dc53
commit 638c7d43f3
2 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
veejay-current/veejay-server/libplugger/livido-loader.c
View File

@@ -21,8 +21,6 @@
/** \defgroup livido Livido Host /** \defgroup livido Livido Host
* *
* See livido specification at http://livido.dyne.org * See livido specification at http://livido.dyne.org
*
* This implements an almost complete and hopefully "correct" livido host.
*/ */
#include <config.h> #include <config.h>
#ifdef STRICT_CHECKING #ifdef STRICT_CHECKING
@@ -50,6 +48,7 @@
//#include <veejay/oscservit.h> //#include <veejay/oscservit.h>
#include <libplugger/utility.h> #include <libplugger/utility.h>
#include <libplugger/livido-loader.h> #include <libplugger/livido-loader.h>
#include <libsubsample/subsample.h>
#include <veejay/vj-shm.h> #include <veejay/vj-shm.h>
#include <veejay/vims.h> #include <veejay/vims.h>
#define LIVIDO_COPY 1 #define LIVIDO_COPY 1
@@ -154,6 +153,22 @@ static int configure_channel( void *instance, const char *name, int channel_id,
#ifdef STRICT_CHECKING #ifdef STRICT_CHECKING
assert( error == LIVIDO_NO_ERROR ); assert( error == LIVIDO_NO_ERROR );
#endif #endif
if( name[0] == 'i' ) {
int current_palette = 0;
vevo_property_get( channel, "current_palette", 0, &current_palette );
if( current_palette != pref_palette_ ) {
switch( current_palette ) {
case LIVIDO_PALETTE_YUV444P:
chroma_supersample ( SSM_422_444, frame, frame->data );
break;
}
}
}
return 1; return 1;
} }
@@ -1070,7 +1085,6 @@ void livido_push_channel( void *instance,int n,int dir, VJFrame *frame ) // in_c
char *key = (dir == 0 ? "in_channels" : "out_channels" ); char *key = (dir == 0 ? "in_channels" : "out_channels" );
livido_push_channel_local(instance, key, n, frame ); livido_push_channel_local(instance, key, n, frame );
} }
void livido_plug_process( void *instance, double time_code ) void livido_plug_process( void *instance, double time_code )
@@ -1090,12 +1104,32 @@ void livido_plug_process( void *instance, double time_code )
(*process)( instance, time_code ); (*process)( instance, time_code );
//see if output channel needs downsampling
void *channel = NULL; void *channel = NULL;
int hsampling = 0; //see if output channel needs downsampling
error = vevo_property_get( instance, "out_channels", 0, &channel ); error = vevo_property_get( instance, "out_channels", 0, &channel );
if( error != LIVIDO_NO_ERROR )
return;
int current_palette = 0;
vevo_property_get( channel, "current_palette", 0, &current_palette );
if( current_palette != pref_palette_ ) {
switch( current_palette ) {
case LIVIDO_PALETTE_YUV444P: {
VJFrame frame; VJFrame *f = &frame;
vevo_property_get( channel, "width", 0, &(f->width));
vevo_property_get( channel, "height", 0, &(f->height));
int i;
for( i = 0; i < 3; i ++ ) {
vevo_property_get( channel, "pixel_data", i, &(f->data[i]));
}
chroma_subsample( SSM_422_444, f, f->data );
}
break;
}
}
} }
void livido_plug_deinit( void *instance ) void livido_plug_deinit( void *instance )

5
veejay-current/veejay-server/veejay/vj-event.c
View File

@@ -1703,11 +1703,6 @@ void vj_event_update_remote(void *ptr)
if( p3 ) if( p3 )
has_n += vj_server_new_connection( v->vjs[VEEJAY_PORT_DAT] ); has_n += vj_server_new_connection( v->vjs[VEEJAY_PORT_DAT] );
// if( has_n )
// {
// return;
// }
if( v->settings->use_vims_mcast ) if( v->settings->use_vims_mcast )
{ {
int res = vj_server_update(v->vjs[VEEJAY_PORT_MAT],0 ); int res = vj_server_update(v->vjs[VEEJAY_PORT_MAT],0 );