[Gnash-commit] gnash ChangeLog server/impl.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/17 09:04:22

Modified files:
        .              : ChangeLog 
        server         : impl.cpp 

Log message:
                * server/impl.cpp: add recognition of FLV files as
                  top level movie (just to log_unimpl about it).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6952&r2=1.6953
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.156&r2=1.157

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6952
retrieving revision 1.6953
diff -u -b -r1.6952 -r1.6953
--- ChangeLog   17 Jun 2008 08:45:35 -0000      1.6952
+++ ChangeLog   17 Jun 2008 09:04:22 -0000      1.6953
@@ -1,3 +1,8 @@
+2008-06-17 Sandro Santilli <address@hidden>
+
+       * server/impl.cpp: add recognition of FLV files as
+         top level movie (just to log_unimpl about it).
+
 2008-06-17 Benjamin Wolsey <address@hidden>
 
        * server/asobj/Error_as.cpp: partial implementation of Error class.

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- server/impl.cpp     9 Jun 2008 19:08:26 -0000       1.156
+++ server/impl.cpp     17 Jun 2008 09:04:22 -0000      1.157
@@ -307,6 +307,7 @@
     GNASH_FILETYPE_JPEG,
     GNASH_FILETYPE_PNG,
     GNASH_FILETYPE_SWF,
+    GNASH_FILETYPE_FLV,
     GNASH_FILETYPE_UNKNOWN
 };
 
@@ -347,11 +348,16 @@
     return GNASH_FILETYPE_SWF;
   }
   
+  if ((buf[0] == 'F') && (buf[1] == 'L') && (buf[2] == 'V') ) {
+    return GNASH_FILETYPE_FLV;
+  }
+  
   // Check if it is an swf embedded in a player (.exe-file)
   if ((buf[0] == 'M') && (buf[1] == 'Z')) {
 
     if ( 3 < in->read(buf, 3) )
     {
+      log_error(_("Can't read 3 bytes after an MZ (.exe) header"));
       in->seek(0);
       return GNASH_FILETYPE_UNKNOWN;
     }
@@ -363,6 +369,7 @@
       buf[2] = in->read_byte();
       if (in->eof())
       {
+        log_error(_("Could not find SWF inside an exe file"));
         in->seek(0);
         return GNASH_FILETYPE_UNKNOWN;
       }
@@ -370,6 +377,8 @@
     in->seek(in->tell()-3); // position to start of the swf itself
     return GNASH_FILETYPE_SWF;
   }
+
+  log_error("unknown file type, buf is %c%c%c", buf[0], buf[1], buf[2]);
   return GNASH_FILETYPE_UNKNOWN;
 }
 
@@ -428,6 +437,11 @@
   {
     return create_swf_movie(in, url, startLoaderThread);
   }
+  else if ( type == GNASH_FILETYPE_FLV )
+  {
+    log_unimpl(_("FLV can't be loaded directly as a movie"));
+    return NULL;
+  }
 
   log_error(_("unknown file type (%s)"), type);
   return NULL;