diff options
Diffstat (limited to 'media/webm')
-rw-r--r-- | media/webm/webm_cluster_parser.h | 14 | ||||
-rw-r--r-- | media/webm/webm_info_parser.h | 15 | ||||
-rw-r--r-- | media/webm/webm_tracks_parser.h | 18 |
3 files changed, 24 insertions, 23 deletions
diff --git a/media/webm/webm_cluster_parser.h b/media/webm/webm_cluster_parser.h index ee1caf8..5a367b0 100644 --- a/media/webm/webm_cluster_parser.h +++ b/media/webm/webm_cluster_parser.h @@ -37,14 +37,14 @@ class WebMClusterParser : public WebMParserClient { private: // WebMParserClient methods. - virtual bool OnListStart(int id); - virtual bool OnListEnd(int id); - virtual bool OnUInt(int id, int64 val); - virtual bool OnFloat(int id, double val); - virtual bool OnBinary(int id, const uint8* data, int size); - virtual bool OnString(int id, const std::string& str); + virtual bool OnListStart(int id) OVERRIDE; + virtual bool OnListEnd(int id) OVERRIDE; + virtual bool OnUInt(int id, int64 val) OVERRIDE; + virtual bool OnFloat(int id, double val) OVERRIDE; + virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; + virtual bool OnString(int id, const std::string& str) OVERRIDE; virtual bool OnSimpleBlock(int track_num, int timecode, int flags, - const uint8* data, int size); + const uint8* data, int size) OVERRIDE; double timecode_multiplier_; // Multiplier used to convert timecodes into // microseconds. diff --git a/media/webm/webm_info_parser.h b/media/webm/webm_info_parser.h index 37cf01c..102a81b 100644 --- a/media/webm/webm_info_parser.h +++ b/media/webm/webm_info_parser.h @@ -5,6 +5,7 @@ #ifndef MEDIA_WEBM_WEBM_INFO_PARSER_H_ #define MEDIA_WEBM_WEBM_INFO_PARSER_H_ +#include "base/compiler_specific.h" #include "media/webm/webm_parser.h" namespace media { @@ -27,14 +28,14 @@ class WebMInfoParser : public WebMParserClient { private: // WebMParserClient methods - virtual bool OnListStart(int id); - virtual bool OnListEnd(int id); - virtual bool OnUInt(int id, int64 val); - virtual bool OnFloat(int id, double val); - virtual bool OnBinary(int id, const uint8* data, int size); - virtual bool OnString(int id, const std::string& str); + virtual bool OnListStart(int id) OVERRIDE; + virtual bool OnListEnd(int id) OVERRIDE; + virtual bool OnUInt(int id, int64 val) OVERRIDE; + virtual bool OnFloat(int id, double val) OVERRIDE; + virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; + virtual bool OnString(int id, const std::string& str) OVERRIDE; virtual bool OnSimpleBlock(int track_num, int timecode, int flags, - const uint8* data, int size); + const uint8* data, int size) OVERRIDE; int64 timecode_scale_; double duration_; diff --git a/media/webm/webm_tracks_parser.h b/media/webm/webm_tracks_parser.h index 02dc10d..c4eff0d 100644 --- a/media/webm/webm_tracks_parser.h +++ b/media/webm/webm_tracks_parser.h @@ -5,9 +5,9 @@ #ifndef MEDIA_WEBM_WEBM_TRACKS_PARSER_H_ #define MEDIA_WEBM_WEBM_TRACKS_PARSER_H_ -#include "media/webm/webm_parser.h" - +#include "base/compiler_specific.h" #include "base/time.h" +#include "media/webm/webm_parser.h" namespace media { @@ -36,14 +36,14 @@ class WebMTracksParser : public WebMParserClient { private: // WebMParserClient methods - virtual bool OnListStart(int id); - virtual bool OnListEnd(int id); - virtual bool OnUInt(int id, int64 val); - virtual bool OnFloat(int id, double val); - virtual bool OnBinary(int id, const uint8* data, int size); - virtual bool OnString(int id, const std::string& str); + virtual bool OnListStart(int id) OVERRIDE; + virtual bool OnListEnd(int id) OVERRIDE; + virtual bool OnUInt(int id, int64 val) OVERRIDE; + virtual bool OnFloat(int id, double val) OVERRIDE; + virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; + virtual bool OnString(int id, const std::string& str) OVERRIDE; virtual bool OnSimpleBlock(int track_num, int timecode, int flags, - const uint8* data, int size); + const uint8* data, int size) OVERRIDE; int64 timecode_scale_; int64 track_type_; |