webrtc/video_engine/report_block_stats.h - Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: webrtc/video_engine/report_block_stats.h

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Resolved merge conflict Created 5 years 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 | « webrtc/video_engine/payload_router_unittest.cc ('k') | webrtc/video_engine/report_block_stats.cc » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.	2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.

3 *	3 *

4 * Use of this source code is governed by a BSD-style license	4 * Use of this source code is governed by a BSD-style license

5 * that can be found in the LICENSE file in the root of the source	5 * that can be found in the LICENSE file in the root of the source

6 * tree. An additional intellectual property rights grant can be found	6 * tree. An additional intellectual property rights grant can be found

7 * in the file PATENTS. All contributing project authors may	7 * in the file PATENTS. All contributing project authors may

8 * be found in the AUTHORS file in the root of the source tree.	8 * be found in the AUTHORS file in the root of the source tree.

9 */	9 */

10	10

11 #ifndef WEBRTC_VIDEO_REPORT_BLOCK_STATS_H_	11 #ifndef WEBRTC_VIDEO_ENGINE_REPORT_BLOCK_STATS_H_

12 #define WEBRTC_VIDEO_REPORT_BLOCK_STATS_H_	12 #define WEBRTC_VIDEO_ENGINE_REPORT_BLOCK_STATS_H_

13	13

14 #include <map>	14 #include <map>

15 #include <vector>	15 #include <vector>

16	16

17 #include "webrtc/common_types.h"	17 #include "webrtc/common_types.h"

18 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"	18 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"

19	19

20 namespace webrtc {	20 namespace webrtc {

21	21

22 // Helper class for rtcp statistics.	22 // Helper class for rtcp statistics.

(...skipping 28 matching lines...) Expand all Loading...
51 // The total number of packets/lost packets.	51 // The total number of packets/lost packets.

52 uint32_t num_sequence_numbers_;	52 uint32_t num_sequence_numbers_;

53 uint32_t num_lost_sequence_numbers_;	53 uint32_t num_lost_sequence_numbers_;

54	54

55 // Map holding the last stored report block (mapped by the source SSRC).	55 // Map holding the last stored report block (mapped by the source SSRC).

56 ReportBlockMap prev_report_blocks_;	56 ReportBlockMap prev_report_blocks_;

57 };	57 };

58	58

59 } // namespace webrtc	59 } // namespace webrtc

60	60

61 #endif // WEBRTC_VIDEO_REPORT_BLOCK_STATS_H_	61 #endif // WEBRTC_VIDEO_ENGINE_REPORT_BLOCK_STATS_H_

62	62

OLD	NEW