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}
76 lines
2.9 KiB
C++
76 lines
2.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.
|
|
*/
|
|
|
|
#ifndef MODULES_VIDEO_CODING_CODECS_STEREO_INCLUDE_STEREO_DECODER_ADAPTER_H_
|
|
#define MODULES_VIDEO_CODING_CODECS_STEREO_INCLUDE_STEREO_DECODER_ADAPTER_H_
|
|
|
|
#include <map>
|
|
#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 "modules/video_coding/codecs/stereo/include/stereo_encoder_adapter.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class StereoDecoderAdapter : public VideoDecoder {
|
|
public:
|
|
// |factory| is not owned and expected to outlive this class' lifetime.
|
|
explicit StereoDecoderAdapter(VideoDecoderFactory* factory,
|
|
const SdpVideoFormat& associated_format);
|
|
virtual ~StereoDecoderAdapter();
|
|
|
|
// Implements VideoDecoder
|
|
int32_t InitDecode(const VideoCodec* codec_settings,
|
|
int32_t number_of_cores) override;
|
|
int32_t Decode(const EncodedImage& input_image,
|
|
bool missing_frames,
|
|
const RTPFragmentationHeader* fragmentation,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
int64_t render_time_ms) override;
|
|
int32_t RegisterDecodeCompleteCallback(
|
|
DecodedImageCallback* callback) override;
|
|
int32_t Release() override;
|
|
|
|
void Decoded(AlphaCodecStream stream_idx,
|
|
VideoFrame* decoded_image,
|
|
rtc::Optional<int32_t> decode_time_ms,
|
|
rtc::Optional<uint8_t> qp);
|
|
|
|
private:
|
|
// Wrapper class that redirects Decoded() calls.
|
|
class AdapterDecodedImageCallback;
|
|
|
|
// Holds the decoded image output of a frame.
|
|
struct DecodedImageData;
|
|
|
|
void MergeAlphaImages(VideoFrame* decoded_image,
|
|
const rtc::Optional<int32_t>& decode_time_ms,
|
|
const rtc::Optional<uint8_t>& qp,
|
|
VideoFrame* stereo_decoded_image,
|
|
const rtc::Optional<int32_t>& stereo_decode_time_ms,
|
|
const rtc::Optional<uint8_t>& stereo_qp);
|
|
|
|
VideoDecoderFactory* const factory_;
|
|
const SdpVideoFormat associated_format_;
|
|
std::vector<std::unique_ptr<VideoDecoder>> decoders_;
|
|
std::vector<std::unique_ptr<AdapterDecodedImageCallback>> adapter_callbacks_;
|
|
DecodedImageCallback* decoded_complete_callback_;
|
|
|
|
// Holds YUV or AXX decode output of a frame that is identified by timestamp.
|
|
std::map<uint32_t /* timestamp */, DecodedImageData> decoded_data_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_CODECS_STEREO_INCLUDE_STEREO_DECODER_ADAPTER_H_
|