Browse Source

on verra demain

master
tonton th 2 years ago
parent
commit
b8e5bbf3cc
  1. 10
      Fonderie/crapulator.c
  2. 2
      Fonderie/metriques.c
  3. 4
      Fonderie/notes.md
  4. 31
      Fonderie/sfx.c
  5. 1
      Fonderie/sfx.h
  6. 2
      floatimg.h
  7. 7
      tools/cumulfimgs.c
  8. 5
      v4l2/grabvidseq.c

10
Fonderie/crapulator.c

@ -196,6 +196,10 @@ switch (idFx) { @@ -196,6 +196,10 @@ switch (idFx) {
/* hipass filter */
retval = insitu_filtre3x3(image, 1);
break;
case 20:
retval = octotree_classif(image, 0);
break;
/* here are the glitches */
case 24: /* experiment ! */
@ -237,8 +241,6 @@ typedef struct { @@ -237,8 +241,6 @@ typedef struct {
int flags;
} Crapulor;
/* -------------------------------------------------------------- */
char * crap_name_from_number(int num)
{
@ -252,10 +254,14 @@ switch (num) { @@ -252,10 +254,14 @@ switch (num) {
case 9: return "classif0";
case 10: return "binariz";
case 11: return "trinariz";
case 12: return "smoo2x2";
case 13: return "fltr3x3";
case 14: return "desatur";
case 15: return "killines";
case 18: return "updown";
case 20: return "octoclass";
}
return "???";

2
Fonderie/metriques.c

@ -15,7 +15,7 @@ extern int verbosity; @@ -15,7 +15,7 @@ extern int verbosity;
*/
int get_float_metric_a(FloatImg *pimg, float *where)
{
float means[4];
float means[4]; /* four values : R G B A */
int foo;
#if DEBUG_LEVEL

4
Fonderie/notes.md

@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
pipeliner le graber et le fondeur par la SHM ?

31
Fonderie/sfx.c

@ -18,6 +18,37 @@ @@ -18,6 +18,37 @@
*/
extern int verbosity;
/* -------------------------------------------------------------- */
/* nouveau du 27 decembre 2020, un soir de grand froid... */
int octotree_classif(FloatImg *pimg, int notused)
{
int foo;
float mm[6], means[4];
fprintf(stderr, ">>> %s ( %p %d )\n", __func__, pimg, notused);
foo = fimg_meanvalues(pimg, means);
if (foo) {
fprintf(stderr, "oups %d in meanvalues\n", foo);
return foo;
}
fprintf(stderr, "means: %11f %11f %11f\n", means[0], means[1], means[2]);
foo = fimg_get_minmax_rgb(pimg, mm);
if (foo) {
fprintf(stderr, "oups %d in get minmax\n", foo);
return foo;
}
fimg_print_minmax(mm, __func__);
/*
* compute the height center points */
return -1;
}
/* -------------------------------------------------------------- */
/* nouveau du 19 decembre 2020, pour le grand ecran de da Scritch */

1
Fonderie/sfx.h

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
int bouger_les_pixels(FloatImg *pimg, int kaboo);
int octotree_classif(FloatImg *pimg, int notused);
int mirror_split(FloatImg *pimg, int kaboo);
int upside_down(FloatImg *pimg);

2
floatimg.h

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
* ugly code from tTh
*/
#define FIMG_VERSION 115
#define FIMG_VERSION 116
/*
* in memory descriptor

7
tools/cumulfimgs.c

@ -24,7 +24,9 @@ if (foo) { @@ -24,7 +24,9 @@ if (foo) {
return foo;
}
if (verbosity) fprintf(stderr, "%-20s %d x %d\n",path, numbers[0], numbers[1]);
if (verbosity) {
fprintf(stderr, "%-20s %dx%d\n", path, numbers[0], numbers[1]);
}
if (FIMG_TYPE_RGB != numbers[2]) {
fprintf(stderr, "file %s, %d : bad type\n", path, numbers[2]);
@ -51,6 +53,7 @@ int main(int argc, char *argv[]) @@ -51,6 +53,7 @@ int main(int argc, char *argv[])
{
int foo, idx;
int opt;
int compte = 0;
int to_gray = 0;
char *output_file = "out.fimg";
@ -97,6 +100,7 @@ for (idx=optind; idx<argc; idx++) { @@ -97,6 +100,7 @@ for (idx=optind; idx<argc; idx++) {
}
fimg_add_2(&temp, &accu);
}
compte++;
}
if (to_gray) {
@ -119,6 +123,7 @@ if (verbosity) { @@ -119,6 +123,7 @@ if (verbosity) {
fprintf(stderr, "err %d on fimg_get_minmax_rgb\n", foo);
return foo;
}
printf("Count %d\n", compte);
printf("Rmin %12.4g Rmax %12.4g delta %12g\n",
vals[0], vals[1], vals[1]-vals[0]);
printf("Gmin %12.4g Gmax %12.4g %12g\n",

5
v4l2/grabvidseq.c

@ -191,7 +191,7 @@ if ((fmt.fmt.pix.width != width) || (fmt.fmt.pix.height != height)) { @@ -191,7 +191,7 @@ if ((fmt.fmt.pix.width != width) || (fmt.fmt.pix.height != height)) {
fmt.fmt.pix.width, fmt.fmt.pix.height);
}
fprintf(stderr,"--- Ok 1\n");
// fprintf(stderr,"--- Ok 1\n");
CLEAR(req);
req.count = NBR_BUFFERS;
@ -241,7 +241,6 @@ else { @@ -241,7 +241,6 @@ else {
fmt.fmt.pix.width, fmt.fmt.pix.height,
FIMG_TYPE_RGB);
}
fimg_clear(&cumul);
cumul.fval = 255.0; /* must be read from camera XXX */
cumul.count = 0;
@ -282,12 +281,10 @@ for (i = 0; i < nbre_capt; i++) { @@ -282,12 +281,10 @@ for (i = 0; i < nbre_capt; i++) {
fimg_timer_get(0));
fflush(stderr);
}
CLEAR(buf);
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_MMAP;
xioctl(fd, VIDIOC_DQBUF, &buf);
if(verbosity > 2) {
fprintf(stderr, "xioctl VIDIOC_DQBUF done\n");
fflush(stderr);

Loading…
Cancel
Save