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

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

Issue 2052233002: Enable passing receive stream ID to the decoder factory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Formatting Created 4 years, 6 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) 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 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 webrtc::VideoDecoder* external_decoder; 459 webrtc::VideoDecoder* external_decoder;
460 webrtc::VideoCodecType type; 460 webrtc::VideoCodecType type;
461 bool external; 461 bool external;
462 }; 462 };
463 463
464 void RecreateWebRtcStream(); 464 void RecreateWebRtcStream();
465 465
466 void ConfigureCodecs(const std::vector<VideoCodecSettings>& recv_codecs, 466 void ConfigureCodecs(const std::vector<VideoCodecSettings>& recv_codecs,
467 std::vector<AllocatedDecoder>* old_codecs); 467 std::vector<AllocatedDecoder>* old_codecs);
468 AllocatedDecoder CreateOrReuseVideoDecoder( 468 AllocatedDecoder CreateOrReuseVideoDecoder(
469 uint32_t ssrc,
469 std::vector<AllocatedDecoder>* old_decoder, 470 std::vector<AllocatedDecoder>* old_decoder,
470 const VideoCodec& codec); 471 const VideoCodec& codec);
471 void ClearDecoders(std::vector<AllocatedDecoder>* allocated_decoders); 472 void ClearDecoders(std::vector<AllocatedDecoder>* allocated_decoders);
472 473
473 std::string GetCodecNameFromPayloadType(int payload_type); 474 std::string GetCodecNameFromPayloadType(int payload_type);
474 475
475 webrtc::Call* const call_; 476 webrtc::Call* const call_;
476 const std::vector<uint32_t> ssrcs_; 477 const std::vector<uint32_t> ssrcs_;
477 const std::vector<SsrcGroup> ssrc_groups_; 478 const std::vector<SsrcGroup> ssrc_groups_;
478 479
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 // send_params/recv_params, rtp_extensions, options, etc. 550 // send_params/recv_params, rtp_extensions, options, etc.
550 VideoSendParameters send_params_; 551 VideoSendParameters send_params_;
551 VideoOptions default_send_options_; 552 VideoOptions default_send_options_;
552 VideoRecvParameters recv_params_; 553 VideoRecvParameters recv_params_;
553 bool red_disabled_by_remote_side_; 554 bool red_disabled_by_remote_side_;
554 }; 555 };
555 556
556 } // namespace cricket 557 } // namespace cricket
557 558
558 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 559 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698