libetherpix

@@ -279,18 +279,19 @@ bool Distri::on_packet(Glib::IOCondition condition)

       // check magic, 3 channels and maxval 0xFF

       if (buffer[ 0] == 0x23 && buffer[ 1] == 0x54 &&

           buffer[ 2] == 0x26 && buffer[ 3] == 0x66 &&

-          buffer[ 8] == 0x00 && buffer[ 9] == 0x03 &&

+          buffer[ 8] == 0x00 && (buffer[9] == 0x01 || buffer[9] == 0x03) &&

           buffer[10] == 0x00 && buffer[11] == 0xFF) {

-        // get outputs (height) and pixels (width)

+        // get outputs (height), pixels (width) and channels

         unsigned int outputs = (unsigned int)buffer[4] << 8 |

                                (unsigned int)buffer[5];

         unsigned int pixels = (unsigned int)buffer[6] << 8 |

                               (unsigned int)buffer[7];

+        unsigned int channels = buffer[9];

         // check data length

-        if (sz >= 12 + outputs * pixels * 3) {

+        if (sz >= 12 + outputs * pixels * channels) {

           uint8_t const *data = buffer + 12;

           // process pixel data

-          procPixelData(outputs, pixels, data);

+          procPixelData(outputs, pixels, channels, data);

         }

       }

     }

@@ -305,10 +306,11 @@ bool Distri::on_packet(Glib::IOCondition condition)

  * @brief process pixel data

  * @param[in] outputs number of outputs in pixel data

  * @param[in] pixels number of pixels per output in pixel data

+ * @param[in] channels number of channels in pixel data

  * @param[in] data pixel data

  */

 void Distri::procPixelData(unsigned long outputs, unsigned long pixels,

-                           uint8_t const *data)

+                           unsigned int channels, uint8_t const *data)

 {

   // get mappings

   Mapping const & mapRed   = m_mappings[Mapping::Red  ];

@@ -316,26 +318,29 @@ void Distri::procPixelData(unsigned long outputs, unsigned long pixels,

   Mapping const & mapBlue  = m_mappings[Mapping::Blue ];

   // traverse all outputs and pixels

+  unsigned int ofs_r = 0;

+  unsigned int ofs_g = channels >= 2 ? 1 : 0;

+  unsigned int ofs_b = channels >= 3 ? 2 : 0;

   OutputMap::iterator out = m_outputMap.begin();

   OutputMap::iterator outend = m_outputMap.end();

   unsigned long o = 0;

   unsigned long oi = 0;

-  for (; out != outend; ++out, ++o, oi += pixels * 3) {

+  for (; out != outend; ++out, ++o, oi += pixels * channels) {

     Output &output = out->second;

     std::vector<Pixel>::iterator pix = output.m_pixels.begin();

     std::vector<Pixel>::iterator pixend = output.m_pixels.end();

     unsigned long p = 0;

     unsigned long pi = oi;

-    for (; pix != pixend; ++pix, ++p, pi += 3) {

+    for (; pix != pixend; ++pix, ++p, pi += channels) {

       Pixel &pixel = *pix;

       // default color: black (in case pixel is not in pixel data)

       uint8_t r = 0, g = 0, b = 0;

       // get color of pixel from data

       if (o < outputs && p < pixels) {

-        r = mapRed  .display2video(data[pi + 0]);

-        g = mapGreen.display2video(data[pi + 1]);

-        b = mapBlue .display2video(data[pi + 2]);

+        r = mapRed  .display2video(data[pi + ofs_r]);

+        g = mapGreen.display2video(data[pi + ofs_g]);

+        b = mapBlue .display2video(data[pi + ofs_b]);

       }

       // store color

       pixel.setColor(r, g, b);

@@ -132,10 +132,11 @@ protected:

    * @brief process pixel data

    * @param[in] outputs number of outputs in pixel data

    * @param[in] pixels number of pixels per output in pixel data

+   * @param[in] channels number of channels in pixel data

    * @param[in] data pixel data

    */

   void procPixelData(unsigned long outputs, unsigned long pixels,

-                     uint8_t const *data);

+                     unsigned int channels, uint8_t const *data);

 protected:

   /// output data