| 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 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 bool AddTransportOffer( | 486 bool AddTransportOffer( |
| 487 const std::string& content_name, | 487 const std::string& content_name, |
| 488 const TransportOptions& transport_options, | 488 const TransportOptions& transport_options, |
| 489 const SessionDescription* current_desc, | 489 const SessionDescription* current_desc, |
| 490 SessionDescription* offer) const; | 490 SessionDescription* offer) const; |
| 491 | 491 |
| 492 TransportDescription* CreateTransportAnswer( | 492 TransportDescription* CreateTransportAnswer( |
| 493 const std::string& content_name, | 493 const std::string& content_name, |
| 494 const SessionDescription* offer_desc, | 494 const SessionDescription* offer_desc, |
| 495 const TransportOptions& transport_options, | 495 const TransportOptions& transport_options, |
| 496 const SessionDescription* current_desc) const; | 496 const SessionDescription* current_desc, |
| 497 bool bundled) const; |
| 497 | 498 |
| 498 bool AddTransportAnswer( | 499 bool AddTransportAnswer( |
| 499 const std::string& content_name, | 500 const std::string& content_name, |
| 500 const TransportDescription& transport_desc, | 501 const TransportDescription& transport_desc, |
| 501 SessionDescription* answer_desc) const; | 502 SessionDescription* answer_desc) const; |
| 502 | 503 |
| 503 // Helpers for adding media contents to the SessionDescription. Returns true | 504 // Helpers for adding media contents to the SessionDescription. Returns true |
| 504 // it succeeds or the media content is not needed, or false if there is any | 505 // it succeeds or the media content is not needed, or false if there is any |
| 505 // error. | 506 // error. |
| 506 | 507 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 520 StreamParamsVec* current_streams, | 521 StreamParamsVec* current_streams, |
| 521 SessionDescription* desc) const; | 522 SessionDescription* desc) const; |
| 522 | 523 |
| 523 bool AddDataContentForOffer( | 524 bool AddDataContentForOffer( |
| 524 const MediaSessionOptions& options, | 525 const MediaSessionOptions& options, |
| 525 const SessionDescription* current_description, | 526 const SessionDescription* current_description, |
| 526 DataCodecs* data_codecs, | 527 DataCodecs* data_codecs, |
| 527 StreamParamsVec* current_streams, | 528 StreamParamsVec* current_streams, |
| 528 SessionDescription* desc) const; | 529 SessionDescription* desc) const; |
| 529 | 530 |
| 530 bool AddAudioContentForAnswer( | 531 bool AddAudioContentForAnswer(const SessionDescription* offer, |
| 531 const SessionDescription* offer, | 532 const MediaSessionOptions& options, |
| 532 const MediaSessionOptions& options, | 533 const SessionDescription* current_description, |
| 533 const SessionDescription* current_description, | 534 const TransportInfo* bundle_transport, |
| 534 StreamParamsVec* current_streams, | 535 StreamParamsVec* current_streams, |
| 535 SessionDescription* answer) const; | 536 SessionDescription* answer) const; |
| 536 | 537 |
| 537 bool AddVideoContentForAnswer( | 538 bool AddVideoContentForAnswer(const SessionDescription* offer, |
| 538 const SessionDescription* offer, | 539 const MediaSessionOptions& options, |
| 539 const MediaSessionOptions& options, | 540 const SessionDescription* current_description, |
| 540 const SessionDescription* current_description, | 541 const TransportInfo* bundle_transport, |
| 541 StreamParamsVec* current_streams, | 542 StreamParamsVec* current_streams, |
| 542 SessionDescription* answer) const; | 543 SessionDescription* answer) const; |
| 543 | 544 |
| 544 bool AddDataContentForAnswer( | 545 bool AddDataContentForAnswer(const SessionDescription* offer, |
| 545 const SessionDescription* offer, | 546 const MediaSessionOptions& options, |
| 546 const MediaSessionOptions& options, | 547 const SessionDescription* current_description, |
| 547 const SessionDescription* current_description, | 548 const TransportInfo* bundle_transport, |
| 548 StreamParamsVec* current_streams, | 549 StreamParamsVec* current_streams, |
| 549 SessionDescription* answer) const; | 550 SessionDescription* answer) const; |
| 550 | 551 |
| 551 AudioCodecs audio_send_codecs_; | 552 AudioCodecs audio_send_codecs_; |
| 552 AudioCodecs audio_recv_codecs_; | 553 AudioCodecs audio_recv_codecs_; |
| 553 AudioCodecs audio_sendrecv_codecs_; | 554 AudioCodecs audio_sendrecv_codecs_; |
| 554 RtpHeaderExtensions audio_rtp_extensions_; | 555 RtpHeaderExtensions audio_rtp_extensions_; |
| 555 VideoCodecs video_codecs_; | 556 VideoCodecs video_codecs_; |
| 556 RtpHeaderExtensions video_rtp_extensions_; | 557 RtpHeaderExtensions video_rtp_extensions_; |
| 557 DataCodecs data_codecs_; | 558 DataCodecs data_codecs_; |
| 558 SecurePolicy secure_; | 559 SecurePolicy secure_; |
| 559 bool add_legacy_; | 560 bool add_legacy_; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 609 void GetSupportedVideoCryptoSuiteNames(const rtc::CryptoOptions& crypto_options, | 610 void GetSupportedVideoCryptoSuiteNames(const rtc::CryptoOptions& crypto_options, |
| 610 std::vector<std::string>* crypto_suite_names); | 611 std::vector<std::string>* crypto_suite_names); |
| 611 void GetSupportedDataCryptoSuiteNames(const rtc::CryptoOptions& crypto_options, | 612 void GetSupportedDataCryptoSuiteNames(const rtc::CryptoOptions& crypto_options, |
| 612 std::vector<std::string>* crypto_suite_names); | 613 std::vector<std::string>* crypto_suite_names); |
| 613 void GetDefaultSrtpCryptoSuiteNames(const rtc::CryptoOptions& crypto_options, | 614 void GetDefaultSrtpCryptoSuiteNames(const rtc::CryptoOptions& crypto_options, |
| 614 std::vector<std::string>* crypto_suite_names); | 615 std::vector<std::string>* crypto_suite_names); |
| 615 | 616 |
| 616 } // namespace cricket | 617 } // namespace cricket |
| 617 | 618 |
| 618 #endif // WEBRTC_PC_MEDIASESSION_H_ | 619 #endif // WEBRTC_PC_MEDIASESSION_H_ |
| OLD | NEW |