Move implementation files out of the webrtc/ root.
Leaves the root for public headers. Also fixes the issue of requiring root OWNERS approval for changes in the Call implementation and adding end-to-end tests. BUG= R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/5049005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5223 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
245037df09
commit
c49d5b7df8
@ -1,17 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Use of this source code is governed by a BSD-style license
|
|
||||||
* that can be found in the LICENSE file in the root of the source
|
|
||||||
* tree. An additional intellectual property rights grant can be found
|
|
||||||
* in the file PATENTS. All contributing project authors may
|
|
||||||
* be found in the AUTHORS file in the root of the source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "webrtc/config.h"
|
|
||||||
|
|
||||||
namespace webrtc {
|
|
||||||
const char* RtpExtension::kTOffset = "urn:ietf:params:rtp-hdrext:toffset";
|
|
||||||
const char* RtpExtension::kAbsSendTime =
|
|
||||||
"http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time";
|
|
||||||
} // namespace webrtc
|
|
@ -18,7 +18,6 @@
|
|||||||
'<(webrtc_root)/test/test.gyp:test_support_main',
|
'<(webrtc_root)/test/test.gyp:test_support_main',
|
||||||
],
|
],
|
||||||
'sources': [
|
'sources': [
|
||||||
'../../common_unittest.cc',
|
|
||||||
'aligned_malloc_unittest.cc',
|
'aligned_malloc_unittest.cc',
|
||||||
'clock_unittest.cc',
|
'clock_unittest.cc',
|
||||||
'condition_variable_unittest.cc',
|
'condition_variable_unittest.cc',
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
#include "webrtc/call.h"
|
#include "webrtc/call.h"
|
||||||
#include "webrtc/common.h"
|
#include "webrtc/common.h"
|
||||||
|
#include "webrtc/config.h"
|
||||||
#include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
|
#include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
|
||||||
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
|
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
|
||||||
#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
|
#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
|
||||||
@ -28,6 +29,9 @@
|
|||||||
#include "webrtc/video_engine/include/vie_rtp_rtcp.h"
|
#include "webrtc/video_engine/include/vie_rtp_rtcp.h"
|
||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
|
const char* RtpExtension::kTOffset = "urn:ietf:params:rtp-hdrext:toffset";
|
||||||
|
const char* RtpExtension::kAbsSendTime =
|
||||||
|
"http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time";
|
||||||
namespace internal {
|
namespace internal {
|
||||||
class Call : public webrtc::Call, public PacketReceiver {
|
class Call : public webrtc::Call, public PacketReceiver {
|
||||||
public:
|
public:
|
||||||
@ -80,7 +84,7 @@ class Call : public webrtc::Call, public PacketReceiver {
|
|||||||
|
|
||||||
DISALLOW_COPY_AND_ASSIGN(Call);
|
DISALLOW_COPY_AND_ASSIGN(Call);
|
||||||
};
|
};
|
||||||
} // internal
|
} // namespace internal
|
||||||
|
|
||||||
class TraceDispatcher : public TraceCallback {
|
class TraceDispatcher : public TraceCallback {
|
||||||
public:
|
public:
|
@ -255,7 +255,7 @@ TEST_F(CallTest, UsesTraceCallback) {
|
|||||||
const unsigned int kReceiverTraceFilter = kTraceDefault & (~kTraceDebug);
|
const unsigned int kReceiverTraceFilter = kTraceDefault & (~kTraceDebug);
|
||||||
class TraceObserver : public TraceCallback {
|
class TraceObserver : public TraceCallback {
|
||||||
public:
|
public:
|
||||||
TraceObserver(unsigned int filter)
|
explicit TraceObserver(unsigned int filter)
|
||||||
: filter_(filter), messages_left_(50), done_(EventWrapper::Create()) {}
|
: filter_(filter), messages_left_(50), done_(EventWrapper::Create()) {}
|
||||||
|
|
||||||
virtual void Print(TraceLevel level,
|
virtual void Print(TraceLevel level,
|
||||||
@ -685,7 +685,7 @@ void CallTest::RespectsRtcpMode(newapi::RtcpMode rtcp_mode) {
|
|||||||
static const int kNumCompoundRtcpPacketsToObserve = 10;
|
static const int kNumCompoundRtcpPacketsToObserve = 10;
|
||||||
class RtcpModeObserver : public test::RtpRtcpObserver {
|
class RtcpModeObserver : public test::RtpRtcpObserver {
|
||||||
public:
|
public:
|
||||||
RtcpModeObserver(newapi::RtcpMode rtcp_mode)
|
explicit RtcpModeObserver(newapi::RtcpMode rtcp_mode)
|
||||||
: test::RtpRtcpObserver(kDefaultTimeoutMs),
|
: test::RtpRtcpObserver(kDefaultTimeoutMs),
|
||||||
rtcp_mode_(rtcp_mode),
|
rtcp_mode_(rtcp_mode),
|
||||||
sent_rtp_(0),
|
sent_rtp_(0),
|
||||||
@ -865,7 +865,7 @@ TEST_F(CallTest, SendsAndReceivesMultipleStreams) {
|
|||||||
|
|
||||||
class SyncRtcpObserver : public test::RtpRtcpObserver {
|
class SyncRtcpObserver : public test::RtpRtcpObserver {
|
||||||
public:
|
public:
|
||||||
SyncRtcpObserver(int delay_ms)
|
explicit SyncRtcpObserver(int delay_ms)
|
||||||
: test::RtpRtcpObserver(kLongTimeoutMs, delay_ms),
|
: test::RtpRtcpObserver(kLongTimeoutMs, delay_ms),
|
||||||
critical_section_(CriticalSectionWrapper::CreateCriticalSection()) {}
|
critical_section_(CriticalSectionWrapper::CreateCriticalSection()) {}
|
||||||
|
|
@ -99,4 +99,4 @@ TEST_F(LoopbackTest, Test) {
|
|||||||
|
|
||||||
transport.StopSending();
|
transport.StopSending();
|
||||||
}
|
}
|
||||||
} // webrtc
|
} // namespace webrtc
|
@ -11,6 +11,7 @@
|
|||||||
'<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core',
|
'<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core',
|
||||||
],
|
],
|
||||||
'webrtc_video_sources': [
|
'webrtc_video_sources': [
|
||||||
|
'video/call.cc',
|
||||||
'video/encoded_frame_callback_adapter.cc',
|
'video/encoded_frame_callback_adapter.cc',
|
||||||
'video/encoded_frame_callback_adapter.h',
|
'video/encoded_frame_callback_adapter.h',
|
||||||
'video/transport_adapter.cc',
|
'video/transport_adapter.cc',
|
||||||
|
@ -59,9 +59,7 @@
|
|||||||
'target_name': 'webrtc',
|
'target_name': 'webrtc',
|
||||||
'type': 'static_library',
|
'type': 'static_library',
|
||||||
'sources': [
|
'sources': [
|
||||||
'call.cc',
|
|
||||||
'call.h',
|
'call.h',
|
||||||
'config.cc',
|
|
||||||
'config.h',
|
'config.h',
|
||||||
'experiments.h',
|
'experiments.h',
|
||||||
'frame_callback.h',
|
'frame_callback.h',
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
'target_name': 'video_loopback',
|
'target_name': 'video_loopback',
|
||||||
'type': 'executable',
|
'type': 'executable',
|
||||||
'sources': [
|
'sources': [
|
||||||
'loopback.cc',
|
'video/loopback.cc',
|
||||||
'test/test_main.cc',
|
'test/test_main.cc',
|
||||||
],
|
],
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
@ -32,12 +32,13 @@
|
|||||||
'target_name': 'video_engine_tests',
|
'target_name': 'video_engine_tests',
|
||||||
'type': '<(gtest_target_type)',
|
'type': '<(gtest_target_type)',
|
||||||
'sources': [
|
'sources': [
|
||||||
'call_tests.cc',
|
'video/call_tests.cc',
|
||||||
'video/full_stack.cc',
|
'video/full_stack.cc',
|
||||||
'video/rampup_tests.cc',
|
'video/rampup_tests.cc',
|
||||||
'video/video_send_stream_tests.cc',
|
'video/video_send_stream_tests.cc',
|
||||||
'voice_engine/test/auto_test/resource_manager.cc',
|
'voice_engine/test/auto_test/resource_manager.cc',
|
||||||
'voice_engine/test/auto_test/resource_manager.h',
|
'voice_engine/test/auto_test/resource_manager.h',
|
||||||
|
'test/common_unittest.cc',
|
||||||
'test/test_main.cc',
|
'test/test_main.cc',
|
||||||
],
|
],
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user