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

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

Issue 164253003: Cast: Split kDuplicatePacketReceived into separate events for audio/video. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 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_receiver.cc ('k') | media/cast/video_receiver/video_receiver.cc » ('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_sender.h" 5 #include "media/cast/rtcp/rtcp_sender.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 23 matching lines...) Expand all
34 case media::cast::kAudioPacketReceived: 34 case media::cast::kAudioPacketReceived:
35 return 4; 35 return 4;
36 case media::cast::kVideoAckSent: 36 case media::cast::kVideoAckSent:
37 return 5; 37 return 5;
38 case media::cast::kVideoFrameDecoded: 38 case media::cast::kVideoFrameDecoded:
39 return 6; 39 return 6;
40 case media::cast::kVideoRenderDelay: 40 case media::cast::kVideoRenderDelay:
41 return 7; 41 return 7;
42 case media::cast::kVideoPacketReceived: 42 case media::cast::kVideoPacketReceived:
43 return 8; 43 return 8;
44 case media::cast::kDuplicatePacketReceived: 44 case media::cast::kDuplicateAudioPacketReceived:
45 return 9; 45 return 9;
46 case media::cast::kDuplicateVideoPacketReceived:
47 return 10;
46 default: 48 default:
47 return 0; // Not an interesting event. 49 return 0; // Not an interesting event.
48 } 50 }
49 } 51 }
50 52
51 uint16 MergeEventTypeAndTimestampForWireFormat( 53 uint16 MergeEventTypeAndTimestampForWireFormat(
52 const media::cast::CastLoggingEvent& event, 54 const media::cast::CastLoggingEvent& event,
53 const base::TimeDelta& time_delta) { 55 const base::TimeDelta& time_delta) {
54 int64 time_delta_ms = time_delta.InMilliseconds(); 56 int64 time_delta_ms = time_delta.InMilliseconds();
55 // Max delta is 4096 milliseconds. 57 // Max delta is 4096 milliseconds.
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 case kAudioPlayoutDelay: 635 case kAudioPlayoutDelay:
634 case kAudioFrameDecoded: 636 case kAudioFrameDecoded:
635 case kVideoFrameDecoded: 637 case kVideoFrameDecoded:
636 case kVideoRenderDelay: 638 case kVideoRenderDelay:
637 big_endian_writer.WriteU16( 639 big_endian_writer.WriteU16(
638 static_cast<uint16>(event_message.delay_delta.InMilliseconds())); 640 static_cast<uint16>(event_message.delay_delta.InMilliseconds()));
639 big_endian_writer.WriteU16(event_type_and_timestamp_delta); 641 big_endian_writer.WriteU16(event_type_and_timestamp_delta);
640 break; 642 break;
641 case kAudioPacketReceived: 643 case kAudioPacketReceived:
642 case kVideoPacketReceived: 644 case kVideoPacketReceived:
643 case kDuplicatePacketReceived: 645 case kDuplicateAudioPacketReceived:
646 case kDuplicateVideoPacketReceived:
644 big_endian_writer.WriteU16(event_message.packet_id); 647 big_endian_writer.WriteU16(event_message.packet_id);
645 big_endian_writer.WriteU16(event_type_and_timestamp_delta); 648 big_endian_writer.WriteU16(event_type_and_timestamp_delta);
646 break; 649 break;
647 default: 650 default:
648 NOTREACHED(); 651 NOTREACHED();
649 } 652 }
650 messages_in_frame--; 653 messages_in_frame--;
651 frame_log_messages.event_log_messages_.pop_front(); 654 frame_log_messages.event_log_messages_.pop_front();
652 } 655 }
653 if (frame_log_messages.event_log_messages_.empty()) { 656 if (frame_log_messages.event_log_messages_.empty()) {
654 // We sent all messages on this frame; pop the frame header. 657 // We sent all messages on this frame; pop the frame header.
655 receiver_log_message->pop_front(); 658 receiver_log_message->pop_front();
656 } 659 }
657 } 660 }
658 DCHECK_EQ(total_number_of_messages_to_send, 0); 661 DCHECK_EQ(total_number_of_messages_to_send, 0);
659 } 662 }
660 663
661 } // namespace cast 664 } // namespace cast
662 } // namespace media 665 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/rtcp/rtcp_receiver.cc ('k') | media/cast/video_receiver/video_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698