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

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

Issue 1479793002: Remove RegisterExternal{De,En}coder error codes. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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
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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 254
255 vie_channel_->RegisterReceiveStatisticsProxy(stats_proxy_.get()); 255 vie_channel_->RegisterReceiveStatisticsProxy(stats_proxy_.get());
256 vie_channel_->RegisterReceiveChannelRtcpStatisticsCallback( 256 vie_channel_->RegisterReceiveChannelRtcpStatisticsCallback(
257 stats_proxy_.get()); 257 stats_proxy_.get());
258 vie_channel_->RegisterReceiveChannelRtpStatisticsCallback(stats_proxy_.get()); 258 vie_channel_->RegisterReceiveChannelRtpStatisticsCallback(stats_proxy_.get());
259 vie_channel_->RegisterRtcpPacketTypeCounterObserver(stats_proxy_.get()); 259 vie_channel_->RegisterRtcpPacketTypeCounterObserver(stats_proxy_.get());
260 260
261 RTC_DCHECK(!config_.decoders.empty()); 261 RTC_DCHECK(!config_.decoders.empty());
262 for (size_t i = 0; i < config_.decoders.size(); ++i) { 262 for (size_t i = 0; i < config_.decoders.size(); ++i) {
263 const Decoder& decoder = config_.decoders[i]; 263 const Decoder& decoder = config_.decoders[i];
264 RTC_CHECK(decoder.decoder);
264 RTC_CHECK_EQ(0, 265 RTC_CHECK_EQ(0,
265 vie_channel_->RegisterExternalDecoder( 266 vie_channel_->RegisterExternalDecoder(
266 decoder.payload_type, decoder.decoder, decoder.is_renderer, 267 decoder.payload_type, decoder.decoder, decoder.is_renderer,
267 decoder.is_renderer ? decoder.expected_delay_ms 268 decoder.is_renderer ? decoder.expected_delay_ms
268 : config.render_delay_ms)); 269 : config.render_delay_ms));
269 270
270 VideoCodec codec = CreateDecoderVideoCodec(decoder); 271 VideoCodec codec = CreateDecoderVideoCodec(decoder);
271 272
272 RTC_CHECK_EQ(0, vie_channel_->SetReceiveCodec(codec)); 273 RTC_CHECK_EQ(0, vie_channel_->SetReceiveCodec(codec));
273 } 274 }
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 return 0; 380 return 0;
380 } 381 }
381 382
382 void VideoReceiveStream::SignalNetworkState(NetworkState state) { 383 void VideoReceiveStream::SignalNetworkState(NetworkState state) {
383 vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode 384 vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode
384 : RtcpMode::kOff); 385 : RtcpMode::kOff);
385 } 386 }
386 387
387 } // namespace internal 388 } // namespace internal
388 } // namespace webrtc 389 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/video_sender_unittest.cc ('k') | webrtc/video_engine/vie_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698