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

Unified Diff: media/filters/frame_processor_unittest.cc

Issue 1041353002: media-internals: Differentiate error, info, and debug log messages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address reviewer comments Created 5 years, 9 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/filters/frame_processor_unittest.cc
diff --git a/media/filters/frame_processor_unittest.cc b/media/filters/frame_processor_unittest.cc
index b4fe2236893897285cc29562fad72b4e99204c4d..f90bfdbcfa30e1def542d1d995cc77d8e7849159 100644
--- a/media/filters/frame_processor_unittest.cc
+++ b/media/filters/frame_processor_unittest.cc
@@ -11,6 +11,7 @@
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
+#include "media/base/media_log.h"
#include "media/base/mock_filters.h"
#include "media/base/test_helpers.h"
#include "media/filters/chunk_demuxer.h"
@@ -27,8 +28,6 @@ typedef StreamParser::BufferQueue BufferQueue;
typedef StreamParser::TextBufferQueueMap TextBufferQueueMap;
typedef StreamParser::TrackId TrackId;
-static void LogFunc(const std::string& str) { DVLOG(1) << str; }
-
// Used for setting expectations on callbacks. Using a StrictMock also lets us
// test for missing or extra callbacks.
class FrameProcessorTestCallbackHelper {
@@ -276,8 +275,8 @@ class FrameProcessorTest : public testing::TestWithParam<bool> {
0,
false);
frame_processor_->OnPossibleAudioConfigUpdate(decoder_config);
- ASSERT_TRUE(
- audio_->UpdateAudioConfig(decoder_config, base::Bind(&LogFunc)));
+ ASSERT_TRUE(audio_->UpdateAudioConfig(decoder_config,
+ base::Bind(&AddLogEntryForTest)));
break;
}
case DemuxerStream::VIDEO: {
@@ -285,7 +284,7 @@ class FrameProcessorTest : public testing::TestWithParam<bool> {
video_.reset(new ChunkDemuxerStream(
DemuxerStream::VIDEO, DemuxerStream::LIVENESS_UNKNOWN, true));
ASSERT_TRUE(video_->UpdateVideoConfig(TestVideoConfig::Normal(),
- base::Bind(&LogFunc)));
+ base::Bind(&AddLogEntryForTest)));
break;
}
// TODO(wolenetz): Test text coded frame processing.

Powered by Google App Engine
This is Rietveld 408576698