
Replaces VideoCodec in VideoSendStream::Config with an EncoderSettings struct. The EncoderSettings struct uses an external encoder for all codecs. This means that external users, such as libjingle, will provide the encoders themselves, removing the previous distinction of internal and external codecs. For now VideoSendStream translates to VideoCodec internally. In the interrim (before the corresponding change is implemented in VideoReceiveStream) tests convert EncoderSettings to VideoCodecs. Removes Call::GetVideoCodecs(). Disables RampUpTest.WithPacingAndRtx as its further exposed with changes to bitrates used in tests. BUG=2854,2992 R=mflodman@webrtc.org, stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/7919004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5722 4adac7df-926f-26a2-2b94-8c16560cd09d
113 lines
3.3 KiB
C++
113 lines
3.3 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
#ifndef WEBRTC_CALL_H_
|
|
#define WEBRTC_CALL_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/video_receive_stream.h"
|
|
#include "webrtc/video_send_stream.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class VoiceEngine;
|
|
|
|
const char* Version();
|
|
|
|
class PacketReceiver {
|
|
public:
|
|
virtual bool DeliverPacket(const uint8_t* packet, size_t length) = 0;
|
|
|
|
protected:
|
|
virtual ~PacketReceiver() {}
|
|
};
|
|
|
|
// Callback interface for reporting when a system overuse is detected.
|
|
// The detection is based on the jitter of incoming captured frames.
|
|
class OveruseCallback {
|
|
public:
|
|
// Called as soon as an overuse is detected.
|
|
virtual void OnOveruse() = 0;
|
|
// Called periodically when the system is not overused any longer.
|
|
virtual void OnNormalUse() = 0;
|
|
|
|
protected:
|
|
virtual ~OveruseCallback() {}
|
|
};
|
|
|
|
// A Call instance can contain several send and/or receive streams. All streams
|
|
// are assumed to have the same remote endpoint and will share bitrate estimates
|
|
// etc.
|
|
class Call {
|
|
public:
|
|
struct Config {
|
|
explicit Config(newapi::Transport* send_transport)
|
|
: webrtc_config(NULL),
|
|
send_transport(send_transport),
|
|
voice_engine(NULL),
|
|
trace_callback(NULL),
|
|
trace_filter(kTraceDefault),
|
|
overuse_callback(NULL) {}
|
|
|
|
webrtc::Config* webrtc_config;
|
|
|
|
newapi::Transport* send_transport;
|
|
|
|
// VoiceEngine used for audio/video synchronization for this Call.
|
|
VoiceEngine* voice_engine;
|
|
|
|
TraceCallback* trace_callback;
|
|
uint32_t trace_filter;
|
|
|
|
// Callback for overuse and normal usage based on the jitter of incoming
|
|
// captured frames. 'NULL' disables the callback.
|
|
OveruseCallback* overuse_callback;
|
|
};
|
|
|
|
static Call* Create(const Call::Config& config);
|
|
|
|
static Call* Create(const Call::Config& config,
|
|
const webrtc::Config& webrtc_config);
|
|
|
|
virtual VideoSendStream::Config GetDefaultSendConfig() = 0;
|
|
|
|
virtual VideoSendStream* CreateVideoSendStream(
|
|
const VideoSendStream::Config& config) = 0;
|
|
|
|
virtual void DestroyVideoSendStream(VideoSendStream* send_stream) = 0;
|
|
|
|
virtual VideoReceiveStream::Config GetDefaultReceiveConfig() = 0;
|
|
|
|
virtual VideoReceiveStream* CreateVideoReceiveStream(
|
|
const VideoReceiveStream::Config& config) = 0;
|
|
virtual void DestroyVideoReceiveStream(
|
|
VideoReceiveStream* receive_stream) = 0;
|
|
|
|
// All received RTP and RTCP packets for the call should be inserted to this
|
|
// PacketReceiver. The PacketReceiver pointer is valid as long as the
|
|
// Call instance exists.
|
|
virtual PacketReceiver* Receiver() = 0;
|
|
|
|
// Returns the estimated total send bandwidth. Note: this can differ from the
|
|
// actual encoded bitrate.
|
|
virtual uint32_t SendBitrateEstimate() = 0;
|
|
|
|
// Returns the total estimated receive bandwidth for the call. Note: this can
|
|
// differ from the actual receive bitrate.
|
|
virtual uint32_t ReceiveBitrateEstimate() = 0;
|
|
|
|
virtual ~Call() {}
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_CALL_H_
|