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

Unified Diff: media/cast/test/sender.cc

Issue 236123003: Cast: Provide more meaningful stats. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor fix Created 6 years, 8 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/cast/test/sender.cc
diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc
index 3feb5b7968c6a6363d18ddbae7621708f3a26bfc..642c65ca3a360d321603cbd711672bb2ced55a76 100644
--- a/media/cast/test/sender.cc
+++ b/media/cast/test/sender.cc
@@ -12,12 +12,14 @@
#include "base/files/file_path.h"
#include "base/files/memory_mapped_file.h"
#include "base/files/scoped_file.h"
+#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/thread.h"
#include "base/time/default_tick_clock.h"
+#include "base/values.h"
#include "media/base/media.h"
#include "media/base/video_frame.h"
#include "media/base/video_util.h"
@@ -28,6 +30,8 @@
#include "media/cast/logging/log_serializer.h"
#include "media/cast/logging/logging_defines.h"
#include "media/cast/logging/proto/raw_events.pb.h"
+#include "media/cast/logging/receiver_time_offset_estimator_impl.h"
+#include "media/cast/logging/stats_event_subscriber.h"
#include "media/cast/test/utility/audio_utility.h"
#include "media/cast/test/utility/default_config.h"
#include "media/cast/test/utility/input_builder.h"
@@ -472,7 +476,7 @@ void DumpLoggingData(const media::cast::proto::LogMetadata& log_metadata,
VLOG(0) << "Failed to write logs to file.";
}
-void WriteLogsToFileAndStopSubscribing(
+void WriteLogsToFileAndDestroySubscribers(
const scoped_refptr<media::cast::CastEnvironment>& cast_environment,
scoped_ptr<media::cast::EncodingEventSubscriber> video_event_subscriber,
scoped_ptr<media::cast::EncodingEventSubscriber> audio_event_subscriber,
@@ -505,6 +509,30 @@ void WriteLogsToFileAndStopSubscribing(
audio_log_file.Pass());
}
+void WriteStatsAndDestroySubscribers(
+ const scoped_refptr<media::cast::CastEnvironment>& cast_environment,
+ scoped_ptr<media::cast::StatsEventSubscriber> video_event_subscriber,
+ scoped_ptr<media::cast::StatsEventSubscriber> audio_event_subscriber,
+ scoped_ptr<media::cast::ReceiverTimeOffsetEstimatorImpl> estimator) {
+ cast_environment->Logging()->RemoveRawEventSubscriber(
+ video_event_subscriber.get());
+ cast_environment->Logging()->RemoveRawEventSubscriber(
+ audio_event_subscriber.get());
+ cast_environment->Logging()->RemoveRawEventSubscriber(estimator.get());
+
+ scoped_ptr<base::DictionaryValue> stats = video_event_subscriber->GetStats();
+ std::string json;
+ base::JSONWriter::WriteWithOptions(
+ stats.get(), base::JSONWriter::OPTIONS_PRETTY_PRINT, &json);
+ VLOG(0) << "Video stats: " << json;
+
+ stats = audio_event_subscriber->GetStats();
+ json.clear();
+ base::JSONWriter::WriteWithOptions(
+ stats.get(), base::JSONWriter::OPTIONS_PRETTY_PRINT, &json);
+ VLOG(0) << "Audio stats: " << json;
+}
+
} // namespace
int main(int argc, char** argv) {
@@ -610,6 +638,38 @@ int main(int argc, char** argv) {
std::string audio_log_file_name("/tmp/audio_events.log.gz");
LOG(INFO) << "Logging audio events to: " << audio_log_file_name;
LOG(INFO) << "Logging video events to: " << video_log_file_name;
+
+ // Subscribers for raw events.
+ video_event_subscriber.reset(new media::cast::EncodingEventSubscriber(
+ media::cast::VIDEO_EVENT, 10000));
+ audio_event_subscriber.reset(new media::cast::EncodingEventSubscriber(
+ media::cast::AUDIO_EVENT, 10000));
+ cast_environment->Logging()->AddRawEventSubscriber(
+ video_event_subscriber.get());
+ cast_environment->Logging()->AddRawEventSubscriber(
+ audio_event_subscriber.get());
+
+ // Subscribers for stats.
+ scoped_ptr<media::cast::ReceiverTimeOffsetEstimatorImpl> offset_estimator(
+ new media::cast::ReceiverTimeOffsetEstimatorImpl);
+ cast_environment->Logging()->AddRawEventSubscriber(offset_estimator.get());
+ scoped_ptr<media::cast::StatsEventSubscriber> video_stats_subscriber(
+ new media::cast::StatsEventSubscriber(media::cast::VIDEO_EVENT,
+ cast_environment->Clock(),
+ offset_estimator.get()));
+ scoped_ptr<media::cast::StatsEventSubscriber> audio_stats_subscriber(
+ new media::cast::StatsEventSubscriber(media::cast::AUDIO_EVENT,
+ cast_environment->Clock(),
+ offset_estimator.get()));
+ cast_environment->Logging()->AddRawEventSubscriber(
+ video_stats_subscriber.get());
+ cast_environment->Logging()->AddRawEventSubscriber(
+ audio_stats_subscriber.get());
+
+ std::string video_log_file_name(
+ media::cast::GetVideoLogFileDestination(compress));
+ std::string audio_log_file_name(
+ media::cast::GetAudioLogFileDestination(compress));
video_event_subscriber.reset(new media::cast::EncodingEventSubscriber(
media::cast::VIDEO_EVENT, 10000));
audio_event_subscriber.reset(new media::cast::EncodingEventSubscriber(
@@ -625,16 +685,16 @@ int main(int argc, char** argv) {
exit(-1);
}
- base::ScopedFILE audio_log_file(fopen(audio_log_file_name.c_str(), "w"));
- if (!audio_log_file) {
- VLOG(1) << "Failed to open audio log file for writing.";
+ base::ScopedFILE video_log_file(fopen(video_log_file_name.c_str(), "w"));
+ if (!video_log_file) {
+ VLOG(1) << "Failed to open video log file for writing.";
exit(-1);
}
const int logging_duration_seconds = 300;
io_message_loop.message_loop_proxy()->PostDelayedTask(
FROM_HERE,
- base::Bind(&WriteLogsToFileAndStopSubscribing,
+ base::Bind(&WriteLogsToFileAndDestroySubscribers,
cast_environment,
base::Passed(&video_event_subscriber),
base::Passed(&audio_event_subscriber),
@@ -642,6 +702,16 @@ int main(int argc, char** argv) {
base::Passed(&audio_log_file)),
base::TimeDelta::FromSeconds(logging_duration_seconds));
+ io_message_loop.message_loop_proxy()->PostDelayedTask(
+ FROM_HERE,
+ base::Bind(&WriteStatsAndDestroySubscribers,
+ cast_environment,
+ base::Passed(&video_stats_subscriber),
+ base::Passed(&audio_stats_subscriber),
+ base::Passed(&offset_estimator)),
+ base::TimeDelta::FromSeconds(logging_duration_seconds));
+ }
+
test_thread.message_loop_proxy()->PostTask(
FROM_HERE,
base::Bind(&media::cast::SendProcess::SendNextFrame,

Powered by Google App Engine
This is Rietveld 408576698