libetherpix

@@ -17,7 +17,7 @@

 LIBTARGET := libetherpix

 VER_MAJ   := 1

-VER_MIN   := 2

+VER_MIN   := 3

 VER_REV   := 0

 VERSION   := $(VER_MAJ).$(VER_MIN).$(VER_REV)

@@ -12,8 +12,8 @@ are sent for one frame - a single MCUF frame to every distributor.

 The coordinates of the pixels in the MCUF packets do not correspond to pixel

 locations, but to pixel addresses. The y coordinate is the number of the

 output of the distributor and the x coordinate is the number of the pixel

-in the chain. The number of channels is always 3 (RGB) and the maximum value

-is always 255 (8 bit per channel).

+in the chain. The number of channels is always 1 (monochrome)  or 3 (RGB) and

+the maximum value is always 255 (8 bit per channel).

 This library can be used to send the required UDP packets to the EtherPix

 display to make it show images and/or videos.

@@ -41,8 +41,9 @@ distributorAddr 0 = 192.168.0.111:2323

 # and the values transmitted to the display

 # a mapping is configured per distributor and applies to all pixels

 # connected to it

+# RGB distributors use red, green and blue, monochrone distributors use white

 # syntax:

-#   mapping <distno> (red|green|blue) = <base> <factor> <gamma>

+#   mapping <distno> (red|green|blue|white) = <base> <factor> <gamma>

 # description:

 #   distno: number of distributor

 #   base, factor, gamma: floating-point values used in formula

@@ -0,0 +1,72 @@

+# EtherPix configuration file for screen with 2x2 panels of 8x12 pixels each

+

+# address of local output socket

+# all distributors must be reachable from this address

+# syntax:

+#   bindAddr = <IPv4>:<port>

+# description:

+#   IPv4: IPv4 address, 0.0.0.0 for all local interfaces

+#   port: UDP port number, 0 for automatic selection

+bindAddr = 0.0.0.0:0

+

+# size of the (virtual) rectangluar display

+# syntax:

+#   size = <width>,<height>

+# description:

+#   width: width in pixels

+#   height: height in pixels

+size = 16,24

+

+# configure distributors

+# syntax:

+#   distributor <distno> = <outputs>,<pixels>

+# description:

+#   distno: number of distributor

+#   outputs: number of outputs per distributor

+#   pixels: number of pixels per output

+distributor 0 = 32,96

+

+# set address of distributor

+# if address is not set, default IP/UDP configuration is used:

+#   IPv4: 10.70.80.<distno>

+#   UDP port: 2323

+# syntax:

+#   distributorAddr = <IPv4>:<port>

+# description:

+#   IPv4: IPv4 address

+#   port: UDP port number

+distributorAddr 0 = 192.168.0.111:2323

+

+# configure mapping between the color channel values in the video

+# and the values transmitted to the display

+# a mapping is configured per distributor and applies to all pixels

+# connected to it

+# RGB distributors use red, green and blue, monochrone distributors use white

+# syntax:

+#   mapping <distno> (red|green|blue|white) = <base> <factor> <gamma>

+# description:

+#   distno: number of distributor

+#   base, factor, gamma: floating-point values used in formula

+# mapping formula:

+#   display := base + factor * video ** (1.0 / gamma)

+# description:

+#   display: the value sent to the actual pixel connected to the distributor

+#   video: the color channel value taken from the video

+mapping 0 white = 0.0 1.0 1.0

+

+# specify logical positions of the pixels at distributor outputs

+# for each physical pixel, the source pixel in the video is specified

+# in video coordinates

+# syntax:

+#   output <distno>,<outno> = <px 1 x>,<px 1 y> <px 2 x>,<px 2 y> ...

+#   <pixel N>

+# description:

+#   distno: number of distributor

+#   outno: number of output of distributor

+#   px i x/y: the x/y cordinate of the video pixel whose color is to be sent

+#             to the i-th pixel connected to the output of the distributor

