| Index: webrtc/pc/mediasession.h
|
| diff --git a/webrtc/pc/mediasession.h b/webrtc/pc/mediasession.h
|
| index ee2126d912a1e3b181542636fccb215e51939938..ebdc1b74b24344e4372c75c396896a33746584a9 100644
|
| --- a/webrtc/pc/mediasession.h
|
| +++ b/webrtc/pc/mediasession.h
|
| @@ -493,7 +493,8 @@ class MediaSessionDescriptionFactory {
|
| const std::string& content_name,
|
| const SessionDescription* offer_desc,
|
| const TransportOptions& transport_options,
|
| - const SessionDescription* current_desc) const;
|
| + const SessionDescription* current_desc,
|
| + bool bundled) const;
|
|
|
| bool AddTransportAnswer(
|
| const std::string& content_name,
|
| @@ -527,26 +528,26 @@ class MediaSessionDescriptionFactory {
|
| StreamParamsVec* current_streams,
|
| SessionDescription* desc) const;
|
|
|
| - bool AddAudioContentForAnswer(
|
| - const SessionDescription* offer,
|
| - const MediaSessionOptions& options,
|
| - const SessionDescription* current_description,
|
| - StreamParamsVec* current_streams,
|
| - SessionDescription* answer) const;
|
| -
|
| - bool AddVideoContentForAnswer(
|
| - const SessionDescription* offer,
|
| - const MediaSessionOptions& options,
|
| - const SessionDescription* current_description,
|
| - StreamParamsVec* current_streams,
|
| - SessionDescription* answer) const;
|
| -
|
| - bool AddDataContentForAnswer(
|
| - const SessionDescription* offer,
|
| - const MediaSessionOptions& options,
|
| - const SessionDescription* current_description,
|
| - StreamParamsVec* current_streams,
|
| - SessionDescription* answer) const;
|
| + bool AddAudioContentForAnswer(const SessionDescription* offer,
|
| + const MediaSessionOptions& options,
|
| + const SessionDescription* current_description,
|
| + const TransportInfo* bundle_transport,
|
| + StreamParamsVec* current_streams,
|
| + SessionDescription* answer) const;
|
| +
|
| + bool AddVideoContentForAnswer(const SessionDescription* offer,
|
| + const MediaSessionOptions& options,
|
| + const SessionDescription* current_description,
|
| + const TransportInfo* bundle_transport,
|
| + StreamParamsVec* current_streams,
|
| + SessionDescription* answer) const;
|
| +
|
| + bool AddDataContentForAnswer(const SessionDescription* offer,
|
| + const MediaSessionOptions& options,
|
| + const SessionDescription* current_description,
|
| + const TransportInfo* bundle_transport,
|
| + StreamParamsVec* current_streams,
|
| + SessionDescription* answer) const;
|
|
|
| AudioCodecs audio_send_codecs_;
|
| AudioCodecs audio_recv_codecs_;
|
|
|