webrtc/video/encoder_state_feedback.h - Issue 1936503002: Removed SSRC knowledge from ViEEncoder.

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/encoder_state_feedback.h

Issue 1936503002: Removed SSRC knowledge from ViEEncoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@move_payload_router2

Patch Set: Created 4 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 | « no previous file | webrtc/video/encoder_state_feedback.cc » ('j') | webrtc/video/encoder_state_feedback_unittest.cc » ('J')

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.	2 * Copyright (c) 2012 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

(...skipping 20 matching lines...) Expand all Loading...
31 // Adds an encoder to receive feedback for a set of SSRCs.	31 // Adds an encoder to receive feedback for a set of SSRCs.

32 void Init(const std::vector<uint32_t>& ssrc, ViEEncoder* encoder);	32 void Init(const std::vector<uint32_t>& ssrc, ViEEncoder* encoder);

33	33

34 void OnReceivedIntraFrameRequest(uint32_t ssrc) override;	34 void OnReceivedIntraFrameRequest(uint32_t ssrc) override;

35 void OnReceivedSLI(uint32_t ssrc, uint8_t picture_id) override;	35 void OnReceivedSLI(uint32_t ssrc, uint8_t picture_id) override;

36 void OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id) override;	36 void OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id) override;

37 void OnLocalSsrcChanged(uint32_t old_ssrc, uint32_t new_ssrc) override;	37 void OnLocalSsrcChanged(uint32_t old_ssrc, uint32_t new_ssrc) override;

38	38

39 private:	39 private:

40 bool HasSsrc(uint32_t ssrc) EXCLUSIVE_LOCKS_REQUIRED(crit_);	40 bool HasSsrc(uint32_t ssrc) EXCLUSIVE_LOCKS_REQUIRED(crit_);

	41 int GetStreamIndex(uint32_t ssrc) EXCLUSIVE_LOCKS_REQUIRED(crit_);
	pbos-webrtc 2016/05/02 01:05:27 this should be a size_t this should be a size_t perkj_webrtc 2016/05/03 10:22:40 Done. Show quoted text On 2016/05/02 01:05:27, pbos-webrtc wrote: > this should be a size_t Done.
41 rtc::CriticalSection crit_;	42 rtc::CriticalSection crit_;

42	43

43 std::vector<uint32_t> ssrcs_ GUARDED_BY(crit_);	44 std::vector<uint32_t> ssrcs_ GUARDED_BY(crit_);

44 ViEEncoder* vie_encoder_ GUARDED_BY(crit_);	45 ViEEncoder* vie_encoder_ GUARDED_BY(crit_);

45 };	46 };

46	47

47 } // namespace webrtc	48 } // namespace webrtc

48	49

49 #endif // WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_	50 #endif // WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_

OLD	NEW