BlinkenLib

@@ -219,7 +219,7 @@ int main(int argCnt, char **args)

   stBlinkenMovie *pMovie;

   int i;

   char *str;

-  unsigned int height, width, channels, colors, times;

+  unsigned int height, width, channels, colors, times, top, left;

   int mode;

   // print info

@@ -253,6 +253,8 @@ int main(int argCnt, char **args)

            "     print movie\n"

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

            "     resize movie\n"

+           "  -cr <src-x>,<src-y> <width>x<height>\n"

+           "     crop movie\n"

            "  -s <width>x<height>\n"

            "     scale movie\n"

            "  -c <channels> [solid|rainbow]\n"

@@ -367,7 +369,7 @@ int main(int argCnt, char **args)

             printf("movie looped %u times\n", times);

         }

       } else

-        printf("missing movie format for \"-r\"\n");

+        printf("missing loop count for \"-l\"\n");

     }

     // output format, frame count and duration of movie

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

@@ -415,6 +417,32 @@ int main(int argCnt, char **args)

       } else

         printf("missing movie format for \"-r\"\n");

     }

+    // crop movie

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

+      if (i + 2 < argCnt) {

+        const char *topleft, *dimensions;

+        i++;

+        topleft = args[i];

+        i++;

+        dimensions = args[i];

+        if (sscanf

+            (topleft, "%u,%u", &left, &top) != 2)

+          printf("invalid top-left position \"%s\"\n", topleft);

+        else if (sscanf

+            (dimensions, "%ux%u", &width, &height) != 2)

+          printf("invalid movie dimensions \"%s\"\n", dimensions);

+        else if (pMovie == NULL)

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

+        else {

+          BlinkenMovieCrop(pMovie, top, left, height, width);

+          printf("movie cropped to %u,%u %ux%u\n", left, top, width, height);

+        }

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

+        printf("missing dimensions for \"-cr\"\n");

+        i++;

+      } else

+        printf("missing top-left position for \"-cr\"\n");

+    }

     // scale movie

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

       if (i + 1 < argCnt) {

@@ -339,12 +339,13 @@ int BlinkenFrameCompare(stBlinkenFrame *pFrame1, stBlinkenFrame *pFrame2)

   return 0;

 }

-void BlinkenFrameResize(stBlinkenFrame *pFrame, int height, int width,

-                        int channels, int maxval)

