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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 2226443002: Support multiple media tracks in MSE / ChunkDemuxer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mp4 format is not supported on some trybots, so use webm Created 4 years, 3 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/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index a979e7a4044cce46ced754942b6cff1b4da33fa4..95654b27d204ac35cec5e5ccab9d0be14dc1b152 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -611,7 +611,7 @@ class MockMediaSource {
// 2. video/webm;codec="vorbis,vp8".
size_t semicolon = mimetype_.find(";");
std::string type = mimetype_;
- std::vector<std::string> codecs;
+ std::string codecs_param = "";
if (semicolon != std::string::npos) {
type = mimetype_.substr(0, semicolon);
size_t codecs_param_start = mimetype_.find("codecs=\"", semicolon);
@@ -624,13 +624,11 @@ class MockMediaSource {
CHECK_NE(codecs_param_end, std::string::npos);
- std::string codecs_param = mimetype_.substr(
- codecs_param_start, codecs_param_end - codecs_param_start);
- codecs = base::SplitString(codecs_param, ",", base::KEEP_WHITESPACE,
- base::SPLIT_WANT_NONEMPTY);
+ codecs_param = mimetype_.substr(codecs_param_start,
+ codecs_param_end - codecs_param_start);
}
- return chunk_demuxer_->AddId(kSourceId, type, codecs);
+ return chunk_demuxer_->AddId(kSourceId, type, codecs_param);
}
void OnEncryptedMediaInitData(EmeInitDataType init_data_type,

Powered by Google App Engine
This is Rietveld 408576698