diff --git a/veejay-current/veejay-server/libOSC/OSC-address-space.c b/veejay-current/veejay-server/libOSC/OSC-address-space.c index 4b4f0420..63437602 100644 --- a/veejay-current/veejay-server/libOSC/OSC-address-space.c +++ b/veejay-current/veejay-server/libOSC/OSC-address-space.c @@ -40,8 +40,8 @@ The OpenSound Control WWW page is #include #define MAX_ALIASES_PER_CONTAINER 3 -#define MAX_CHILDREN_PER_CONTAINER 20 -#define MAX_METHODS_PER_CONTAINER 30 +#define MAX_CHILDREN_PER_CONTAINER 32 +#define MAX_METHODS_PER_CONTAINER 32 #define BASE_NUM_TO_REALLOCATE 10 diff --git a/veejay-current/veejay-server/libel/pixbuf.c b/veejay-current/veejay-server/libel/pixbuf.c index c2802128..9d146969 100644 --- a/veejay-current/veejay-server/libel/pixbuf.c +++ b/veejay-current/veejay-server/libel/pixbuf.c @@ -430,6 +430,10 @@ void vj_fast_picture_save_to_mem( VJFrame *frame, int out_w, int out_h, int pixf assert( pic_scaler_ != NULL ); #endif update_pic_data( out_w, out_h, pixfmt ); + + veejay_memset( dest[0], 0, out_w*out_h); + veejay_memset( dest[1], 128, (out_w*out_h)/4); + veejay_memset( dest[2], 128, (out_w*out_h)/4); } // if( frame->width == out_w && frame->height == out_h ) diff --git a/veejay-current/veejay-server/veejay/vj-event.c b/veejay-current/veejay-server/veejay/vj-event.c index 65176bec..b9863836 100644 --- a/veejay-current/veejay-server/veejay/vj-event.c +++ b/veejay-current/veejay-server/veejay/vj-event.c @@ -8425,12 +8425,12 @@ void vj_event_get_scaled_image ( void *ptr, const char format[], va_list ap ) h, pixel_format ); - int input_len = (use_bw_preview_ ? ( w * h ) : (( w * h ) + ((w * h)/2)) ); + int dstlen = (use_bw_preview_ ? ( w * h ) : (( w * h ) + ((w * h)/2)) ); char header[8]; - sprintf( header, "%06d%1d", input_len, use_bw_preview_ ); + sprintf( header, "%06d%1d", dstlen, use_bw_preview_ ); SEND_DATA(v, header, 7 ); - SEND_DATA(v, vj_perform_get_preview_buffer(), input_len ); + SEND_DATA(v, vj_perform_get_preview_buffer(), dstlen ); } void vj_event_get_cali_image ( void *ptr, const char format[], va_list ap ) diff --git a/veejay-current/veejay-server/veejay/vj-perform.c b/veejay-current/veejay-server/veejay/vj-perform.c index a5350856..1c99ad20 100644 --- a/veejay-current/veejay-server/veejay/vj-perform.c +++ b/veejay-current/veejay-server/veejay/vj-perform.c @@ -596,6 +596,10 @@ int vj_perform_init(veejay_t * info) primary_buffer[6] = (ycbcr_frame*) vj_calloc(sizeof(ycbcr_frame)); primary_buffer[6]->Y = (uint8_t*) vj_calloc( sizeof(uint8_t) * RUP8(512 * 512 * 3)); + //@ layout of primary_buffer[6] is flat, only Y + + + primary_buffer[7] = (ycbcr_frame*) vj_calloc(sizeof(ycbcr_frame)); primary_buffer[7]->Y = (uint8_t*) vj_calloc( sizeof(uint8_t) * RUP8(w * h * 3)); primary_buffer[7]->Cb = primary_buffer[7]->Y + ( RUP8(w*h));