OLD | NEW |
---|---|
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 #include "media/webm/webm_tracks_parser.h" | 5 #include "media/webm/webm_tracks_parser.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "media/base/buffers.h" | 9 #include "media/base/buffers.h" |
10 #include "media/webm/webm_constants.h" | 10 #include "media/webm/webm_constants.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
131 | 131 |
132 bool WebMTracksParser::OnFloat(int id, double val) { | 132 bool WebMTracksParser::OnFloat(int id, double val) { |
133 return true; | 133 return true; |
134 } | 134 } |
135 | 135 |
136 bool WebMTracksParser::OnBinary(int id, const uint8* data, int size) { | 136 bool WebMTracksParser::OnBinary(int id, const uint8* data, int size) { |
137 return true; | 137 return true; |
138 } | 138 } |
139 | 139 |
140 bool WebMTracksParser::OnString(int id, const std::string& str) { | 140 bool WebMTracksParser::OnString(int id, const std::string& str) { |
141 if (id == kWebMIdCodecID && str != "A_VORBIS" && str != "V_VP8") { | 141 if (id == kWebMIdCodecID && str != "A_VORBIS" && str != "A_OPUS" && |
142 str != "V_VP8") { | |
xhwang
2012/12/14 08:41:48
nit:
if (id == kWebMIdCodecID &&
str != "A_VO
Tom Finegan
2012/12/14 20:21:34
Done.
| |
142 MEDIA_LOG(log_cb_) << "Unexpected CodecID " << str; | 143 MEDIA_LOG(log_cb_) << "Unexpected CodecID " << str; |
143 return false; | 144 return false; |
144 } | 145 } |
145 | 146 |
146 return true; | 147 return true; |
147 } | 148 } |
148 | 149 |
149 } // namespace media | 150 } // namespace media |
OLD | NEW |