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}
53 lines
2.1 KiB
C++
53 lines
2.1 KiB
C++
/*
|
|
* Copyright 2024 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 MEDIA_BASE_CODEC_COMPARATORS_H_
|
|
#define MEDIA_BASE_CODEC_COMPARATORS_H_
|
|
|
|
#include <optional>
|
|
#include <vector>
|
|
|
|
#include "api/rtp_parameters.h"
|
|
#include "media/base/codec.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Comparison used for the Codec::Matches function
|
|
bool MatchesWithCodecRules(const cricket::Codec& left_codec,
|
|
const cricket::Codec& codec);
|
|
|
|
// Comparison that also checks on codecs referenced by PT in the
|
|
// fmtp line, as used with RED and RTX "codecs".
|
|
bool MatchesWithReferenceAttributes(const cricket::Codec& left_codec,
|
|
const cricket::Codec& right_codec);
|
|
|
|
// Finds a codec in `codecs2` that matches `codec_to_match`, which is
|
|
// a member of `codecs1`. If `codec_to_match` is an RED or RTX codec, both
|
|
// the codecs themselves and their associated codecs must match.
|
|
// The purpose of this function is that codecs1 and codecs2 are different
|
|
// PT numbering spaces, and it is trying to find the codec in codecs2
|
|
// that has the same functionality as `codec_to_match` so that its PT
|
|
// can be used in place of the original.
|
|
std::optional<cricket::Codec> FindMatchingCodec(
|
|
const std::vector<cricket::Codec>& codecs1,
|
|
const std::vector<cricket::Codec>& codecs2,
|
|
const cricket::Codec& codec_to_match);
|
|
|
|
// Similar to `Codec::MatchesRtpCodec` but not an exact match of parameters.
|
|
// Unspecified parameters are treated as default.
|
|
bool IsSameRtpCodec(const cricket::Codec& codec, const RtpCodec& rtp_codec);
|
|
|
|
// Similar to `IsSameRtpCodec` but ignoring the level related parameter.
|
|
bool IsSameRtpCodecIgnoringLevel(const cricket::Codec& codec,
|
|
const RtpCodec& rtp_codec);
|
|
} // namespace webrtc
|
|
|
|
#endif // MEDIA_BASE_CODEC_COMPARATORS_H_
|