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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/formats/webm/webm_cluster_parser_unittest.cc

Issue 1235793005: Deprecate LogCB in favor of using MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the accidentally included pieces of followup CL 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
« media/base/media_log.cc ('K') | « media/formats/webm/webm_cluster_parser.cc ('k') | media/formats/webm/webm_content_encodings_client.h » ('j') | media/formats/webm/webm_tracks_parser.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/webm/webm_cluster_parser_unittest.cc
diff --git a/media/formats/webm/webm_cluster_parser_unittest.cc b/media/formats/webm/webm_cluster_parser_unittest.cc
index 4020df458bd2044ef2cea50731281ac3ed8b66e4..43d75ea83a6d1916691e185086f23d5466db67bb 100644
--- a/media/formats/webm/webm_cluster_parser_unittest.cc
+++ b/media/formats/webm/webm_cluster_parser_unittest.cc
@@ -268,7 +268,7 @@ class WebMClusterParserTest : public testing::Test {
std::string(),
std::string(),
kUnknownAudioCodec,
- LogCB())) {}
+ new MediaLog())) {}
protected:
void ResetParserToHaveDefaultDurations() {
@@ -281,17 +281,10 @@ class WebMClusterParserTest : public testing::Test {
ASSERT_NE(kNoTimestamp(), default_audio_duration);
ASSERT_NE(kNoTimestamp(), default_video_duration);
- parser_.reset(new WebMClusterParser(kTimecodeScale,
- kAudioTrackNum,
- default_audio_duration,
- kVideoTrackNum,
- default_video_duration,
- TextTracks(),
- std::set<int64>(),
- std::string(),
- std::string(),
- kUnknownAudioCodec,
- LogCB()));
+ parser_.reset(new WebMClusterParser(
+ kTimecodeScale, kAudioTrackNum, default_audio_duration, kVideoTrackNum,
+ default_video_duration, TextTracks(), std::set<int64>(), std::string(),
+ std::string(), kUnknownAudioCodec, new MediaLog()));
xhwang 2015/07/13 22:41:17 nit: It might make sense to have a helper function
wolenetz 2015/07/13 22:59:24 sgtm. I'll put those in a separate CL though. Than
wolenetz 2015/07/21 00:57:58 I have now prepared the separate CL for review @ h
}
scoped_ptr<WebMClusterParser> parser_;
@@ -317,17 +310,10 @@ TEST_F(WebMClusterParserTest, HeldBackBufferHoldsBackAllTracks) {
base::TimeDelta::FromMilliseconds(kTestAudioFrameDefaultDurationInMs);
ASSERT_GE(default_audio_duration, base::TimeDelta());
ASSERT_NE(kNoTimestamp(), default_audio_duration);
- parser_.reset(new WebMClusterParser(kTimecodeScale,
- kAudioTrackNum,
- default_audio_duration,
- kVideoTrackNum,
- kNoTimestamp(),
- text_tracks,
- std::set<int64>(),
- std::string(),
- std::string(),
- kUnknownAudioCodec,
- LogCB()));
+ parser_.reset(new WebMClusterParser(
+ kTimecodeScale, kAudioTrackNum, default_audio_duration, kVideoTrackNum,
+ kNoTimestamp(), text_tracks, std::set<int64>(), std::string(),
+ std::string(), kUnknownAudioCodec, new MediaLog()));
const BlockInfo kBlockInfo[] = {
{kVideoTrackNum, 0, 33, true, NULL, 0},
@@ -510,17 +496,10 @@ TEST_F(WebMClusterParserTest, IgnoredTracks) {
std::set<int64> ignored_tracks;
ignored_tracks.insert(kTextTrackNum);
- parser_.reset(new WebMClusterParser(kTimecodeScale,
- kAudioTrackNum,
- kNoTimestamp(),
- kVideoTrackNum,
- kNoTimestamp(),
- TextTracks(),
- ignored_tracks,
- std::string(),
- std::string(),
- kUnknownAudioCodec,
- LogCB()));
+ parser_.reset(new WebMClusterParser(
+ kTimecodeScale, kAudioTrackNum, kNoTimestamp(), kVideoTrackNum,
+ kNoTimestamp(), TextTracks(), ignored_tracks, std::string(),
+ std::string(), kUnknownAudioCodec, new MediaLog()));
const BlockInfo kInputBlockInfo[] = {
{kAudioTrackNum, 0, 23, true, NULL, 0},
@@ -556,17 +535,10 @@ TEST_F(WebMClusterParserTest, ParseTextTracks) {
TextTrackConfig(kTextSubtitles, "", "",
"")));
- parser_.reset(new WebMClusterParser(kTimecodeScale,
- kAudioTrackNum,
- kNoTimestamp(),
- kVideoTrackNum,
- kNoTimestamp(),
- text_tracks,
- std::set<int64>(),
- std::string(),
- std::string(),
- kUnknownAudioCodec,
- LogCB()));
+ parser_.reset(new WebMClusterParser(
+ kTimecodeScale, kAudioTrackNum, kNoTimestamp(), kVideoTrackNum,
+ kNoTimestamp(), text_tracks, std::set<int64>(), std::string(),
+ std::string(), kUnknownAudioCodec, new MediaLog()));
const BlockInfo kInputBlockInfo[] = {
{kAudioTrackNum, 0, 23, true, NULL, 0},
@@ -594,17 +566,10 @@ TEST_F(WebMClusterParserTest, TextTracksSimpleBlock) {
TextTrackConfig(kTextSubtitles, "", "",
"")));
- parser_.reset(new WebMClusterParser(kTimecodeScale,
- kAudioTrackNum,
- kNoTimestamp(),
- kVideoTrackNum,
- kNoTimestamp(),
- text_tracks,
- std::set<int64>(),
- std::string(),
- std::string(),
- kUnknownAudioCodec,
- LogCB()));
+ parser_.reset(new WebMClusterParser(
+ kTimecodeScale, kAudioTrackNum, kNoTimestamp(), kVideoTrackNum,
+ kNoTimestamp(), text_tracks, std::set<int64>(), std::string(),
+ std::string(), kUnknownAudioCodec, new MediaLog()));
const BlockInfo kInputBlockInfo[] = {
{ kTextTrackNum, 33, 42, true },
@@ -632,17 +597,10 @@ TEST_F(WebMClusterParserTest, ParseMultipleTextTracks) {
TextTrackConfig(kTextCaptions, "", "",
"")));
- parser_.reset(new WebMClusterParser(kTimecodeScale,
- kAudioTrackNum,
- kNoTimestamp(),
- kVideoTrackNum,
- kNoTimestamp(),
- text_tracks,
- std::set<int64>(),
- std::string(),
- std::string(),
- kUnknownAudioCodec,
- LogCB()));
+ parser_.reset(new WebMClusterParser(
+ kTimecodeScale, kAudioTrackNum, kNoTimestamp(), kVideoTrackNum,
+ kNoTimestamp(), text_tracks, std::set<int64>(), std::string(),
+ std::string(), kUnknownAudioCodec, new MediaLog()));
const BlockInfo kInputBlockInfo[] = {
{kAudioTrackNum, 0, 23, true, NULL, 0},
@@ -679,17 +637,10 @@ TEST_F(WebMClusterParserTest, ParseMultipleTextTracks) {
TEST_F(WebMClusterParserTest, ParseEncryptedBlock) {
scoped_ptr<Cluster> cluster(CreateEncryptedCluster(sizeof(kEncryptedFrame)));
- parser_.reset(new WebMClusterParser(kTimecodeScale,
- kAudioTrackNum,
- kNoTimestamp(),
- kVideoTrackNum,
- kNoTimestamp(),
- TextTracks(),
- std::set<int64>(),
- std::string(),
- "video_key_id",
- kUnknownAudioCodec,
- LogCB()));
+ parser_.reset(new WebMClusterParser(
+ kTimecodeScale, kAudioTrackNum, kNoTimestamp(), kVideoTrackNum,
+ kNoTimestamp(), TextTracks(), std::set<int64>(), std::string(),
+ "video_key_id", kUnknownAudioCodec, new MediaLog()));
int result = parser_->Parse(cluster->data(), cluster->size());
EXPECT_EQ(cluster->size(), result);
ASSERT_EQ(1UL, parser_->GetVideoBuffers().size());
@@ -701,17 +652,10 @@ TEST_F(WebMClusterParserTest, ParseBadEncryptedBlock) {
scoped_ptr<Cluster> cluster(
CreateEncryptedCluster(sizeof(kEncryptedFrame) - 1));
- parser_.reset(new WebMClusterParser(kTimecodeScale,
- kAudioTrackNum,
- kNoTimestamp(),
- kVideoTrackNum,
- kNoTimestamp(),
- TextTracks(),
- std::set<int64>(),
- std::string(),
- "video_key_id",
- kUnknownAudioCodec,
- LogCB()));
+ parser_.reset(new WebMClusterParser(
+ kTimecodeScale, kAudioTrackNum, kNoTimestamp(), kVideoTrackNum,
+ kNoTimestamp(), TextTracks(), std::set<int64>(), std::string(),
+ "video_key_id", kUnknownAudioCodec, new MediaLog()));
int result = parser_->Parse(cluster->data(), cluster->size());
EXPECT_EQ(-1, result);
}
@@ -741,17 +685,10 @@ TEST_F(WebMClusterParserTest, ParseInvalidTextBlockGroupWithoutDuration) {
TextTrackConfig(kTextSubtitles, "", "",
"")));
- parser_.reset(new WebMClusterParser(kTimecodeScale,
- kAudioTrackNum,
- kNoTimestamp(),
- kVideoTrackNum,
- kNoTimestamp(),
- text_tracks,
- std::set<int64>(),
- std::string(),
- std::string(),
- kUnknownAudioCodec,
- LogCB()));
+ parser_.reset(new WebMClusterParser(
+ kTimecodeScale, kAudioTrackNum, kNoTimestamp(), kVideoTrackNum,
+ kNoTimestamp(), text_tracks, std::set<int64>(), std::string(),
+ std::string(), kUnknownAudioCodec, new MediaLog()));
const BlockInfo kBlockInfo[] = {
{ kTextTrackNum, 33, -42, false },
@@ -1002,7 +939,7 @@ TEST_F(WebMClusterParserTest, ReadOpusDurationsSimpleBlockAtEndOfCluster) {
parser_.reset(new WebMClusterParser(
kTimecodeScale, kAudioTrackNum, kNoTimestamp(), kVideoTrackNum,
kNoTimestamp(), TextTracks(), std::set<int64>(), std::string(),
- std::string(), kCodecOpus, LogCB()));
+ std::string(), kCodecOpus, new MediaLog()));
int loop_count = 0;
for (const auto* packet_ptr : BuildAllOpusPackets()) {
@@ -1030,7 +967,7 @@ TEST_F(WebMClusterParserTest, PreferOpusDurationsOverBlockDurations) {
parser_.reset(new WebMClusterParser(
kTimecodeScale, kAudioTrackNum, kNoTimestamp(), kVideoTrackNum,
kNoTimestamp(), TextTracks(), std::set<int64>(), std::string(),
- std::string(), kCodecOpus, LogCB()));
+ std::string(), kCodecOpus, new MediaLog()));
int loop_count = 0;
for (const auto* packet_ptr : BuildAllOpusPackets()) {
@@ -1072,7 +1009,7 @@ TEST_F(WebMClusterParserTest, DontReadEncodedDurationWhenEncrypted) {
parser_.reset(new WebMClusterParser(
kTimecodeScale, kAudioTrackNum, kNoTimestamp(), kVideoTrackNum,
kNoTimestamp(), TextTracks(), std::set<int64>(), audio_encryption_id,
- std::string(), kCodecOpus, LogCB()));
+ std::string(), kCodecOpus, new MediaLog()));
// Single Block with BlockDuration and encrypted data.
const BlockInfo kBlockInfo[] = {{kAudioTrackNum,
« media/base/media_log.cc ('K') | « media/formats/webm/webm_cluster_parser.cc ('k') | media/formats/webm/webm_content_encodings_client.h » ('j') | media/formats/webm/webm_tracks_parser.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698