mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
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}
82 lines
3.2 KiB
C++
82 lines
3.2 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_MULTIPLEX_INCLUDE_MULTIPLEX_DECODER_ADAPTER_H_
|
|
#define MODULES_VIDEO_CODING_CODECS_MULTIPLEX_INCLUDE_MULTIPLEX_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/multiplex/include/multiplex_encoder_adapter.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class MultiplexDecoderAdapter : public VideoDecoder {
|
|
public:
|
|
// |factory| is not owned and expected to outlive this class' lifetime.
|
|
MultiplexDecoderAdapter(VideoDecoderFactory* factory,
|
|
const SdpVideoFormat& associated_format,
|
|
bool supports_augmenting_data = false);
|
|
virtual ~MultiplexDecoderAdapter();
|
|
|
|
// 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 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,
|
|
absl::optional<int32_t> decode_time_ms,
|
|
absl::optional<uint8_t> qp);
|
|
|
|
private:
|
|
// Wrapper class that redirects Decoded() calls.
|
|
class AdapterDecodedImageCallback;
|
|
|
|
// Holds the decoded image output of a frame.
|
|
struct DecodedImageData;
|
|
|
|
// Holds the augmenting data of an image
|
|
struct AugmentingData;
|
|
|
|
void MergeAlphaImages(VideoFrame* decoded_image,
|
|
const absl::optional<int32_t>& decode_time_ms,
|
|
const absl::optional<uint8_t>& qp,
|
|
VideoFrame* multiplex_decoded_image,
|
|
const absl::optional<int32_t>& multiplex_decode_time_ms,
|
|
const absl::optional<uint8_t>& multiplex_qp,
|
|
std::unique_ptr<uint8_t[]> augmenting_data,
|
|
uint16_t augmenting_data_length);
|
|
|
|
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_;
|
|
std::map<uint32_t /* timestamp */, AugmentingData> decoded_augmenting_data_;
|
|
const bool supports_augmenting_data_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_CODECS_MULTIPLEX_INCLUDE_MULTIPLEX_DECODER_ADAPTER_H_
|