Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: media/webm/webm_tracks_parser.h

Issue 10825108: Remove a bunch of dead fields found by Scythe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_WEBM_WEBM_TRACKS_PARSER_H_ 5 #ifndef MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
6 #define MEDIA_WEBM_WEBM_TRACKS_PARSER_H_ 6 #define MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time.h" 10 #include "base/time.h"
11 #include "media/webm/webm_content_encodings_client.h" 11 #include "media/webm/webm_content_encodings_client.h"
12 #include "media/webm/webm_parser.h" 12 #include "media/webm/webm_parser.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 // Parser for WebM Tracks element. 16 // Parser for WebM Tracks element.
17 class WebMTracksParser : public WebMParserClient { 17 class WebMTracksParser : public WebMParserClient {
18 public: 18 public:
19 explicit WebMTracksParser(int64 timecode_scale); 19 explicit WebMTracksParser();
20 virtual ~WebMTracksParser(); 20 virtual ~WebMTracksParser();
21 21
22 // Parses a WebM Tracks element in |buf|. 22 // Parses a WebM Tracks element in |buf|.
23 // 23 //
24 // Returns -1 if the parse fails. 24 // Returns -1 if the parse fails.
25 // Returns 0 if more data is needed. 25 // Returns 0 if more data is needed.
26 // Returns the number of bytes parsed on success. 26 // Returns the number of bytes parsed on success.
27 int Parse(const uint8* buf, int size); 27 int Parse(const uint8* buf, int size);
28 28
29 int64 audio_track_num() const { return audio_track_num_; } 29 int64 audio_track_num() const { return audio_track_num_; }
30 int64 video_track_num() const { return video_track_num_; } 30 int64 video_track_num() const { return video_track_num_; }
31 31
32 const uint8* video_encryption_key_id() const; 32 const uint8* video_encryption_key_id() const;
33 int video_encryption_key_id_size() const; 33 int video_encryption_key_id_size() const;
34 34
35 private: 35 private:
36 // WebMParserClient methods 36 // WebMParserClient methods
37 virtual WebMParserClient* OnListStart(int id) OVERRIDE; 37 virtual WebMParserClient* OnListStart(int id) OVERRIDE;
38 virtual bool OnListEnd(int id) OVERRIDE; 38 virtual bool OnListEnd(int id) OVERRIDE;
39 virtual bool OnUInt(int id, int64 val) OVERRIDE; 39 virtual bool OnUInt(int id, int64 val) OVERRIDE;
40 virtual bool OnFloat(int id, double val) OVERRIDE; 40 virtual bool OnFloat(int id, double val) OVERRIDE;
41 virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; 41 virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE;
42 virtual bool OnString(int id, const std::string& str) OVERRIDE; 42 virtual bool OnString(int id, const std::string& str) OVERRIDE;
43 43
44 int64 timecode_scale_;
45
46 int64 track_type_; 44 int64 track_type_;
47 int64 track_num_; 45 int64 track_num_;
48 scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_; 46 scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_;
49 47
50 int64 audio_track_num_; 48 int64 audio_track_num_;
51 scoped_ptr<WebMContentEncodingsClient> audio_content_encodings_client_; 49 scoped_ptr<WebMContentEncodingsClient> audio_content_encodings_client_;
52 50
53 int64 video_track_num_; 51 int64 video_track_num_;
54 scoped_ptr<WebMContentEncodingsClient> video_content_encodings_client_; 52 scoped_ptr<WebMContentEncodingsClient> video_content_encodings_client_;
55 53
56 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMTracksParser); 54 DISALLOW_COPY_AND_ASSIGN(WebMTracksParser);
57 }; 55 };
58 56
59 } // namespace media 57 } // namespace media
60 58
61 #endif // MEDIA_WEBM_WEBM_TRACKS_PARSER_H_ 59 #endif // MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698