mirror of
https://github.com/game-stop/veejay.git
synced 2025-12-16 12:50:00 +01:00
issue #42, compile warning fixes
This commit is contained in:
@@ -131,7 +131,6 @@ static inline int frei0r_param_set_double(f0r_set_param_value_f q,void *plugin,
|
|||||||
static inline int frei0r_param_get_bool(f0r_get_param_value_f q, void *plugin, int seq_no)
|
static inline int frei0r_param_get_bool(f0r_get_param_value_f q, void *plugin, int seq_no)
|
||||||
{
|
{
|
||||||
double b;
|
double b;
|
||||||
f0r_param_t param;
|
|
||||||
(*q)( plugin, (void **) &b, seq_no );
|
(*q)( plugin, (void **) &b, seq_no );
|
||||||
if( b!= 0.0 && b!=1. ) {
|
if( b!= 0.0 && b!=1. ) {
|
||||||
b = 0.0;
|
b = 0.0;
|
||||||
|
|||||||
@@ -837,8 +837,6 @@ void plug_build_name_space( int fx_id, void *fx_instance, void *data, int entry_
|
|||||||
|
|
||||||
void plug_print_all()
|
void plug_print_all()
|
||||||
{
|
{
|
||||||
int n;
|
|
||||||
int x=0;
|
|
||||||
/*for(n = 0; n < index_ ; n ++ )
|
/*for(n = 0; n < index_ ; n ++ )
|
||||||
{
|
{
|
||||||
char *fx_name = plug_get_name(n);
|
char *fx_name = plug_get_name(n);
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ void alphaselect_apply( VJFrame *frame, int width,
|
|||||||
int height, int i_angle, int r, int g,
|
int height, int i_angle, int r, int g,
|
||||||
int b, int swap)
|
int b, int swap)
|
||||||
{
|
{
|
||||||
int8_t *fg_cb, *fg_cr;
|
uint8_t *fg_cb, *fg_cr;
|
||||||
int accept_angle_tg;
|
int accept_angle_tg;
|
||||||
int cb, cr;
|
int cb, cr;
|
||||||
float kg1, tmp, aa = 255.0f, bb = 255.0f, _y = 0;
|
float kg1, tmp, aa = 255.0f, bb = 255.0f, _y = 0;
|
||||||
@@ -91,7 +91,7 @@ void alphaselect_apply( VJFrame *frame, int width,
|
|||||||
uint8_t *Cb = frame->data[1];
|
uint8_t *Cb = frame->data[1];
|
||||||
uint8_t *Cr = frame->data[2];
|
uint8_t *Cr = frame->data[2];
|
||||||
uint8_t *A = frame->data[3];
|
uint8_t *A = frame->data[3];
|
||||||
int iy,iu,iv;
|
int iy=0,iu=128,iv=128;
|
||||||
|
|
||||||
_rgb2yuv(r,g,b,iy,iu,iv);
|
_rgb2yuv(r,g,b,iy,iu,iv);
|
||||||
_y = (float) iy;
|
_y = (float) iy;
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ void alphaselect2_apply( VJFrame *frame, int width,
|
|||||||
uint8_t *Cb = frame->data[1];
|
uint8_t *Cb = frame->data[1];
|
||||||
uint8_t *Cr = frame->data[2];
|
uint8_t *Cr = frame->data[2];
|
||||||
uint8_t *A = frame->data[3];
|
uint8_t *A = frame->data[3];
|
||||||
int iy,iu,iv;
|
int iy=0,iu=128,iv=128;
|
||||||
_rgb2yuv(r,g,b,iy,iu,iv);
|
_rgb2yuv(r,g,b,iy,iu,iv);
|
||||||
|
|
||||||
const double dtola = tola * 0.1f;
|
const double dtola = tola * 0.1f;
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ static int n__ = 0;
|
|||||||
static int N__ = 0;
|
static int N__ = 0;
|
||||||
int bathroom_malloc(int width, int height)
|
int bathroom_malloc(int width, int height)
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
bathroom_frame[0] = (uint8_t*)vj_malloc(sizeof(uint8_t) * RUP8(width*height * 4));
|
bathroom_frame[0] = (uint8_t*)vj_malloc(sizeof(uint8_t) * RUP8(width*height * 4));
|
||||||
if(!bathroom_frame[0])
|
if(!bathroom_frame[0])
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -160,7 +160,6 @@ static void blob_init_( blob_t *b , int blob_id, int w , int h)
|
|||||||
int boids_malloc(int w, int h)
|
int boids_malloc(int w, int h)
|
||||||
{
|
{
|
||||||
int j,i;
|
int j,i;
|
||||||
double frac;
|
|
||||||
int dist_sqrt;
|
int dist_sqrt;
|
||||||
|
|
||||||
if(blob_radius_ <= 0)
|
if(blob_radius_ <= 0)
|
||||||
@@ -190,7 +189,6 @@ int boids_malloc(int w, int h)
|
|||||||
dist_sqrt = i * i + j * j;
|
dist_sqrt = i * i + j * j;
|
||||||
if( dist_sqrt < blob_sradius_ )
|
if( dist_sqrt < blob_sradius_ )
|
||||||
{
|
{
|
||||||
frac = (double) (sqrt(dist_sqrt)) / (double) blob_sradius_;
|
|
||||||
blob_[i + blob_radius_][j + blob_radius_] = 0xff;
|
blob_[i + blob_radius_][j + blob_radius_] = 0xff;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ void chromapalette_apply(VJFrame *frame, int width, int height, int angle, int r
|
|||||||
uint8_t *Cr = frame->data[2];
|
uint8_t *Cr = frame->data[2];
|
||||||
uint8_t U;
|
uint8_t U;
|
||||||
uint8_t V;
|
uint8_t V;
|
||||||
int y,u,v;
|
int y=0,u=128,v=128;
|
||||||
const float cb_mul = 0.492;
|
const float cb_mul = 0.492;
|
||||||
const float cr_mul = 0.877;
|
const float cr_mul = 0.877;
|
||||||
|
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ void dices_apply( void* data, VJFrame *frame, int width, int height,
|
|||||||
int cube_bits)
|
int cube_bits)
|
||||||
{
|
{
|
||||||
|
|
||||||
int i = 0, map_x, map_y, map_i = 0, base, dx, dy, di;
|
int i = 0, map_x, map_y, map_i = 0, base, dx, dy, di=0;
|
||||||
uint8_t *Y = frame->data[0];
|
uint8_t *Y = frame->data[0];
|
||||||
uint8_t *Cb = frame->data[1];
|
uint8_t *Cb = frame->data[1];
|
||||||
uint8_t *Cr = frame->data[2];
|
uint8_t *Cr = frame->data[2];
|
||||||
|
|||||||
@@ -66,9 +66,9 @@ void dummy_apply( VJFrame *frame, int width, int height, int color)
|
|||||||
|
|
||||||
void dummy_rgb_apply( VJFrame *frame, int width, int height, int r,int g, int b)
|
void dummy_rgb_apply( VJFrame *frame, int width, int height, int r,int g, int b)
|
||||||
{
|
{
|
||||||
const int len = frame->len;
|
const int len = frame->len;
|
||||||
const int uv_len = frame->uv_len;
|
const int uv_len = frame->uv_len;
|
||||||
int colorCb, colorCr, colorY;
|
int colorCb=128, colorCr=128, colorY=0;
|
||||||
|
|
||||||
uint8_t *Y = frame->data[0];
|
uint8_t *Y = frame->data[0];
|
||||||
uint8_t *Cb = frame->data[1];
|
uint8_t *Cb = frame->data[1];
|
||||||
|
|||||||
@@ -20,8 +20,8 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <libvjmem/vjmem.h>
|
#include <libvjmem/vjmem.h>
|
||||||
|
#include "common.h"
|
||||||
#include "flip.h"
|
#include "flip.h"
|
||||||
#include <stdlib.h>
|
|
||||||
vj_effect *flip_init(int w, int h)
|
vj_effect *flip_init(int w, int h)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -67,9 +67,8 @@ void isolate_apply( VJFrame *frame, int width,
|
|||||||
int height, int i_angle, int r, int g,
|
int height, int i_angle, int r, int g,
|
||||||
int b, int opacity)
|
int b, int opacity)
|
||||||
{
|
{
|
||||||
|
uint8_t *fg_cb, *fg_cr;
|
||||||
int8_t *fg_cb, *fg_cr;
|
int accept_angle_tg;
|
||||||
int accept_angle_tg, accept_angle_ctg;
|
|
||||||
int cb, cr;
|
int cb, cr;
|
||||||
float kg1, tmp, aa = 255, bb = 255, _y = 0;
|
float kg1, tmp, aa = 255, bb = 255, _y = 0;
|
||||||
float angle = (float) i_angle / 100.0f;
|
float angle = (float) i_angle / 100.0f;
|
||||||
@@ -90,7 +89,6 @@ void isolate_apply( VJFrame *frame, int width,
|
|||||||
|
|
||||||
/* obtain coordinate system for cb / cr */
|
/* obtain coordinate system for cb / cr */
|
||||||
accept_angle_tg = (int)( 15.0f * tanf(M_PI * angle / 180.0f));
|
accept_angle_tg = (int)( 15.0f * tanf(M_PI * angle / 180.0f));
|
||||||
accept_angle_ctg= (int)( 15.0f / tanf(M_PI * angle / 180.0f));
|
|
||||||
|
|
||||||
tmp = 1 / kg1;
|
tmp = 1 / kg1;
|
||||||
|
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ void radcor_apply( VJFrame *frame, int width, int height, int alpaX, int alpaY,
|
|||||||
|
|
||||||
if( alpha) {
|
if( alpha) {
|
||||||
for( i = 0; i < len; i ++ ) {
|
for( i = 0; i < len; i ++ ) {
|
||||||
A[i * width + j ] = Ai[ Map[i * width + j] ];
|
A[i] = Ai[ Map[i] ];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -209,7 +209,7 @@ void rgbkey_apply(VJFrame *frame, VJFrame *frame2, int width,int height, int tol
|
|||||||
uint8_t *A = frame->data[3];
|
uint8_t *A = frame->data[3];
|
||||||
uint8_t *B = frame2->data[3];
|
uint8_t *B = frame2->data[3];
|
||||||
const unsigned int len = frame->len;
|
const unsigned int len = frame->len;
|
||||||
int iy,iu,iv;
|
int iy=0,iu=128,iv=128;
|
||||||
uint8_t *T = temp[0];
|
uint8_t *T = temp[0];
|
||||||
uint8_t op0,op1;
|
uint8_t op0,op1;
|
||||||
|
|
||||||
|
|||||||
@@ -94,7 +94,6 @@ void threshold_apply( VJFrame *frame, VJFrame *frame2,int width, int height, int
|
|||||||
uint8_t *Cb2=frame2->data[1];
|
uint8_t *Cb2=frame2->data[1];
|
||||||
uint8_t *Cr2=frame2->data[2];
|
uint8_t *Cr2=frame2->data[2];
|
||||||
|
|
||||||
uint8_t *bmap = binary_img;
|
|
||||||
int len = frame->len;
|
int len = frame->len;
|
||||||
softblur_apply( frame, width,height,0 );
|
softblur_apply( frame, width,height,0 );
|
||||||
|
|
||||||
|
|||||||
@@ -84,9 +84,6 @@ static int prepare_filmstrip(int film_length, int w, int h)
|
|||||||
|
|
||||||
num_videos = film_length;
|
num_videos = film_length;
|
||||||
|
|
||||||
uint8_t val = 0;
|
|
||||||
// int inc = num_videos % 255;
|
|
||||||
|
|
||||||
for ( i = 0; i < num_videos; i ++ )
|
for ( i = 0; i < num_videos; i ++ )
|
||||||
{
|
{
|
||||||
video_list[i] = vj_calloc(sizeof(picture_t));
|
video_list[i] = vj_calloc(sizeof(picture_t));
|
||||||
@@ -101,7 +98,6 @@ static int prepare_filmstrip(int film_length, int w, int h)
|
|||||||
return 0;
|
return 0;
|
||||||
veejay_memset(video_list[i]->data[j], (j==0 ? pixel_Y_lo_ : 128), picture_width *picture_height );
|
veejay_memset(video_list[i]->data[j], (j==0 ? pixel_Y_lo_ : 128), picture_width *picture_height );
|
||||||
}
|
}
|
||||||
// val+= inc;
|
|
||||||
}
|
}
|
||||||
frame_counter = 0;
|
frame_counter = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ vj_effect *videowall_init(int w, int h)
|
|||||||
static picture_t **photo_list = NULL;
|
static picture_t **photo_list = NULL;
|
||||||
static int num_photos = 0;
|
static int num_photos = 0;
|
||||||
static int frame_counter = 0;
|
static int frame_counter = 0;
|
||||||
static int frame_delay = 0;
|
|
||||||
static int *offset_table_x = NULL;
|
static int *offset_table_x = NULL;
|
||||||
static int *offset_table_y = NULL;
|
static int *offset_table_y = NULL;
|
||||||
|
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ void colorfade_apply(VJFrame *frame, int width, int height, int opacity,
|
|||||||
unsigned int i, op0, op1;
|
unsigned int i, op0, op1;
|
||||||
unsigned int len = width * height;
|
unsigned int len = width * height;
|
||||||
uint8_t colorCb = 128, colorCr = 128;
|
uint8_t colorCb = 128, colorCr = 128;
|
||||||
uint8_t colorY;
|
uint8_t colorY=0;
|
||||||
const int uv_len = frame->uv_len;
|
const int uv_len = frame->uv_len;
|
||||||
uint8_t *Y = frame->data[0];
|
uint8_t *Y = frame->data[0];
|
||||||
uint8_t *Cb = frame->data[1];
|
uint8_t *Cb = frame->data[1];
|
||||||
|
|||||||
Reference in New Issue
Block a user