Browse Source

working on singlepass

master
tth 1 year ago
parent
commit
2b03f3f516
  1. 10
      Fonderie/single.c
  2. 2
      Fonderie/single.h
  3. 23
      Fonderie/singlepass.c
  4. 2
      Fonderie/t.c

10
Fonderie/single.c

@ -20,20 +20,22 @@ @@ -20,20 +20,22 @@
/*
* singleton/private variables
*/
static int nextpng, counter;
static char *destination;
static int chainfilter;
/* and the classic global var */
extern int verbosity;
/* -------------------------------------------------------------- */
int single_init(int next, char *dest, int fxchain)
int single_init(int next, char *dest, int fxchain, int outfmt)
{
int foo;
struct stat stbuf;
#if DEBUG_LEVEL
fprintf(stderr, ">>> %s ( %d '%s' %d )\n", __func__,
next, dest, fxchain);
fprintf(stderr, ">>> %s ( %d '%s' %d %d )\n", __func__,
next, dest, fxchain, outfmt);
#endif
nextpng = next;

2
Fonderie/single.h

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
/* -------------------------------------------------------------- */
int single_init(int next, char *dest, int fxchain);
int single_init(int next, char *dest, int fxchain, int outfmt);
int single_push_picture(FloatImg *pimg);
int single_print_state(char *title, int k);

23
Fonderie/singlepass.c

@ -23,7 +23,8 @@ @@ -23,7 +23,8 @@
int verbosity;
/* ----------------------------------------------------------- */
int run_the_singlepass(char *globber, char *destdir, int fchain)
int run_the_singlepass(char *globber, char *destdir,
int fchain, int outfmt)
{
FloatImg image = { 0 };
int idx, foo;
@ -32,15 +33,15 @@ char *fname; @@ -32,15 +33,15 @@ char *fname;
double elapsed;
#if DEBUG_LEVEL
fprintf(stderr, ">>> %s ( '%s' '%s' %d )\n", __func__,
globber, destdir, fchain);
fprintf(stderr, ">>> %s ( '%s' '%s' %d %d )\n", __func__,
globber, destdir, fchain, outfmt);
#endif
// filterstack_list(fchain, "Run the single pass");
(void)fimg_timer_set(0);
foo = single_init(0, destdir, fchain);
foo = single_init(0, destdir, fchain, outfmt);
if (foo) {
fprintf(stderr, "erreur %d single_init\n", foo);
return foo;
@ -106,8 +107,10 @@ for (idx=0; idx<globbuf.gl_pathc; idx++) { @@ -106,8 +107,10 @@ for (idx=0; idx<globbuf.gl_pathc; idx++) {
fprintf(stderr, "\n");
globfree(&globbuf);
fimg_destroy(&image);
single_print_state("end of run :)", 0);
single_print_state("end of run", 0);
elapsed = fimg_timer_get(0);
fprintf(stderr, "%s: %ld frames, elapsed %.3f s, %.3f fps\n",
@ -139,12 +142,18 @@ int foo, opt; @@ -139,12 +142,18 @@ int foo, opt;
char *filterchain = "none";
char *globbing = "./capture/?????.fimg";
char *outdir = "./p8";
char *outtype = ".png";
int do_xper = 0;
fprintf(stderr, "*** %s : compiled %s %s\n", __FILE__,
__DATE__, __TIME__);
fimg_print_version(2);
if (argc < 2) {
fprintf(stderr, "\t/!\\ %s is option driven\n", argv[0]);
help();
}
while ((opt = getopt(argc, argv, "hF:g:LO:svx")) != -1) {
switch (opt) {
case 'h': help(); break;
@ -179,11 +188,11 @@ if (verbosity) { @@ -179,11 +188,11 @@ if (verbosity) {
fprintf(stderr, "\tpid %d\n", getpid());
fprintf(stderr, "\tinput glob %s\n", globbing);
fprintf(stderr, "\tfilter chain %s\n", filterchain);
fprintf(stderr, "\tourput dir %s\n", outdir);
fprintf(stderr, "\toutput dir %s\n", outdir);
fprintf(stderr, "\tdo xper %d\n", do_xper);
}
foo = run_the_singlepass(globbing, outdir, FILTERS);
foo = run_the_singlepass(globbing, outdir, FILTERS, -1);
fprintf(stderr, "\n\tRun the single pass --> %d\n", foo);
return 0;

2
Fonderie/t.c

@ -89,7 +89,7 @@ fprintf(stderr, ">>> %s ( '%s' '%s' %d )\n", __func__, @@ -89,7 +89,7 @@ fprintf(stderr, ">>> %s ( '%s' '%s' %d )\n", __func__,
filterstack_list(chain, "essai du single");
foo = single_init(0, destdir, chain);
foo = single_init(0, destdir, chain, -1);
if (foo) {
fprintf(stderr, "erreur %d single_init\n", foo);
return foo;

Loading…
Cancel
Save