+output 0,0 = 0,11 0,10 0,9 0,8 0,7 0,6 0,5 0,4 0,3 0,2 0,1 0,0 1,0 1,1 1,2 1,3 1,4 1,5 1,6 1,7 1,8 1,9 1,10 1,11 2,11 2,10 2,9 2,8 2,7 2,6 2,5 2,4 2,3 2,2 2,1 2,0 3,0 3,1 3,2 3,3 3,4 3,5 3,6 3,7 3,8 3,9 3,10 3,11 4,11 4,10 4,9 4,8 4,7 4,6 4,5 4,4 4,3 4,2 4,1 4,0 5,0 5,1 5,2 5,3 5,4 5,5 5,6 5,7 5,8 5,9 5,10 5,11 6,11 6,10 6,9 6,8 6,7 6,6 6,5 6,4 6,3 6,2 6,1 6,0 7,0 7,1 7,2 7,3 7,4 7,5 7,6 7,7 7,8 7,9 7,10 7,11

+output 0,1 = 0,23 0,22 0,21 0,20 0,19 0,18 0,17 0,16 0,15 0,14 0,13 0,12 1,12 1,13 1,14 1,15 1,16 1,17 1,18 1,19 1,20 1,21 1,22 1,23 2,23 2,22 2,21 2,20 2,19 2,18 2,17 2,16 2,15 2,14 2,13 2,12 3,12 3,13 3,14 3,15 3,16 3,17 3,18 3,19 3,20 3,21 3,22 3,23 4,23 4,22 4,21 4,20 4,19 4,18 4,17 4,16 4,15 4,14 4,13 4,12 5,12 5,13 5,14 5,15 5,16 5,17 5,18 5,19 5,20 5,21 5,22 5,23 6,23 6,22 6,21 6,20 6,19 6,18 6,17 6,16 6,15 6,14 6,13 6,12 7,12 7,13 7,14 7,15 7,16 7,17 7,18 7,19 7,20 7,21 7,22 7,23

+output 0,2 = 8,11 8,10 8,9 8,8 8,7 8,6 8,5 8,4 8,3 8,2 8,1 8,0 9,0 9,1 9,2 9,3 9,4 9,5 9,6 9,7 9,8 9,9 9,10 9,11 10,11 10,10 10,9 10,8 10,7 10,6 10,5 10,4 10,3 10,2 10,1 10,0 11,0 11,1 11,2 11,3 11,4 11,5 11,6 11,7 11,8 11,9 11,10 11,11 12,11 12,10 12,9 12,8 12,7 12,6 12,5 12,4 12,3 12,2 12,1 12,0 13,0 13,1 13,2 13,3 13,4 13,5 13,6 13,7 13,8 13,9 13,10 13,11 14,11 14,10 14,9 14,8 14,7 14,6 14,5 14,4 14,3 14,2 14,1 14,0 15,0 15,1 15,2 15,3 15,4 15,5 15,6 15,7 15,8 15,9 15,10 15,11

+output 0,3 = 8,23 8,22 8,21 8,20 8,19 8,18 8,17 8,16 8,15 8,14 8,13 8,12 9,12 9,13 9,14 9,15 9,16 9,17 9,18 9,19 9,20 9,21 9,22 9,23 10,23 10,22 10,21 10,20 10,19 10,18 10,17 10,16 10,15 10,14 10,13 10,12 11,12 11,13 11,14 11,15 11,16 11,17 11,18 11,19 11,20 11,21 11,22 11,23 12,23 12,22 12,21 12,20 12,19 12,18 12,17 12,16 12,15 12,14 12,13 12,12 13,12 13,13 13,14 13,15 13,16 13,17 13,18 13,19 13,20 13,21 13,22 13,23 14,23 14,22 14,21 14,20 14,19 14,18 14,17 14,16 14,15 14,14 14,13 14,12 15,12 15,13 15,14 15,15 15,16 15,17 15,18 15,19 15,20 15,21 15,22 15,23

+

@@ -41,8 +41,9 @@ distributorAddr 0 = 192.168.0.111:2323

 # and the values transmitted to the display

 # a mapping is configured per distributor and applies to all pixels

 # connected to it

+# RGB distributors use red, green and blue, monochrone distributors use white

 # syntax:

-#   mapping <distno> (red|green|blue) = <base> <factor> <gamma>

+#   mapping <distno> (red|green|blue|white) = <base> <factor> <gamma>

 # description:

 #   distno: number of distributor

 #   base, factor, gamma: floating-point values used in formula

@@ -42,8 +42,9 @@ distributorAddr 0 = 127.0.0.1:23000 # simulator

 # and the values transmitted to the display

 # a mapping is configured per distributor and applies to all pixels

 # connected to it

+# RGB distributors use red, green and blue, monochrone distributors use white

 # syntax:

-#   mapping <distno> (red|green|blue) = <base> <factor> <gamma>

