Libvje / refactor : blob

* w ,h
* clean headers
This commit is contained in:
[d.j.a.y] Jerome Blanchi
2016-07-29 17:57:13 +02:00
parent 38e82d310d
commit c632b95970
4 changed files with 8 additions and 17 deletions

View File

@@ -48,11 +48,8 @@
*/
#include <config.h>
#include <stdint.h>
#include <stdio.h>
#include <libvjmem/vjmem.h>
#include "common.h"
#include <libvjmem/vjmem.h>
#include "blob.h"
typedef struct
@@ -213,10 +210,11 @@ static blob_func blob_render(void)
return &blob_render_circle;
}
void blob_apply(VJFrame *frame,
int width, int height, int radius, int num, int speed, int shape)
void blob_apply(VJFrame *frame, int radius, int num, int speed, int shape)
{
const int len = frame->len;
const unsigned int width = frame->width;
const unsigned int height = frame->height;
const unsigned int len = frame->len;
uint8_t *srcY = frame->data[0];
uint8_t *srcCb= frame->data[1];
uint8_t *srcCr= frame->data[2];

View File

@@ -20,13 +20,8 @@
#ifndef BLOB_H
#define BLOB_H
#include <libvje/vje.h>
#include <sys/types.h>
#include <stdint.h>
vj_effect *blob_init(int w, int h);
void blob_apply( VJFrame *frame, int width, int height, int p0,int p1, int p2, int p3);
void blob_apply( VJFrame *frame, int p0,int p1, int p2, int p3);
int blob_malloc( int w, int h );
void blob_free(void);
#endif

View File

@@ -459,8 +459,7 @@ extern int bgpush_prepare( VJFrame *frame );
extern void cartonize_apply( VJFrame *frame, int b1, int b2, int b3 );
extern void morphology_apply( VJFrame *frame, int threshold, int kernel, int mode, int channel);
extern void colmorphology_apply( VJFrame *frame, int t, int v, int p);
extern void blob_apply( VJFrame *frame, int w, int h, int p0,int p1, int p2, int p3);
extern void blob_apply( VJFrame *frame, int p0,int p1, int p2, int p3);
extern void boids_apply( VJFrame *frame, int w, int h, int p0,int p1, int p2, int p3, int p4, int p5, int p6, int p7
);

View File

@@ -227,8 +227,7 @@ static void vj_effman_apply_image_effect(
cartonize_apply( frames[0], arg[0], arg[1], arg[2] );
break;
case VJ_IMAGE_EFFECT_VIDBLOB:
blob_apply( frames[0],frames[0]->width,frames[0]->height,
arg[0],arg[1],arg[2],arg[3] );
blob_apply( frames[0], arg[0], arg[1], arg[2], arg[3] );
break;
case VJ_IMAGE_EFFECT_VIDBOIDS:
boids_apply( frames[0],frames[0]->width,frames[0]->height,