#include "talk/session/media/mediasessionclient.h"
-#include "talk/base/helpers.h"
-#include "talk/base/logging.h"
-#include "talk/base/stringencode.h"
-#include "talk/base/stringutils.h"
-#include "talk/media/base/cryptoparams.h"
#include "talk/media/base/capturemanager.h"
+#include "talk/media/base/cryptoparams.h"
#include "talk/media/sctp/sctpdataengine.h"
#include "talk/p2p/base/constants.h"
#include "talk/p2p/base/parsing.h"
#include "talk/xmllite/qname.h"
#include "talk/xmllite/xmlconstants.h"
#include "talk/xmpp/constants.h"
+#include "webrtc/base/helpers.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/stringutils.h"
namespace cricket {
ParseError* error) {
if (!ssrc_str.empty()) {
uint32 ssrc;
- if (!talk_base::FromString(ssrc_str, &ssrc)) {
+ if (!rtc::FromString(ssrc_str, &ssrc)) {
return BadParse("Missing or invalid ssrc.", error);
}
MediaContentDescription* media) {
const buzz::XmlElement* bw_elem = GetXmlChild(parent_elem, LN_BANDWIDTH);
int bandwidth_kbps = -1;
- if (bw_elem && talk_base::FromString(bw_elem->BodyText(), &bandwidth_kbps)) {
+ if (bw_elem && rtc::FromString(bw_elem->BodyText(), &bandwidth_kbps)) {
if (bandwidth_kbps >= 0) {
media->set_bandwidth(bandwidth_kbps * 1000);
}
ParseError* error) {
AudioContentDescription* audio = new AudioContentDescription();
+ int preference = kMaxPayloadId;
if (content_elem->FirstElement()) {
for (const buzz::XmlElement* codec_elem =
content_elem->FirstNamed(QN_GINGLE_AUDIO_PAYLOADTYPE);
codec_elem = codec_elem->NextNamed(QN_GINGLE_AUDIO_PAYLOADTYPE)) {
AudioCodec codec;
if (ParseGingleAudioCodec(codec_elem, &codec)) {
+ codec.preference = preference--;
audio->AddCodec(codec);
}
}
ParseError* error) {
VideoContentDescription* video = new VideoContentDescription();
+ int preference = kMaxPayloadId;
for (const buzz::XmlElement* codec_elem =
content_elem->FirstNamed(QN_GINGLE_VIDEO_PAYLOADTYPE);
codec_elem != NULL;
codec_elem = codec_elem->NextNamed(QN_GINGLE_VIDEO_PAYLOADTYPE)) {
VideoCodec codec;
if (ParseGingleVideoCodec(codec_elem, &codec)) {
+ codec.preference = preference--;
video->AddCodec(codec);
}
}
bool ParseJingleAudioContent(const buzz::XmlElement* content_elem,
ContentDescription** content,
ParseError* error) {
- talk_base::scoped_ptr<AudioContentDescription> audio(
+ rtc::scoped_ptr<AudioContentDescription> audio(
new AudioContentDescription());
FeedbackParams content_feedback_params;
ParseFeedbackParams(content_elem, &content_feedback_params);
+ int preference = kMaxPayloadId;
for (const buzz::XmlElement* payload_elem =
content_elem->FirstNamed(QN_JINGLE_RTP_PAYLOADTYPE);
payload_elem != NULL;
AudioCodec codec;
if (ParseJingleAudioCodec(payload_elem, &codec)) {
AddFeedbackParams(content_feedback_params, &codec.feedback_params);
+ codec.preference = preference--;
audio->AddCodec(codec);
}
}
bool ParseJingleVideoContent(const buzz::XmlElement* content_elem,
ContentDescription** content,
ParseError* error) {
- talk_base::scoped_ptr<VideoContentDescription> video(
+ rtc::scoped_ptr<VideoContentDescription> video(
new VideoContentDescription());
FeedbackParams content_feedback_params;
ParseFeedbackParams(content_elem, &content_feedback_params);
+ int preference = kMaxPayloadId;
for (const buzz::XmlElement* payload_elem =
content_elem->FirstNamed(QN_JINGLE_RTP_PAYLOADTYPE);
payload_elem != NULL;
VideoCodec codec;
if (ParseJingleVideoCodec(payload_elem, &codec)) {
AddFeedbackParams(content_feedback_params, &codec.feedback_params);
+ codec.preference = preference--;
video->AddCodec(codec);
}
}
bool ParseJingleSctpDataContent(const buzz::XmlElement* content_elem,
ContentDescription** content,
ParseError* error) {
- talk_base::scoped_ptr<DataContentDescription> data(
+ rtc::scoped_ptr<DataContentDescription> data(
new DataContentDescription());
data->set_protocol(kMediaProtocolSctp);
stream.groupid = stream_elem->Attr(QN_NICK);
stream.id = stream_elem->Attr(QN_NAME);
uint32 sid;
- if (!talk_base::FromString(stream_elem->Attr(QN_SID), &sid)) {
+ if (!rtc::FromString(stream_elem->Attr(QN_SID), &sid)) {
return BadParse("Missing or invalid sid.", error);
}
if (sid > kMaxSctpSid) {
FeedbackParams content_feedback_params;
ParseFeedbackParams(content_elem, &content_feedback_params);
+ int preference = kMaxPayloadId;
for (const buzz::XmlElement* payload_elem =
content_elem->FirstNamed(QN_JINGLE_RTP_PAYLOADTYPE);
payload_elem != NULL;
DataCodec codec;
if (ParseJingleDataCodec(payload_elem, &codec)) {
AddFeedbackParams(content_feedback_params, &codec.feedback_params);
+ codec.preference = preference--;
data->AddCodec(codec);
}
}
}
} else {
return BadWrite("Unknown content type: " +
- talk_base::ToString<int>(media->type()), error);
+ rtc::ToString<int>(media->type()), error);
}
return true;