deb866360a
This reverts commit 20f2133d5d.
Reason for revert: Breaks downstream project.
Original change's description:
> Add stereo codec header and pass it through RTP
>
> - Defines CodecSpecificInfoStereo that carries stereo specific header info from
> encoded image.
> - Defines RTPVideoHeaderStereo that carries the above info to packetizer,
> see module_common_types.h.
> - Adds an RTPPacketizer and RTPDepacketizer that supports passing specific stereo
> header.
> - Uses new data containers in StereoAdapter classes.
>
> This CL is the step 3 for adding alpha channel support over the wire in webrtc.
> See https://webrtc-review.googlesource.com/c/src/+/7800 for the experimental
> CL that gives an idea about how it will come together.
> Design Doc: https://goo.gl/sFeSUT
>
> Bug: webrtc:7671
> Change-Id: Ia932568fdd7065ba104afd2bc0ecf25a765748ab
> Reviewed-on: https://webrtc-review.googlesource.com/22900
> Reviewed-by: Emircan Uysaler <emircan@webrtc.org>
> Reviewed-by: Erik Språng <sprang@webrtc.org>
> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org>
> Commit-Queue: Emircan Uysaler <emircan@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20920}
TBR=danilchap@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,niklas.enbom@webrtc.org,emircan@webrtc.org
Change-Id: I57f3172ca3c60a84537d577a574dc8018e12d634
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:7671
Reviewed-on: https://webrtc-review.googlesource.com/26940
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20931}
74 lines
2.5 KiB
C++
74 lines
2.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 MODULES_VIDEO_CODING_CODECS_STEREO_INCLUDE_STEREO_ENCODER_ADAPTER_H_
|
|
#define MODULES_VIDEO_CODING_CODECS_STEREO_INCLUDE_STEREO_ENCODER_ADAPTER_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "api/video_codecs/video_encoder_factory.h"
|
|
#include "modules/video_coding/include/video_codec_interface.h"
|
|
|
|
namespace webrtc {
|
|
|
|
enum AlphaCodecStream {
|
|
kYUVStream = 0,
|
|
kAXXStream = 1,
|
|
kAlphaCodecStreams = 2,
|
|
};
|
|
|
|
class StereoEncoderAdapter : public VideoEncoder {
|
|
public:
|
|
// |factory| is not owned and expected to outlive this class' lifetime.
|
|
explicit StereoEncoderAdapter(VideoEncoderFactory* factory);
|
|
virtual ~StereoEncoderAdapter();
|
|
|
|
// Implements VideoEncoder
|
|
int InitEncode(const VideoCodec* inst,
|
|
int number_of_cores,
|
|
size_t max_payload_size) override;
|
|
int Encode(const VideoFrame& input_image,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const std::vector<FrameType>* frame_types) override;
|
|
int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override;
|
|
int SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
|
|
int SetRateAllocation(const BitrateAllocation& bitrate,
|
|
uint32_t new_framerate) override;
|
|
int Release() override;
|
|
const char* ImplementationName() const override;
|
|
|
|
EncodedImageCallback::Result OnEncodedImage(
|
|
AlphaCodecStream stream_idx,
|
|
const EncodedImage& encodedImage,
|
|
const CodecSpecificInfo* codecSpecificInfo,
|
|
const RTPFragmentationHeader* fragmentation);
|
|
|
|
private:
|
|
// Wrapper class that redirects OnEncodedImage() calls.
|
|
class AdapterEncodedImageCallback;
|
|
|
|
// Holds the encoded image output of a frame.
|
|
struct EncodedImageData;
|
|
|
|
VideoEncoderFactory* const factory_;
|
|
std::vector<std::unique_ptr<VideoEncoder>> encoders_;
|
|
std::vector<std::unique_ptr<AdapterEncodedImageCallback>> adapter_callbacks_;
|
|
EncodedImageCallback* encoded_complete_callback_;
|
|
|
|
uint64_t picture_index_ = 0;
|
|
std::vector<uint8_t> stereo_dummy_planes_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_CODECS_STEREO_INCLUDE_STEREO_ENCODER_ADAPTER_H_
|