[Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/14 21:14:38

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am 
Added files:
        testsuite/misc-ming.all: NetStream-SquareTest.c 
                                 Video-EmbedSquareTest.c 
Removed files:
        testsuite/misc-ming.all: NetStream-Square.c Video-EmbedSquare.c 

Log message:
                * testsuite/misc-ming.all/: Makefile.am, NetStream-Square.c,
                  NetStream-SquareTest.c, Video-EmbedSquare.c,
                  Video-EmbedSquareTest.c: Renamed video tests to conform
                  to the tests naming convention (end with "test"). Enabled
                  build of the SWF. Test runners still missing.
                  Get FLV path on command line.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3211&r2=1.3212
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/NetStream-SquareTest.c?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Video-EmbedSquareTest.c?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/NetStream-Square.c?cvsroot=gnash&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Video-EmbedSquare.c?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3211
retrieving revision 1.3212
diff -u -b -r1.3211 -r1.3212
--- ChangeLog   14 May 2007 20:40:10 -0000      1.3211
+++ ChangeLog   14 May 2007 21:14:37 -0000      1.3212
@@ -1,5 +1,14 @@
 2007-05-14 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/: Makefile.am, NetStream-Square.c,
+         NetStream-SquareTest.c, Video-EmbedSquare.c,
+         Video-EmbedSquareTest.c: Renamed video tests to conform
+         to the tests naming convention (end with "test"). Enabled
+         build of the SWF. Test runners still missing.
+         Get FLV path on command line.
+
+2007-05-14 Sandro Santilli <address@hidden>
+
        * server/font.cpp: more robustness improvements.
        * server/font.cpp (readDefineFont, readDefineFont2_or_3): pass
          shape_character_def the real tag we're parsing.

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- testsuite/misc-ming.all/Makefile.am 14 May 2007 12:14:38 -0000      1.115
+++ testsuite/misc-ming.all/Makefile.am 14 May 2007 21:14:38 -0000      1.116
@@ -128,6 +128,8 @@
        key_event_testrunner \
        static_vs_dynamic1 \
        static_vs_dynamic2 \
+       Video-EmbedSquareTest \
+       NetStream-SquareTest \
        $(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -1220,6 +1222,29 @@
        sh $< $(top_builddir) static_vs_dynamic2.swf > $@
        chmod 755 $@
 
+
+NetStream_SquareTest_SOURCES = \
+       NetStream-SquareTest.c \
+       ming_utils.h            \
+       ming_utils.c            \
+       $(NULL)
+
+NetStream_SquareTest_LDADD = $(MING_LIBS)
+
+NetStream-SquareTest.swf: NetStream-SquareTest
+       ./NetStream-SquareTest $(srcdir)/../media
+
+Video_EmbedSquareTest_SOURCES = \
+       Video-EmbedSquareTest.c \
+       ming_utils.h            \
+       ming_utils.c            \
+       $(NULL)
+
+Video_EmbedSquareTest_LDADD = $(MING_LIBS)
+
+Video-EmbedSquareTest.swf: Video-EmbedSquareTest
+       ./Video-EmbedSquareTest $(srcdir)/../media
+
 Dejagnu_SOURCES =      \
        Dejagnu.c       \
        ming_utils.h                            \

Index: testsuite/misc-ming.all/NetStream-SquareTest.c
===================================================================
RCS file: testsuite/misc-ming.all/NetStream-SquareTest.c
diff -N testsuite/misc-ming.all/NetStream-SquareTest.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/NetStream-SquareTest.c      14 May 2007 21:14:38 
-0000      1.1
@@ -0,0 +1,93 @@
+/* 
+ *   Copyright (C) 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Plays an external FLV video
+ * Should be used with the MovieTester to test if the video decoder works.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 7
+#define OUTPUT_FILENAME "NetStream-ExtSquare.swf"
+
+const char* mediadir=".";
+char filename[256];
+
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFVideoStream stream;
+  SWFDisplayItem item;
+  SWFAction a;
+  char buffer[1024];
+
+  int video_width = 128;
+  int video_height = 96;
+
+  if ( argc>1 ) mediadir=argv[1];
+  else
+  {
+    fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+    return 1;
+  }
+       
+  sprintf(filename, "%s/square.flv", mediadir);
+  
+  sprintf(buffer, 
+       "nc=new NetConnection();"
+       "nc.connect(null);"
+       "_global.stream = new NetStream(nc);"
+       "video.attachVideo(_global.stream); "
+       "_global.stream.setBufferTime(2); "
+       "_global.stream.play(\"%s\");", filename);
+
+  Ming_init();
+  Ming_useSWFVersion (OUTPUT_VERSION);
+
+
+  mo = newSWFMovie();
+  SWFMovie_setDimension(mo, 128, 96);
+
+  SWFMovie_setRate(mo, 15);
+ 
+  stream = newSWFVideoStream();
+  SWFVideoStream_setDimension(stream, video_width, video_height);
+  item = SWFMovie_add(mo, (SWFBlock)stream);
+//  SWFDisplayItem_moveTo(item, (400 - video_width / 2), 0);
+  SWFDisplayItem_setName(item, "video");
+
+  a = newSWFAction(buffer);
+
+  if(a == NULL) return -1;
+  SWFMovie_add(mo, (SWFBlock)a);
+
+  SWFMovie_nextFrame(mo);
+
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}

Index: testsuite/misc-ming.all/Video-EmbedSquareTest.c
===================================================================
RCS file: testsuite/misc-ming.all/Video-EmbedSquareTest.c
diff -N testsuite/misc-ming.all/Video-EmbedSquareTest.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/Video-EmbedSquareTest.c     14 May 2007 21:14:38 
-0000      1.1
@@ -0,0 +1,84 @@
+/* 
+ *   Copyright (C) 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Plays video stored internal in the SWF.
+ * Should be used with the MovieTester to test if the video decoder works.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 7
+#define OUTPUT_FILENAME "Video-EmbedSquare.swf"
+
+const char* mediadir=".";
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  int frames;
+  SWFVideoStream stream;
+  SWFDisplayItem item;
+  FILE *flv;
+  char filename[256];
+
+  if ( argc>1 ) mediadir=argv[1];
+  else
+  {
+    fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+    return 1;
+  }
+       
+  
+  sprintf(filename, "%s/square.flv", mediadir);
+  flv = fopen(filename, "rb");
+  if (flv == NULL) {
+         perror(filename);
+         return -1;
+  }
+
+  Ming_init();
+  Ming_useSWFVersion (OUTPUT_VERSION);
+
+       
+  mo = newSWFMovie();
+  SWFMovie_setDimension(mo, 128, 96);
+
+  if (mo == NULL) return -1;
+
+  SWFMovie_setRate(mo, 5);
+
+  stream = newSWFVideoStream_fromFile(flv);
+  item = SWFMovie_add(mo, (SWFBlock)stream);
+
+  // TODO: dynamic frame rate adjust
+  frames = SWFVideoStream_getNumFrames(stream);
+  for(; frames > 0; frames--)
+    SWFMovie_nextFrame(mo);
+
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}

Index: testsuite/misc-ming.all/NetStream-Square.c
===================================================================
RCS file: testsuite/misc-ming.all/NetStream-Square.c
diff -N testsuite/misc-ming.all/NetStream-Square.c
--- testsuite/misc-ming.all/NetStream-Square.c  14 May 2007 13:17:33 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,79 +0,0 @@
-/* 
- *   Copyright (C) 2007 Free Software Foundation, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */ 
-
-/*
- * Plays an external FLV video
- * Should be used with the MovieTester to test if the video decoder works.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <ming.h>
-
-#include "ming_utils.h"
-
-#define OUTPUT_VERSION 7
-#define OUTPUT_FILENAME "NetStream-ExtSquare.swf"
-
-
-int
-main(int argc, char** argv)
-{
-  SWFMovie mo;
-
-  Ming_init();
-  Ming_useSWFVersion (OUTPUT_VERSION);
-
-  SWFVideoStream stream;
-  SWFDisplayItem item;
-  SWFAction a;
-  char* buffer= 
-       "nc=new NetConnection();"
-       "nc.connect(null);"
-       "_global.stream = new NetStream(nc);"
-       "video.attachVideo(_global.stream); "
-       "_global.stream.setBufferTime(2); "
-       "_global.stream.play(\"../media/square.flv\");";
-
-  int video_width = 128;
-  int video_height = 96;
-
-  mo = newSWFMovie();
-  SWFMovie_setDimension(mo, 128, 96);
-
-  SWFMovie_setRate(mo, 15);
- 
-  stream = newSWFVideoStream();
-  SWFVideoStream_setDimension(stream, video_width, video_height);
-  item = SWFMovie_add(mo, (SWFBlock)stream);
-//  SWFDisplayItem_moveTo(item, (400 - video_width / 2), 0);
-  SWFDisplayItem_setName(item, "video");
-
-  a = newSWFAction(buffer);
-
-  if(a == NULL) return -1;
-  SWFMovie_add(mo, (SWFBlock)a);
-
-  SWFMovie_nextFrame(mo);
-
-  //Output movie
-  puts("Saving " OUTPUT_FILENAME );
-  SWFMovie_save(mo, OUTPUT_FILENAME);
-
-  return 0;
-}

Index: testsuite/misc-ming.all/Video-EmbedSquare.c
===================================================================
RCS file: testsuite/misc-ming.all/Video-EmbedSquare.c
diff -N testsuite/misc-ming.all/Video-EmbedSquare.c
--- testsuite/misc-ming.all/Video-EmbedSquare.c 14 May 2007 13:17:33 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,70 +0,0 @@
-/* 
- *   Copyright (C) 2007 Free Software Foundation, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */ 
-
-/*
- * Plays video stored internal in the SWF.
- * Should be used with the MovieTester to test if the video decoder works.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <ming.h>
-
-#include "ming_utils.h"
-
-#define OUTPUT_VERSION 7
-#define OUTPUT_FILENAME "Video-EmbedSquare.swf"
-
-
-int
-main(int argc, char** argv)
-{
-  SWFMovie mo;
-
-  Ming_init();
-  Ming_useSWFVersion (OUTPUT_VERSION);
-
-  int frames;
-  SWFVideoStream stream;
-  SWFDisplayItem item;
-  FILE *flv;
-
-  flv = fopen("../media/square.flv", "rb");
-  if (flv == NULL) return -1;
-       
-  mo = newSWFMovie();
-  SWFMovie_setDimension(mo, 128, 96);
-
-  if (mo == NULL) return -1;
-
-  SWFMovie_setRate(mo, 5);
-
-  stream = newSWFVideoStream_fromFile(flv);
-  item = SWFMovie_add(mo, (SWFBlock)stream);
-
-  // TODO: dynamic frame rate adjust
-  frames = SWFVideoStream_getNumFrames(stream);
-  for(; frames > 0; frames--)
-    SWFMovie_nextFrame(mo);
-
-  //Output movie
-  puts("Saving " OUTPUT_FILENAME );
-  SWFMovie_save(mo, OUTPUT_FILENAME);
-
-  return 0;
-}