2 files changed, 33 insertions, 27 deletions

diff --git a/test_qnx/dce_test.c b/test_qnx/dce_test.c
index 805b240..6a6d6a1 100644
--- a/test_qnx/dce_test.c
+++ b/test_qnx/dce_test.c
@@ -93,7 +93,7 @@ enum {
  * and write out raw (unstrided) nv12 frames (one per file).
  */
 
-int                      width, height, padded_width, padded_height, num_buffers, tiler;
+int                      width, height, frames_to_write, padded_width, padded_height, num_buffers, tiler;
 Engine_Handle            engine    = NULL;
 VIDDEC3_Handle           codec     = NULL;
 VIDDEC3_Params          *params    = NULL;
@@ -605,14 +605,14 @@ int main(int argc, char * *argv)
         oned = FALSE;
     }
 
-    if( argc != 8 ) {
-        printf("usage:   %s width height framefile inpattern outpattern codec tilerbuffer\n", argv[0]);
-        printf("example: %s 320 240 frame.txt in.h264 out.yuv h264 tiler\n", argv[0]);
-        printf("example: %s 640 480 frame.txt in.m4v out.yuv mpeg4 nontiler\n", argv[0]);
-        printf("example: %s 720 480 frame.txt in.vc1 out.yuv vc1ap tiler\n", argv[0]);
-        printf("example: %s 320 240 frame.txt in.vc1 out.yuv vc1smp nontiler\n", argv[0]);
-        printf("example: %s 1280 720 frame.txt in.bin out.yuv mjpeg tiler\n", argv[0]);
-        printf("example: %s 1920 1088 frame.txt in.bin out.yuv mpeg2 nontiler\n", argv[0]);
+    if( argc != 9 ) {
+        printf("usage:   %s width height frames_to_write framefile inpattern outpattern codec tilerbuffer\n", argv[0]);
+        printf("example: %s 320 240 30 frame.txt in.h264 out.yuv h264 tiler\n", argv[0]);
+        printf("example: %s 640 480 30 frame.txt in.m4v out.yuv mpeg4 nontiler\n", argv[0]);
+        printf("example: %s 720 480 30 frame.txt in.vc1 out.yuv vc1ap tiler\n", argv[0]);
+        printf("example: %s 320 240 30 frame.txt in.vc1 out.yuv vc1smp nontiler\n", argv[0]);
+        printf("example: %s 1280 720 30 frame.txt in.bin out.yuv mjpeg tiler\n", argv[0]);
+        printf("example: %s 1920 1088 30 frame.txt in.bin out.yuv mpeg2 nontiler\n", argv[0]);
         printf("Currently supported codecs: h264, mpeg4, vc1ap, vc1smp, mjpeg, mpeg2\n");
         return (1);
     }
@@ -620,15 +620,21 @@ int main(int argc, char * *argv)
     /* error checking? */
     width  = atoi(argv[1]);
     height = atoi(argv[2]);
-    frameData   = argv[3];
-    in_pattern  = argv[4];
-    out_pattern = argv[5];
-    strcpy(vid_codec, argv[6]);
-    strcpy(tilerbuffer, argv[7]);
+    frames_to_write = atoi(argv[3]);
+    frameData   = argv[4];
+    in_pattern  = argv[5];
+    out_pattern = argv[6];
+    strcpy(vid_codec, argv[7]);
+    strcpy(tilerbuffer, argv[8]);
 
     printf("Selected codec: %s\n", vid_codec);
     printf("Selected buffer: %s\n", tilerbuffer);
 
+    if( frames_to_write == -1 ) {
+        /* Default : 30 frames to write into output file */
+        frames_to_write = 30;
+    }
+
     enum {
         DCE_TEST_H264   = 1,
         DCE_TEST_MPEG4  = 2,
@@ -1348,7 +1354,7 @@ int main(int argc, char * *argv)
                     buf = (OutputBuffer *)outArgs->outputID[i];
                     DEBUG("pop: %d (%p)", out_cnt, buf);
 
-                    if( out_cnt < 30 ) {  // write first 30 frames to output file out_cnt < 300
+                    if( out_cnt < frames_to_write ) {  // write first 30 frames to output file out_cnt < 300
                         write_output(out_pattern, out_cnt++, buf->buf + yoff,
                                      buf->buf + uvoff, stride);
                     } else {
diff --git a/test_qnx/dce_test.use b/test_qnx/dce_test.use
index 413d849..9e511a1 100644
--- a/test_qnx/dce_test.use
+++ b/test_qnx/dce_test.use
@@ -12,27 +12,27 @@ Options:
 

 Examples:

 1. decoding h.264

-   dce_test width height framesize inpattern outpattern codec tiler/nontiler

-   dce_test 320 240 framesize.txt inputfile.h264 outputfile.yuv h264 tiler

+   dce_test width height frames_to_write framesize inpattern outpattern codec tiler/nontiler

+   dce_test 320 240 30 framesize.txt inputfile.h264 outputfile.yuv h264 tiler

 

 2. decoding mpeg4

-   dce_test width height framesize inpattern outpattern codec tiler/nontiler

-   dce_test 640 480 framesize.txt inputfile.m4v outputfile.yuv mpeg4 nontiler

+   dce_test width height frames_to_write framesize inpattern outpattern codec tiler/nontiler

+   dce_test 640 480 30 framesize.txt inputfile.m4v outputfile.yuv mpeg4 nontiler

 

 3. decoding vc1ap

-   dce_test width height framesize inpattern outpattern codec tiler/nontiler

-   dce_test 720 480 framesize.txt inputfile.vc1 outputfile.yuv vc1ap tiler

+   dce_test width height frames_to_write framesize inpattern outpattern codec tiler/nontiler

+   dce_test 720 480 30 framesize.txt inputfile.vc1 outputfile.yuv vc1ap tiler

 

 4. decoding vc1smp

-   dce_test width height framesize inpattern outpattern codec tiler/nontiler

-   dce_test 320 240 framesize.txt inputfile.vc1 outputfile.yuv vc1smp nontiler

+   dce_test width height frames_to_write framesize inpattern outpattern codec tiler/nontiler

+   dce_test 320 240 30 framesize.txt inputfile.vc1 outputfile.yuv vc1smp nontiler

 

 5. decoding mjpeg

-   dce_test width height framesize inpattern outpattern codec tiler/nontiler

-   dce_test 1280 720 framesize.txt inputfile.bin outputfile.yuv mjpeg tiler

+   dce_test width height frames_to_write framesize inpattern outpattern codec tiler/nontiler

+   dce_test 1280 720 30 framesize.txt inputfile.bin outputfile.yuv mjpeg tiler

 

 6. decoding mpeg2

-   dce_test width height framesize inpattern outpattern codec tiler/nontiler

-   dce_test 1920 1088 framesize.txt inputfile.bin outputfile.yuv mpeg2 nontiler

+   dce_test width height frames_to_write framesize inpattern outpattern codec tiler/nontiler

+   dce_test 1920 1088 30 framesize.txt inputfile.bin outputfile.yuv mpeg2 nontiler

 

 Currently supported codecs: h264, mpeg4, vc1ap, vc1smp, mjpeg, mpeg2