[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11767: Add info about AVM version s
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11767: Add info about AVM version so that it's easier for users to check. |
|
Date: |
Mon, 18 Jan 2010 10:38:22 +0100 |
|
User-agent: |
Bazaar (2.0.2) |
------------------------------------------------------------
revno: 11767 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2010-01-18 10:38:22 +0100
message:
Add info about AVM version so that it's easier for users to check.
Add documentation.
modified:
libcore/movie_root.cpp
libcore/parser/SWFMovieDefinition.h
libcore/parser/movie_definition.h
libcore/vm/VM.h
=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp 2010-01-18 06:36:32 +0000
+++ b/libcore/movie_root.cpp 2010-01-18 09:07:48 +0000
@@ -2107,9 +2107,12 @@
it = tr.insert(it, StringPair("Stage Properties", ""));
+ localIter = tr.append_child(it, StringPair("Root VM version",
+ def->isAS3() ? "AVM2 (unsupported)" : "AVM1"));
+
std::ostringstream os;
os << "SWF " << def->get_version();
- localIter = tr.append_child(it, StringPair("SWF version", os.str()));
+ localIter = tr.append_child(it, StringPair("Root SWF version", os.str()));
localIter = tr.append_child(it, StringPair("URL", def->get_url()));
// TODO: format this better?
=== modified file 'libcore/parser/SWFMovieDefinition.h'
--- a/libcore/parser/SWFMovieDefinition.h 2010-01-11 06:41:38 +0000
+++ b/libcore/parser/SWFMovieDefinition.h 2010-01-18 09:07:31 +0000
@@ -48,11 +48,11 @@
//
// Forward declarations
namespace gnash {
- class SWFMovieDefinition;
- class SWFStream;
+ class SWFMovieDefinition;
+ class SWFStream;
class movie_root;
- class MovieClip;
- class SWFMovie;
+ class MovieClip;
+ class SWFMovie;
class RunResources;
class Font;
}
@@ -68,38 +68,38 @@
{
public:
- SWFMovieLoader(SWFMovieDefinition& md);
-
- ~SWFMovieLoader();
-
- /// Start loading thread.
- //
- /// The associated SWFMovieDefinition instance
- /// is expected to have already read the SWF
- /// header and applied a zlib adapter if needed.
- ///
- bool start();
-
- /// Return true if the loader thread was started
- bool started() const;
-
- /// Return true if called from the loader thread.
- bool isSelfThread() const;
+ SWFMovieLoader(SWFMovieDefinition& md);
+
+ ~SWFMovieLoader();
+
+ /// Start loading thread.
+ //
+ /// The associated SWFMovieDefinition instance
+ /// is expected to have already read the SWF
+ /// header and applied a zlib adapter if needed.
+ ///
+ bool start();
+
+ /// Return true if the loader thread was started
+ bool started() const;
+
+ /// Return true if called from the loader thread.
+ bool isSelfThread() const;
private:
- SWFMovieDefinition& _movie_def;
-
- mutable boost::mutex _mutex;
- std::auto_ptr<boost::thread> _thread;
-
- // Barrier to ensure that _thread
- // is initialized before the loader thread
- // continues execution
- boost::barrier _barrier;
-
- /// Entry point for the actual thread
- static void execute(SWFMovieLoader& ml, SWFMovieDefinition* md);
+ SWFMovieDefinition& _movie_def;
+
+ mutable boost::mutex _mutex;
+ std::auto_ptr<boost::thread> _thread;
+
+ // Barrier to ensure that _thread
+ // is initialized before the loader thread
+ // continues execution
+ boost::barrier _barrier;
+
+ /// Entry point for the actual thread
+ static void execute(SWFMovieLoader& ml, SWFMovieDefinition* md);
};
@@ -112,58 +112,58 @@
{
public:
- /// The container used by this dictionary
- //
- /// It contains pairs of 'int' and 'boost::intrusive_ptr<DefinitionTag>'
- ///
- typedef std::map<int, boost::intrusive_ptr<SWF::DefinitionTag> >
+ /// The container used by this dictionary
+ //
+ /// It contains pairs of 'int' and 'boost::intrusive_ptr<DefinitionTag>'
+ ///
+ typedef std::map<int, boost::intrusive_ptr<SWF::DefinitionTag> >
CharacterContainer;
- typedef CharacterContainer::iterator CharacterIterator;
-
- typedef CharacterContainer::const_iterator CharacterConstIterator;
-
- /// Get the Character with the given id
- //
- /// returns a NULL if the id is unknown.
- ///
- boost::intrusive_ptr<SWF::DefinitionTag> getDisplayObject(int id) const;
-
- /// Add a Character assigning it the given id
- //
- /// replaces any existing DisplayObject with the same id
- ///
- void addDisplayObject(int id, boost::intrusive_ptr<SWF::DefinitionTag>
c);
-
- /// Return an iterator to the first dictionary element
- CharacterIterator begin() { return _map.begin(); }
-
- /// Return a const_iterator to the first dictionary element
- CharacterConstIterator begin() const { return _map.begin(); }
-
- /// Return an iterator to one-past last dictionary element
- CharacterIterator end() { return _map.end(); }
-
- /// Return a const_iterator to one-past last dictionary element
- CharacterConstIterator end() const { return _map.end(); }
+ typedef CharacterContainer::iterator CharacterIterator;
+
+ typedef CharacterContainer::const_iterator CharacterConstIterator;
+
+ /// Get the Character with the given id
+ //
+ /// returns a NULL if the id is unknown.
+ ///
+ boost::intrusive_ptr<SWF::DefinitionTag> getDisplayObject(int id) const;
+
+ /// Add a Character assigning it the given id
+ //
+ /// replaces any existing DisplayObject with the same id
+ ///
+ void addDisplayObject(int id, boost::intrusive_ptr<SWF::DefinitionTag> c);
+
+ /// Return an iterator to the first dictionary element
+ CharacterIterator begin() { return _map.begin(); }
+
+ /// Return a const_iterator to the first dictionary element
+ CharacterConstIterator begin() const { return _map.begin(); }
+
+ /// Return an iterator to one-past last dictionary element
+ CharacterIterator end() { return _map.end(); }
+
+ /// Return a const_iterator to one-past last dictionary element
+ CharacterConstIterator end() const { return _map.end(); }
friend std::ostream& operator<<(std::ostream& o,
const CharacterDictionary& cd);
#ifdef GNASH_USE_GC
- /// Mark all dictionary items to be reachable (for GC)
- void markReachableResources() const
- {
- for(CharacterConstIterator i=_map.begin(), e=_map.end(); i!=e;
++i)
- {
- i->second->setReachable();
- }
- }
-#endif // GNASH_USE_GC
+ /// Mark all dictionary items to be reachable (for GC)
+ void markReachableResources() const
+ {
+ for(CharacterConstIterator i=_map.begin(), e=_map.end(); i!=e; ++i)
+ {
+ i->second->setReachable();
+ }
+ }
+#endif
private:
- CharacterContainer _map;
+ CharacterContainer _map;
};
@@ -173,7 +173,6 @@
/// It cannot be played directly, and does not hold
/// current state; for that you need to call createMovie()
/// to get a movie instance
-///
class SWFMovieDefinition : public movie_definition
{
public:
@@ -181,25 +180,33 @@
/// Construct a SWF movie.
//
/// @param runResources A RunResources containing information used for
- /// parsing.
- SWFMovieDefinition(const RunResources& runResources);
-
- ~SWFMovieDefinition();
-
- // ...
- size_t get_frame_count() const { return m_frame_count; }
- float get_frame_rate() const { return m_frame_rate; }
- const SWFRect& get_frame_size() const { return m_frame_size; }
-
- float get_width_pixels() const
- {
- return std::ceil(twipsToPixels(m_frame_size.width()));
- }
-
- float get_height_pixels() const
- {
- return std::ceil(twipsToPixels(m_frame_size.height()));
- }
+ /// parsing.
+ SWFMovieDefinition(const RunResources& runResources);
+
+ ~SWFMovieDefinition();
+
+ /// Return total number of frames advertised for the SWFMovie.
+ size_t get_frame_count() const {
+ return m_frame_count;
+ }
+
+ /// Return frame rate advertised for the SWFMovie.
+ float get_frame_rate() const {
+ return m_frame_rate;
+ }
+
+ /// Return dimensions of the SWFMovie.
+ const SWFRect& get_frame_size() const {
+ return m_frame_size;
+ }
+
+ float get_width_pixels() const {
+ return std::ceil(twipsToPixels(m_frame_size.width()));
+ }
+
+ float get_height_pixels() const {
+ return std::ceil(twipsToPixels(m_frame_size.height()));
+ }
/// Call this to inform callers that tags should be executed using AVM2
void setAS3() {
@@ -211,206 +218,199 @@
return _as3;
}
- virtual int get_version() const { return m_version; }
-
- /// Get the number of fully loaded frames
- //
- /// The number returned is also the index
- /// of the frame currently being loaded/parsed,
- /// except when parsing finishes, in which case
- /// it an index to on-past-last frame.
- ///
- /// NOTE: this method locks _frames_loaded_mutex
- ///
- virtual size_t get_loading_frame() const;
-
- /// Get number of bytes loaded from input stream
- //
- /// NOTE: this method locks _bytes_loaded_mutex
- ///
- size_t get_bytes_loaded() const
- {
- boost::mutex::scoped_lock lock(_bytes_loaded_mutex);
- return _bytes_loaded;
- }
-
- /// Get total number of bytes as parsed from the SWF header
- size_t get_bytes_total() const {
- return m_file_length;
- }
-
- // See docs in movie_definition.h
- virtual void export_resource(const std::string& symbol,
+ /// Return the advertised version for the SWFMovie.
+ //
+ /// This is stored and used in AS interpretation for some version-based
+ /// behaviour.
+ virtual int get_version() const { return m_version; }
+
+ /// Get the number of fully loaded frames
+ //
+ /// The number returned is also the index
+ /// of the frame currently being loaded/parsed,
+ /// except when parsing finishes, in which case
+ /// it an index to on-past-last frame.
+ ///
+ /// NOTE: this method locks _frames_loaded_mutex
+ ///
+ virtual size_t get_loading_frame() const;
+
+ /// Get number of bytes loaded from input stream
+ //
+ /// NOTE: this method locks _bytes_loaded_mutex
+ ///
+ size_t get_bytes_loaded() const {
+ boost::mutex::scoped_lock lock(_bytes_loaded_mutex);
+ return _bytes_loaded;
+ }
+
+ /// Get total number of bytes as parsed from the SWF header
+ size_t get_bytes_total() const {
+ return m_file_length;
+ }
+
+ // See docs in movie_definition.h
+ virtual void export_resource(const std::string& symbol,
ExportableResource* res);
- /// Get the named exported resource, if we expose it.
- //
- /// @return NULL if the label doesn't correspond to an exported
- /// resource, or if a timeout occurs while scanning the movie.
- ///
- virtual boost::intrusive_ptr<ExportableResource> get_exported_resource(
+ /// Get the named exported resource, if we expose it.
+ //
+ /// @return NULL if the label doesn't correspond to an exported
+ /// resource, or if a timeout occurs while scanning the movie.
+ virtual boost::intrusive_ptr<ExportableResource> get_exported_resource(
const std::string& symbol) const;
- virtual void importResources(boost::intrusive_ptr<movie_definition>
source,
+ virtual void importResources(boost::intrusive_ptr<movie_definition> source,
Imports& imports);
- void addDisplayObject(int DisplayObject_id, SWF::DefinitionTag* c);
+ void addDisplayObject(int DisplayObject_id, SWF::DefinitionTag* c);
- /// \brief
- /// Return a DisplayObject from the dictionary
+ /// Return a DisplayObject from the dictionary
SWF::DefinitionTag* getDefinitionTag(int id) const;
- // See dox in movie_definition
- //
- // locks _namedFramesMutex
- //
- bool get_labeled_frame(const std::string& label, size_t& frame_number)
+ // See dox in movie_definition
+ //
+ // locks _namedFramesMutex
+ bool get_labeled_frame(const std::string& label, size_t& frame_number)
const;
- void add_font(int font_id, Font* f);
-
- Font* get_font(int font_id) const;
-
- Font* get_font(const std::string& name, bool bold, bool italic) const;
-
- // See dox in movie_definition.h
- BitmapInfo* getBitmap(int DisplayObject_id) const;
-
- // See dox in movie_definition.h
- void addBitmap(int DisplayObject_id, boost::intrusive_ptr<BitmapInfo>
im);
-
- // See dox in movie_definition.h
- sound_sample* get_sound_sample(int DisplayObject_id) const;
-
- // See dox in movie_definition.h
- virtual void add_sound_sample(int DisplayObject_id, sound_sample* sam);
-
- // See dox in movie_definition.h
- virtual void set_loading_sound_stream_id(int id) {
m_loading_sound_stream = id; }
-
- // See dox in movie_definition.h
- int get_loading_sound_stream_id() const { return
m_loading_sound_stream; }
-
- // See dox in movie_definition.h
- void addControlTag(SWF::ControlTag* tag)
- {
- assert(tag);
- boost::mutex::scoped_lock lock(_frames_loaded_mutex);
- m_playlist[_frames_loaded].push_back(tag);
- }
-
- // See dox in movie_definition.h
- //
- // locks _namedFramesMutex and _frames_loaded_mutex
- //
- void add_frame_name(const std::string& name);
-
- /// Set an input object for later loading DefineBits
- /// images (JPEG images without the table info).
- void set_jpeg_loader(std::auto_ptr<JpegImageInput> j_in)
- {
- if (m_jpeg_in.get())
- {
- /// There should be only one JPEGTABLES tag in an SWF (see:
- /// http://www.m2osw.com/en/swf_alexref.html#tag_jpegtables)
- /// Discard any subsequent attempts to set the jpeg loader
- /// to avoid crashing on very malformed SWFs. (No conclusive
tests
- /// for pp behaviour, though one version also crashes out on the
- /// malformed SWF that triggers this assert in Gnash).
- log_swferror(_("More than one JPEGTABLES tag found: not
resetting JPEG loader"));
- return;
- }
- m_jpeg_in = j_in;
- }
-
- // See dox in movie_definition.h
- JpegImageInput* get_jpeg_loader() const
- {
- return m_jpeg_in.get();
- }
-
- virtual const PlayList* getPlaylist(size_t frame_number) const
- {
+ void add_font(int font_id, Font* f);
+
+ Font* get_font(int font_id) const;
+
+ Font* get_font(const std::string& name, bool bold, bool italic) const;
+
+ // See dox in movie_definition.h
+ BitmapInfo* getBitmap(int DisplayObject_id) const;
+
+ // See dox in movie_definition.h
+ void addBitmap(int DisplayObject_id, boost::intrusive_ptr<BitmapInfo> im);
+
+ // See dox in movie_definition.h
+ sound_sample* get_sound_sample(int DisplayObject_id) const;
+
+ // See dox in movie_definition.h
+ virtual void add_sound_sample(int DisplayObject_id, sound_sample* sam);
+
+ // See dox in movie_definition.h
+ virtual void set_loading_sound_stream_id(int id) {
+ m_loading_sound_stream = id;
+ }
+
+ // See dox in movie_definition.h
+ int get_loading_sound_stream_id() const {
+ return m_loading_sound_stream;
+ }
+
+ // See dox in movie_definition.h
+ void addControlTag(SWF::ControlTag* tag) {
+ assert(tag);
+ boost::mutex::scoped_lock lock(_frames_loaded_mutex);
+ m_playlist[_frames_loaded].push_back(tag);
+ }
+
+ // See dox in movie_definition.h
+ //
+ // locks _namedFramesMutex and _frames_loaded_mutex
+ //
+ void add_frame_name(const std::string& name);
+
+ /// Set an input object for later loading DefineBits
+ /// images (JPEG images without the table info).
+ void set_jpeg_loader(std::auto_ptr<JpegImageInput> j_in) {
+ if (m_jpeg_in.get()) {
+ /// There should be only one JPEGTABLES tag in an SWF (see:
+ /// http://www.m2osw.com/en/swf_alexref.html#tag_jpegtables)
+ /// Discard any subsequent attempts to set the jpeg loader
+ /// to avoid crashing on very malformed SWFs. (No conclusive tests
+ /// for pp behaviour, though one version also crashes out on the
+ /// malformed SWF that triggers this assert in Gnash).
+ log_swferror(_("More than one JPEGTABLES tag found: not "
+ "resetting JPEG loader"));
+ return;
+ }
+ m_jpeg_in = j_in;
+ }
+
+ // See dox in movie_definition.h
+ JpegImageInput* get_jpeg_loader() const {
+ return m_jpeg_in.get();
+ }
+
+ virtual const PlayList* getPlaylist(size_t frame_number) const {
+
#ifndef NDEBUG
- boost::mutex::scoped_lock lock(_frames_loaded_mutex);
- assert(frame_number <= _frames_loaded);
+ boost::mutex::scoped_lock lock(_frames_loaded_mutex);
+ assert(frame_number <= _frames_loaded);
#endif
- PlayListMap::const_iterator it = m_playlist.find(frame_number);
- if ( it == m_playlist.end() ) return NULL;
- else return &(it->second);
- }
-
- /// Read the header of the SWF file
- //
- /// This function only reads the header of the SWF
- /// stream and assigns the movie an URL.
- /// Call completeLoad() to fire up the loader thread.
- ///
- /// @param in the IOChannel from which to read SWF
- /// @param url the url associated with the input
- ///
- /// @return false if SWF header could not be parsed
- ///
- bool readHeader(std::auto_ptr<IOChannel> in, const std::string& url);
-
- /// Complete load of the SWF file
- //
- /// This function completes parsing of the SWF stream
- /// engaging a separate thread.
- /// Make sure you called readHeader before this!
- ///
- /// @return false if the loading thread could not be started.
- ///
- bool completeLoad();
-
- /// \brief
- /// Ensure that frame number 'framenum' (1-based offset)
- /// has been loaded (load on demand).
- ///
- bool ensure_frame_loaded(size_t framenum) const;
-
- /// Read and parse all the SWF stream (blocking until load is finished)
- //
- /// This function uses a private TagLoadersTable
- /// to interpret specific tag types.
- /// Currently the TagLoadersTable in use is the
- /// TagLoadersTable singleton.
- ///
- void read_all_swf();
-
- /// Create an instance of this movie.
- //
- /// TOCHECK:
- /// Make sure you called completeLoad() before this
- /// function is invoked (calling read() will do that for you).
- ///
- /// TOCHECK:
- /// The _root reference of the newly created movie_root
- /// will be set to a newly created Movie.
- ///
- Movie* createMovie(Global_as& gl, DisplayObject* parent = 0);
+ PlayListMap::const_iterator it = m_playlist.find(frame_number);
+ if ( it == m_playlist.end() ) return NULL;
+ else return &(it->second);
+ }
+
+ /// Read the header of the SWF file
+ //
+ /// This function only reads the header of the SWF
+ /// stream and assigns the movie an URL.
+ /// Call completeLoad() to fire up the loader thread.
+ ///
+ /// @param in the IOChannel from which to read SWF
+ /// @param url the url associated with the input
+ /// @return false if SWF header could not be parsed
+ bool readHeader(std::auto_ptr<IOChannel> in, const std::string& url);
+
+ /// Complete load of the SWF file
+ //
+ /// This function completes parsing of the SWF stream
+ /// engaging a separate thread.
+ /// Make sure you called readHeader before this!
+ ///
+ /// @return false if the loading thread could not be started.
+ bool completeLoad();
+
+ /// \brief
+ /// Ensure that frame number 'framenum' (1-based offset)
+ /// has been loaded (load on demand).
+ bool ensure_frame_loaded(size_t framenum) const;
+
+ /// Read and parse all the SWF stream (blocking until load is finished)
+ //
+ /// This function uses a private TagLoadersTable
+ /// to interpret specific tag types.
+ /// Currently the TagLoadersTable in use is the
+ /// TagLoadersTable singleton.
+ void read_all_swf();
+
+ /// Create an instance of this movie.
+ //
+ /// TOCHECK:
+ /// Make sure you called completeLoad() before this
+ /// function is invoked (calling read() will do that for you).
+ ///
+ /// TOCHECK:
+ /// The _root reference of the newly created movie_root
+ /// will be set to a newly created Movie.
+ Movie* createMovie(Global_as& gl, DisplayObject* parent = 0);
virtual DisplayObject* createDisplayObject(Global_as&, DisplayObject*)
const {
return 0;
}
- virtual const std::string& get_url() const { return _url; }
-
+ virtual const std::string& get_url() const { return _url; }
+
#ifdef USE_SWFTREE
- // These methods attach the contents of the METADATA tag
- // to a movie_definition.
- virtual void storeDescriptiveMetadata(const std::string& data)
- {
- _metadata = data;
- }
+ // These methods attach the contents of the METADATA tag
+ // to a movie_definition.
+ virtual void storeDescriptiveMetadata(const std::string& data) {
+ _metadata = data;
+ }
- virtual const std::string& getDescriptiveMetadata() const
- {
- return _metadata;
- }
+ virtual const std::string& getDescriptiveMetadata() const {
+ return _metadata;
+ }
#endif
@@ -421,146 +421,142 @@
std::string _metadata;
#endif
- /// Characters Dictionary
- CharacterDictionary _dictionary;
-
- /// Mutex protecting _dictionary
- mutable boost::mutex _dictionaryMutex;
-
- typedef std::map<int, boost::intrusive_ptr<Font> > FontMap;
- FontMap m_fonts;
-
- typedef std::map<int, boost::intrusive_ptr<BitmapInfo> > Bitmaps;
- Bitmaps _bitmaps;
-
- typedef std::map<int, boost::intrusive_ptr<sound_sample> >
SoundSampleMap;
- SoundSampleMap m_sound_samples;
-
- typedef std::map<size_t, PlayList> PlayListMap;
-
- /// Movie control events for each frame.
- PlayListMap m_playlist;
-
- /// 0-based frame #'s
- typedef std::map<std::string, size_t, StringNoCaseLessThan>
NamedFrameMap;
- NamedFrameMap _namedFrames;
-
- // Mutex protecting access to _namedFrames
- mutable boost::mutex _namedFramesMutex;
-
- typedef std::map<std::string, boost::intrusive_ptr<ExportableResource>,
+ /// Characters Dictionary
+ CharacterDictionary _dictionary;
+
+ /// Mutex protecting _dictionary
+ mutable boost::mutex _dictionaryMutex;
+
+ typedef std::map<int, boost::intrusive_ptr<Font> > FontMap;
+ FontMap m_fonts;
+
+ typedef std::map<int, boost::intrusive_ptr<BitmapInfo> > Bitmaps;
+ Bitmaps _bitmaps;
+
+ typedef std::map<int, boost::intrusive_ptr<sound_sample> > SoundSampleMap;
+ SoundSampleMap m_sound_samples;
+
+ typedef std::map<size_t, PlayList> PlayListMap;
+
+ /// Movie control events for each frame.
+ PlayListMap m_playlist;
+
+ /// 0-based frame #'s
+ typedef std::map<std::string, size_t, StringNoCaseLessThan> NamedFrameMap;
+ NamedFrameMap _namedFrames;
+
+ // Mutex protecting access to _namedFrames
+ mutable boost::mutex _namedFramesMutex;
+
+ typedef std::map<std::string, boost::intrusive_ptr<ExportableResource>,
StringNoCaseLessThan > ExportMap;
- ExportMap _exportedResources;
-
- // Mutex protecting access to _exportedResources
- mutable boost::mutex _exportedResourcesMutex;
-
- /// Movies we import from; hold a ref on these,
- /// to keep them alive
- typedef std::vector<boost::intrusive_ptr<movie_definition> > ImportVect;
- ImportVect m_import_source_movies;
-
- SWFRect m_frame_size;
- float m_frame_rate;
- size_t m_frame_count;
- int m_version;
-
- /// Number of fully loaded frames
- size_t _frames_loaded;
-
- /// A mutex protecting access to _frames_loaded
- //
- /// This is needed because the loader thread will
- /// increment this number, while the virtual machine
- /// thread will read it.
- ///
- mutable boost::mutex _frames_loaded_mutex;
-
- /// A semaphore to signal load of a specific frame
- mutable boost::condition _frame_reached_condition;
-
- /// Set this to trigger signaling of loaded frame
- //
- /// Make sure you _frames_loaded_mutex is locked
- /// when accessing this member !
- ///
- mutable size_t _waiting_for_frame;
-
- /// Number bytes loaded / parsed
- unsigned long _bytes_loaded;
-
- /// A mutex protecting access to _bytes_loaded
- //
- /// This is needed because the loader thread will
- /// increment this number, while the virtual machine
- /// thread will read it.
- ///
- mutable boost::mutex _bytes_loaded_mutex;
-
- int m_loading_sound_stream;
- boost::uint32_t m_file_length;
-
- std::auto_ptr<JpegImageInput> m_jpeg_in;
-
- std::string _url;
+ ExportMap _exportedResources;
+
+ // Mutex protecting access to _exportedResources
+ mutable boost::mutex _exportedResourcesMutex;
+
+ /// Movies we import from; hold a ref on these,
+ /// to keep them alive
+ typedef std::vector<boost::intrusive_ptr<movie_definition> > ImportVect;
+ ImportVect m_import_source_movies;
+
+ SWFRect m_frame_size;
+ float m_frame_rate;
+ size_t m_frame_count;
+ int m_version;
+
+ /// Number of fully loaded frames
+ size_t _frames_loaded;
+
+ /// A mutex protecting access to _frames_loaded
+ //
+ /// This is needed because the loader thread will
+ /// increment this number, while the virtual machine
+ /// thread will read it.
+ mutable boost::mutex _frames_loaded_mutex;
+
+ /// A semaphore to signal load of a specific frame
+ mutable boost::condition _frame_reached_condition;
+
+ /// Set this to trigger signaling of loaded frame
+ //
+ /// Make sure you _frames_loaded_mutex is locked
+ /// when accessing this member !
+ mutable size_t _waiting_for_frame;
+
+ /// Number bytes loaded / parsed
+ unsigned long _bytes_loaded;
+
+ /// A mutex protecting access to _bytes_loaded
+ //
+ /// This is needed because the loader thread will
+ /// increment this number, while the virtual machine
+ /// thread will read it.
+ mutable boost::mutex _bytes_loaded_mutex;
+
+ int m_loading_sound_stream;
+
+ boost::uint32_t m_file_length;
+
+ std::auto_ptr<JpegImageInput> m_jpeg_in;
+
+ std::string _url;
/// Non transferable stream.
boost::scoped_ptr<SWFStream> _str;
- std::auto_ptr<IOChannel> _in;
+ std::auto_ptr<IOChannel> _in;
- /// swf end position (as read from header)
+ /// swf end position (as read from header)
size_t _swf_end_pos;
- /// asyncronous SWF loader and parser
- SWFMovieLoader _loader;
-
- /// \brief
- /// Increment loaded frames count, signaling frame reached condition if
- /// any thread is waiting for that. See ensure_frame_loaded().
- ///
- /// NOTE: this method locks _frames_loaded_mutex
- ///
- /// @return the new value of _frames_loaded
- ///
- virtual void incrementLoadedFrames();
-
- /// Set number of bytes loaded from input stream
- //
- /// NOTE: this method locks _bytes_loaded_mutex
- ///
- void setBytesLoaded(unsigned long bytes)
- {
- boost::mutex::scoped_lock lock(_bytes_loaded_mutex);
- _bytes_loaded=bytes;
- }
-
- /// A flag set to true when load cancelation is requested
- bool _loadingCanceled;
-
- /// Movies we import resources from
- std::set< boost::intrusive_ptr<movie_definition> > _importSources;
+ /// asyncronous SWF loader and parser
+ SWFMovieLoader _loader;
+
+ /// \brief
+ /// Increment loaded frames count, signaling frame reached condition if
+ /// any thread is waiting for that. See ensure_frame_loaded().
+ ///
+ /// NOTE: this method locks _frames_loaded_mutex
+ ///
+ /// @return the new value of _frames_loaded
+ virtual void incrementLoadedFrames();
+
+ /// Set number of bytes loaded from input stream
+ //
+ /// NOTE: this method locks _bytes_loaded_mutex
+ void setBytesLoaded(unsigned long bytes)
+ {
+ boost::mutex::scoped_lock lock(_bytes_loaded_mutex);
+ _bytes_loaded=bytes;
+ }
+
+ /// A flag set to true when load cancelation is requested
+ bool _loadingCanceled;
+
+ /// Movies we import resources from
+ std::set< boost::intrusive_ptr<movie_definition> > _importSources;
protected:
#ifdef GNASH_USE_GC
- /// Mark reachable resources of a SWFMovieDefinition
- //
- /// Reachable resources are:
- /// - fonts (m_fonts)
- /// - bitmaps (_bitmaps)
- /// - bitmaps (m_bitmap_list) [ what's the difference with bitmap
+ /// Mark reachable resources of a SWFMovieDefinition
+ //
+ /// Reachable resources are:
+ /// - fonts (m_fonts)
+ /// - bitmaps (_bitmaps)
+ /// - bitmaps (m_bitmap_list) [ what's the difference with bitmap
/// DisplayObjects ?? ]
- /// - sound samples (m_sound_samples)
- /// - exports (m_exports)
- /// - imported movies (m_import_source_movies)
- /// - DisplayObject dictionary (_dictionary)
- ///
- /// TODO: do we really need all this stuff to be a GcResource ??
- ///
- void markReachableResources() const;
-#endif // GNASH_USE_GC
+ /// - sound samples (m_sound_samples)
+ /// - exports (m_exports)
+ /// - imported movies (m_import_source_movies)
+ /// - DisplayObject dictionary (_dictionary)
+ ///
+ /// TODO: do we really need all this stuff to be a GcResource ??
+ void markReachableResources() const;
+
+#endif
private:
=== modified file 'libcore/parser/movie_definition.h'
--- a/libcore/parser/movie_definition.h 2010-01-11 06:41:38 +0000
+++ b/libcore/parser/movie_definition.h 2010-01-18 09:07:31 +0000
@@ -102,10 +102,10 @@
typedef std::vector<SWF::ControlTag*> PlayList;
virtual int get_version() const = 0;
- virtual float get_width_pixels() const = 0;
- virtual float get_height_pixels() const = 0;
- virtual size_t get_frame_count() const = 0;
- virtual float get_frame_rate() const = 0;
+ virtual float get_width_pixels() const = 0;
+ virtual float get_height_pixels() const = 0;
+ virtual size_t get_frame_count() const = 0;
+ virtual float get_frame_rate() const = 0;
/// Return size of frame, in TWIPS
virtual const SWFRect& get_frame_size() const = 0;
=== modified file 'libcore/vm/VM.h'
--- a/libcore/vm/VM.h 2010-01-11 06:41:38 +0000
+++ b/libcore/vm/VM.h 2010-01-18 09:07:18 +0000
@@ -168,6 +168,10 @@
/// Set SWF version of the currently executing code
void setSWFVersion(int v);
+ /// Get the version of the currently executing VM
+ //
+ /// Note: this value changes according to the current execution context;
+ /// do not use it to determine what VM version a particular SWF uses.
AVMVersion getAVMVersion() const {
return _avmVersion;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11767: Add info about AVM version so that it's easier for users to check.,
Benjamin Wolsey <=