882b32d00f
This reverts commit e046787a5a80a9d292b3aec7e946644e025a2b95. Reason for revert: Revised codec matching to fix issue. Changes also back out some changes that should not have been included (using PayloadTypePicker for codec list merging). Original change's description: > Revert "Use PayloadTypePicker for video PT assignment" > > This reverts commit e5048949b0fcc275264e24f3b2a4c658fcc84aa3. > > Reason for revert: Broke internal tests. > > Original change's description: > > Use PayloadTypePicker for video PT assignment > > > > This includes changes that change the order of codecs. > > It is preparatory to doing late assignment of video PTs. > > > > Bug: webrtc:360058654 > > Change-Id: Id5ddaf94d4b9557c0502a373e42635108d8fdf26 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/366400 > > Reviewed-by: Henrik Boström <hbos@webrtc.org> > > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#43489} > > Bug: webrtc:360058654 > Change-Id: I5c94a7bafa49bdf17f665480398707155e458d26 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/370240 > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43490} Bug: webrtc:360058654 Change-Id: I66b3b6bd657c66f8860c5e67a504266d7707f48d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/370380 Commit-Queue: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43554}
97 lines
3.2 KiB
C++
97 lines
3.2 KiB
C++
/*
|
|
* Copyright (c) 2021 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 API_VIDEO_CODECS_H264_PROFILE_LEVEL_ID_H_
|
|
#define API_VIDEO_CODECS_H264_PROFILE_LEVEL_ID_H_
|
|
|
|
#include <optional>
|
|
#include <string>
|
|
|
|
#include "api/rtp_parameters.h"
|
|
#include "rtc_base/system/rtc_export.h"
|
|
|
|
namespace webrtc {
|
|
|
|
enum class H264Profile {
|
|
kProfileConstrainedBaseline,
|
|
kProfileBaseline,
|
|
kProfileMain,
|
|
kProfileConstrainedHigh,
|
|
kProfileHigh,
|
|
kProfilePredictiveHigh444,
|
|
};
|
|
|
|
// All values are equal to ten times the level number, except level 1b which is
|
|
// special.
|
|
enum class H264Level {
|
|
kLevel1_b = 0,
|
|
kLevel1 = 10,
|
|
kLevel1_1 = 11,
|
|
kLevel1_2 = 12,
|
|
kLevel1_3 = 13,
|
|
kLevel2 = 20,
|
|
kLevel2_1 = 21,
|
|
kLevel2_2 = 22,
|
|
kLevel3 = 30,
|
|
kLevel3_1 = 31,
|
|
kLevel3_2 = 32,
|
|
kLevel4 = 40,
|
|
kLevel4_1 = 41,
|
|
kLevel4_2 = 42,
|
|
kLevel5 = 50,
|
|
kLevel5_1 = 51,
|
|
kLevel5_2 = 52
|
|
};
|
|
|
|
struct H264ProfileLevelId {
|
|
constexpr H264ProfileLevelId(H264Profile profile, H264Level level)
|
|
: profile(profile), level(level) {}
|
|
H264Profile profile;
|
|
H264Level level;
|
|
};
|
|
|
|
// Parse profile level id that is represented as a string of 3 hex bytes.
|
|
// Nothing will be returned if the string is not a recognized H264
|
|
// profile level id.
|
|
std::optional<H264ProfileLevelId> ParseH264ProfileLevelId(const char* str);
|
|
|
|
// Parse profile level id that is represented as a string of 3 hex bytes
|
|
// contained in an SDP key-value map. A default profile level id will be
|
|
// returned if the profile-level-id key is missing. Nothing will be returned if
|
|
// the key is present but the string is invalid.
|
|
RTC_EXPORT std::optional<H264ProfileLevelId> ParseSdpForH264ProfileLevelId(
|
|
const CodecParameterMap& params);
|
|
|
|
// Given that a decoder supports up to a given frame size (in pixels) at up to a
|
|
// given number of frames per second, return the highest H.264 level where it
|
|
// can guarantee that it will be able to support all valid encoded streams that
|
|
// are within that level.
|
|
RTC_EXPORT std::optional<H264Level> H264SupportedLevel(
|
|
int max_frame_pixel_count,
|
|
float max_fps);
|
|
|
|
// Returns canonical string representation as three hex bytes of the profile
|
|
// level id, or returns nothing for invalid profile level ids.
|
|
RTC_EXPORT std::optional<std::string> H264ProfileLevelIdToString(
|
|
const H264ProfileLevelId& profile_level_id);
|
|
|
|
// Returns true if the parameters have the same H264 profile (Baseline, High,
|
|
// etc).
|
|
RTC_EXPORT bool H264IsSameProfile(const CodecParameterMap& params1,
|
|
const CodecParameterMap& params2);
|
|
// Returns true if the parameters have the same H264 profile (Baseline, High,
|
|
// etc) and same level.
|
|
RTC_EXPORT bool H264IsSameProfileAndLevel(const CodecParameterMap& params1,
|
|
const CodecParameterMap& params2);
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_VIDEO_CODECS_H264_PROFILE_LEVEL_ID_H_
|