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

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: Add tests. 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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 webrtc::Call* call, 418 webrtc::Call* call,
419 const StreamParams& sp, 419 const StreamParams& sp,
420 webrtc::VideoReceiveStream::Config config, 420 webrtc::VideoReceiveStream::Config config,
421 WebRtcVideoDecoderFactory* external_decoder_factory, 421 WebRtcVideoDecoderFactory* external_decoder_factory,
422 bool default_stream, 422 bool default_stream,
423 const std::vector<VideoCodecSettings>& recv_codecs, 423 const std::vector<VideoCodecSettings>& recv_codecs,
424 bool red_disabled_by_remote_side); 424 bool red_disabled_by_remote_side);
425 ~WebRtcVideoReceiveStream(); 425 ~WebRtcVideoReceiveStream();
426 426
427 const std::vector<uint32_t>& GetSsrcs() const; 427 const std::vector<uint32_t>& GetSsrcs() const;
428 rtc::Optional<uint32_t> GetFirstPrimarySsrc() const;
428 429
429 void SetLocalSsrc(uint32_t local_ssrc); 430 void SetLocalSsrc(uint32_t local_ssrc);
430 // TODO(deadbeef): Move these feedback parameters into the recv parameters. 431 // TODO(deadbeef): Move these feedback parameters into the recv parameters.
431 void SetFeedbackParameters(bool nack_enabled, 432 void SetFeedbackParameters(bool nack_enabled,
432 bool remb_enabled, 433 bool remb_enabled,
433 bool transport_cc_enabled, 434 bool transport_cc_enabled,
434 webrtc::RtcpMode rtcp_mode); 435 webrtc::RtcpMode rtcp_mode);
435 void SetRecvParameters(const ChangedRecvParameters& recv_params); 436 void SetRecvParameters(const ChangedRecvParameters& recv_params);
436 437
437 void OnFrame(const webrtc::VideoFrame& frame) override; 438 void OnFrame(const webrtc::VideoFrame& frame) override;
(...skipping 28 matching lines...) Expand all
466 void ConfigureCodecs(const std::vector<VideoCodecSettings>& recv_codecs, 467 void ConfigureCodecs(const std::vector<VideoCodecSettings>& recv_codecs,
467 std::vector<AllocatedDecoder>* old_codecs); 468 std::vector<AllocatedDecoder>* old_codecs);
468 AllocatedDecoder CreateOrReuseVideoDecoder( 469 AllocatedDecoder CreateOrReuseVideoDecoder(
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 StreamParams stream_params_;
477 const std::vector<SsrcGroup> ssrc_groups_;
478 478
479 webrtc::VideoReceiveStream* stream_; 479 webrtc::VideoReceiveStream* stream_;
480 const bool default_stream_; 480 const bool default_stream_;
481 webrtc::VideoReceiveStream::Config config_; 481 webrtc::VideoReceiveStream::Config config_;
482 bool red_disabled_by_remote_side_; 482 bool red_disabled_by_remote_side_;
483 483
484 WebRtcVideoDecoderFactory* const external_decoder_factory_; 484 WebRtcVideoDecoderFactory* const external_decoder_factory_;
485 std::vector<AllocatedDecoder> allocated_decoders_; 485 std::vector<AllocatedDecoder> allocated_decoders_;
486 486
487 rtc::CriticalSection sink_lock_; 487 rtc::CriticalSection sink_lock_;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 // send_params/recv_params, rtp_extensions, options, etc. 549 // send_params/recv_params, rtp_extensions, options, etc.
550 VideoSendParameters send_params_; 550 VideoSendParameters send_params_;
551 VideoOptions default_send_options_; 551 VideoOptions default_send_options_;
552 VideoRecvParameters recv_params_; 552 VideoRecvParameters recv_params_;
553 bool red_disabled_by_remote_side_; 553 bool red_disabled_by_remote_side_;
554 }; 554 };
555 555
556 } // namespace cricket 556 } // namespace cricket
557 557
558 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 558 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698