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

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

Issue 1235793005: Deprecate LogCB in favor of using MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and attempt to fix Android compilation Created 5 years, 5 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/box_reader.cc ('k') | media/formats/mp4/mp4_stream_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp4/box_reader_unittest.cc
diff --git a/media/formats/mp4/box_reader_unittest.cc b/media/formats/mp4/box_reader_unittest.cc
index 62284e8a52b5cec873e1f8febb243cf11c8cfb55..e4fff265b54c1c49ed34918f2255317c32b5b311 100644
--- a/media/formats/mp4/box_reader_unittest.cc
+++ b/media/formats/mp4/box_reader_unittest.cc
@@ -86,7 +86,7 @@ TEST_F(BoxReaderTest, ExpectedOperationTest) {
std::vector<uint8> buf = GetBuf();
bool err;
scoped_ptr<BoxReader> reader(
- BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
+ BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
EXPECT_FALSE(err);
EXPECT_TRUE(reader.get());
@@ -113,8 +113,8 @@ TEST_F(BoxReaderTest, OuterTooShortTest) {
bool err;
// Create a soft failure by truncating the outer box.
- scoped_ptr<BoxReader> r(
- BoxReader::ReadTopLevelBox(&buf[0], buf.size() - 2, LogCB(), &err));
+ scoped_ptr<BoxReader> r(BoxReader::ReadTopLevelBox(&buf[0], buf.size() - 2,
+ new MediaLog(), &err));
EXPECT_FALSE(err);
EXPECT_FALSE(r.get());
@@ -127,7 +127,7 @@ TEST_F(BoxReaderTest, InnerTooLongTest) {
// Make an inner box too big for its outer box.
buf[25] = 1;
scoped_ptr<BoxReader> reader(
- BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
+ BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
SkipBox box;
EXPECT_FALSE(box.Parse(reader.get()));
@@ -140,7 +140,7 @@ TEST_F(BoxReaderTest, WrongFourCCTest) {
// Set an unrecognized top-level FourCC.
buf[5] = 1;
scoped_ptr<BoxReader> reader(
- BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
+ BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
EXPECT_FALSE(reader.get());
EXPECT_TRUE(err);
}
@@ -149,7 +149,7 @@ TEST_F(BoxReaderTest, ScanChildrenTest) {
std::vector<uint8> buf = GetBuf();
bool err;
scoped_ptr<BoxReader> reader(
- BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
+ BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
EXPECT_TRUE(reader->SkipBytes(16) && reader->ScanChildren());
@@ -173,7 +173,7 @@ TEST_F(BoxReaderTest, ReadAllChildrenTest) {
buf[3] = 0x38;
bool err;
scoped_ptr<BoxReader> reader(
- BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
+ BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
std::vector<PsshBox> kids;
EXPECT_TRUE(reader->SkipBytes(16) && reader->ReadAllChildren(&kids));
@@ -187,7 +187,7 @@ static void TestTopLevelBox(const uint8* data, int size, uint32 fourCC) {
bool err;
scoped_ptr<BoxReader> reader(
- BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
+ BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
EXPECT_FALSE(err);
EXPECT_TRUE(reader);
« no previous file with comments | « media/formats/mp4/box_reader.cc ('k') | media/formats/mp4/mp4_stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698