mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 14:50:39 +01:00
cf1308fddd
When spatial scalability is used, both vpx and aom set key frame flag for all spatial layers of the first frame, while rtp code expect it to be set only on the frame without spatial dependencies. That creates confusion for the frame dependency calculator. Simplest solution seems to ignore that confusing signal and instead rely encoder wrappers update frame buffer usages when key frame is generated. Bug: webrtc:11999 Change-Id: Ica24f1d8d42d32dd24664beabf32ac24872cd15a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194002 Reviewed-by: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32667}
118 lines
4.5 KiB
C++
118 lines
4.5 KiB
C++
/*
|
|
* Copyright (c) 2018 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 CALL_RTP_PAYLOAD_PARAMS_H_
|
|
#define CALL_RTP_PAYLOAD_PARAMS_H_
|
|
|
|
#include <array>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "api/transport/webrtc_key_value_config.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "call/rtp_config.h"
|
|
#include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h"
|
|
#include "modules/rtp_rtcp/source/rtp_video_header.h"
|
|
#include "modules/video_coding/chain_diff_calculator.h"
|
|
#include "modules/video_coding/frame_dependencies_calculator.h"
|
|
#include "modules/video_coding/include/video_codec_interface.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class RtpRtcp;
|
|
|
|
// State for setting picture id and tl0 pic idx, for VP8 and VP9
|
|
// TODO(nisse): Make these properties not codec specific.
|
|
class RtpPayloadParams final {
|
|
public:
|
|
RtpPayloadParams(const uint32_t ssrc,
|
|
const RtpPayloadState* state,
|
|
const WebRtcKeyValueConfig& trials);
|
|
RtpPayloadParams(const RtpPayloadParams& other);
|
|
~RtpPayloadParams();
|
|
|
|
RTPVideoHeader GetRtpVideoHeader(const EncodedImage& image,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
int64_t shared_frame_id);
|
|
|
|
uint32_t ssrc() const;
|
|
|
|
RtpPayloadState state() const;
|
|
|
|
private:
|
|
void SetCodecSpecific(RTPVideoHeader* rtp_video_header,
|
|
bool first_frame_in_picture);
|
|
RTPVideoHeader::GenericDescriptorInfo GenericDescriptorFromFrameInfo(
|
|
const GenericFrameInfo& frame_info,
|
|
int64_t frame_id);
|
|
void SetGeneric(const CodecSpecificInfo* codec_specific_info,
|
|
int64_t frame_id,
|
|
bool is_keyframe,
|
|
RTPVideoHeader* rtp_video_header);
|
|
|
|
void Vp8ToGeneric(const CodecSpecificInfoVP8& vp8_info,
|
|
int64_t shared_frame_id,
|
|
bool is_keyframe,
|
|
RTPVideoHeader* rtp_video_header);
|
|
|
|
void H264ToGeneric(const CodecSpecificInfoH264& h264_info,
|
|
int64_t shared_frame_id,
|
|
bool is_keyframe,
|
|
RTPVideoHeader* rtp_video_header);
|
|
|
|
void GenericToGeneric(int64_t shared_frame_id,
|
|
bool is_keyframe,
|
|
RTPVideoHeader* rtp_video_header);
|
|
|
|
// TODO(bugs.webrtc.org/10242): Delete SetDependenciesVp8Deprecated() and move
|
|
// the logic in SetDependenciesVp8New() into Vp8ToGeneric() once all hardware
|
|
// wrappers have been updated.
|
|
void SetDependenciesVp8Deprecated(
|
|
const CodecSpecificInfoVP8& vp8_info,
|
|
int64_t shared_frame_id,
|
|
bool is_keyframe,
|
|
int spatial_index,
|
|
int temporal_index,
|
|
bool layer_sync,
|
|
RTPVideoHeader::GenericDescriptorInfo* generic);
|
|
void SetDependenciesVp8New(const CodecSpecificInfoVP8& vp8_info,
|
|
int64_t shared_frame_id,
|
|
bool is_keyframe,
|
|
bool layer_sync,
|
|
RTPVideoHeader::GenericDescriptorInfo* generic);
|
|
|
|
FrameDependenciesCalculator dependencies_calculator_;
|
|
ChainDiffCalculator chains_calculator_;
|
|
// TODO(bugs.webrtc.org/10242): Remove once all encoder-wrappers are updated.
|
|
// Holds the last shared frame id for a given (spatial, temporal) layer.
|
|
std::array<std::array<int64_t, RtpGenericFrameDescriptor::kMaxTemporalLayers>,
|
|
RtpGenericFrameDescriptor::kMaxSpatialLayers>
|
|
last_shared_frame_id_;
|
|
|
|
// TODO(eladalon): When additional codecs are supported,
|
|
// set kMaxCodecBuffersCount to the max() of these codecs' buffer count.
|
|
static constexpr size_t kMaxCodecBuffersCount =
|
|
CodecSpecificInfoVP8::kBuffersCount;
|
|
|
|
// Maps buffer IDs to the frame-ID stored in them.
|
|
std::array<int64_t, kMaxCodecBuffersCount> buffer_id_to_frame_id_;
|
|
|
|
// Until we remove SetDependenciesVp8Deprecated(), we should make sure
|
|
// that, for a given object, we either always use
|
|
// SetDependenciesVp8Deprecated(), or always use SetDependenciesVp8New().
|
|
// TODO(bugs.webrtc.org/10242): Remove.
|
|
absl::optional<bool> new_version_used_;
|
|
|
|
const uint32_t ssrc_;
|
|
RtpPayloadState state_;
|
|
|
|
const bool generic_picture_id_experiment_;
|
|
};
|
|
} // namespace webrtc
|
|
#endif // CALL_RTP_PAYLOAD_PARAMS_H_
|