| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 // Default ctor; use methods below to set configuration. | 388 // Default ctor; use methods below to set configuration. |
| 389 // The TransportDescriptionFactory is not owned by MediaSessionDescFactory, | 389 // The TransportDescriptionFactory is not owned by MediaSessionDescFactory, |
| 390 // so it must be kept alive by the user of this class. | 390 // so it must be kept alive by the user of this class. |
| 391 explicit MediaSessionDescriptionFactory( | 391 explicit MediaSessionDescriptionFactory( |
| 392 const TransportDescriptionFactory* factory); | 392 const TransportDescriptionFactory* factory); |
| 393 // This helper automatically sets up the factory to get its configuration | 393 // This helper automatically sets up the factory to get its configuration |
| 394 // from the specified ChannelManager. | 394 // from the specified ChannelManager. |
| 395 MediaSessionDescriptionFactory(ChannelManager* cmanager, | 395 MediaSessionDescriptionFactory(ChannelManager* cmanager, |
| 396 const TransportDescriptionFactory* factory); | 396 const TransportDescriptionFactory* factory); |
| 397 | 397 |
| 398 const AudioCodecs& audio_codecs() const { return audio_codecs_; } | 398 const AudioCodecs& audio_codecs() const; |
| 399 void set_audio_codecs(const AudioCodecs& codecs) { audio_codecs_ = codecs; } | 399 void set_audio_codecs(const AudioCodecs& send_and_recv_codecs); |
| 400 void set_audio_codecs(const AudioCodecs& send_codecs, |
| 401 const AudioCodecs& recv_codecs); |
| 400 void set_audio_rtp_header_extensions(const RtpHeaderExtensions& extensions) { | 402 void set_audio_rtp_header_extensions(const RtpHeaderExtensions& extensions) { |
| 401 audio_rtp_extensions_ = extensions; | 403 audio_rtp_extensions_ = extensions; |
| 402 } | 404 } |
| 403 const RtpHeaderExtensions& audio_rtp_header_extensions() const { | 405 const RtpHeaderExtensions& audio_rtp_header_extensions() const { |
| 404 return audio_rtp_extensions_; | 406 return audio_rtp_extensions_; |
| 405 } | 407 } |
| 406 const VideoCodecs& video_codecs() const { return video_codecs_; } | 408 const VideoCodecs& video_codecs() const { return video_codecs_; } |
| 407 void set_video_codecs(const VideoCodecs& codecs) { video_codecs_ = codecs; } | 409 void set_video_codecs(const VideoCodecs& codecs) { video_codecs_ = codecs; } |
| 408 void set_video_rtp_header_extensions(const RtpHeaderExtensions& extensions) { | 410 void set_video_rtp_header_extensions(const RtpHeaderExtensions& extensions) { |
| 409 video_rtp_extensions_ = extensions; | 411 video_rtp_extensions_ = extensions; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 424 SessionDescription* CreateOffer( | 426 SessionDescription* CreateOffer( |
| 425 const MediaSessionOptions& options, | 427 const MediaSessionOptions& options, |
| 426 const SessionDescription* current_description) const; | 428 const SessionDescription* current_description) const; |
| 427 SessionDescription* CreateAnswer( | 429 SessionDescription* CreateAnswer( |
| 428 const SessionDescription* offer, | 430 const SessionDescription* offer, |
| 429 const MediaSessionOptions& options, | 431 const MediaSessionOptions& options, |
| 430 const SessionDescription* current_description) const; | 432 const SessionDescription* current_description) const; |
| 431 | 433 |
| 432 private: | 434 private: |
| 433 void GetCodecsToOffer(const SessionDescription* current_description, | 435 void GetCodecsToOffer(const SessionDescription* current_description, |
| 436 const AudioCodecs& supported_audio_codecs, |
| 437 const VideoCodecs& supported_video_codecs, |
| 438 const DataCodecs& supported_data_codecs, |
| 434 AudioCodecs* audio_codecs, | 439 AudioCodecs* audio_codecs, |
| 435 VideoCodecs* video_codecs, | 440 VideoCodecs* video_codecs, |
| 436 DataCodecs* data_codecs) const; | 441 DataCodecs* data_codecs) const; |
| 437 void GetRtpHdrExtsToOffer(const SessionDescription* current_description, | 442 void GetRtpHdrExtsToOffer(const SessionDescription* current_description, |
| 438 RtpHeaderExtensions* audio_extensions, | 443 RtpHeaderExtensions* audio_extensions, |
| 439 RtpHeaderExtensions* video_extensions) const; | 444 RtpHeaderExtensions* video_extensions) const; |
| 440 bool AddTransportOffer( | 445 bool AddTransportOffer( |
| 441 const std::string& content_name, | 446 const std::string& content_name, |
| 442 const TransportOptions& transport_options, | 447 const TransportOptions& transport_options, |
| 443 const SessionDescription* current_desc, | 448 const SessionDescription* current_desc, |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 495 StreamParamsVec* current_streams, | 500 StreamParamsVec* current_streams, |
| 496 SessionDescription* answer) const; | 501 SessionDescription* answer) const; |
| 497 | 502 |
| 498 bool AddDataContentForAnswer( | 503 bool AddDataContentForAnswer( |
| 499 const SessionDescription* offer, | 504 const SessionDescription* offer, |
| 500 const MediaSessionOptions& options, | 505 const MediaSessionOptions& options, |
| 501 const SessionDescription* current_description, | 506 const SessionDescription* current_description, |
| 502 StreamParamsVec* current_streams, | 507 StreamParamsVec* current_streams, |
| 503 SessionDescription* answer) const; | 508 SessionDescription* answer) const; |
| 504 | 509 |
| 505 AudioCodecs audio_codecs_; | 510 AudioCodecs audio_send_codecs_; |
| 511 AudioCodecs audio_recv_codecs_; |
| 512 AudioCodecs audio_sendrecv_codecs_; |
| 506 RtpHeaderExtensions audio_rtp_extensions_; | 513 RtpHeaderExtensions audio_rtp_extensions_; |
| 507 VideoCodecs video_codecs_; | 514 VideoCodecs video_codecs_; |
| 508 RtpHeaderExtensions video_rtp_extensions_; | 515 RtpHeaderExtensions video_rtp_extensions_; |
| 509 DataCodecs data_codecs_; | 516 DataCodecs data_codecs_; |
| 510 SecurePolicy secure_; | 517 SecurePolicy secure_; |
| 511 bool add_legacy_; | 518 bool add_legacy_; |
| 512 std::string lang_; | 519 std::string lang_; |
| 513 const TransportDescriptionFactory* transport_desc_factory_; | 520 const TransportDescriptionFactory* transport_desc_factory_; |
| 514 }; | 521 }; |
| 515 | 522 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 542 void GetSupportedVideoCryptoSuiteNames( | 549 void GetSupportedVideoCryptoSuiteNames( |
| 543 std::vector<std::string>* crypto_suite_names); | 550 std::vector<std::string>* crypto_suite_names); |
| 544 void GetSupportedDataCryptoSuiteNames( | 551 void GetSupportedDataCryptoSuiteNames( |
| 545 std::vector<std::string>* crypto_suite_names); | 552 std::vector<std::string>* crypto_suite_names); |
| 546 void GetDefaultSrtpCryptoSuiteNames( | 553 void GetDefaultSrtpCryptoSuiteNames( |
| 547 std::vector<std::string>* crypto_suite_names); | 554 std::vector<std::string>* crypto_suite_names); |
| 548 | 555 |
| 549 } // namespace cricket | 556 } // namespace cricket |
| 550 | 557 |
| 551 #endif // WEBRTC_PC_MEDIASESSION_H_ | 558 #endif // WEBRTC_PC_MEDIASESSION_H_ |
| OLD | NEW |