flaneth

@@ -11,6 +11,7 @@

 #include "debug.h"

 #include "dosfs.h"

 #include "nethelp.h"

+#include "udp.h"

 #include "timing.h"

 ///< BBM file header

@@ -46,7 +47,7 @@ static char AppBbmNextName(AppBbmState *state, char *filename,

     // no playlist dir -> deactivate application

     state->isInit = 0;

     debug_app_bbm_printf("%hhu: cannot open directory %s",

-                         state->no, filename);

+                         state->no, dirname);

     return -1;

   }

@@ -130,7 +131,8 @@ static void AppBbmParseHeader(AppBbmState *state)

     debug_app_bbm_printf("%hhu: invalid dimensions in BBM file", state->no);

     return; // retry with next file in next iteration

   }

-  if (state->height * state->width * state->channels > 1000) {

+  state->dataSz = state->height * state->width * state->channels;

+  if (state->dataSz > 1000) {

     debug_app_bbm_printf("%hhu: BBM frame size too large", state->no);

     return; // retry with next file in next iteration

   }

@@ -147,7 +149,23 @@ static void AppBbmParseHeader(AppBbmState *state)

     return; // retry with next file in next iteration

   }

+  // read frame start mrker

+  uint8_t framestart[4];

+  if (DFS_ReadFile(&state->fi, *state->sectorBuf,

+                   framestart, &len, sizeof(framestart)) != DFS_OK)

+    len = 0;

+  if (len < sizeof(framestart)) {

+    debug_app_bbm_printf("%hhu: truncated BBM file", state->no);

+    return; // retry with next file in next iteration

+  }

+  if (memcmp(framestart, "frms", 4) != 0) {

+    debug_app_bbm_printf("%hhu: invalid frame start marker in BBM file",

+                         state->no);

+    return; // retry with next file in next iteration

+  }

+

   // a file has been found and opened, header is parsed

+  state->haveFile = 1;

   debug_app_bbm_printf("%hhu: header parsed: %hux%hu-%hu/%hu", state->no,

                        state->width, state->height, state->channels,

                        state->maxval + 1);

@@ -176,6 +194,53 @@ static void AppBbmNextFile(AppBbmState *state)

   AppBbmParseHeader(state);

 }

+/**

+ * @brief process next frame

+ * @param[in,out] state internal state of application

+ */

+static void AppBbmProcFrame(AppBbmState *state)

+{

+  struct packet {

+    struct UdpPacket udp;

+    uint8_t mcuf[12 + state->dataSz];

+  } pack;

+

+  // read next frame from file

+  //   - read to mcuf pos 10, so data is placed at pos 12 for MCUF frame

+  uint32_t len;

+  if (DFS_ReadFile(&state->fi, *state->sectorBuf,

+                   pack.mcuf + 10, &len, state->dataSz + 2) != DFS_OK)

+    len = 0;

+  if (len < state->dataSz + 2) {

+    // end of file reached -> use next file in next iteration

+    state->haveFile = 0;

+    debug_app_bbm_printf("%hhu: end of file", state->no);

+    return;

+  }

+

+  // get frame duration

+  uint16_t duration = ntohs(*(uint16_t *)(pack.mcuf + 10));

+  debug_app_bbm_printf("%hhu: frame duration %u", state->no, duration);

+

+  // fill in MCUF header

+  *(uint32_t *)(pack.mcuf +  0) = htonl(0x23542666);

+  *(uint16_t *)(pack.mcuf +  4) = htons(state->height);

+  *(uint16_t *)(pack.mcuf +  6) = htons(state->width);

+  *(uint16_t *)(pack.mcuf +  8) = htons(state->channels);

+  *(uint16_t *)(pack.mcuf + 10) = htons(state->maxval);

+

+  // send MCUF frame

+  if (state->haveAddr) {

+    memcpy(pack.udp.IpHdr.Dest, state->addr, sizeof(pack.udp.IpHdr.Dest));

+    pack.udp.UdpHdr.SrcPort = htons(2323);

+    pack.udp.UdpHdr.DestPort = htons(2323);

+    UdpSend((unsigned char *)&pack, sizeof(pack));

+  }

+

+  // wait for frame duration

+  state->nextActMs += duration;

+}

+

 /**

  * @brief initialize BBM play application

  * @param[in,out] state internal state of application

@@ -223,8 +288,12 @@ void AppBbmRun(AppBbmState *state) // (extern)

   // time for next action not yet reached -> leave

   unsigned long ms;

   TimingGetMs(&ms);

-  if ((long)(state->nextActMs - ms) > 0)

+  long delta = state->nextActMs - ms;

+  if (delta > 0)

     return;

+  // if lagging behing more than 100ms, do not try to catch up -> advance time

+  if (delta < -100)

+    state->nextActMs = ms;

   // no file -> open next one

   if (!state->haveFile) {

@@ -232,6 +301,7 @@ void AppBbmRun(AppBbmState *state) // (extern)

     return; // do not work too much in one step / app might be deactivated now

   }

-  // TODO

+  // process next frame

+  AppBbmProcFrame(state);

 }

@@ -26,6 +26,7 @@ typedef struct app_bbm_state {

   uint16_t      width;     ///< width of current movie

   uint16_t      channels;  ///< channels in current movie

   uint16_t      maxval;    ///< maxval of current movie

+  uint16_t      dataSz;    ///< size of data in a frame

 } AppBbmState;

 /**