+static void BlinkenFramePadCrop(stBlinkenFrame *pFrame, int height, int width,

+                                int channels, int maxval,

+                                int emptyY, int emptyX, int skipY, int skipX)

 {

   unsigned char **ppData;

   int y, x, c, i, j;

-  int emptyY, emptyX, skipY, skipX, rangeY, rangeX;

+  int rangeY, rangeX;

   unsigned long val, div;

   if (pFrame == NULL)

@@ -367,14 +368,13 @@ void BlinkenFrameResize(stBlinkenFrame *pFrame, int height, int width,

   if (maxval > BlinkenMaxvalMax)

     maxval = BlinkenMaxvalMax;

-  if (height == pFrame->height &&

-      width == pFrame->width &&

-      channels == pFrame->channels && maxval == pFrame->maxval)

+  if (height == pFrame->height && width == pFrame->width &&

+      channels == pFrame->channels && maxval == pFrame->maxval &&

+      emptyX == 0 && emptyY == 0 && skipY == 0 && skipX == 0)

     return;

   // allocate new data array

-  ppData =

-      (unsigned char **)BlinkenMalloc2D(height, width * channels,

+  ppData = (unsigned char **)BlinkenMalloc2D(height, width * channels,

                                              sizeof(unsigned char));

   if (ppData == NULL)

     return;

@@ -383,27 +383,27 @@ void BlinkenFrameResize(stBlinkenFrame *pFrame, int height, int width,

       for (c = 0; c < channels; c++, i++)

         ppData[y][i] = 0;

-  // get number of pixels to skip / to leave empty in X and Y direction

-  if (height > pFrame->height) {

-    emptyY = (height - pFrame->height) / 2;

-    skipY = 0;

-    rangeY = pFrame->height;

-  } else {

+  // sanitize number of pixels to skip / to leave empty in X and Y direction

+  if (emptyY < 0)

     emptyY = 0;

-    skipY = (pFrame->height - height) / 2;

-    rangeY = height;

-  }

-  if (width > pFrame->width) {

-    emptyX = (width - pFrame->width) / 2;

-    skipX = 0;

-    rangeX = pFrame->width;

-  } else {

+  if (emptyY > height)

+    emptyY = height;

+  if (emptyX < 0)

     emptyX = 0;

-    skipX = (pFrame->width - width) / 2;

-    rangeX = width;

-  }

+  if (emptyX > width)

+    emptyX = width;

+  if (skipY < 0)

+    skipY = 0;

+  if (skipY > pFrame->height)

+    skipY = pFrame->height;

+  if (skipX < 0)

+    skipX = 0;

+  if (skipX > pFrame->width)

+    skipX = pFrame->width;

+  rangeY = mini(height - emptyY, pFrame->height - skipY);

+  rangeX = mini(width - emptyX, pFrame->width - skipX);

-  // resize frame with help of calculated parameters

+  // pad/crop frame with help of calculated parameters

   for (y = 0; y < rangeY; y++) {

     for (x = 0; x < rangeX; x++) {

       i = (skipX + x) * pFrame->channels;

@@ -444,6 +444,88 @@ void BlinkenFrameResize(stBlinkenFrame *pFrame, int height, int width,

   pFrame->ppData = ppData;

 }

+void BlinkenFrameResize(stBlinkenFrame *pFrame, int height, int width,

+                        int channels, int maxval)

+{

+  int emptyY, emptyX, skipY, skipX;

+

+  if (pFrame == NULL)

+    return;

+

+  if (height < BlinkenHeightMin)

+    height = BlinkenHeightMin;

+  if (height > BlinkenHeightMax)

+    height = BlinkenHeightMax;

+  if (width < BlinkenWidthMin)

+    width = BlinkenWidthMin;

+  if (width > BlinkenWidthMax)

+    width = BlinkenWidthMax;

+  if (channels < BlinkenChannelsMin)

+    channels = BlinkenChannelsMin;

+  if (channels > BlinkenChannelsMax)

+    channels = BlinkenMaxvalMax;

+  if (maxval < BlinkenMaxvalMin)

+    maxval = BlinkenMaxvalMin;

+  if (maxval > BlinkenMaxvalMax)

+    maxval = BlinkenMaxvalMax;

+

+  if (height == pFrame->height && width == pFrame->width &&

+      channels == pFrame->channels && maxval == pFrame->maxval)

+    return;

+

+  // get number of pixels to skip / to leave empty in X and Y direction

+  if (height > pFrame->height) {

+    emptyY = (height - pFrame->height) / 2;

+    skipY = 0;

+  } else {

+    emptyY = 0;

+    skipY = (pFrame->height - height) / 2;

+  }

+  if (width > pFrame->width) {

+    emptyX = (width - pFrame->width) / 2;

+    skipX = 0;

+  } else {

+    emptyX = 0;

+    skipX = (pFrame->width - width) / 2;

+  }

+

+  // resize frame with help of calculated parameters

+  BlinkenFramePadCrop(pFrame, height, width, channels, maxval,

+                      emptyY, emptyX, skipY, skipX);

+}

+

+void BlinkenFrameCrop(stBlinkenFrame *pFrame, int top, int left,

+                      int height, int width)

+{

+  if (pFrame == NULL)

+    return;

+

+  if (top < 0)

+    top = 0;

+  if (top > pFrame->height - BlinkenHeightMin)

+    top = pFrame->height - BlinkenHeightMin;

+  if (height < BlinkenHeightMin)

+    height = BlinkenHeightMin;

+  if (height > pFrame->height - top)

+    height = pFrame->height - top;

+  if (left < 0)

+    left = 0;

+  if (left > pFrame->width - BlinkenWidthMin)

+    left = pFrame->width - BlinkenWidthMin;

+  if (width < BlinkenWidthMin)

+    width = BlinkenWidthMin;

+  if (width > pFrame->width - left)

+    width = pFrame->width - left;

+

+  if (top == 0 && left == 0 &&

+      height == pFrame->height && width == pFrame->width)

+    return;

+

+  // crop frame with help of calculated parameters

+  BlinkenFramePadCrop(pFrame, height, width, pFrame->channels, pFrame->maxval,

+                      0, 0, top, left);

+}

+

 void BlinkenFrameScale(stBlinkenFrame *pFrame, int height, int width)

 {

   unsigned char **ppData;

@@ -48,6 +48,8 @@ int BlinkenFrameCompare(stBlinkenFrame *pFrame1, stBlinkenFrame *pFrame2);

 void BlinkenFrameResize(stBlinkenFrame *pFrame, int height, int width,

                         int channels, int maxval);

+void BlinkenFrameCrop(stBlinkenFrame *pFrame, int top, int left,

+                      int height, int width);

 void BlinkenFrameScale(stBlinkenFrame *pFrame, int height, int width);

 void BlinkenFrameColorize(stBlinkenFrame *pFrame, int channels, int mode,

                           int step);

@@ -567,6 +567,42 @@ void BlinkenMovieResize(stBlinkenMovie *pMovie, int height, int width,

     BlinkenFrameResize(pMovie->ppFrames[i], height, width, channels, maxval);

 }

+void BlinkenMovieCrop(stBlinkenMovie *pMovie, int top, int left,

+                      int height, int width)

+{

+  int i;

+

+  if (pMovie == NULL)

+    return;

+

+  if (top < 0)

+    top = 0;

+  if (top > pMovie->height - BlinkenHeightMin)

+    top = pMovie->height - BlinkenHeightMin;

+  if (height < BlinkenHeightMin)

+    height = BlinkenHeightMin;

+  if (height > pMovie->height - top)

+    height = pMovie->height - top;

+  if (left < 0)

+    left = 0;

+  if (left > pMovie->width - BlinkenWidthMin)

+    left = pMovie->width - BlinkenWidthMin;

+  if (width < BlinkenWidthMin)

+    width = BlinkenWidthMin;

+  if (width > pMovie->width - left)

+    width = pMovie->width - left;

+

+  if (top == 0 && left == 0 &&

+      height == pMovie->height && width == pMovie->width)

+    return;

+

+  pMovie->height = height;

+  pMovie->width = width;

+

+  for (i = 0; i < pMovie->frameCnt; i++)

+    BlinkenFrameCrop(pMovie->ppFrames[i], top, left, height, width);

+}

+

 void BlinkenMovieScale(stBlinkenMovie *pMovie, int height, int width)

 {

   int i;

@@ -63,6 +63,8 @@ void BlinkenMovieReverse(stBlinkenMovie *pMovie);

 void BlinkenMovieResize(stBlinkenMovie *pMovie, int height, int width,

                         int channels, int maxval);

+void BlinkenMovieCrop(stBlinkenMovie *pMovie, int top, int left,

+                      int height, int width);

 void BlinkenMovieScale(stBlinkenMovie *pMovie, int height, int width);

 void BlinkenMovieColorize(stBlinkenMovie *pMovie, int channels, int mode);

 void BlinkenMovieCopyRect(stBlinkenMovie *pDest, int destY, int destX,