add fps calculation (dmjpeg.c)

diff --git a/snapgear-2.6-p42/user/jpeg-6b/dmjpeg b/snapgear-2.6-p42/user/jpeg-6b/dmjpeg
index ce74a44..c2e3f9a 100755 (executable)
Binary files a/snapgear-2.6-p42/user/jpeg-6b/dmjpeg and b/snapgear-2.6-p42/user/jpeg-6b/dmjpeg differ

diff --git a/snapgear-2.6-p42/user/jpeg-6b/dmjpeg.c b/snapgear-2.6-p42/user/jpeg-6b/dmjpeg.c
index e45befa..244eaf7 100644 (file)
--- a/snapgear-2.6-p42/user/jpeg-6b/dmjpeg.c
+++ b/snapgear-2.6-p42/user/jpeg-6b/dmjpeg.c
@@ -1,7 +1,7 @@
 /* dmjpeg.c
  *
  * This software is modified from djpeg.c
- *
+ *    by Kenichi Kurimoto
  */
 
 
@@ -63,6 +63,7 @@ static const char * const cdjpeg_message_table[] = {
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 
+#include<sys/time.h>
 static int f_num = 0;
 
 
@@ -491,6 +492,10 @@ main (int argc, char **argv)
   FILE * output_file;
   JDIMENSION num_scanlines;
 
+  struct timeval j_50f,j_100f;
+  double exe_fps;
+
+
   /* On Mac, fetch a command line. */
 #ifdef USE_CCOMMAND
   argc = ccommand(&argv);
@@ -586,7 +591,14 @@ main (int argc, char **argv)
   jpeg_stdio_src(&cinfo, input_file);
 
  /*V1 LEON-mjpeg project */
-  for(f_num=0;f_num<100;f_num++){
+  for(f_num=0;f_num<110;f_num++){
+
+  if(f_num == 50){
+    gettimeofday(&j_50f,NULL);
+  }
+  if(f_num == 100){
+    gettimeofday(&j_100f,NULL);
+  }
 
   /* Read file header, set default decompression parameters */
   (void) jpeg_read_header(&cinfo, TRUE);
@@ -675,6 +687,17 @@ main (int argc, char **argv)
   end_progress_monitor((j_common_ptr) &cinfo);
 #endif
 
+  fprintf(stderr, "Frame  #50 = %d.%d\n", j_50f.tv_sec,j_50f.tv_usec);
+  fprintf(stderr, "Frame #100 = %d.%d\n", j_100f.tv_sec,j_100f.tv_usec);
+
+  exe_fps = 50/(((double)j_100f.tv_sec + (double)j_100f.tv_usec / 1e6)
+                 -((double)j_50f.tv_sec + (double)j_50f.tv_usec / 1e6));
+
+
+  fprintf(stderr, "This program decode %f fps\n", exe_fps);
+
+
+
   /* All done. */
   exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS);
   return 0;                    /* suppress no-return-value warnings */

diff --git a/snapgear-2.6-p42/vendors/gaisler/common/piggy b/snapgear-2.6-p42/vendors/gaisler/common/piggy
index 789a4d5..abc8e70 100755 (executable)
Binary files a/snapgear-2.6-p42/vendors/gaisler/common/piggy and b/snapgear-2.6-p42/vendors/gaisler/common/piggy differ

diff --git a/snapgear-2.6-p42/vendors/gaisler/common/piggy.gz b/snapgear-2.6-p42/vendors/gaisler/common/piggy.gz
index 9dbd761..ef3ba98 100644 (file)
Binary files a/snapgear-2.6-p42/vendors/gaisler/common/piggy.gz and b/snapgear-2.6-p42/vendors/gaisler/common/piggy.gz differ

diff --git a/snapgear-2.6-p42/vendors/gaisler/common/piggy.o b/snapgear-2.6-p42/vendors/gaisler/common/piggy.o
index be136cb..0db4613 100644 (file)
Binary files a/snapgear-2.6-p42/vendors/gaisler/common/piggy.o and b/snapgear-2.6-p42/vendors/gaisler/common/piggy.o differ