BlinkenLib

@@ -1,4 +1,5 @@

 *.o

+.*.swp

 BlinkenConv

 BlinkenOutput

 BlinkenRecv

@@ -9,6 +9,14 @@

 #include <BlinkenLib/BlinkenLib.h>

+/**

+ * @brief generate test movie

+ * @param[in,out] *pMovie pointer to old/new/changed movie

+ * @param[in] str_format format of new video to generate,

+ *                       may be NULL for appending to video

+ * @param[in] str_mode test movie mode: black, white, dots, lines, trans

+ * @param[in] str_duration duration of each frame in ms (as string)

+ */

 static void gen_test_movie(stBlinkenMovie **ppMovie, const char *str_format,

                            const char *str_mode, const char *str_duration)

 {

@@ -16,8 +24,28 @@ static void gen_test_movie(stBlinkenMovie **ppMovie, const char *str_format,

   enum {

     ModeNone, ModeBlack, ModeWhite, ModeDots, ModeLines, ModeTrans

   } mode = ModeNone;

-  int duration;

+  int fmt_ok, append, duration;

+  //format

+  if (str_format == NULL) {

+    if (*ppMovie == NULL) {

+      str_format = "<none>";

+      fmt_ok = 0;

+      append = 0;

+    } else {

+      height = BlinkenMovieGetHeight(*ppMovie);

+      width = BlinkenMovieGetWidth(*ppMovie);

+      channels = BlinkenMovieGetChannels(*ppMovie);

+      colors = BlinkenMovieGetMaxval(*ppMovie) + 1;

+      fmt_ok = 1;

+      append = 1;

+    }

+  } else {

+    fmt_ok = sscanf(str_format, "%ux%u-%u/%u",

+                    &width, &height, &channels, &colors) == 4;

+    append = 0;

+  }

+  //mode

   if (strcmp(str_mode, "black") == 0)

     mode = ModeBlack;

   if (strcmp(str_mode, "white") == 0)

@@ -28,22 +56,26 @@ static void gen_test_movie(stBlinkenMovie **ppMovie, const char *str_format,

     mode = ModeLines;

   if (strcmp(str_mode, "trans") == 0)

     mode = ModeTrans;

-  if (sscanf(str_format, "%ux%u-%u/%u", &width, &height, &channels, &colors)

-      != 4)

-    printf("invalid movie format \"%s\" for \"-t\"\n", str_format);

+  //check

+  if (! fmt_ok)

+    printf("invalid movie format \"%s\" for \"-t\" or \"-ta\"\n", str_format);

   else if (mode == ModeNone)

-    printf("invalid test mode \"%s\" for \"-t\"\n", str_mode);

+    printf("invalid test mode \"%s\" for \"-t\" or \"-ta\"\n", str_mode);

   else if (sscanf(str_duration, "%u", &duration) != 1)

-    printf("invalid duration \"%s\" for \"-t\"\n", str_duration);

+    printf("invalid duration \"%s\" for \"-t\" or \"-ta\"\n", str_duration);

   else {

+    if (! append) {

       if (*ppMovie != NULL)

         BlinkenMovieFree(*ppMovie);

       *ppMovie = BlinkenMovieNew(height, width, channels, colors - 1);

       if (*ppMovie == NULL)

-      printf("could not create movie with format \"%ux%u-%x/%u\" for \"-t\"\n",

+        printf("could not create movie with format \"%ux%u-%x/%u\""

+               " for \"-t\" or \"-ta\"\n",

                width, height, channels, colors);

-    else {

+    }

+

+    if (*ppMovie != NULL) {

       unsigned int y, x, c, c2, c3, o, b, yy, xx, cc, oo;

       stBlinkenFrame *pFrame;

@@ -229,9 +261,10 @@ int main(int argCnt, char **args)

            "     reverse movie\n"

            "  -d <first> <count>\n"

            "     delete frames\n"

-           "  -t <width>x<height>-<channels>/<colors>\n"

-           "     [black|white|dots|lines|trans] <duration>\n"

+           "  -t <width>x<height>-<channels>/<colors> <test_mode> <duration>\n"

            "     generate a test movie\n"

+           "  -ta <test_mode> <duration>\n"

+           "     generate a test movie and append it to current video\n"

            "  -C <file> <src-x>,<src-y> <width>x<height> <dest-x>,<dest-y>\n"

            "     copy rectangular section of other movie\n"

            "  -Rcw\n"

@@ -250,6 +283,7 @@ int main(int argCnt, char **args)

            "     mirror movie diagonally (/)\n"

            "  -o <file>\n"

            "     write movie to file (*.blm, *.bmm, *.bml, *.bbm)\n\n"

+           "test_modes: black, white, dots, lines, trans\n\n"

            "old syntax: %s <input-file> [<output-file>]\n\n",

            args[0], args[0]);

     return 0;

@@ -487,6 +521,24 @@ int main(int argCnt, char **args)

       } else

         printf("missing format for \"-t\"\n");

     }

+    // generate test movie and append it to current video

+    else if (strcmp(args[i], "-ta") == 0) {

+      if (i + 2 < argCnt) {

+        const char *str_mode, *str_duration;

+        i++;

+        str_mode = args[i];

+        i++;

+        str_duration = args[i];

+        if (pMovie == NULL)

+          printf("no movie loaded to append to\n");

+        else

+          gen_test_movie(&pMovie, NULL /* append */, str_mode, str_duration);

+      } else if (i + 1 < argCnt) {

+        printf("missing duration for \"-ta\"\n");

+        i += 1;

+      } else if (i < argCnt)

+        printf("missing test mode for \"-ta\"\n");

+    }

     // copy rectangular section of other movie

     else if (strcmp(args[i], "-C") == 0) {

       if (i + 4 < argCnt) {