+#   mapping <distno> (red|green|blue|white) = <base> <factor> <gamma>

 # description:

 #   distno: number of distributor

 #   base, factor, gamma: floating-point values used in formula

@@ -41,8 +41,9 @@ distributorAddr 0 = 127.0.0.1:23000 # simulator

 # and the values transmitted to the display

 # a mapping is configured per distributor and applies to all pixels

 # connected to it

+# RGB distributors use red, green and blue, monochrone distributors use white

 # syntax:

-#   mapping <distno> (red|green|blue) = <base> <factor> <gamma>

+#   mapping <distno> (red|green|blue|white) = <base> <factor> <gamma>

 # description:

 #   distno: number of distributor

 #   base, factor, gamma: floating-point values used in formula

@@ -29,7 +29,8 @@ distributor 15 = 6,64

 # those lines introduce a mapping between the channel values in the video and the values transmitted to the display

 #  - mapping is done per distributor and applies to all pixels connected to it

-#  - the general format is: mapping <distributor number> (red|green|blue) = <base> <factor> <gamma>

+#  - RGB distributors use red, green and blue, monochrone distributors use white

+#  - the general format is: mapping <distributor number> (red|green|blue|white) = <base> <factor> <gamma>

 #  - the mapping formula is: <display value> := <base> + <factor> * <original value> ^ (1 / <gamma>)

 mapping 0 red = 0.005 0.99 1.0

 mapping 0 green = 0.005 0.99 1.0

@@ -0,0 +1,26 @@

+# EtherPix configuration file

+

+# the address to bind the local socket to

+#  - the EtherPix network 10.70.80.0/16 must be reachable from this address

+bindAddr = 0.0.0.0:0

+

+# the size of the display

+#  - <width>,<height> in pixels

+size = 8,8

+

+# this line adds a new distributor

+#  - the general format is: distributor <distributor number> = <number of outputs>,<number of pixel per output>

+distributor 0 = 6,64

+

+# those lines introduce a mapping between the channel values in the video and the values transmitted to the display

+#  - mapping is done per distributor and applies to all pixels connected to it

+#  - RGB distributors use red, green and blue, monochrone distributors use white

+#  - the general format is: mapping <distributor number> (red|green|blue|white) = <base> <factor> <gamma>

+#  - the mapping formula is: <display value> := <base> + <factor> * <original value> ^ (1 / <gamma>)

+mapping 0 white = 0.0 1.0 1.0

+

+# these lines specify the logical positions of the pixels at an output in movie coordinates

+#  - the general format is: output <distributor number>,<output number> = <pixel x>,<pixel y> ...

+#  - the order of the pixels is the order they are connected in the chain

+output 0,0 = 0,0 1,0 2,0 3,0 4,0 5,0 6,0 7,0 7,1 6,1 5,1 4,1 3,1 2,1 1,1 0,1 0,2 1,2 2,2 3,2 4,2 5,2 6,2 7,2 7,3 6,3 5,3 4,3 3,3 2,3 1,3 0,3 0,4 1,4 2,4 3,4 4,4 5,4 6,4 7,4 7,5 6,5 5,5 4,5 3,5 2,5 1,5 0,5 0,6 1,6 2,6 3,6 4,6 5,6 6,6 7,6 7,7 6,7 5,7 4,7 3,7 2,7 1,7 0,7

+

@@ -14,7 +14,8 @@ distributor 0 = 6,64

 # those lines introduce a mapping between the channel values in the video and the values transmitted to the display

 #  - mapping is done per distributor and applies to all pixels connected to it

-#  - the general format is: mapping <distributor number> (red|green|blue) = <base> <factor> <gamma>

+#  - RGB distributors use red, green and blue, monochrone distributors use white

+#  - the general format is: mapping <distributor number> (red|green|blue|white) = <base> <factor> <gamma>

 #  - the mapping formula is: <display value> := <base> + <factor> * <original value> ^ (1 / <gamma>)

 mapping 0 red = 0.0 1.0 1.0

 mapping 0 green = 0.0 1.0 1.0

