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

Unified Diff: media/webm/webm_tracks_parser.cc

Issue 7203002: Adding ChunkDemuxer implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed CR comments & split code out into separate files. Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: media/webm/webm_tracks_parser.cc
diff --git a/media/webm/webm_tracks_parser.cc b/media/webm/webm_tracks_parser.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bc40315bfeb073e2455c14f9964708806701ae59
--- /dev/null
+++ b/media/webm/webm_tracks_parser.cc
@@ -0,0 +1,139 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "media/webm/webm_tracks_parser.h"
+
+#include "base/logging.h"
+#include "media/webm/webm_constants.h"
+
+namespace media {
+
scherkus (not reviewing) 2011/06/24 18:27:37 remove blank line
acolwell GONE FROM CHROMIUM 2011/06/27 23:48:25 Done.
+
+WebMTracksParser::WebMTracksParser(int64 timecode_scale)
+ : timecode_scale_(timecode_scale),
+ track_type_(-1),
+ track_num_(-1),
+ track_default_duration_(-1),
+ audio_track_num_(-1),
+ audio_default_duration_(base::TimeDelta::FromMicroseconds(-1)),
+ video_track_num_(-1),
+ video_default_duration_(base::TimeDelta::FromMicroseconds(-1)) {
+}
+
+WebMTracksParser::~WebMTracksParser() {}
+
+int WebMTracksParser::Parse(const uint8* buf, int size) {
+ return WebMParseListElement(buf, size, kWebMIdTracks, 1, this);
+}
+
+int64 WebMTracksParser::audio_track_num() const {
+ return audio_track_num_;
+}
+
+base::TimeDelta WebMTracksParser::audio_default_duration() const {
+ return audio_default_duration_;
+}
+
+int64 WebMTracksParser::video_track_num() const {
+ return video_track_num_;
+}
+
+base::TimeDelta WebMTracksParser::video_default_duration() const {
+ return video_default_duration_;
+}
+
+bool WebMTracksParser::OnListStart(int id) {
+ if (id == kWebMIdTrackEntry) {
+ track_type_ = -1;
+ track_num_ = -1;
+ track_default_duration_ = -1;
+ }
+
+ return true;
+}
+
+bool WebMTracksParser::OnListEnd(int id) {
+ if (id == kWebMIdTrackEntry) {
+ if (track_type_ == -1 || track_num_ == -1) {
+ VLOG(1) << "Missing TrackEntry data"
+ << " TrackType " << track_type_
scherkus (not reviewing) 2011/06/24 18:27:37 indentation
acolwell GONE FROM CHROMIUM 2011/06/27 23:48:25 Done.
+ << " TrackNum " << track_num_;
+ return false;
+ }
+
+ // Convert nanoseconds to base::TimeDelta.
+ base::TimeDelta default_duration = base::TimeDelta::FromMicroseconds(
+ track_default_duration_ / 1000.0);
+
+ if (track_type_ == kWebMTrackTypeVideo) {
+ video_track_num_ = track_num_;
+ video_default_duration_ = default_duration;
+ } else if (track_type_ == kWebMTrackTypeAudio) {
+ audio_track_num_ = track_num_;
+ audio_default_duration_ = default_duration;
+ } else {
+ VLOG(1) << "Unexpected TrackType " << track_type_;
+ return false;
+ }
+
+ track_type_ = -1;
+ track_num_ = -1;
+ }
+
+ return true;
+}
+
+bool WebMTracksParser::OnUInt(int id, int64 val) {
+ int64* dst = NULL;
+
+ switch (id) {
+ case kWebMIdTrackNumber:
+ dst = &track_num_;
+ break;
+ case kWebMIdTrackType:
+ dst = &track_type_;
+ break;
+ case kWebMIdDefaultDuration:
+ dst = &track_default_duration_;
+ break;
+ default:
+ return true;
+ }
+
+ if (*dst != -1) {
+ VLOG(1) << "Multiple values for id " << std::hex << id << " specified";
+ return false;
+ }
+
+ *dst = val;
+ return true;
+}
+
+bool WebMTracksParser::OnFloat(int id, double val) {
+ VLOG(1) << "Unexpected float for id" << std::hex << id;
+ return false;
+}
+
+bool WebMTracksParser::OnBinary(int id, const uint8* data, int size) {
+ return true;
+}
+
+bool WebMTracksParser::OnString(int id, const std::string& str) {
+ if (id != kWebMIdCodecID)
+ return false;
+
+ if (str != "A_VORBIS" && str != "V_VP8") {
+ VLOG(1) << "Unexpected CodecID " << str;
+ return false;
+ }
+
+ return true;
+}
+
+bool WebMTracksParser::OnSimpleBlock(int track_num, int timecode, int flags,
+ const uint8* data, int size) {
+ return false;
+}
+
+} // namespace media

Powered by Google App Engine
This is Rietveld 408576698