[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11623: cleanups: move MovieFactory
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11623: cleanups: move MovieFactory code to new MovieFactory.cpp file, also move MovieLibrary in that namespace. |
|
Date: |
Sat, 14 Nov 2009 00:21:54 +0100 |
|
User-agent: |
Bazaar (1.16.1) |
------------------------------------------------------------
revno: 11623
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Sat 2009-11-14 00:21:54 +0100
message:
cleanups: move MovieFactory code to new MovieFactory.cpp file, also move
MovieLibrary in that namespace.
added:
libcore/MovieFactory.cpp
modified:
libcore/Makefile.am
libcore/MovieFactory.h
libcore/MovieLibrary.h
libcore/impl.cpp
=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am 2009-11-12 12:13:15 +0000
+++ b/libcore/Makefile.am 2009-11-13 23:21:54 +0000
@@ -130,6 +130,7 @@
RGBA.cpp \
asClass.cpp \
asNamespace.cpp \
+ MovieFactory.cpp \
MovieLoader.cpp \
$(FREETYPE_SOURCES) \
$(NULL)
=== added file 'libcore/MovieFactory.cpp'
--- a/libcore/MovieFactory.cpp 1970-01-01 00:00:00 +0000
+++ b/libcore/MovieFactory.cpp 2009-11-13 23:21:54 +0000
@@ -0,0 +1,335 @@
+//
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 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 3 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
+//
+
+#ifdef HAVE_CONFIG_H
+# include "gnashconfig.h"
+#endif
+
+#include "MovieFactory.h"
+#include "smart_ptr.h" // GNASH_USE_GC
+#include "IOChannel.h"
+#include "utility.h"
+#include "log.h"
+#include "SWFMovieDefinition.h"
+#include "BitmapMovieDefinition.h"
+#include "RunResources.h"
+#include "URL.h"
+#include "StreamProvider.h"
+#include "MovieLibrary.h"
+
+#include <string>
+#include <map>
+#include <memory> // for auto_ptr
+#include <algorithm>
+
+namespace gnash
+{
+
+namespace // anonymous
+{
+
+/// Get type of file looking at first bytes
+FileType
+getFileType(IOChannel& in)
+{
+ in.seek(0);
+
+ char buf[3];
+
+ if (in.read(buf, 3) < 3)
+ {
+ log_error(_("Can't read file header"));
+ in.seek(0);
+ return GNASH_FILETYPE_UNKNOWN;
+ }
+
+ // This is the magic number {0xff, 0xd8, 0xff} for JPEG format files
+ if (std::equal(buf, buf + 3, "\xff\xd8\xff"))
+ {
+ in.seek(0);
+ return GNASH_FILETYPE_JPEG;
+ }
+
+ // This is the magic number for any PNG format file
+ // buf[3] == 'G' (we didn't read so far)
+ if (std::equal(buf, buf + 3, "\x89PN"))
+ {
+ in.seek(0);
+ return GNASH_FILETYPE_PNG;
+ }
+
+ // This is the magic number for any GIF format file
+ if (std::equal(buf, buf + 3, "GIF"))
+ {
+ in.seek(0);
+ return GNASH_FILETYPE_GIF;
+ }
+
+ // This is for SWF (FWS or CWS)
+ if (std::equal(buf, buf + 3, "FWS") || std::equal(buf, buf + 3, "CWS"))
+ {
+ in.seek(0);
+ return GNASH_FILETYPE_SWF;
+ }
+
+ // Take one guess at what this is. (It's an FLV-format file).
+ if (std::equal(buf, buf + 3, "FLV")) {
+ return GNASH_FILETYPE_FLV;
+ }
+
+ // Check if it is an swf embedded in a player (.exe-file)
+ if (std::equal(buf, buf + 2, "MZ")) {
+
+ 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;
+ }
+
+ while ((buf[0]!='F' && buf[0]!='C') || buf[1]!='W' || buf[2]!='S')
+ {
+ buf[0] = buf[1];
+ buf[1] = buf[2];
+ 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;
+ }
+ }
+ in.seek(in.tell() - static_cast<std::streamoff>(3));
+ return GNASH_FILETYPE_SWF;
+ }
+
+ log_error("unknown file type, buf is %c%c%c", buf[0], buf[1], buf[2]);
+ return GNASH_FILETYPE_UNKNOWN;
+}
+
+// Create a SWFMovieDefinition from an SWF stream
+// NOTE: this method assumes this *is* an SWF stream
+//
+SWFMovieDefinition*
+createSWFMovie(std::auto_ptr<IOChannel> in, const std::string& url,
+ const RunResources& runResources, bool startLoaderThread)
+{
+
+ std::auto_ptr<SWFMovieDefinition> m (new SWFMovieDefinition(runResources));
+
+ const std::string& absURL = URL(url).str();
+
+ if (!m->readHeader(in, absURL)) return 0;
+ if (startLoaderThread && !m->completeLoad()) return 0;
+
+ return m.release();
+}
+
+// Create a movie_definition from an image format stream
+// NOTE: this method assumes this *is* the format described in the
+// FileType type
+// TODO: The pp won't display PNGs for SWF7 or below.
+movie_definition*
+createBitmapMovie(std::auto_ptr<IOChannel> in, const std::string& url,
+ const RunResources& r, FileType type)
+{
+ assert (in.get());
+
+ // readImageData takes a shared pointer because JPEG streams sometimes need
+ // to transfer ownership.
+ boost::shared_ptr<IOChannel> imageData(in.release());
+
+ try
+ {
+ std::auto_ptr<GnashImage> im(
+ ImageInput::readImageData(imageData, type));
+
+ if (!im.get()) {
+ log_error(_("Can't read image file from %s"), url);
+ return NULL;
+ }
+
+ Renderer* renderer = r.renderer();
+
+ BitmapMovieDefinition* mdef =
+ new BitmapMovieDefinition(im, renderer, url);
+
+ return mdef;
+
+ }
+ catch (ParserException& e)
+ {
+ log_error(_("Parsing error: %s"), e.what());
+ return NULL;
+ }
+
+}
+
+movie_definition*
+createNonLibraryMovie(const URL& url, const RunResources& runResources,
+ const char* reset_url, bool startLoaderThread,
+ const std::string* postdata)
+{
+
+ std::auto_ptr<IOChannel> in;
+
+ const StreamProvider& streamProvider = runResources.streamProvider();
+
+ const RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+
+ if (postdata) {
+ in = streamProvider.getStream(url, *postdata, rcfile.saveLoadedMedia());
+ }
+ else in = streamProvider.getStream(url, rcfile.saveLoadedMedia());
+
+ if ( ! in.get() )
+ {
+ log_error(_("failed to open '%s'; can't create movie"), url);
+ return NULL;
+ }
+
+ if (in->bad())
+ {
+ log_error(_("streamProvider opener can't open '%s'"), url);
+ return NULL;
+ }
+
+ std::string movie_url = reset_url ? reset_url : url.str();
+ movie_definition* ret = MovieFactory::makeMovie(in, movie_url, runResources,
+ startLoaderThread);
+
+ return ret;
+
+
+}
+
+
+
+
+} // anonymous namespace
+
+
+MovieLibrary MovieFactory::movieLibrary;
+
+movie_definition*
+MovieFactory::makeMovie(std::auto_ptr<IOChannel> in, const std::string& url,
+ const RunResources& runResources, bool startLoaderThread)
+{
+ assert(in.get());
+
+ // see if it's a jpeg or an swf
+ FileType type = getFileType(*in);
+
+ switch (type)
+ {
+ case GNASH_FILETYPE_JPEG:
+ case GNASH_FILETYPE_PNG:
+ case GNASH_FILETYPE_GIF:
+ {
+ if ( startLoaderThread == false )
+ {
+ log_unimpl(_("Requested to keep from completely loading "
+ "a movie, but the movie in question is an "
+ "image, for which we don't yet have the "
+ "concept of a 'loading thread'"));
+ }
+ return createBitmapMovie(in, url, runResources, type);
+ }
+
+
+ case GNASH_FILETYPE_SWF:
+ return createSWFMovie(in, url, runResources, startLoaderThread);
+
+ case GNASH_FILETYPE_FLV:
+ log_unimpl(_("FLV can't be loaded directly as a movie"));
+ return NULL;
+
+ default:
+ log_error(_("unknown file type (%s)"), type);
+ break;
+ }
+
+ return NULL;
+}
+
+// Try to load a movie from the given url, if we haven't
+// loaded it already. Add it to our library on success, and
+// return a pointer to it.
+//
+movie_definition*
+MovieFactory::makeMovie(const URL& url, const RunResources& runResources,
+ const char* real_url, bool startLoaderThread,
+ const std::string* postdata)
+{
+
+ // Use real_url as label for cache if available
+ std::string cache_label = real_url ? URL(real_url).str() : url.str();
+
+ // Is the movie already in the library? (don't check if we have post data!)
+ if (!postdata)
+ {
+ boost::intrusive_ptr<movie_definition> m;
+ if ( movieLibrary.get(cache_label, &m) )
+ {
+ log_debug(_("Movie %s already in library"), cache_label);
+ return m.get();
+ }
+ }
+
+ // Try to open a file under the filename, but DO NOT start
+ // the loader thread now to avoid IMPORT tag loaders from
+ // calling createMovie() again and NOT finding
+ // the just-created movie.
+ movie_definition* mov = createNonLibraryMovie(url, runResources,
+ real_url, false,
+ postdata);
+
+ if (!mov)
+ {
+ log_error(_("Couldn't load library movie '%s'"), url.str());
+ return NULL;
+ }
+
+ // Movie is good, add to the library
+ if (!postdata) // don't add if we POSTed
+ {
+ movieLibrary.add(cache_label, mov);
+ log_debug(_("Movie %s (SWF%d) added to library"),
+ cache_label, mov->get_version());
+ }
+ else
+ {
+ log_debug(_("Movie %s (SWF%d) NOT added to library (resulted from "
+ "a POST)"), cache_label, mov->get_version());
+ }
+
+ /// Now complete the load if the movie is an SWF movie
+ //
+ /// This is a no-op except for SWF movies.
+ if (startLoaderThread) mov->completeLoad();
+
+ return mov;
+}
+
+
+} // namespace gnash
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:
=== modified file 'libcore/MovieFactory.h'
--- a/libcore/MovieFactory.h 2009-11-12 09:03:35 +0000
+++ b/libcore/MovieFactory.h 2009-11-13 23:21:54 +0000
@@ -21,6 +21,8 @@
#include "dsodefs.h"
+#include "MovieLibrary.h"
+
#include <string>
#include <memory>
@@ -109,6 +111,8 @@
static DSOEXPORT movie_definition* makeMovie(std::auto_ptr<IOChannel> in,
const std::string& url, const RunResources& runResources,
bool startLoaderThread);
+
+ static MovieLibrary movieLibrary;
};
} // namespace gnash
=== modified file 'libcore/MovieLibrary.h'
--- a/libcore/MovieLibrary.h 2009-11-11 23:18:13 +0000
+++ b/libcore/MovieLibrary.h 2009-11-13 23:21:54 +0000
@@ -73,19 +73,6 @@
return true;
}
-#ifdef GNASH_USE_GC
- /// Mark all library elements as reachable (for GC)
- void markReachableResources() const
- {
- boost::mutex::scoped_lock lock(_mapMutex);
- for (LibraryContainer::const_iterator i=_map.begin(), e=_map.end();
- i!=e; ++i)
- {
- i->second.def->setReachable();
- }
- }
-#endif
-
void add(const std::string& key, movie_definition* mov)
{
=== modified file 'libcore/impl.cpp'
--- a/libcore/impl.cpp 2009-11-08 12:53:30 +0000
+++ b/libcore/impl.cpp 2009-11-13 23:21:54 +0000
@@ -50,243 +50,10 @@
namespace gnash
{
-// Forward declarations
-namespace {
- FileType getFileType(IOChannel& in);
- SWFMovieDefinition* createSWFMovie(std::auto_ptr<IOChannel> in,
- const std::string& url, const RunResources& runResources,
- bool startLoaderThread);
-}
-
-static void clear_library();
-
-// Create a movie_definition from an image format stream
-// NOTE: this method assumes this *is* the format described in the
-// FileType type
-// TODO: The pp won't display PNGs for SWF7 or below.
-static movie_definition*
-createBitmapMovie(std::auto_ptr<IOChannel> in, const std::string& url,
- const RunResources& r, FileType type)
-{
- assert (in.get());
-
- // readImageData takes a shared pointer because JPEG streams sometimes need
- // to transfer ownership.
- boost::shared_ptr<IOChannel> imageData(in.release());
-
- try
- {
- std::auto_ptr<GnashImage> im(
- ImageInput::readImageData(imageData, type));
-
- if (!im.get()) {
- log_error(_("Can't read image file from %s"), url);
- return NULL;
- }
-
- Renderer* renderer = r.renderer();
-
- BitmapMovieDefinition* mdef =
- new BitmapMovieDefinition(im, renderer, url);
-
- return mdef;
-
- }
- catch (ParserException& e)
- {
- log_error(_("Parsing error: %s"), e.what());
- return NULL;
- }
-
-}
-
-
-movie_definition*
-MovieFactory::makeMovie(std::auto_ptr<IOChannel> in, const std::string& url,
- const RunResources& runResources, bool startLoaderThread)
-{
- assert(in.get());
-
- // see if it's a jpeg or an swf
- FileType type = getFileType(*in);
-
- switch (type)
- {
- case GNASH_FILETYPE_JPEG:
- case GNASH_FILETYPE_PNG:
- case GNASH_FILETYPE_GIF:
- {
- if ( startLoaderThread == false )
- {
- log_unimpl(_("Requested to keep from completely loading "
- "a movie, but the movie in question is an "
- "image, for which we don't yet have the "
- "concept of a 'loading thread'"));
- }
- return createBitmapMovie(in, url, runResources, type);
- }
-
-
- case GNASH_FILETYPE_SWF:
- return createSWFMovie(in, url, runResources, startLoaderThread);
-
- case GNASH_FILETYPE_FLV:
- log_unimpl(_("FLV can't be loaded directly as a movie"));
- return NULL;
-
- default:
- log_error(_("unknown file type (%s)"), type);
- break;
- }
-
- return NULL;
-}
-
-movie_definition*
-createNonLibraryMovie(const URL& url, const RunResources& runResources,
- const char* reset_url, bool startLoaderThread,
- const std::string* postdata)
-{
-
- std::auto_ptr<IOChannel> in;
-
- const StreamProvider& streamProvider = runResources.streamProvider();
-
- const RcInitFile& rcfile = RcInitFile::getDefaultInstance();
-
- if (postdata) {
- in = streamProvider.getStream(url, *postdata, rcfile.saveLoadedMedia());
- }
- else in = streamProvider.getStream(url, rcfile.saveLoadedMedia());
-
- if ( ! in.get() )
- {
- log_error(_("failed to open '%s'; can't create movie"), url);
- return NULL;
- }
-
- if (in->bad())
- {
- log_error(_("streamProvider opener can't open '%s'"), url);
- return NULL;
- }
-
- std::string movie_url = reset_url ? reset_url : url.str();
- movie_definition* ret = MovieFactory::makeMovie(in, movie_url, runResources,
- startLoaderThread);
-
- return ret;
-
-
-}
-
-
-namespace {
-
-/// Get type of file looking at first bytes
-FileType
-getFileType(IOChannel& in)
-{
- in.seek(0);
-
- char buf[3];
-
- if (in.read(buf, 3) < 3)
- {
- log_error(_("Can't read file header"));
- in.seek(0);
- return GNASH_FILETYPE_UNKNOWN;
- }
-
- // This is the magic number {0xff, 0xd8, 0xff} for JPEG format files
- if (std::equal(buf, buf + 3, "\xff\xd8\xff"))
- {
- in.seek(0);
- return GNASH_FILETYPE_JPEG;
- }
-
- // This is the magic number for any PNG format file
- // buf[3] == 'G' (we didn't read so far)
- if (std::equal(buf, buf + 3, "\x89PN"))
- {
- in.seek(0);
- return GNASH_FILETYPE_PNG;
- }
-
- // This is the magic number for any GIF format file
- if (std::equal(buf, buf + 3, "GIF"))
- {
- in.seek(0);
- return GNASH_FILETYPE_GIF;
- }
-
- // This is for SWF (FWS or CWS)
- if (std::equal(buf, buf + 3, "FWS") || std::equal(buf, buf + 3, "CWS"))
- {
- in.seek(0);
- return GNASH_FILETYPE_SWF;
- }
-
- // Take one guess at what this is. (It's an FLV-format file).
- if (std::equal(buf, buf + 3, "FLV")) {
- return GNASH_FILETYPE_FLV;
- }
-
- // Check if it is an swf embedded in a player (.exe-file)
- if (std::equal(buf, buf + 2, "MZ")) {
-
- 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;
- }
-
- while ((buf[0]!='F' && buf[0]!='C') || buf[1]!='W' || buf[2]!='S')
- {
- buf[0] = buf[1];
- buf[1] = buf[2];
- 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;
- }
- }
- in.seek(in.tell() - static_cast<std::streamoff>(3));
- return GNASH_FILETYPE_SWF;
- }
-
- log_error("unknown file type, buf is %c%c%c", buf[0], buf[1], buf[2]);
- return GNASH_FILETYPE_UNKNOWN;
-}
-
-// Create a SWFMovieDefinition from an SWF stream
-// NOTE: this method assumes this *is* an SWF stream
-//
-SWFMovieDefinition*
-createSWFMovie(std::auto_ptr<IOChannel> in, const std::string& url,
- const RunResources& runResources, bool startLoaderThread)
-{
-
- std::auto_ptr<SWFMovieDefinition> m (new SWFMovieDefinition(runResources));
-
- const std::string& absURL = URL(url).str();
-
- if (!m->readHeader(in, absURL)) return 0;
- if (startLoaderThread && !m->completeLoad()) return 0;
-
- return m.release();
-}
-
-}
-
//
// global gnash management
//
-
// Maximum release of resources.
void clear()
{
@@ -309,7 +76,7 @@
VM::get().clear();
- clear_library();
+ MovieFactory::movieLibrary.clear();
fontlib::clear();
#ifdef GNASH_USE_GC
@@ -320,73 +87,6 @@
}
-static MovieLibrary s_movie_library;
-
-static void clear_library()
- // Drop all library references to movie_definitions, so they
- // can be cleaned up.
-{
- s_movie_library.clear();
-}
-
-// Try to load a movie from the given url, if we haven't
-// loaded it already. Add it to our library on success, and
-// return a pointer to it.
-//
-movie_definition*
-MovieFactory::makeMovie(const URL& url, const RunResources& runResources,
- const char* real_url, bool startLoaderThread,
- const std::string* postdata)
-{
-
- // Use real_url as label for cache if available
- std::string cache_label = real_url ? URL(real_url).str() : url.str();
-
- // Is the movie already in the library? (don't check if we have post data!)
- if (!postdata)
- {
- boost::intrusive_ptr<movie_definition> m;
- if ( s_movie_library.get(cache_label, &m) )
- {
- log_debug(_("Movie %s already in library"), cache_label);
- return m.get();
- }
- }
-
- // Try to open a file under the filename, but DO NOT start
- // the loader thread now to avoid IMPORT tag loaders from
- // calling createMovie() again and NOT finding
- // the just-created movie.
- movie_definition* mov = createNonLibraryMovie(url, runResources, real_url,
false,
- postdata);
-
- if (!mov)
- {
- log_error(_("Couldn't load library movie '%s'"), url.str());
- return NULL;
- }
-
- // Movie is good, add to the library
- if (!postdata) // don't add if we POSTed
- {
- s_movie_library.add(cache_label, mov);
- log_debug(_("Movie %s (SWF%d) added to library"),
- cache_label, mov->get_version());
- }
- else
- {
- log_debug(_("Movie %s (SWF%d) NOT added to library (resulted from "
- "a POST)"), cache_label, mov->get_version());
- }
-
- /// Now complete the load if the movie is an SWF movie
- //
- /// This is a no-op except for SWF movies.
- if (startLoaderThread) mov->completeLoad();
-
- return mov;
-}
-
#ifdef GNASH_USE_GC
/// A GC root used to mark all reachable collectable pointers
class GnashGcRoot : public GcRoot
@@ -401,9 +101,6 @@
void markReachableResources() const
{
VM::get().markReachableResources();
-
- // Mark library movies (TODO: redesign this part)
- s_movie_library.markReachableResources();
}
};
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11623: cleanups: move MovieFactory code to new MovieFactory.cpp file, also move MovieLibrary in that namespace.,
Sandro Santilli <=