77c8e65b88
Multiplex encoder is now supporting attaching user-defined data to the video frame. This data will be sent with the video frame and thus is guaranteed to be synchronized. This is useful in cases where the data and video frame need to by synchronized such as sending information about 3D objects or camera tracking information with the video stream Multiplex Encoder with data is implemented in a modular way. A new VideoFrameBuffer type is created with the encoder. AugmentedVideoFrameBuffer holds the video frame and the data. MultiplexVideoEncoder encodes both the frame and data. Change-Id: I23263f70d111f6f1783c070edec70bd11ebb9868 Bug: webrtc:9632 Reviewed-on: https://webrtc-review.googlesource.com/92642 Commit-Queue: Tarek Hefny <tarekh@google.com> Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org> Reviewed-by: Emircan Uysaler <emircan@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24297}
119 lines
4.3 KiB
C++
119 lines
4.3 KiB
C++
/*
|
|
* Copyright (c) 2017 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 "media/engine/multiplexcodecfactory.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "api/video_codecs/sdp_video_format.h"
|
|
#include "media/base/codec.h"
|
|
#include "media/base/mediaconstants.h"
|
|
#include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h"
|
|
#include "modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace {
|
|
|
|
bool IsMultiplexCodec(const cricket::VideoCodec& codec) {
|
|
return cricket::CodecNamesEq(codec.name.c_str(),
|
|
cricket::kMultiplexCodecName);
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
namespace webrtc {
|
|
|
|
constexpr const char* kMultiplexAssociatedCodecName = cricket::kVp9CodecName;
|
|
|
|
MultiplexEncoderFactory::MultiplexEncoderFactory(
|
|
std::unique_ptr<VideoEncoderFactory> factory,
|
|
bool supports_augmenting_data)
|
|
: factory_(std::move(factory)),
|
|
supports_augmenting_data_(supports_augmenting_data) {}
|
|
|
|
std::vector<SdpVideoFormat> MultiplexEncoderFactory::GetSupportedFormats()
|
|
const {
|
|
std::vector<SdpVideoFormat> formats = factory_->GetSupportedFormats();
|
|
for (const auto& format : formats) {
|
|
if (cricket::CodecNamesEq(format.name, kMultiplexAssociatedCodecName)) {
|
|
SdpVideoFormat multiplex_format = format;
|
|
multiplex_format.parameters[cricket::kCodecParamAssociatedCodecName] =
|
|
format.name;
|
|
multiplex_format.name = cricket::kMultiplexCodecName;
|
|
formats.push_back(multiplex_format);
|
|
break;
|
|
}
|
|
}
|
|
return formats;
|
|
}
|
|
|
|
VideoEncoderFactory::CodecInfo MultiplexEncoderFactory::QueryVideoEncoder(
|
|
const SdpVideoFormat& format) const {
|
|
if (!IsMultiplexCodec(cricket::VideoCodec(format)))
|
|
return factory_->QueryVideoEncoder(format);
|
|
return factory_->QueryVideoEncoder(
|
|
SdpVideoFormat(kMultiplexAssociatedCodecName));
|
|
}
|
|
|
|
std::unique_ptr<VideoEncoder> MultiplexEncoderFactory::CreateVideoEncoder(
|
|
const SdpVideoFormat& format) {
|
|
if (!IsMultiplexCodec(cricket::VideoCodec(format)))
|
|
return factory_->CreateVideoEncoder(format);
|
|
const auto& it =
|
|
format.parameters.find(cricket::kCodecParamAssociatedCodecName);
|
|
if (it == format.parameters.end()) {
|
|
RTC_LOG(LS_ERROR) << "No assicated codec for multiplex.";
|
|
return nullptr;
|
|
}
|
|
SdpVideoFormat associated_format = format;
|
|
associated_format.name = it->second;
|
|
return std::unique_ptr<VideoEncoder>(new MultiplexEncoderAdapter(
|
|
factory_.get(), associated_format, supports_augmenting_data_));
|
|
}
|
|
|
|
MultiplexDecoderFactory::MultiplexDecoderFactory(
|
|
std::unique_ptr<VideoDecoderFactory> factory,
|
|
bool supports_augmenting_data)
|
|
: factory_(std::move(factory)),
|
|
supports_augmenting_data_(supports_augmenting_data) {}
|
|
|
|
std::vector<SdpVideoFormat> MultiplexDecoderFactory::GetSupportedFormats()
|
|
const {
|
|
std::vector<SdpVideoFormat> formats = factory_->GetSupportedFormats();
|
|
for (const auto& format : formats) {
|
|
if (cricket::CodecNamesEq(format.name, kMultiplexAssociatedCodecName)) {
|
|
SdpVideoFormat multiplex_format = format;
|
|
multiplex_format.parameters[cricket::kCodecParamAssociatedCodecName] =
|
|
format.name;
|
|
multiplex_format.name = cricket::kMultiplexCodecName;
|
|
formats.push_back(multiplex_format);
|
|
}
|
|
}
|
|
return formats;
|
|
}
|
|
|
|
std::unique_ptr<VideoDecoder> MultiplexDecoderFactory::CreateVideoDecoder(
|
|
const SdpVideoFormat& format) {
|
|
if (!IsMultiplexCodec(cricket::VideoCodec(format)))
|
|
return factory_->CreateVideoDecoder(format);
|
|
const auto& it =
|
|
format.parameters.find(cricket::kCodecParamAssociatedCodecName);
|
|
if (it == format.parameters.end()) {
|
|
RTC_LOG(LS_ERROR) << "No assicated codec for multiplex.";
|
|
return nullptr;
|
|
}
|
|
SdpVideoFormat associated_format = format;
|
|
associated_format.name = it->second;
|
|
return std::unique_ptr<VideoDecoder>(new MultiplexDecoderAdapter(
|
|
factory_.get(), associated_format, supports_augmenting_data_));
|
|
}
|
|
|
|
} // namespace webrtc
|