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

Side by Side Diff: media/cast/rtcp/rtcp_utility.cc

Issue 266373008: Cast: Fix rtcp event dedup logic in rtcp_receiver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 6 years, 7 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 unified diff | Download patch
« no previous file with comments | « media/cast/rtcp/rtcp_utility.h ('k') | media/cast/rtcp/test_rtcp_packet_builder.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/rtcp/rtcp_utility.h" 5 #include "media/cast/rtcp/rtcp_utility.h"
6 6
7 #include "base/big_endian.h" 7 #include "base/big_endian.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "media/cast/transport/cast_transport_defines.h" 9 #include "media/cast/transport/cast_transport_defines.h"
10 10
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 big_endian_reader.ReadU32(&field_.dlrr.last_receiver_report); 1044 big_endian_reader.ReadU32(&field_.dlrr.last_receiver_report);
1045 big_endian_reader.ReadU32(&field_.dlrr.delay_last_receiver_report); 1045 big_endian_reader.ReadU32(&field_.dlrr.delay_last_receiver_report);
1046 1046
1047 rtcp_data_ += 12; 1047 rtcp_data_ += 12;
1048 1048
1049 number_of_blocks_--; 1049 number_of_blocks_--;
1050 field_type_ = kRtcpXrDlrrCode; 1050 field_type_ = kRtcpXrDlrrCode;
1051 return true; 1051 return true;
1052 } 1052 }
1053 1053
1054 uint8 ConvertEventTypeToWireFormat(CastLoggingEvent event) {
1055 switch (event) {
1056 case kAudioAckSent:
1057 return 1;
1058 case kAudioPlayoutDelay:
1059 return 2;
1060 case kAudioFrameDecoded:
1061 return 3;
1062 case kAudioPacketReceived:
1063 return 4;
1064 case kVideoAckSent:
1065 return 5;
1066 case kVideoFrameDecoded:
1067 return 6;
1068 case kVideoRenderDelay:
1069 return 7;
1070 case kVideoPacketReceived:
1071 return 8;
1072 case kDuplicateAudioPacketReceived:
1073 return 9;
1074 case kDuplicateVideoPacketReceived:
1075 return 10;
1076 default:
1077 return 0; // Not an interesting event.
1078 }
1079 }
1080
1081 CastLoggingEvent TranslateToLogEventFromWireFormat(uint8 event) {
1082 switch (event) {
1083 case 1:
1084 return media::cast::kAudioAckSent;
1085 case 2:
1086 return media::cast::kAudioPlayoutDelay;
1087 case 3:
1088 return media::cast::kAudioFrameDecoded;
1089 case 4:
1090 return media::cast::kAudioPacketReceived;
1091 case 5:
1092 return media::cast::kVideoAckSent;
1093 case 6:
1094 return media::cast::kVideoFrameDecoded;
1095 case 7:
1096 return media::cast::kVideoRenderDelay;
1097 case 8:
1098 return media::cast::kVideoPacketReceived;
1099 case 9:
1100 return media::cast::kDuplicateAudioPacketReceived;
1101 case 10:
1102 return media::cast::kDuplicateVideoPacketReceived;
1103 default:
1104 // If the sender adds new log messages we will end up here until we add
1105 // the new messages in the receiver.
1106 VLOG(1) << "Unexpected log message received: " << static_cast<int>(event);
1107 NOTREACHED();
1108 return media::cast::kUnknown;
1109 }
1110 }
1111
1054 } // namespace cast 1112 } // namespace cast
1055 } // namespace media 1113 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/rtcp/rtcp_utility.h ('k') | media/cast/rtcp/test_rtcp_packet_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698