2018-10-08 11:13:58 +02:00
|
|
|
/*
|
|
|
|
|
* Copyright 2018 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.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// This is EXPERIMENTAL interface for media transport.
|
|
|
|
|
//
|
|
|
|
|
// The goal is to refactor WebRTC code so that audio and video frames
|
|
|
|
|
// are sent / received through the media transport interface. This will
|
|
|
|
|
// enable different media transport implementations, including QUIC-based
|
|
|
|
|
// media transport.
|
|
|
|
|
|
|
|
|
|
#include "api/media_transport_interface.h"
|
|
|
|
|
|
2018-10-23 12:03:01 +02:00
|
|
|
#include <cstdint>
|
|
|
|
|
#include <utility>
|
|
|
|
|
|
2018-10-08 11:13:58 +02:00
|
|
|
namespace webrtc {
|
|
|
|
|
|
2018-10-29 07:31:42 -07:00
|
|
|
MediaTransportSettings::MediaTransportSettings() = default;
|
2018-10-29 10:43:16 -07:00
|
|
|
MediaTransportSettings::MediaTransportSettings(const MediaTransportSettings&) =
|
|
|
|
|
default;
|
|
|
|
|
MediaTransportSettings& MediaTransportSettings::operator=(
|
|
|
|
|
const MediaTransportSettings&) = default;
|
2018-10-29 07:31:42 -07:00
|
|
|
MediaTransportSettings::~MediaTransportSettings() = default;
|
|
|
|
|
|
2018-10-08 09:43:21 -07:00
|
|
|
MediaTransportEncodedAudioFrame::~MediaTransportEncodedAudioFrame() {}
|
|
|
|
|
|
2018-10-08 11:13:58 +02:00
|
|
|
MediaTransportEncodedAudioFrame::MediaTransportEncodedAudioFrame(
|
|
|
|
|
int sampling_rate_hz,
|
|
|
|
|
int starting_sample_index,
|
|
|
|
|
int samples_per_channel,
|
|
|
|
|
int sequence_number,
|
|
|
|
|
FrameType frame_type,
|
2018-12-06 13:00:27 +01:00
|
|
|
int payload_type,
|
2018-10-08 11:13:58 +02:00
|
|
|
std::vector<uint8_t> encoded_data)
|
|
|
|
|
: sampling_rate_hz_(sampling_rate_hz),
|
|
|
|
|
starting_sample_index_(starting_sample_index),
|
|
|
|
|
samples_per_channel_(samples_per_channel),
|
|
|
|
|
sequence_number_(sequence_number),
|
|
|
|
|
frame_type_(frame_type),
|
|
|
|
|
payload_type_(payload_type),
|
|
|
|
|
encoded_data_(std::move(encoded_data)) {}
|
|
|
|
|
|
2018-10-08 09:43:21 -07:00
|
|
|
MediaTransportEncodedAudioFrame& MediaTransportEncodedAudioFrame::operator=(
|
|
|
|
|
const MediaTransportEncodedAudioFrame&) = default;
|
|
|
|
|
|
|
|
|
|
MediaTransportEncodedAudioFrame& MediaTransportEncodedAudioFrame::operator=(
|
|
|
|
|
MediaTransportEncodedAudioFrame&&) = default;
|
|
|
|
|
|
|
|
|
|
MediaTransportEncodedAudioFrame::MediaTransportEncodedAudioFrame(
|
|
|
|
|
const MediaTransportEncodedAudioFrame&) = default;
|
|
|
|
|
|
|
|
|
|
MediaTransportEncodedAudioFrame::MediaTransportEncodedAudioFrame(
|
|
|
|
|
MediaTransportEncodedAudioFrame&&) = default;
|
|
|
|
|
|
2018-11-28 15:34:37 +01:00
|
|
|
MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame() = default;
|
|
|
|
|
|
|
|
|
|
MediaTransportEncodedVideoFrame::~MediaTransportEncodedVideoFrame() = default;
|
2018-10-08 11:13:58 +02:00
|
|
|
|
|
|
|
|
MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame(
|
|
|
|
|
int64_t frame_id,
|
|
|
|
|
std::vector<int64_t> referenced_frame_ids,
|
|
|
|
|
VideoCodecType codec_type,
|
|
|
|
|
const webrtc::EncodedImage& encoded_image)
|
|
|
|
|
: codec_type_(codec_type),
|
2018-12-06 13:00:27 +01:00
|
|
|
payload_type_(0),
|
|
|
|
|
encoded_image_(encoded_image),
|
|
|
|
|
frame_id_(frame_id),
|
|
|
|
|
referenced_frame_ids_(std::move(referenced_frame_ids)) {}
|
|
|
|
|
|
|
|
|
|
MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame(
|
|
|
|
|
int64_t frame_id,
|
|
|
|
|
std::vector<int64_t> referenced_frame_ids,
|
|
|
|
|
int payload_type,
|
|
|
|
|
const webrtc::EncodedImage& encoded_image)
|
|
|
|
|
: codec_type_(kVideoCodecGeneric),
|
|
|
|
|
payload_type_(payload_type),
|
2018-10-08 11:13:58 +02:00
|
|
|
encoded_image_(encoded_image),
|
|
|
|
|
frame_id_(frame_id),
|
|
|
|
|
referenced_frame_ids_(std::move(referenced_frame_ids)) {}
|
|
|
|
|
|
2018-10-08 09:43:21 -07:00
|
|
|
MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=(
|
2018-11-28 15:34:37 +01:00
|
|
|
const MediaTransportEncodedVideoFrame& o) {
|
|
|
|
|
codec_type_ = o.codec_type_;
|
2018-12-06 13:00:27 +01:00
|
|
|
payload_type_ = o.payload_type_;
|
2018-11-28 15:34:37 +01:00
|
|
|
encoded_image_ = o.encoded_image_;
|
|
|
|
|
encoded_data_ = o.encoded_data_;
|
|
|
|
|
frame_id_ = o.frame_id_;
|
|
|
|
|
referenced_frame_ids_ = o.referenced_frame_ids_;
|
|
|
|
|
if (!encoded_data_.empty()) {
|
|
|
|
|
// We own the underlying data.
|
|
|
|
|
encoded_image_._buffer = encoded_data_.data();
|
|
|
|
|
}
|
|
|
|
|
return *this;
|
|
|
|
|
}
|
2018-10-08 09:43:21 -07:00
|
|
|
|
|
|
|
|
MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=(
|
2018-11-28 15:34:37 +01:00
|
|
|
MediaTransportEncodedVideoFrame&& o) {
|
|
|
|
|
codec_type_ = o.codec_type_;
|
2018-12-06 13:00:27 +01:00
|
|
|
payload_type_ = o.payload_type_;
|
2018-11-28 15:34:37 +01:00
|
|
|
encoded_image_ = o.encoded_image_;
|
|
|
|
|
encoded_data_ = std::move(o.encoded_data_);
|
|
|
|
|
frame_id_ = o.frame_id_;
|
|
|
|
|
referenced_frame_ids_ = std::move(o.referenced_frame_ids_);
|
|
|
|
|
if (!encoded_data_.empty()) {
|
|
|
|
|
// We take over ownership of the underlying data.
|
|
|
|
|
encoded_image_._buffer = encoded_data_.data();
|
|
|
|
|
o.encoded_image_._buffer = nullptr;
|
|
|
|
|
}
|
|
|
|
|
return *this;
|
|
|
|
|
}
|
2018-10-08 09:43:21 -07:00
|
|
|
|
|
|
|
|
MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame(
|
2018-11-28 15:34:37 +01:00
|
|
|
const MediaTransportEncodedVideoFrame& o)
|
|
|
|
|
: MediaTransportEncodedVideoFrame() {
|
|
|
|
|
*this = o;
|
|
|
|
|
}
|
2018-10-08 09:43:21 -07:00
|
|
|
|
|
|
|
|
MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame(
|
2018-11-28 15:34:37 +01:00
|
|
|
MediaTransportEncodedVideoFrame&& o)
|
|
|
|
|
: MediaTransportEncodedVideoFrame() {
|
|
|
|
|
*this = std::move(o);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void MediaTransportEncodedVideoFrame::Retain() {
|
|
|
|
|
if (encoded_image_._buffer && encoded_data_.empty()) {
|
|
|
|
|
encoded_data_ =
|
|
|
|
|
std::vector<uint8_t>(encoded_image_._buffer,
|
|
|
|
|
encoded_image_._buffer + encoded_image_._length);
|
|
|
|
|
encoded_image_._buffer = encoded_data_.data();
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-10-08 11:13:58 +02:00
|
|
|
|
Add interfaces for using MediaTransport as the transport for data channels.
Adds the types and methods required for sending and receiving data
channel messages over the media transport. These are:
- A DataMessageType to distinguish between text, binary, and control
messages
- A parameters struct for sending data messages, which specifies the
channel id, type, and ordering/reliability parameters
- A sink for data-channel related callbacks (receive data, begin
closing procedure, and end closing procedure)
- A method to set the sink for data channels
- Methods to open, close, and send on data channels
These methods, combined with the state sink, allow PeerConnection to
implement the DataChannelProviderInterface using MediaTransport as the
underlying transport.
Change-Id: Iccb2ba374594762a5b4f995564e2a1ff7d8805f5
Bug: webrtc:9719
Reviewed-on: https://webrtc-review.googlesource.com/c/108541
Reviewed-by: Anton Sukhanov <sukhanov@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Seth Hampson <shampson@webrtc.org>
Reviewed-by: Peter Slatala <psla@webrtc.org>
Commit-Queue: Bjorn Mellem <mellem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25454}
2018-10-30 15:15:00 -07:00
|
|
|
SendDataParams::SendDataParams() = default;
|
2018-11-30 09:35:52 +01:00
|
|
|
SendDataParams::SendDataParams(const SendDataParams&) = default;
|
Add interfaces for using MediaTransport as the transport for data channels.
Adds the types and methods required for sending and receiving data
channel messages over the media transport. These are:
- A DataMessageType to distinguish between text, binary, and control
messages
- A parameters struct for sending data messages, which specifies the
channel id, type, and ordering/reliability parameters
- A sink for data-channel related callbacks (receive data, begin
closing procedure, and end closing procedure)
- A method to set the sink for data channels
- Methods to open, close, and send on data channels
These methods, combined with the state sink, allow PeerConnection to
implement the DataChannelProviderInterface using MediaTransport as the
underlying transport.
Change-Id: Iccb2ba374594762a5b4f995564e2a1ff7d8805f5
Bug: webrtc:9719
Reviewed-on: https://webrtc-review.googlesource.com/c/108541
Reviewed-by: Anton Sukhanov <sukhanov@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Seth Hampson <shampson@webrtc.org>
Reviewed-by: Peter Slatala <psla@webrtc.org>
Commit-Queue: Bjorn Mellem <mellem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25454}
2018-10-30 15:15:00 -07:00
|
|
|
|
2018-10-29 07:31:42 -07:00
|
|
|
RTCErrorOr<std::unique_ptr<MediaTransportInterface>>
|
|
|
|
|
MediaTransportFactory::CreateMediaTransport(
|
|
|
|
|
rtc::PacketTransportInternal* packet_transport,
|
|
|
|
|
rtc::Thread* network_thread,
|
|
|
|
|
bool is_caller) {
|
2018-10-29 10:43:16 -07:00
|
|
|
MediaTransportSettings settings;
|
|
|
|
|
settings.is_caller = is_caller;
|
|
|
|
|
return CreateMediaTransport(packet_transport, network_thread, settings);
|
2018-10-29 07:31:42 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RTCErrorOr<std::unique_ptr<MediaTransportInterface>>
|
|
|
|
|
MediaTransportFactory::CreateMediaTransport(
|
|
|
|
|
rtc::PacketTransportInternal* packet_transport,
|
|
|
|
|
rtc::Thread* network_thread,
|
2018-10-29 10:43:16 -07:00
|
|
|
const MediaTransportSettings& settings) {
|
2018-10-29 07:31:42 -07:00
|
|
|
return std::unique_ptr<MediaTransportInterface>(nullptr);
|
|
|
|
|
}
|
|
|
|
|
|
2018-11-08 07:43:31 -08:00
|
|
|
absl::optional<TargetTransferRate>
|
|
|
|
|
MediaTransportInterface::GetLatestTargetTransferRate() {
|
|
|
|
|
return absl::nullopt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void MediaTransportInterface::SetNetworkChangeCallback(
|
|
|
|
|
MediaTransportNetworkChangeCallback* callback) {}
|
|
|
|
|
|
|
|
|
|
void MediaTransportInterface::RemoveTargetTransferRateObserver(
|
|
|
|
|
webrtc::TargetTransferRateObserver* observer) {}
|
|
|
|
|
|
|
|
|
|
void MediaTransportInterface::AddTargetTransferRateObserver(
|
|
|
|
|
webrtc::TargetTransferRateObserver* observer) {}
|
|
|
|
|
|
|
|
|
|
size_t MediaTransportInterface::GetAudioPacketOverhead() const {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-08 11:13:58 +02:00
|
|
|
} // namespace webrtc
|