diff options
author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 19:48:35 +0000 |
---|---|---|
committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 19:48:35 +0000 |
commit | c4d866d7cb9d3826d6bf568ed8805672bf16020f (patch) | |
tree | 590140edc866d517fe31a689b19565d8eeeb3a51 /media/webm | |
parent | 910048ac6bc65fff4cab063aac610e0cdc12b875 (diff) | |
download | chromium_src-c4d866d7cb9d3826d6bf568ed8805672bf16020f.zip chromium_src-c4d866d7cb9d3826d6bf568ed8805672bf16020f.tar.gz chromium_src-c4d866d7cb9d3826d6bf568ed8805672bf16020f.tar.bz2 |
Remove a bunch of dead fields found by Scythe.
Review URL: https://chromiumcodereview.appspot.com/10825108
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm')
-rw-r--r-- | media/webm/webm_cluster_parser.h | 4 | ||||
-rw-r--r-- | media/webm/webm_stream_parser.cc | 2 | ||||
-rw-r--r-- | media/webm/webm_tracks_parser.cc | 5 | ||||
-rw-r--r-- | media/webm/webm_tracks_parser.h | 6 |
4 files changed, 5 insertions, 12 deletions
diff --git a/media/webm/webm_cluster_parser.h b/media/webm/webm_cluster_parser.h index 926e6a1..bbcbf37 100644 --- a/media/webm/webm_cluster_parser.h +++ b/media/webm/webm_cluster_parser.h @@ -19,10 +19,6 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient { public: typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue; - // Size is defined by the WebM encryption specification. - // http://wiki.webmproject.org/encryption/webm-encryption-rfc - static const int kIvSize = 8; - WebMClusterParser(int64 timecode_scale, int audio_track_num, int video_track_num, diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc index f27f7e7..5119d1e 100644 --- a/media/webm/webm_stream_parser.cc +++ b/media/webm/webm_stream_parser.cc @@ -327,7 +327,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) { cur_size -= result; bytes_parsed += result; - WebMTracksParser tracks_parser(info_parser.timecode_scale()); + WebMTracksParser tracks_parser; result = tracks_parser.Parse(cur, cur_size); if (result <= 0) diff --git a/media/webm/webm_tracks_parser.cc b/media/webm/webm_tracks_parser.cc index 77cb0d0..29c8f2f 100644 --- a/media/webm/webm_tracks_parser.cc +++ b/media/webm/webm_tracks_parser.cc @@ -16,9 +16,8 @@ namespace media { static const int kWebMTrackTypeVideo = 1; static const int kWebMTrackTypeAudio = 2; -WebMTracksParser::WebMTracksParser(int64 timecode_scale) - : timecode_scale_(timecode_scale), - track_type_(-1), +WebMTracksParser::WebMTracksParser() + : track_type_(-1), track_num_(-1), audio_track_num_(-1), video_track_num_(-1) { diff --git a/media/webm/webm_tracks_parser.h b/media/webm/webm_tracks_parser.h index 8b8cb32..ec7b790 100644 --- a/media/webm/webm_tracks_parser.h +++ b/media/webm/webm_tracks_parser.h @@ -16,7 +16,7 @@ namespace media { // Parser for WebM Tracks element. class WebMTracksParser : public WebMParserClient { public: - explicit WebMTracksParser(int64 timecode_scale); + explicit WebMTracksParser(); virtual ~WebMTracksParser(); // Parses a WebM Tracks element in |buf|. @@ -41,8 +41,6 @@ class WebMTracksParser : public WebMParserClient { virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; virtual bool OnString(int id, const std::string& str) OVERRIDE; - int64 timecode_scale_; - int64 track_type_; int64 track_num_; scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_; @@ -53,7 +51,7 @@ class WebMTracksParser : public WebMParserClient { int64 video_track_num_; scoped_ptr<WebMContentEncodingsClient> video_content_encodings_client_; - DISALLOW_IMPLICIT_CONSTRUCTORS(WebMTracksParser); + DISALLOW_COPY_AND_ASSIGN(WebMTracksParser); }; } // namespace media |