mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 23:57:59 +01:00
f00bf42d1c
This change adds the plumbing of RtpPacketInfo from RtpVideoStreamReceiver::OnRtpPacket() to VideoReceiveStream::OnFrame() for video. It is a step towards replacing the non-spec compliant ContributingSources that updates itself at packet-receive time, with the spec-compliant SourceTracker that will update itself at frame-delivery-to-track time. Bug: webrtc:10668 Change-Id: Ib97d430530c5a8487d3b129936c7c51e118889bd Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139891 Reviewed-by: Stefan Holmer <stefan@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Chen Xing <chxg@google.com> Cr-Commit-Position: refs/heads/master@{#28332}
87 lines
3 KiB
C++
87 lines
3 KiB
C++
/*
|
|
* Copyright (c) 2019 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 VIDEO_FRAME_ENCODE_METADATA_WRITER_H_
|
|
#define VIDEO_FRAME_ENCODE_METADATA_WRITER_H_
|
|
|
|
#include <list>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "api/video/encoded_image.h"
|
|
#include "api/video_codecs/video_codec.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "modules/video_coding/include/video_codec_interface.h"
|
|
#include "rtc_base/critical_section.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class FrameEncodeMetadataWriter {
|
|
public:
|
|
explicit FrameEncodeMetadataWriter(EncodedImageCallback* frame_drop_callback);
|
|
~FrameEncodeMetadataWriter();
|
|
|
|
void OnEncoderInit(const VideoCodec& codec, bool internal_source);
|
|
void OnSetRates(const VideoBitrateAllocation& bitrate_allocation,
|
|
uint32_t framerate_fps);
|
|
|
|
void OnEncodeStarted(const VideoFrame& frame);
|
|
|
|
void FillTimingInfo(size_t simulcast_svc_idx, EncodedImage* encoded_image);
|
|
|
|
std::unique_ptr<RTPFragmentationHeader> UpdateBitstream(
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const RTPFragmentationHeader* fragmentation,
|
|
EncodedImage* encoded_image);
|
|
|
|
void Reset();
|
|
|
|
private:
|
|
size_t NumSpatialLayers() const RTC_EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
|
|
|
// For non-internal-source encoders, returns encode started time and fixes
|
|
// capture timestamp for the frame, if corrupted by the encoder.
|
|
absl::optional<int64_t> ExtractEncodeStartTimeAndFillMetadata(
|
|
size_t simulcast_svc_idx,
|
|
EncodedImage* encoded_image) RTC_EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
|
|
|
struct FrameMetadata {
|
|
uint32_t rtp_timestamp;
|
|
int64_t encode_start_time_ms;
|
|
int64_t ntp_time_ms = 0;
|
|
int64_t timestamp_us = 0;
|
|
VideoRotation rotation = kVideoRotation_0;
|
|
absl::optional<ColorSpace> color_space;
|
|
RtpPacketInfos packet_infos;
|
|
};
|
|
struct TimingFramesLayerInfo {
|
|
TimingFramesLayerInfo();
|
|
~TimingFramesLayerInfo();
|
|
size_t target_bitrate_bytes_per_sec = 0;
|
|
std::list<FrameMetadata> frames;
|
|
};
|
|
|
|
rtc::CriticalSection lock_;
|
|
EncodedImageCallback* const frame_drop_callback_;
|
|
VideoCodec codec_settings_ RTC_GUARDED_BY(&lock_);
|
|
bool internal_source_ RTC_GUARDED_BY(&lock_);
|
|
uint32_t framerate_fps_ RTC_GUARDED_BY(&lock_);
|
|
|
|
// Separate instance for each simulcast stream or spatial layer.
|
|
std::vector<TimingFramesLayerInfo> timing_frames_info_ RTC_GUARDED_BY(&lock_);
|
|
int64_t last_timing_frame_time_ms_ RTC_GUARDED_BY(&lock_);
|
|
size_t reordered_frames_logged_messages_ RTC_GUARDED_BY(&lock_);
|
|
size_t stalled_encoder_logged_messages_ RTC_GUARDED_BY(&lock_);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // VIDEO_FRAME_ENCODE_METADATA_WRITER_H_
|