0a37547033
- Defines stereo codec case, similar to RTX, that adds stereo codec to the SDP negotiation. The underlying codec's payload type is similarly defined by "apt". - If this negotiation is successful, codec name is included in sdp line via "acn". - Adds codec setting initializers for these specific stereo cases. - Introduces new Stereo*Factory classes as optional convenience wrappers that inserts stereo codec to the existing set of supported codecs on demand. This CL is the step 5 for adding alpha channel support over the wire in webrtc. Design Doc: https://goo.gl/sFeSUT Bug: webrtc:7671 Change-Id: Ie12c56c8fcf7934e216135d73af33adec5248f76 Reviewed-on: https://webrtc-review.googlesource.com/22901 Commit-Queue: Niklas Enbom <niklas.enbom@webrtc.org> Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21210}
112 lines
3.9 KiB
C++
112 lines
3.9 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/stereocodecfactory.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/stereo/include/stereo_decoder_adapter.h"
|
|
#include "modules/video_coding/codecs/stereo/include/stereo_encoder_adapter.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace {
|
|
|
|
bool IsStereoCodec(const cricket::VideoCodec& codec) {
|
|
return cricket::CodecNamesEq(codec.name.c_str(), cricket::kStereoCodecName);
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
namespace webrtc {
|
|
|
|
constexpr const char* kStereoAssociatedCodecName = cricket::kVp9CodecName;
|
|
|
|
StereoEncoderFactory::StereoEncoderFactory(
|
|
std::unique_ptr<VideoEncoderFactory> factory)
|
|
: factory_(std::move(factory)) {}
|
|
|
|
std::vector<SdpVideoFormat> StereoEncoderFactory::GetSupportedFormats() const {
|
|
std::vector<SdpVideoFormat> formats = factory_->GetSupportedFormats();
|
|
for (const auto& format : formats) {
|
|
if (cricket::CodecNamesEq(format.name, kStereoAssociatedCodecName)) {
|
|
SdpVideoFormat stereo_format = format;
|
|
stereo_format.parameters[cricket::kCodecParamAssociatedCodecName] =
|
|
format.name;
|
|
stereo_format.name = cricket::kStereoCodecName;
|
|
formats.push_back(stereo_format);
|
|
break;
|
|
}
|
|
}
|
|
return formats;
|
|
}
|
|
|
|
VideoEncoderFactory::CodecInfo StereoEncoderFactory::QueryVideoEncoder(
|
|
const SdpVideoFormat& format) const {
|
|
if (!IsStereoCodec(cricket::VideoCodec(format)))
|
|
return factory_->QueryVideoEncoder(format);
|
|
return factory_->QueryVideoEncoder(
|
|
SdpVideoFormat(kStereoAssociatedCodecName));
|
|
}
|
|
|
|
std::unique_ptr<VideoEncoder> StereoEncoderFactory::CreateVideoEncoder(
|
|
const SdpVideoFormat& format) {
|
|
if (!IsStereoCodec(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 stereo.";
|
|
return nullptr;
|
|
}
|
|
SdpVideoFormat associated_format = format;
|
|
associated_format.name = it->second;
|
|
return std::unique_ptr<VideoEncoder>(
|
|
new StereoEncoderAdapter(factory_.get(), associated_format));
|
|
}
|
|
|
|
StereoDecoderFactory::StereoDecoderFactory(
|
|
std::unique_ptr<VideoDecoderFactory> factory)
|
|
: factory_(std::move(factory)) {}
|
|
|
|
std::vector<SdpVideoFormat> StereoDecoderFactory::GetSupportedFormats() const {
|
|
std::vector<SdpVideoFormat> formats = factory_->GetSupportedFormats();
|
|
for (const auto& format : formats) {
|
|
if (cricket::CodecNamesEq(format.name, kStereoAssociatedCodecName)) {
|
|
SdpVideoFormat stereo_format = format;
|
|
stereo_format.parameters[cricket::kCodecParamAssociatedCodecName] =
|
|
format.name;
|
|
stereo_format.name = cricket::kStereoCodecName;
|
|
formats.push_back(stereo_format);
|
|
}
|
|
}
|
|
return formats;
|
|
}
|
|
|
|
std::unique_ptr<VideoDecoder> StereoDecoderFactory::CreateVideoDecoder(
|
|
const SdpVideoFormat& format) {
|
|
if (!IsStereoCodec(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 stereo.";
|
|
return nullptr;
|
|
}
|
|
SdpVideoFormat associated_format = format;
|
|
associated_format.name = it->second;
|
|
return std::unique_ptr<VideoDecoder>(
|
|
new StereoDecoderAdapter(factory_.get(), associated_format));
|
|
}
|
|
|
|
} // namespace webrtc
|