@@ -32,6 +32,7 @@ typedef struct etp_display_s etp_display_t;

 typedef enum etp_pixfmt_e {

   etp_pixfmt_rgb24, /**< 24 bit RGB data, 3 bytes: red, green, blue */

   etp_pixfmt_bgr24, /**< 24 bit BGR data, 3 bytes: blue, green, red */

+  etp_pixfmt_mono8, /**< 8 bit monochrome data, 1 byte: white */

 } etp_pixfmt_t;

 /**

@@ -110,6 +110,8 @@ int etp_config_proc_distri(etp_config_ctx_t *p_ctx, char *p_setting_part2,

   p_distri->pixel_cnt = pix;

   /* no network address yet */

   p_distri->addr_cnt = 0;

+  /* RGB by default */

+  p_distri->channels = 3;

   /* initialize mapping information */

   for (i = 0; i < 3; i++) {

     p_distri->mapping[i].base = 0.0;

@@ -130,9 +132,9 @@ int etp_config_proc_distri(etp_config_ctx_t *p_ctx, char *p_setting_part2,

     p_distri->p_pixels[i].x = -1;

     p_distri->p_pixels[i].y = -1;

   }

-  /* create and initialize message buffer */

-  p_distri->msg_len = ETP_MCUF_HDR_LEN + out * pix * 3;

-  p_distri->p_msg_buf = (etp_u8_t *)malloc(p_distri->msg_len);

+  /* create and initialize message buffer (for up to 3 channels) */

+  p_distri->msg_buf_len = ETP_MCUF_HDR_LEN + out * pix * 3;

+  p_distri->p_msg_buf = (etp_u8_t *)malloc(p_distri->msg_buf_len);

   if (!p_distri->p_msg_buf) {

     free(p_distri->p_pixels);

     free(p_distri);

@@ -140,7 +142,7 @@ int etp_config_proc_distri(etp_config_ctx_t *p_ctx, char *p_setting_part2,

       p_ctx->p_msg_func(p_ctx->p_msg_ctx, etp_msg_type_err, "out of memory\n");

     return -1;

   }

-  memset(p_distri->p_msg_buf, 0, p_distri->msg_len);

+  memset(p_distri->p_msg_buf, 0, p_distri->msg_buf_len);

   memcpy(p_distri->p_msg_buf, etp_mcuf_hdr, ETP_MCUF_HDR_LEN);

   p_distri->p_msg_buf[ETP_MCUF_HDR_OFS_OUTPUTS_U16 + 0] = (etp_u8_t)(out >> 8);

   p_distri->p_msg_buf[ETP_MCUF_HDR_OFS_OUTPUTS_U16 + 1] = (etp_u8_t)out;

@@ -239,7 +241,7 @@ int etp_config_proc_mapping(etp_config_ctx_t *p_ctx, char *p_setting_part2,

 {

   char *ptr, *ptr2;

   unsigned long val;

-  unsigned int distri, chan;

+  unsigned int distri, channels, chan;

   etp_distri_t *p_distri;

   double base, factor, gamma;

@@ -268,13 +270,19 @@ int etp_config_proc_mapping(etp_config_ctx_t *p_ctx, char *p_setting_part2,

   /* get channel */

   while (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n')

     ptr++;

-  if (!strcmp(ptr, "red"))

+  if (!strcmp(ptr, "red")) {

+    channels = 3;

     chan = 0;

-  else if (!strcmp(ptr, "green"))

+  } else if (!strcmp(ptr, "green")) {

+    channels = 3;

     chan = 1;

-  else if (!strcmp(ptr, "blue"))

+  } else if (!strcmp(ptr, "blue")) {

+    channels = 3;

     chan = 2;

-  else {

+  } else if (!strcmp(ptr, "white")) {

+    channels = 1;

+    chan = 0;

+  } else {

     if (p_ctx->p_msg_func)

       p_ctx->p_msg_func(p_ctx->p_msg_ctx, etp_msg_type_err,

                         "invalid channel \"%s\""

@@ -337,12 +345,22 @@ int etp_config_proc_mapping(etp_config_ctx_t *p_ctx, char *p_setting_part2,

     return -1;

   }

-  /* store new mapping parameters and re-calculate mapping table */

+  /* store number of channels as well as new mapping parameters

+   * and re-calculate mapping table */

+  p_distri->channels = channels;

   p_distri->mapping[chan].base = base;

   p_distri->mapping[chan].factor = factor;

   p_distri->mapping[chan].gamma = gamma;

   etp_mapping_precalc(&p_distri->mapping[chan]);

+  /* update channel count in message buffer and message length

+   * (buffer is allocated for 3 channels on distri creation, so this is ok) */

+  p_distri->p_msg_buf[ETP_MCUF_HDR_OFS_CHANNELS_U16 + 0]

+                                                  = (etp_u8_t)(channels >> 8);

+  p_distri->p_msg_buf[ETP_MCUF_HDR_OFS_CHANNELS_U16 + 1] = (etp_u8_t)channels;

+  p_distri->msg_len = ETP_MCUF_HDR_LEN +

+                      p_distri->output_cnt * p_distri->pixel_cnt * channels;

+

   return 0;

 }

@@ -42,6 +42,8 @@

                                                *   in MCUF data */

 #define ETP_MCUF_HDR_OFS_PIXELS_U16   (6)     /**< offset of pixel count

                                                *   in MCUF data */

+#define ETP_MCUF_HDR_OFS_CHANNELS_U16 (8)     /**< offset of channel count

+                                               *   in MCUF data */

 #define ETP_MCUF_MAX_FRAME_INTERVAL_MS (1000) /**< maximum interval between

                                                    two MCUF frames */

@@ -213,6 +213,7 @@ void etp_display_data_fmt(etp_display_t *p_display, etp_u8_t *p_data,

   etp_u8_t *dest, *src;

   etp_pixel_t *p_pixel;

   int rx, ry;

+  etp_u8_t val;

   /* set data for all distributors */

   for (distri = 0; distri < ETP_DISTRI_MAX_CNT; distri++) {

@@ -236,6 +237,25 @@ void etp_display_data_fmt(etp_display_t *p_display, etp_u8_t *p_data,

               && ry >= 0 && (unsigned int)ry < height) {

             /* get pixel data and map it */

             src = (p_data + rx * stride_x + ry * stride_y);

+            switch (p_distri->channels) {

+              case 1:

+                switch (pixfmt) {

+                  case etp_pixfmt_rgb24:

+                  case etp_pixfmt_bgr24:

+                    /* RGB/BGR -> monochrome, emphasize green */

+                    val = (etp_u8_t)(((unsigned int)src[0] +

+                                      ((unsigned int)src[1] << 1) +

+                                      (unsigned int)src[2] + 2) >> 2);

+                    dest[0] = p_distri->mapping[0].table[val];

+                    break;

+                  case etp_pixfmt_mono8:

+                    dest[0] = p_distri->mapping[0].table[src[0]];

+                    break;

+                  default:

+                    dest[0] = 0;

+                }

+                break;

+              case 3:

                 switch (pixfmt) {

                   case etp_pixfmt_rgb24:

                     dest[0] = p_distri->mapping[0].table[src[0]];

@@ -247,14 +267,22 @@ void etp_display_data_fmt(etp_display_t *p_display, etp_u8_t *p_data,

                     dest[1] = p_distri->mapping[1].table[src[1]];

                     dest[2] = p_distri->mapping[2].table[src[0]];

                     break;

+                  case etp_pixfmt_mono8:

+                    val = p_distri->mapping[0].table[src[0]];

+                    dest[0] = val;

+                    dest[1] = val;

+                    dest[2] = val;

+                    break;

                   default:

                     dest[0] = 0;

                     dest[1] = 0;

                     dest[2] = 0;

                 }

-          }

+                break;

+            } /* switch channels */

+          } /* if */

-          dest += 3;

+          dest += p_distri->channels;

         } /* for (pix ...) */

       } /* for (out ...) */

@@ -54,16 +54,17 @@ typedef struct etp_distri_s {

       [ETP_DISTRI_MAX_ADDRS]; /**< network address(es) of distributor,

                                *   multiple addresses mean the packets are

                                *   sent to each address */

-  etp_mapping_t mapping[3];   /**< mapping information for red, green

+  unsigned int channels;      /**< number of chanels: 1 (mono) or 3 (RGB) */

+  etp_mapping_t mapping[3];   /**< mapping information for red/white, green

                                *   and blue channel */

   etp_pixel_t *p_pixels;      /**< array with information about pixels

                                *   of this distributor,

                                *   index = output * pixel_cnt + pixel,

                                *   malloc-ed */

-  unsigned int msg_len;       /**< size of a message to send to distributor */

+  unsigned int msg_buf_len;   /**< size of buffer for message */

   etp_u8_t *p_msg_buf;        /**< buffer for current message to send

-                               *   to distributor,

-                               *   malloc-ed */

+                               *   to distributor, malloc-ed */

+  unsigned int msg_len;       /**< size of a message to send to distributor */

 } etp_distri_t;

 /** information about a display */