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

Unified Diff: media/formats/mp4/mp4_stream_parser_unittest.cc

Issue 616183002: Revert of Pass initDataType instead of contentType on OnNeedKey(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « media/formats/mp4/mp4_stream_parser.cc ('k') | media/formats/webm/webm_crypto_helpers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp4/mp4_stream_parser_unittest.cc
diff --git a/media/formats/mp4/mp4_stream_parser_unittest.cc b/media/formats/mp4/mp4_stream_parser_unittest.cc
index 5bcb7add29f4a6243ca0ef5ad21d07e4db43b1cf..c44e0ce96ccb2095a37e7337aa53ee6d30bd4863 100644
--- a/media/formats/mp4/mp4_stream_parser_unittest.cc
+++ b/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -25,7 +25,8 @@
namespace media {
namespace mp4 {
-static const char kCencInitDataType[] = "cenc";
+// TODO(xhwang): Figure out the init data type appropriately once it's spec'ed.
+static const char kMp4InitDataType[] = "video/mp4";
class MP4StreamParserTest : public testing::Test {
public:
@@ -121,7 +122,7 @@
void KeyNeededF(const std::string& type,
const std::vector<uint8>& init_data) {
DVLOG(1) << "KeyNeededF: " << init_data.size();
- EXPECT_EQ(kCencInitDataType, type);
+ EXPECT_EQ(kMp4InitDataType, type);
EXPECT_FALSE(init_data.empty());
}
« no previous file with comments | « media/formats/mp4/mp4_stream_parser.cc ('k') | media/formats/webm/webm_crypto_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698