1ec2a16121
This reverts commit cdc5eb0de179dcc866ef770ea303879c64466879. Reason for revert: Causes wrong CPU adaptation to be used for some HW codecs since GetEncoderInfo() is polled before InitEncode(). Original change's description: > Replace VideoEncoderFactory::QueryVideoEncoder with VideoEncoder::GetEncoderInfo > > Make implementation of VideoEncoderFactory::QueryVideoEncoder optional > until it is removed downstream and remove all implementations of it. > > Bug: webrtc:10065 > Change-Id: Ibb1f9612234e536651ce53f05ee048a5d172a41f > Reviewed-on: https://webrtc-review.googlesource.com/c/113065 > Commit-Queue: Mirta Dvornicic <mirtad@webrtc.org> > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > Reviewed-by: Per Kjellander <perkj@webrtc.org> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Reviewed-by: Kári Helgason <kthelgason@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#25924} TBR=brandtr@webrtc.org,sakal@webrtc.org,kthelgason@webrtc.org,sprang@webrtc.org,srte@webrtc.org,perkj@webrtc.org,mirtad@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10065 Change-Id: Idaa452e1d8c1c58cdb4ec69b88fce9042589cc3c Reviewed-on: https://webrtc-review.googlesource.com/c/113800 Reviewed-by: Mirta Dvornicic <mirtad@webrtc.org> Reviewed-by: Per Kjellander <perkj@webrtc.org> Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Mirta Dvornicic <mirtad@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25943}
81 lines
3.5 KiB
C++
81 lines
3.5 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.
|
|
*/
|
|
|
|
#ifndef MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
|
|
#define MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/video_codecs/sdp_video_format.h"
|
|
#include "api/video_codecs/video_decoder.h"
|
|
#include "api/video_codecs/video_decoder_factory.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "api/video_codecs/video_encoder_factory.h"
|
|
#include "rtc_base/system/rtc_export.h"
|
|
|
|
namespace webrtc {
|
|
// Multiplex codec is a completely modular/optional codec that allows users to
|
|
// send more than a frame's opaque content(RGB/YUV) over video channels.
|
|
// - Allows sending Alpha channel over the wire iff input is
|
|
// I420ABufferInterface. Users can expect to receive I420ABufferInterface as the
|
|
// decoded video frame buffer. I420A data is split into YUV/AXX portions,
|
|
// encoded/decoded seperately and bitstreams are concatanated.
|
|
// - Allows sending augmenting data over the wire attached to the frame. This
|
|
// attached data portion is not encoded in any way and sent as it is. Users can
|
|
// input AugmentedVideoFrameBuffer and can expect the same interface as the
|
|
// decoded video frame buffer.
|
|
// - Showcases an example of how to add a custom codec in webrtc video channel.
|
|
// How to use it end-to-end:
|
|
// - Wrap your existing VideoEncoderFactory implemention with
|
|
// MultiplexEncoderFactory and VideoDecoderFactory implemention with
|
|
// MultiplexDecoderFactory below. For actual coding, multiplex creates encoder
|
|
// and decoder instance(s) using these factories.
|
|
// - Use Multiplex*coderFactory classes in CreatePeerConnectionFactory() calls.
|
|
// - Select "multiplex" codec in SDP negotiation.
|
|
class RTC_EXPORT MultiplexEncoderFactory : public VideoEncoderFactory {
|
|
public:
|
|
// |supports_augmenting_data| defines if the encoder would support augmenting
|
|
// data. If set, the encoder expects to receive video frame buffers of type
|
|
// AugmentedVideoFrameBuffer.
|
|
MultiplexEncoderFactory(std::unique_ptr<VideoEncoderFactory> factory,
|
|
bool supports_augmenting_data = false);
|
|
|
|
std::vector<SdpVideoFormat> GetSupportedFormats() const override;
|
|
CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const override;
|
|
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
|
|
const SdpVideoFormat& format) override;
|
|
|
|
private:
|
|
std::unique_ptr<VideoEncoderFactory> factory_;
|
|
const bool supports_augmenting_data_;
|
|
};
|
|
|
|
class RTC_EXPORT MultiplexDecoderFactory : public VideoDecoderFactory {
|
|
public:
|
|
// |supports_augmenting_data| defines if the decoder would support augmenting
|
|
// data. If set, the decoder is expected to output video frame buffers of type
|
|
// AugmentedVideoFrameBuffer.
|
|
MultiplexDecoderFactory(std::unique_ptr<VideoDecoderFactory> factory,
|
|
bool supports_augmenting_data = false);
|
|
|
|
std::vector<SdpVideoFormat> GetSupportedFormats() const override;
|
|
std::unique_ptr<VideoDecoder> CreateVideoDecoder(
|
|
const SdpVideoFormat& format) override;
|
|
|
|
private:
|
|
std::unique_ptr<VideoDecoderFactory> factory_;
|
|
const bool supports_augmenting_data_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
|