| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/cast/logging/log_deserializer.h" | 5 #include "media/cast/logging/log_deserializer.h" |
| 6 | 6 |
| 7 #include <map> | |
| 8 #include <utility> | 7 #include <utility> |
| 9 | 8 |
| 10 #include "base/big_endian.h" | 9 #include "base/big_endian.h" |
| 11 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 12 #include "third_party/zlib/zlib.h" | 11 #include "third_party/zlib/zlib.h" |
| 13 | 12 |
| 14 using media::cast::FrameEventMap; | 13 using media::cast::FrameEventMap; |
| 15 using media::cast::PacketEventMap; | 14 using media::cast::PacketEventMap; |
| 16 using media::cast::RtpTimestamp; | 15 using media::cast::RtpTimestamp; |
| 17 using media::cast::proto::AggregatedFrameEvent; | 16 using media::cast::proto::AggregatedFrameEvent; |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 } else { | 242 } else { |
| 244 return DoDeserializeEvents(data, data_bytes, audio_log, video_log); | 243 return DoDeserializeEvents(data, data_bytes, audio_log, video_log); |
| 245 } | 244 } |
| 246 } | 245 } |
| 247 | 246 |
| 248 DeserializedLog::DeserializedLog() {} | 247 DeserializedLog::DeserializedLog() {} |
| 249 DeserializedLog::~DeserializedLog() {} | 248 DeserializedLog::~DeserializedLog() {} |
| 250 | 249 |
| 251 } // namespace cast | 250 } // namespace cast |
| 252 } // namespace media | 251 } // namespace media |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1133363002:
Getting rid of duplicate includes from media/ (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master