mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 06:40:43 +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}
88 lines
3.1 KiB
C++
88 lines
3.1 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_ENCODER_ADAPTER_H_
|
|
#define MODULES_VIDEO_CODING_CODECS_MULTIPLEX_INCLUDE_MULTIPLEX_ENCODER_ADAPTER_H_
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/video_codecs/sdp_video_format.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "api/video_codecs/video_encoder_factory.h"
|
|
#include "modules/video_coding/codecs/multiplex/include/multiplex_encoded_image_packer.h"
|
|
#include "modules/video_coding/include/video_codec_interface.h"
|
|
#include "rtc_base/criticalsection.h"
|
|
|
|
namespace webrtc {
|
|
|
|
enum AlphaCodecStream {
|
|
kYUVStream = 0,
|
|
kAXXStream = 1,
|
|
kAlphaCodecStreams = 2,
|
|
};
|
|
|
|
class MultiplexEncoderAdapter : public VideoEncoder {
|
|
public:
|
|
// |factory| is not owned and expected to outlive this class' lifetime.
|
|
MultiplexEncoderAdapter(VideoEncoderFactory* factory,
|
|
const SdpVideoFormat& associated_format,
|
|
bool supports_augmenting_data = false);
|
|
virtual ~MultiplexEncoderAdapter();
|
|
|
|
// 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 VideoBitrateAllocation& 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;
|
|
|
|
VideoEncoderFactory* const factory_;
|
|
const SdpVideoFormat associated_format_;
|
|
std::vector<std::unique_ptr<VideoEncoder>> encoders_;
|
|
std::vector<std::unique_ptr<AdapterEncodedImageCallback>> adapter_callbacks_;
|
|
EncodedImageCallback* encoded_complete_callback_;
|
|
|
|
std::map<uint32_t /* timestamp */, MultiplexImage> stashed_images_
|
|
RTC_GUARDED_BY(crit_);
|
|
|
|
uint16_t picture_index_ = 0;
|
|
std::vector<uint8_t> multiplex_dummy_planes_;
|
|
|
|
int key_frame_interval_;
|
|
EncodedImage combined_image_;
|
|
|
|
rtc::CriticalSection crit_;
|
|
|
|
const bool supports_augmented_data_;
|
|
int augmenting_data_size_ = 0;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_CODECS_MULTIPLEX_INCLUDE_MULTIPLEX_ENCODER_ADAPTER_H_
|