diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 20:04:30 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 20:04:30 +0000 |
| commit | fbbbf6c3ba10804ec9429256f032c7370c5c652e (patch) | |
| tree | 703bcea1167350a8ce0b0ce5b7d07c7ee9840430 /content/renderer/media | |
| parent | 98eb87d6bc550a5cb5f1a219b6973101b873f8d5 (diff) | |
| download | chromium_src-fbbbf6c3ba10804ec9429256f032c7370c5c652e.zip chromium_src-fbbbf6c3ba10804ec9429256f032c7370c5c652e.tar.gz chromium_src-fbbbf6c3ba10804ec9429256f032c7370c5c652e.tar.bz2 | |
Rolling libjingle r220.
TEST=apprtc and try bots
Review URL: https://codereview.chromium.org/11273088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media')
| -rw-r--r-- | content/renderer/media/media_stream_impl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index 0029b3b..d3dfdf7 100644 --- a/content/renderer/media/media_stream_impl.cc +++ b/content/renderer/media/media_stream_impl.cc @@ -76,7 +76,10 @@ void CreateWebKitSourceVector( WebKit::WebVector<WebKit::WebMediaStreamSource>& webkit_sources) { CHECK_EQ(devices.size(), webkit_sources.size()); for (size_t i = 0; i < devices.size(); ++i) { - std::string source_id = StringPrintf("%s%d%u", label.c_str(), type, + const char* track_type = + (type == WebKit::WebMediaStreamSource::TypeAudio) ? "a" : "v"; + std::string source_id = StringPrintf("%s%s%u", label.c_str(), + track_type, static_cast<unsigned int>(i)); webkit_sources[i].initialize( UTF8ToUTF16(source_id), |