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

Side by Side Diff: webrtc/video/video_receive_stream.h

Issue 1964473002: Potential fix for rtx/red issue where red is removed only from the remote description. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 const Config& config() const { return config_; } 80 const Config& config() const { return config_; }
81 81
82 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id); 82 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
83 83
84 // NackSender 84 // NackSender
85 void SendNack(const std::vector<uint16_t>& sequence_numbers) override; 85 void SendNack(const std::vector<uint16_t>& sequence_numbers) override;
86 86
87 // KeyFrameRequestSender 87 // KeyFrameRequestSender
88 void RequestKeyFrame() override; 88 void RequestKeyFrame() override;
89 89
90 void DisableFec() override;
91
90 private: 92 private:
91 static bool DecodeThreadFunction(void* ptr); 93 static bool DecodeThreadFunction(void* ptr);
92 void Decode(); 94 void Decode();
93 95
94 TransportAdapter transport_adapter_; 96 TransportAdapter transport_adapter_;
95 EncodedFrameCallbackAdapter encoded_frame_proxy_; 97 EncodedFrameCallbackAdapter encoded_frame_proxy_;
96 const VideoReceiveStream::Config config_; 98 const VideoReceiveStream::Config config_;
97 ProcessThread* const process_thread_; 99 ProcessThread* const process_thread_;
98 Clock* const clock_; 100 Clock* const clock_;
99 101
(...skipping 10 matching lines...) Expand all
110 ViEChannel vie_channel_; 112 ViEChannel vie_channel_;
111 ViESyncModule vie_sync_; 113 ViESyncModule vie_sync_;
112 RtpRtcp* const rtp_rtcp_; 114 RtpRtcp* const rtp_rtcp_;
113 115
114 std::unique_ptr<IvfFileWriter> ivf_writer_; 116 std::unique_ptr<IvfFileWriter> ivf_writer_;
115 }; 117 };
116 } // namespace internal 118 } // namespace internal
117 } // namespace webrtc 119 } // namespace webrtc
118 120
119 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 121 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698