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

Unified Diff: content/renderer/media/media_stream_center.cc

Issue 10038009: Revert 131949 (multiple memory leaks) - Adding JSEP PeerConnection glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_stream_center.cc
===================================================================
--- content/renderer/media/media_stream_center.cc (revision 131960)
+++ content/renderer/media/media_stream_center.cc (working copy)
@@ -4,17 +4,10 @@
#include "content/renderer/media/media_stream_center.h"
-#include <string>
-
-#include "base/logging.h"
-#include "base/utf_string_conversions.h"
-#include "third_party/libjingle/source/talk/app/webrtc/jsep.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICECandidateDescriptor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSourcesRequest.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSessionDescriptionDescriptor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
namespace content {
@@ -48,36 +41,4 @@
const WebKit::WebMediaStreamDescriptor& stream) {
}
-WebKit::WebString MediaStreamCenter::constructSDP(
- const WebKit::WebICECandidateDescriptor& candidate) {
- webrtc::IceCandidateInterface* native_candidate =
- webrtc::CreateIceCandidate(UTF16ToUTF8(candidate.label()),
- UTF16ToUTF8(candidate.candidateLine()));
- std::string sdp;
- if (!native_candidate->ToString(&sdp))
- LOG(ERROR) << "Could not create SDP string";
- return UTF8ToUTF16(sdp);
-}
-
-WebKit::WebString MediaStreamCenter::constructSDP(
- const WebKit::WebSessionDescriptionDescriptor& description) {
- webrtc::SessionDescriptionInterface* native_desc =
- webrtc::CreateSessionDescription(UTF16ToUTF8(description.initialSDP()));
- if (!native_desc)
- return WebKit::WebString();
-
- for (size_t i = 0; i < description.numberOfAddedCandidates(); ++i) {
- WebKit::WebICECandidateDescriptor candidate = description.candidate(i);
- webrtc::IceCandidateInterface* native_candidate =
- webrtc::CreateIceCandidate(UTF16ToUTF8(candidate.label()),
- UTF16ToUTF8(candidate.candidateLine()));
- native_desc->AddCandidate(native_candidate);
- }
-
- std::string sdp;
- if (!native_desc->ToString(&sdp))
- LOG(ERROR) << "Could not create SDP string";
- return UTF8ToUTF16(sdp);
-}
-
} // namespace content
« no previous file with comments | « content/renderer/media/media_stream_center.h ('k') | content/renderer/media/media_stream_dependency_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698