media/cast/logging/log_deserializer.h - Issue 241833002: Cast: Limit number of events/packets in EncodingEventSubscriber protos.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/cast/logging/log_deserializer.h

Issue 241833002: Cast: Limit number of events/packets in EncodingEventSubscriber protos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« media/cast/logging/encoding_event_subscriber.cc ('K') | « media/cast/logging/encoding_event_subscriber_unittest.cc ('k') | media/cast/logging/log_deserializer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/cast/logging/log_deserializer.h

diff --git a/media/cast/logging/log_deserializer.h b/media/cast/logging/log_deserializer.h

index 6087eec111a3ca0ed4a0ee625752f06a5910d3dc..01b6db7dd1220669d6f3337245fc42dd95ef68e9 100644

--- a/media/cast/logging/log_deserializer.h

+++ b/media/cast/logging/log_deserializer.h

@@ -5,14 +5,23 @@

#ifndef MEDIA_CAST_LOGGING_LOG_DESERIALIZER_H_

#define MEDIA_CAST_LOGGING_LOG_DESERIALIZER_H_

+#include <map>

#include <string>

-#include "base/memory/scoped_ptr.h"

-#include "media/cast/logging/encoding_event_subscriber.h"

+#include "base/memory/linked_ptr.h"

+#include "media/cast/logging/logging_defines.h"

+#include "media/cast/logging/proto/raw_events.pb.h"

namespace media {

namespace cast {

+typedef std::map<RtpTimestamp,

+ linked_ptr<media::cast::proto::AggregatedFrameEvent> >

+ FrameEventMap;

+typedef std::map<RtpTimestamp,

+ linked_ptr<media::cast::proto::AggregatedPacketEvent> >

+ PacketEventMap;

// Represents deserialized raw event logs for a particular stream.

struct DeserializedLog {

DeserializedLog();