OpenMAX MJPEG decoder

diff -ur decode_display/src/es_parser.c decode_display.mjpeg/src/es_parser.c
--- decode_display/src/es_parser.c	2012-04-19 12:22:39.000000000 +0100
+++ decode_display.mjpeg/src/es_parser.c	2012-08-21 16:05:31.000000000 +0100
@@ -875,6 +875,60 @@
   return 0;
 
 }
+
+void Decode_MJPEGParserInit (MJPEG_ParsingCtx *ctx, void *fp)
+{
+  ctx->fp = fp;
+  ctx->tmp = malloc(CHUNK_TO_READ);
+  if(!ctx->tmp) {
+    printf("MJPEG read buffer allocation failed\n");
+  }
+  ctx->tmp_len = 0;
+}
+
+unsigned int Decode_GetNextMJPEGFrameSize (MJPEG_ParsingCtx *pc)
+{
+  int eof = 0;
+  unsigned char *tmp = pc->tmp;
+  size_t len = pc->tmp_len;
+
+  while(1) {
+    if(len < CHUNK_TO_READ) {
+      size_t rs = fread(tmp + len, 1, CHUNK_TO_READ - len, pc->fp);
+      if(rs == 0)
+        eof = 1;
+      len += rs;
+    }
+
+    int i;
+    for(i = 0; i < len - 1; i++) {
+      if(tmp[i] == 0xff && tmp[i+1] == 0xd9) {
+        // EOI marker.
+        size_t img_len = i + 2;
+        memcpy(pc->buff_in + pc->buff_len, tmp, img_len);
+        if(img_len < len) {
+          memmove(tmp, tmp + img_len, len - img_len);
+          len -= img_len;
+        }
+        pc->tmp_len = len;
+        pc->buff_len = 0;
+        return img_len;
+      }
+    }
+
+    if(eof)
+      return 0;
+
+    if(len > 1) {
+      memcpy(pc->buff_in + pc->buff_len, tmp, len - 1);
+      pc->buff_len += len - 1;
+      tmp[0] = tmp[len - 1];
+      len = 1;
+    }
+  }
+}
+
+
 /******************************************************************************\
 *      Decode_VDEC_Reset_Parser Function Declaration
 \******************************************************************************/
diff -ur decode_display/src/es_parser.h decode_display.mjpeg/src/es_parser.h
--- decode_display/src/es_parser.h	2012-04-19 12:22:39.000000000 +0100
+++ decode_display.mjpeg/src/es_parser.h	2012-08-21 16:05:31.000000000 +0100
@@ -174,6 +174,15 @@
   unsigned char *buff_in;
 } MPEG2_ParsingCtx;
 
+typedef struct
+{
+  FILE *fp;
+  unsigned char *buff_in;
+  size_t buff_len;
+  unsigned char *tmp;
+  size_t tmp_len;
+} MJPEG_ParsingCtx;
+
 typedef MPEG4_ParsingCtx H263_ParsingCtx;
 typedef MPEG4_ParsingCtx VC1_ParsingCtx;
 
@@ -259,6 +268,7 @@
 unsigned int Decode_GetNextMpeg4FrameSize (MPEG4_ParsingCtx * pc);
 unsigned int Decode_GetNextVC1FrameSize (VC1_ParsingCtx * pc);
 unsigned int Decode_GetNextMpeg2FrameSize (MPEG2_ParsingCtx *pc);
+unsigned int Decode_GetNextMJPEGFrameSize (MJPEG_ParsingCtx *pc);
 
 void Decode_VDEC_Reset_Parser (void *parserPtr);
 void Decode_ParserInit (H264_ParsingCtx * pc, void *fp);
@@ -266,6 +276,7 @@
 void Decode_Mpeg4ParserInit (MPEG4_ParsingCtx *pc, void *fp);
 void Decode_H263ParserInit (H263_ParsingCtx *pc, void *fp);
 void Decode_VC1ParserInit(VC1_ParsingCtx *ctx, void *fin);
+void Decode_MJPEGParserInit (MJPEG_ParsingCtx *ctx, void *fp);
 
 #ifdef __cplusplus              /* matches __cplusplus construct above */
 }
diff -ur decode_display/src/ilclient.c decode_display.mjpeg/src/ilclient.c
--- decode_display/src/ilclient.c	2012-08-13 11:06:35.000000000 +0100
+++ decode_display.mjpeg/src/ilclient.c	2012-08-21 16:05:20.000000000 +0100
@@ -754,7 +754,7 @@
   }  
   else if(pAppData->codingType == OMX_VIDEO_CodingMJPEG)
   {
-    printf(" first frame of jpeg stream will be decoded \n");
+    Decode_MJPEGParserInit (&pAppData->pcmjpeg, pAppData->fIn);
   }  
 
   /* Initialize application / IL Client callback functions */
diff -ur decode_display/src/ilclient.h decode_display.mjpeg/src/ilclient.h
--- decode_display/src/ilclient.h	2012-04-19 12:22:40.000000000 +0100
+++ decode_display.mjpeg/src/ilclient.h	2012-08-21 16:05:28.000000000 +0100
@@ -226,6 +226,7 @@
   H263_ParsingCtx pch263;
   MPEG4_ParsingCtx pcmpeg4;
   MPEG2_ParsingCtx pcmpeg2;
+  MJPEG_ParsingCtx pcmjpeg;
   OMX_VIDEO_CODINGTYPE  codingType;
   void *fieldBuf;
   IL_CLIENT_COMP_PRIVATE *decILComp;
diff -ur decode_display/src/ilclient_utils.c decode_display.mjpeg/src/ilclient_utils.c
--- decode_display/src/ilclient_utils.c	2012-04-19 12:22:40.000000000 +0100
+++ decode_display.mjpeg/src/ilclient_utils.c	2012-08-21 16:05:23.000000000 +0100
@@ -740,6 +740,11 @@
   pAppData->pcmpeg2.buff_in = pBuf->pBuffer;
   frameSize = Decode_GetNextMpeg2FrameSize (&pAppData->pcmpeg2);
  }
+ else if(pAppData->codingType == OMX_VIDEO_CodingMJPEG)
+ {
+  pAppData->pcmjpeg.buff_in = pBuf->pBuffer;
+  frameSize = Decode_GetNextMJPEGFrameSize (&pAppData->pcmjpeg);
+ }
  else {
    /* for keeping the image on display timeout */
    sleep(2);
@@ -921,15 +926,9 @@
      }
      else if(pAppdata->codingType == OMX_VIDEO_CodingMJPEG)
      {
-      /* pass same data to all the buffers; mjpeg decode example does not have 
-         parser and only single image is decoded and displayed */
-      fseek(pAppdata->fIn, 0, SEEK_END);
-      frameSize = ftell(pAppdata->fIn);
-      fseek(pAppdata->fIn, 0 , SEEK_SET);
-      printf(" reading input file of size %d bytes into input buffer \n ", frameSize); 
-      fread (decILComp->inPortParams->pInBuff[i]->pBuffer, 1, frameSize, pAppdata->fIn); 
-      fseek(pAppdata->fIn, 0 , SEEK_SET);
-      }
+         pAppdata->pcmjpeg.buff_in = decILComp->inPortParams->pInBuff[i]->pBuffer;
+         frameSize = Decode_GetNextMJPEGFrameSize (&pAppdata->pcmjpeg);
+     }
 
     /* Exit the loop if no data available */
     if (!frameSize)