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

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

Issue 1241123002: Remove UpdateSsrcs from EncoderStateFeedback. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: empty SSRC vector handling Created 5 years, 5 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 | « webrtc/video/video_send_stream.cc ('k') | webrtc/video_engine/encoder_state_feedback.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 /* 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 17 matching lines...) Expand all
28 class RtcpIntraFrameObserver; 28 class RtcpIntraFrameObserver;
29 class ViEEncoder; 29 class ViEEncoder;
30 30
31 class EncoderStateFeedback { 31 class EncoderStateFeedback {
32 public: 32 public:
33 friend class EncoderStateFeedbackObserver; 33 friend class EncoderStateFeedbackObserver;
34 34
35 EncoderStateFeedback(); 35 EncoderStateFeedback();
36 ~EncoderStateFeedback(); 36 ~EncoderStateFeedback();
37 37
38 // Update SSRCs for an encoder. 38 // Adds an encoder to receive feedback for a set of SSRCs.
39 void UpdateSsrcs(const std::vector<uint32_t>& ssrc, ViEEncoder* encoder); 39 void AddEncoder(const std::vector<uint32_t>& ssrc, ViEEncoder* encoder);
40
41 // Adds an encoder to receive feedback for a unique ssrc.
42 bool AddEncoder(uint32_t ssrc, ViEEncoder* encoder);
43 40
44 // Removes a registered ViEEncoder. 41 // Removes a registered ViEEncoder.
45 void RemoveEncoder(const ViEEncoder* encoder); 42 void RemoveEncoder(const ViEEncoder* encoder);
46 43
47 // Returns an observer to register at the requesting class. The observer has 44 // Returns an observer to register at the requesting class. The observer has
48 // the same lifetime as the EncoderStateFeedback instance. 45 // the same lifetime as the EncoderStateFeedback instance.
49 RtcpIntraFrameObserver* GetRtcpIntraFrameObserver(); 46 RtcpIntraFrameObserver* GetRtcpIntraFrameObserver();
50 47
51 protected: 48 protected:
52 // Called by EncoderStateFeedbackObserver when a new key frame is requested. 49 // Called by EncoderStateFeedbackObserver when a new key frame is requested.
(...skipping 12 matching lines...) Expand all
65 62
66 // Maps a unique ssrc to the given encoder. 63 // Maps a unique ssrc to the given encoder.
67 SsrcEncoderMap encoders_; 64 SsrcEncoderMap encoders_;
68 65
69 DISALLOW_COPY_AND_ASSIGN(EncoderStateFeedback); 66 DISALLOW_COPY_AND_ASSIGN(EncoderStateFeedback);
70 }; 67 };
71 68
72 } // namespace webrtc 69 } // namespace webrtc
73 70
74 #endif // WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_ 71 #endif // WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video_engine/encoder_state_feedback.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698