flaneth

@@ -207,6 +207,7 @@ static void AppBbmProcFrame(AppBbmState *state)

   // read next frame from file

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

+  uint32_t pos_before_frame = state->fi.pointer;

   uint32_t len;

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

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

@@ -221,6 +222,11 @@ static void AppBbmProcFrame(AppBbmState *state)

   // get frame duration

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

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

+  // subtract time this frame has already been shown

+  if (state->thisFrameMs < duration)

+    duration -= state->thisFrameMs;

+  else

+    duration = 0;

   // fill in MCUF header

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

@@ -237,8 +243,31 @@ static void AppBbmProcFrame(AppBbmState *state)

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

   }

+  // frame duration not more than one second

+  if (duration <= 1000) {

     // wait for frame duration

     state->nextActMs += duration;

+    // next time, a new frame will be read

+    state->thisFrameMs = 0;

+    // done

+    return;

+  }

+

+  // show same frame again in 1 second

+

+  // jump back to position before this frame

+  DFS_Seek(&state->fi, pos_before_frame, *state->sectorBuf);

+  if (state->fi.pointer != pos_before_frame) {

+    // broken file -> use next file in next iteration

+    state->haveFile = 0;

+    debug_app_bbm_printf("%hhu: seek failed", state->no);

+    return;

+  }

+

+  // next action in 1 second

+  state->nextActMs += 1000;

+  // next time, the frame has been shown 1 second longer

+  state->thisFrameMs += 1000;

 }

 /**

@@ -279,6 +308,7 @@ void AppBbmInit(AppBbmState *state) // (extern)

   // initialize internal state

   state->idxFile = 0;

   state->haveFile = 0;

+  state->thisFrameMs = 0;

   // initialized, start with first action now

   state->isInit = 1;

@@ -301,8 +331,8 @@ void AppBbmRun(AppBbmState *state) // (extern)

   long delta = state->nextActMs - ms;

   if (delta > 0)

     return;

-  /* do not catch up - this can harm synchronous playback

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

+  /* do not manipulate frame time - this can harm synchronous playback

+  // if lagging behind more than 100ms, do not try to catch up

   if (delta < -100)

     state->nextActMs = ms;

   */

@@ -28,6 +28,8 @@ typedef struct app_bbm_state {

   uint16_t       channels;    ///< channels in current movie

   uint16_t       maxval;      ///< maxval of current movie

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

+  uint16_t       thisFrameMs; /**< time the current frame has already been

+                                   shown when next action triggers */

 } AppBbmState;

 /**