[Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/15 14:41:12

Modified files:
        .              : ChangeLog 
        server/parser  : movie_def_impl.cpp 

Log message:
        * server/parser/movie_def_impl.cpp (readHeader): limit FPS to a max of
          84 (limit found by trial and error). Can be turned into a
          compile-time define. Use this upper bound when FPS 0 is requested.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6609&r2=1.6610
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.106&r2=1.107

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6609
retrieving revision 1.6610
diff -u -b -r1.6609 -r1.6610
--- ChangeLog   15 May 2008 13:46:00 -0000      1.6609
+++ ChangeLog   15 May 2008 14:41:09 -0000      1.6610
@@ -1,5 +1,11 @@
 2008-05-15 Sandro Santilli <address@hidden>
 
+       * server/parser/movie_def_impl.cpp (readHeader): limit FPS to a max of
+         84 (limit found by trial and error). Can be turned into a
+         compile-time define. Use this upper bound when FPS 0 is requested.
+
+2008-05-15 Sandro Santilli <address@hidden>
+
        * configure.ac: bail out if sdl gui is selected in conjuntion
          with cairo renderer (unsupported).
 

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- server/parser/movie_def_impl.cpp    21 Apr 2008 11:27:45 -0000      1.106
+++ server/parser/movie_def_impl.cpp    15 May 2008 14:41:11 -0000      1.107
@@ -487,9 +487,27 @@
                log_swferror("non-finite movie bounds");
                );
        }
+
+       // It seems frame rate is limited to a max 
+       // 84 was found by testing the pp, might be turned into a compile-time 
define
+       static const int maxfps = 84;
        m_frame_rate = _str->read_u16();
-       if ( ! m_frame_rate ) m_frame_rate = 65535;
-       else m_frame_rate /= 256.0f;
+       if ( ! m_frame_rate )
+       {
+               log_debug("Frame rate of 0 taken as %d (upper bound)", maxfps);
+               m_frame_rate = maxfps;
+       }
+       else
+       {
+               m_frame_rate /= 256.0f;
+               if ( m_frame_rate > maxfps )
+               {
+                       log_debug("Frame rate of %d too high, we'll use %d 
(upper bound)",
+                               m_frame_rate, maxfps);
+                       m_frame_rate = maxfps;
+               }
+       }
+
        m_frame_count = _str->read_u16();
 
        /* Markus: Probably this is better anyways */