git-svn-id: http://webrtc.googlecode.com/svn/trunk@45 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
niklase@google.com
parent
06313d5de9
commit
0839478fa7
178
DEPS
178
DEPS
@ -1,89 +1,89 @@
|
||||
vars = {
|
||||
"webrtc_trunk" : "https://webrtc.googlecode.com/svn/trunk",
|
||||
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
||||
"chromium_revision": "86252",
|
||||
# Use this googlecode_url variable only if there is an internal mirror for it.
|
||||
# If you do not know, use the full path while defining your new deps entry.
|
||||
"googlecode_url": "http://%s.googlecode.com/svn",
|
||||
"libjingle_revision": "59",
|
||||
}
|
||||
|
||||
deps = {
|
||||
"build":
|
||||
Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
|
||||
|
||||
"testing":
|
||||
Var("chromium_trunk") + "/src/testing@" + Var("chromium_revision"),
|
||||
|
||||
"testing/gtest":
|
||||
"http://googletest.googlecode.com/svn/trunk@539",
|
||||
|
||||
"tools/gyp":
|
||||
"http://gyp.googlecode.com/svn/trunk@930",
|
||||
|
||||
"third_party/libvpx/":
|
||||
"git://review.webmproject.org/libvpx.git@v0.9.6",
|
||||
|
||||
"third_party/libjpeg_turbo/":
|
||||
Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@78340",
|
||||
|
||||
"third_party/yasm/":
|
||||
Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/expat/":
|
||||
Var("chromium_trunk") + "/src/third_party/expat@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/libjingle/":
|
||||
Var("chromium_trunk") + "/src/third_party/libjingle@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/libjingle/source":
|
||||
(Var("googlecode_url") % "libjingle") + "/branches/chrome-sandbox@" + Var("libjingle_revision"),
|
||||
|
||||
"third_party/yasm/source/patched-yasm":
|
||||
Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761",
|
||||
# Used by libjpeg-turbo
|
||||
"third_party/yasm/binaries":
|
||||
Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228",
|
||||
|
||||
"third_party/jsoncpp/":
|
||||
"https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/tags/jsoncpp/0.5.0",
|
||||
}
|
||||
|
||||
deps_os = {
|
||||
"win": {
|
||||
"third_party/cygwin/":
|
||||
Var("chromium_trunk") + "/deps/third_party/cygwin@66844",
|
||||
}
|
||||
}
|
||||
|
||||
hooks = [
|
||||
{
|
||||
"pattern": ".",
|
||||
"action": ["svn", "export", Var("webrtc_trunk") + "/third_party_mods/libvpx/libvpx.gyp", "third_party/libvpx/libvpx.gyp", "--force"],
|
||||
},
|
||||
{
|
||||
"pattern": ".",
|
||||
"action": ["svn", "export", Var("webrtc_trunk") + "/third_party_mods/libvpx/source/config", "third_party/libvpx/config", "--force"],
|
||||
},
|
||||
{
|
||||
"pattern": ".",
|
||||
"action": ["svn", "export", Var("webrtc_trunk") + "/third_party_mods/libjingle", "third_party/libjingle", "--force"],
|
||||
},
|
||||
{
|
||||
"pattern": ".",
|
||||
"action": ["svn", "export", Var("webrtc_trunk") + "/third_party_mods/jsoncpp", "third_party/jsoncpp", "--force"],
|
||||
},
|
||||
{
|
||||
# Create a supplement.gypi file under trunk/. This file will be picked up
|
||||
# by gyp and we use it to set Chromium related variables (inside_chromium_build)
|
||||
# to 0 and enable the standalone build.
|
||||
"pattern": ".",
|
||||
"action": ["python", "trunk/tools/create_supplement_gypi.py", "trunk/supplement.gypi"],
|
||||
},
|
||||
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
|
||||
{
|
||||
"pattern": ".",
|
||||
"action": ["python", "build/gyp_chromium", "--depth=.", "trunk/webrtc.gyp"],
|
||||
},
|
||||
]
|
||||
|
||||
vars = {
|
||||
"webrtc_trunk" : "https://webrtc.googlecode.com/svn/trunk",
|
||||
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
||||
"chromium_revision": "86252",
|
||||
# Use this googlecode_url variable only if there is an internal mirror for it.
|
||||
# If you do not know, use the full path while defining your new deps entry.
|
||||
"googlecode_url": "http://%s.googlecode.com/svn",
|
||||
"libjingle_revision": "59",
|
||||
}
|
||||
|
||||
deps = {
|
||||
"build":
|
||||
Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
|
||||
|
||||
"testing":
|
||||
Var("chromium_trunk") + "/src/testing@" + Var("chromium_revision"),
|
||||
|
||||
"testing/gtest":
|
||||
"http://googletest.googlecode.com/svn/trunk@539",
|
||||
|
||||
"tools/gyp":
|
||||
"http://gyp.googlecode.com/svn/trunk@930",
|
||||
|
||||
"third_party/libvpx/":
|
||||
"git://review.webmproject.org/libvpx.git@v0.9.6",
|
||||
|
||||
"third_party/libjpeg_turbo/":
|
||||
Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@78340",
|
||||
|
||||
"third_party/yasm/":
|
||||
Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/expat/":
|
||||
Var("chromium_trunk") + "/src/third_party/expat@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/libjingle/":
|
||||
Var("chromium_trunk") + "/src/third_party/libjingle@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/libjingle/source":
|
||||
(Var("googlecode_url") % "libjingle") + "/branches/chrome-sandbox@" + Var("libjingle_revision"),
|
||||
|
||||
"third_party/yasm/source/patched-yasm":
|
||||
Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761",
|
||||
# Used by libjpeg-turbo
|
||||
"third_party/yasm/binaries":
|
||||
Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228",
|
||||
|
||||
"third_party/jsoncpp/":
|
||||
"https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/tags/jsoncpp/0.5.0",
|
||||
}
|
||||
|
||||
deps_os = {
|
||||
"win": {
|
||||
"third_party/cygwin/":
|
||||
Var("chromium_trunk") + "/deps/third_party/cygwin@66844",
|
||||
}
|
||||
}
|
||||
|
||||
hooks = [
|
||||
{
|
||||
"pattern": ".",
|
||||
"action": ["svn", "export", Var("webrtc_trunk") + "/third_party_mods/libvpx/libvpx.gyp", "third_party/libvpx/libvpx.gyp", "--force"],
|
||||
},
|
||||
{
|
||||
"pattern": ".",
|
||||
"action": ["svn", "export", Var("webrtc_trunk") + "/third_party_mods/libvpx/source/config", "third_party/libvpx/config", "--force"],
|
||||
},
|
||||
{
|
||||
"pattern": ".",
|
||||
"action": ["svn", "export", Var("webrtc_trunk") + "/third_party_mods/libjingle@29", "third_party/libjingle", "--force"],
|
||||
},
|
||||
{
|
||||
"pattern": ".",
|
||||
"action": ["svn", "export", Var("webrtc_trunk") + "/third_party_mods/jsoncpp", "third_party/jsoncpp", "--force"],
|
||||
},
|
||||
{
|
||||
# Create a supplement.gypi file under trunk/. This file will be picked up
|
||||
# by gyp and we use it to set Chromium related variables (inside_chromium_build)
|
||||
# to 0 and enable the standalone build.
|
||||
"pattern": ".",
|
||||
"action": ["python", "trunk/tools/create_supplement_gypi.py", "trunk/supplement.gypi"],
|
||||
},
|
||||
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
|
||||
{
|
||||
"pattern": ".",
|
||||
"action": ["python", "build/gyp_chromium", "--depth=.", "trunk/webrtc.gyp"],
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
|
||||
#include "peerconnection/samples/client/defaults.h"
|
||||
#include "talk/base/logging.h"
|
||||
#include "talk/session/phone/videorendererfactory.h"
|
||||
|
||||
Conductor::Conductor(PeerConnectionClient* client, MainWnd* main_wnd)
|
||||
: handshake_(NONE),
|
||||
@ -71,8 +70,6 @@ bool Conductor::InitializePeerConnection() {
|
||||
|
||||
void Conductor::DeletePeerConnection() {
|
||||
peer_connection_.reset();
|
||||
local_renderer_.reset();
|
||||
remote_renderer_.reset();
|
||||
handshake_ = NONE;
|
||||
}
|
||||
|
||||
@ -82,14 +79,8 @@ void Conductor::StartCaptureDevice() {
|
||||
main_wnd_->SwitchToStreamingUI();
|
||||
|
||||
if (peer_connection_->SetVideoCapture("")) {
|
||||
if (!local_renderer_.get()) {
|
||||
// The window will be resized according to the stream properties
|
||||
// when streaming starts.
|
||||
local_renderer_.reset(
|
||||
cricket::VideoRendererFactory::CreateGuiVideoRenderer(100, 100));
|
||||
}
|
||||
if (local_renderer_.get())
|
||||
peer_connection_->SetLocalVideoRenderer(local_renderer_.get());
|
||||
peer_connection_->SetVideoRenderer(-1, main_wnd_->handle(), 0,
|
||||
0.7f, 0.7f, 0.95f, 0.95f);
|
||||
} else {
|
||||
ASSERT(false);
|
||||
}
|
||||
@ -139,13 +130,8 @@ void Conductor::OnAddStream(const std::string& stream_id, int channel_id,
|
||||
video_channel_ = channel_id;
|
||||
waiting_for_video_ = false;
|
||||
LOG(INFO) << "Setting video renderer for channel: " << channel_id;
|
||||
if (!remote_renderer_.get()) {
|
||||
// The window size will be automatically corrected.
|
||||
remote_renderer_.reset(
|
||||
cricket::VideoRendererFactory::CreateGuiVideoRenderer(100, 100));
|
||||
}
|
||||
bool ok = peer_connection_->SetVideoRenderer(stream_id,
|
||||
remote_renderer_.get());
|
||||
bool ok = peer_connection_->SetVideoRenderer(channel_id,
|
||||
main_wnd_->handle(), 1, 0.0f, 0.0f, 1.0f, 1.0f);
|
||||
ASSERT(ok);
|
||||
} else {
|
||||
ASSERT(audio_channel_ == -1);
|
||||
|
||||
@ -19,9 +19,6 @@
|
||||
#include "talk/app/peerconnection.h"
|
||||
#include "talk/base/scoped_ptr.h"
|
||||
|
||||
namespace cricket {
|
||||
class VideoRenderer;
|
||||
} // namespace cricket
|
||||
|
||||
class Conductor
|
||||
: public webrtc::PeerConnectionObserver,
|
||||
@ -115,8 +112,6 @@ class Conductor
|
||||
MainWnd* main_wnd_;
|
||||
int video_channel_;
|
||||
int audio_channel_;
|
||||
talk_base::scoped_ptr<cricket::VideoRenderer> local_renderer_;
|
||||
talk_base::scoped_ptr<cricket::VideoRenderer> remote_renderer_;
|
||||
};
|
||||
|
||||
#endif // PEERCONNECTION_SAMPLES_CLIENT_CONDUCTOR_H_
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user