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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine.h

Issue 2974453002: Protected streams report RTP messages directly to the FlexFec streams (Closed)
Patch Set: Appease lint. Created 3 years, 4 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/media/engine/fakewebrtccall.cc ('k') | webrtc/media/engine/webrtcvideoengine.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) 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
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 webrtc::VideoDecoder* decoder; 417 webrtc::VideoDecoder* decoder;
418 // Decoder wrapped into a fallback decoder to permit software fallback. 418 // Decoder wrapped into a fallback decoder to permit software fallback.
419 webrtc::VideoDecoder* external_decoder; 419 webrtc::VideoDecoder* external_decoder;
420 webrtc::VideoCodecType type; 420 webrtc::VideoCodecType type;
421 bool external; 421 bool external;
422 }; 422 };
423 423
424 void RecreateWebRtcVideoStream(); 424 void RecreateWebRtcVideoStream();
425 void MaybeRecreateWebRtcFlexfecStream(); 425 void MaybeRecreateWebRtcFlexfecStream();
426 426
427 void MaybeAssociateFlexfecWithVideo();
428 void MaybeDissociateFlexfecFromVideo();
429
427 void ConfigureCodecs(const std::vector<VideoCodecSettings>& recv_codecs, 430 void ConfigureCodecs(const std::vector<VideoCodecSettings>& recv_codecs,
428 std::vector<AllocatedDecoder>* old_codecs); 431 std::vector<AllocatedDecoder>* old_codecs);
429 void ConfigureFlexfecCodec(int flexfec_payload_type); 432 void ConfigureFlexfecCodec(int flexfec_payload_type);
430 AllocatedDecoder CreateOrReuseVideoDecoder( 433 AllocatedDecoder CreateOrReuseVideoDecoder(
431 std::vector<AllocatedDecoder>* old_decoder, 434 std::vector<AllocatedDecoder>* old_decoder,
432 const VideoCodec& codec); 435 const VideoCodec& codec);
433 void ClearDecoders(std::vector<AllocatedDecoder>* allocated_decoders); 436 void ClearDecoders(std::vector<AllocatedDecoder>* allocated_decoders);
434 437
435 std::string GetCodecNameFromPayloadType(int payload_type); 438 std::string GetCodecNameFromPayloadType(int payload_type);
436 439
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 const std::string codec_name_; 546 const std::string codec_name_;
544 const int max_qp_; 547 const int max_qp_;
545 const int max_framerate_; 548 const int max_framerate_;
546 const bool is_screencast_; 549 const bool is_screencast_;
547 const bool conference_mode_; 550 const bool conference_mode_;
548 }; 551 };
549 552
550 } // namespace cricket 553 } // namespace cricket
551 554
552 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ 555 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/fakewebrtccall.cc ('k') | webrtc/media/engine/webrtcvideoengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698