4fb12b0cae
Reland with fixes. Currently some video frames metadata like rotation or ntp timestamps are copied in every encoder and decoder separately. This CL makes copying to happen at a single place for send or receive side. This will make it easier to add new metadata in the future. Also, added some missing tests. Original Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133346 Bug: webrtc:10460 Change-Id: Ia71198685de7fbd990704b575231cdce94dc0645 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134961 Reviewed-by: Johannes Kron <kron@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27828}
79 lines
2.6 KiB
C++
79 lines
2.6 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 <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 "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);
|
|
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;
|
|
};
|
|
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_
|