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

Side by Side Diff: webrtc/pc/mediasession.h

Issue 2647593003: Accept SDP with TRANSPORT attributes missing from bundled m= sections. (Closed)
Patch Set: Fixing tests due to bool's meaning being reversed in patchset 4 Created 3 years, 10 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/p2p/base/transportdescriptionfactory_unittest.cc ('k') | webrtc/pc/mediasession.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 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 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 bool AddTransportOffer( 487 bool AddTransportOffer(
488 const std::string& content_name, 488 const std::string& content_name,
489 const TransportOptions& transport_options, 489 const TransportOptions& transport_options,
490 const SessionDescription* current_desc, 490 const SessionDescription* current_desc,
491 SessionDescription* offer) const; 491 SessionDescription* offer) const;
492 492
493 TransportDescription* CreateTransportAnswer( 493 TransportDescription* CreateTransportAnswer(
494 const std::string& content_name, 494 const std::string& content_name,
495 const SessionDescription* offer_desc, 495 const SessionDescription* offer_desc,
496 const TransportOptions& transport_options, 496 const TransportOptions& transport_options,
497 const SessionDescription* current_desc) const; 497 const SessionDescription* current_desc,
498 bool require_transport_attributes) const;
498 499
499 bool AddTransportAnswer( 500 bool AddTransportAnswer(
500 const std::string& content_name, 501 const std::string& content_name,
501 const TransportDescription& transport_desc, 502 const TransportDescription& transport_desc,
502 SessionDescription* answer_desc) const; 503 SessionDescription* answer_desc) const;
503 504
504 // Helpers for adding media contents to the SessionDescription. Returns true 505 // Helpers for adding media contents to the SessionDescription. Returns true
505 // it succeeds or the media content is not needed, or false if there is any 506 // it succeeds or the media content is not needed, or false if there is any
506 // error. 507 // error.
507 508
(...skipping 13 matching lines...) Expand all
521 StreamParamsVec* current_streams, 522 StreamParamsVec* current_streams,
522 SessionDescription* desc) const; 523 SessionDescription* desc) const;
523 524
524 bool AddDataContentForOffer( 525 bool AddDataContentForOffer(
525 const MediaSessionOptions& options, 526 const MediaSessionOptions& options,
526 const SessionDescription* current_description, 527 const SessionDescription* current_description,
527 DataCodecs* data_codecs, 528 DataCodecs* data_codecs,
528 StreamParamsVec* current_streams, 529 StreamParamsVec* current_streams,
529 SessionDescription* desc) const; 530 SessionDescription* desc) const;
530 531
531 bool AddAudioContentForAnswer( 532 bool AddAudioContentForAnswer(const SessionDescription* offer,
532 const SessionDescription* offer, 533 const MediaSessionOptions& options,
533 const MediaSessionOptions& options, 534 const SessionDescription* current_description,
534 const SessionDescription* current_description, 535 const TransportInfo* bundle_transport,
535 StreamParamsVec* current_streams, 536 StreamParamsVec* current_streams,
536 SessionDescription* answer) const; 537 SessionDescription* answer) const;
537 538
538 bool AddVideoContentForAnswer( 539 bool AddVideoContentForAnswer(const SessionDescription* offer,
539 const SessionDescription* offer, 540 const MediaSessionOptions& options,
540 const MediaSessionOptions& options, 541 const SessionDescription* current_description,
541 const SessionDescription* current_description, 542 const TransportInfo* bundle_transport,
542 StreamParamsVec* current_streams, 543 StreamParamsVec* current_streams,
543 SessionDescription* answer) const; 544 SessionDescription* answer) const;
544 545
545 bool AddDataContentForAnswer( 546 bool AddDataContentForAnswer(const SessionDescription* offer,
546 const SessionDescription* offer, 547 const MediaSessionOptions& options,
547 const MediaSessionOptions& options, 548 const SessionDescription* current_description,
548 const SessionDescription* current_description, 549 const TransportInfo* bundle_transport,
549 StreamParamsVec* current_streams, 550 StreamParamsVec* current_streams,
550 SessionDescription* answer) const; 551 SessionDescription* answer) const;
551 552
552 AudioCodecs audio_send_codecs_; 553 AudioCodecs audio_send_codecs_;
553 AudioCodecs audio_recv_codecs_; 554 AudioCodecs audio_recv_codecs_;
554 AudioCodecs audio_sendrecv_codecs_; 555 AudioCodecs audio_sendrecv_codecs_;
555 RtpHeaderExtensions audio_rtp_extensions_; 556 RtpHeaderExtensions audio_rtp_extensions_;
556 VideoCodecs video_codecs_; 557 VideoCodecs video_codecs_;
557 RtpHeaderExtensions video_rtp_extensions_; 558 RtpHeaderExtensions video_rtp_extensions_;
558 DataCodecs data_codecs_; 559 DataCodecs data_codecs_;
559 SecurePolicy secure_; 560 SecurePolicy secure_;
560 bool add_legacy_; 561 bool add_legacy_;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 void GetSupportedVideoCryptoSuiteNames(const rtc::CryptoOptions& crypto_options, 611 void GetSupportedVideoCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
611 std::vector<std::string>* crypto_suite_names); 612 std::vector<std::string>* crypto_suite_names);
612 void GetSupportedDataCryptoSuiteNames(const rtc::CryptoOptions& crypto_options, 613 void GetSupportedDataCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
613 std::vector<std::string>* crypto_suite_names); 614 std::vector<std::string>* crypto_suite_names);
614 void GetDefaultSrtpCryptoSuiteNames(const rtc::CryptoOptions& crypto_options, 615 void GetDefaultSrtpCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
615 std::vector<std::string>* crypto_suite_names); 616 std::vector<std::string>* crypto_suite_names);
616 617
617 } // namespace cricket 618 } // namespace cricket
618 619
619 #endif // WEBRTC_PC_MEDIASESSION_H_ 620 #endif // WEBRTC_PC_MEDIASESSION_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/transportdescriptionfactory_unittest.cc ('k') | webrtc/pc/mediasession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698