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

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

Issue 213153008: MSE: Parse WebM TrackEntry DefaultDuration field (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/time/time.h"
15 #include "media/base/audio_decoder_config.h" 16 #include "media/base/audio_decoder_config.h"
16 #include "media/base/media_log.h" 17 #include "media/base/media_log.h"
17 #include "media/base/text_track_config.h" 18 #include "media/base/text_track_config.h"
18 #include "media/base/video_decoder_config.h" 19 #include "media/base/video_decoder_config.h"
19 #include "media/formats/webm/webm_audio_client.h" 20 #include "media/formats/webm/webm_audio_client.h"
20 #include "media/formats/webm/webm_content_encodings_client.h" 21 #include "media/formats/webm/webm_content_encodings_client.h"
21 #include "media/formats/webm/webm_parser.h" 22 #include "media/formats/webm/webm_parser.h"
22 #include "media/formats/webm/webm_video_client.h" 23 #include "media/formats/webm/webm_video_client.h"
23 24
24 namespace media { 25 namespace media {
25 26
26 // Parser for WebM Tracks element. 27 // Parser for WebM Tracks element.
27 class MEDIA_EXPORT WebMTracksParser : public WebMParserClient { 28 class MEDIA_EXPORT WebMTracksParser : public WebMParserClient {
28 public: 29 public:
29 explicit WebMTracksParser(const LogCB& log_cb, bool ignore_text_tracks); 30 explicit WebMTracksParser(const LogCB& log_cb, bool ignore_text_tracks);
30 virtual ~WebMTracksParser(); 31 virtual ~WebMTracksParser();
31 32
32 // Parses a WebM Tracks element in |buf|. 33 // Parses a WebM Tracks element in |buf|.
33 // 34 //
34 // Returns -1 if the parse fails. 35 // Returns -1 if the parse fails.
35 // Returns 0 if more data is needed. 36 // Returns 0 if more data is needed.
36 // Returns the number of bytes parsed on success. 37 // Returns the number of bytes parsed on success.
37 int Parse(const uint8* buf, int size); 38 int Parse(const uint8* buf, int size);
38 39
39 int64 audio_track_num() const { return audio_track_num_; } 40 int64 audio_track_num() const { return audio_track_num_; }
40 int64 video_track_num() const { return video_track_num_; } 41 int64 video_track_num() const { return video_track_num_; }
42
43 // If TrackEntry DefaultDuration field existed for the associated audio or
44 // video track, returns that value converted from ns to base::TimeDelta with
45 // precision not greater than |timecode_scale_in_us|. Defaults to
46 // kNoTimestamp().
47 base::TimeDelta GetAudioDefaultDuration(
48 const double timecode_scale_in_us) const;
49 base::TimeDelta GetVideoDefaultDuration(
50 const double timecode_scale_in_us) const;
51
41 const std::set<int64>& ignored_tracks() const { return ignored_tracks_; } 52 const std::set<int64>& ignored_tracks() const { return ignored_tracks_; }
42 53
43 const std::string& audio_encryption_key_id() const { 54 const std::string& audio_encryption_key_id() const {
44 return audio_encryption_key_id_; 55 return audio_encryption_key_id_;
45 } 56 }
46 57
47 const AudioDecoderConfig& audio_decoder_config() { 58 const AudioDecoderConfig& audio_decoder_config() {
48 return audio_decoder_config_; 59 return audio_decoder_config_;
49 } 60 }
50 61
(...skipping 22 matching lines...) Expand all
73 84
74 int64 track_type_; 85 int64 track_type_;
75 int64 track_num_; 86 int64 track_num_;
76 int64 track_uid_; 87 int64 track_uid_;
77 std::string track_name_; 88 std::string track_name_;
78 std::string track_language_; 89 std::string track_language_;
79 std::string codec_id_; 90 std::string codec_id_;
80 std::vector<uint8> codec_private_; 91 std::vector<uint8> codec_private_;
81 int64 seek_preroll_; 92 int64 seek_preroll_;
82 int64 codec_delay_; 93 int64 codec_delay_;
94 int64 default_duration_;
83 scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_; 95 scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_;
84 96
85 int64 audio_track_num_; 97 int64 audio_track_num_;
98 int64 audio_default_duration_;
86 int64 video_track_num_; 99 int64 video_track_num_;
100 int64 video_default_duration_;
87 bool ignore_text_tracks_; 101 bool ignore_text_tracks_;
88 TextTracks text_tracks_; 102 TextTracks text_tracks_;
89 std::set<int64> ignored_tracks_; 103 std::set<int64> ignored_tracks_;
90 std::string audio_encryption_key_id_; 104 std::string audio_encryption_key_id_;
91 std::string video_encryption_key_id_; 105 std::string video_encryption_key_id_;
92 LogCB log_cb_; 106 LogCB log_cb_;
93 107
94 WebMAudioClient audio_client_; 108 WebMAudioClient audio_client_;
95 AudioDecoderConfig audio_decoder_config_; 109 AudioDecoderConfig audio_decoder_config_;
96 110
97 WebMVideoClient video_client_; 111 WebMVideoClient video_client_;
98 VideoDecoderConfig video_decoder_config_; 112 VideoDecoderConfig video_decoder_config_;
99 113
100 DISALLOW_COPY_AND_ASSIGN(WebMTracksParser); 114 DISALLOW_COPY_AND_ASSIGN(WebMTracksParser);
101 }; 115 };
102 116
103 } // namespace media 117 } // namespace media
104 118
105 #endif // MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_ 119 #endif // MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698