nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1834008 - Changed JSEP's default H264 level from 42e00d to 42e01f to better match the default pref.r=bwc

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D180871
This commit is contained in:
Dan Baker 2023-06-13 23:04:12 +00:00
parent 38cbc55c27
commit 7b553b3150
6 changed files with 21 additions and 21 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
dom/media/webrtc/jsep/JsepCodecDescription.h
View file

@ -422,7 +422,7 @@ class JsepVideoCodecDescription : public JsepCodecDescription {
auto codec = MakeUnique<JsepVideoCodecDescription>("97", "H264", 90000);
codec->mPacketizationMode = 0;
// Defaults for mandatory params
codec->mProfileLevelId = 0x42E00D;
codec->mProfileLevelId = 0x42E01F;
if (aUseRtx) {
codec->EnableRtx("98");
}
@ -434,7 +434,7 @@ class JsepVideoCodecDescription : public JsepCodecDescription {
auto codec = MakeUnique<JsepVideoCodecDescription>("126", "H264", 90000);
codec->mPacketizationMode = 1;
// Defaults for mandatory params
codec->mProfileLevelId = 0x42E00D;
codec->mProfileLevelId = 0x42E01F;
if (aUseRtx) {
codec->EnableRtx("127");
}

20
media/webrtc/signaling/gtest/jsep_session_unittest.cpp
View file

@ -3412,7 +3412,7 @@ TEST_F(JsepSessionTest, ValidateOfferedVideoCodecParams) {
const auto& parsed_h264_1_params =
*static_cast<const SdpFmtpAttributeList::H264Parameters*>(h264_1_params);
ASSERT_EQ((uint32_t)0x42e00d, parsed_h264_1_params.profile_level_id);
ASSERT_EQ((uint32_t)0x42e01f, parsed_h264_1_params.profile_level_id);
ASSERT_TRUE(parsed_h264_1_params.level_asymmetry_allowed);
ASSERT_EQ(1U, parsed_h264_1_params.packetization_mode);
@ -3437,7 +3437,7 @@ TEST_F(JsepSessionTest, ValidateOfferedVideoCodecParams) {
const auto& parsed_h264_0_params =
*static_cast<const SdpFmtpAttributeList::H264Parameters*>(h264_0_params);
ASSERT_EQ((uint32_t)0x42e00d, parsed_h264_0_params.profile_level_id);
ASSERT_EQ((uint32_t)0x42e01f, parsed_h264_0_params.profile_level_id);
ASSERT_TRUE(parsed_h264_0_params.level_asymmetry_allowed);
ASSERT_EQ(0U, parsed_h264_0_params.packetization_mode);
@ -3888,7 +3888,7 @@ static void ForceH264(JsepSession& session, uint32_t profileLevelId) {
TEST_F(JsepSessionTest, TestH264Negotiation) {
ForceH264(*mSessionOff, 0x42e00b);
ForceH264(*mSessionAns, 0x42e00d);
ForceH264(*mSessionAns, 0x42e01f);
AddTracks(*mSessionOff, "video");
AddTracks(*mSessionAns, "video");
@ -3908,7 +3908,7 @@ TEST_F(JsepSessionTest, TestH264Negotiation) {
ASSERT_EQ("H264", offererSendCodec->mName);
const JsepVideoCodecDescription* offererVideoSendCodec(
static_cast<const JsepVideoCodecDescription*>(offererSendCodec.get()));
ASSERT_EQ((uint32_t)0x42e00d, offererVideoSendCodec->mProfileLevelId);
ASSERT_EQ((uint32_t)0x42e01f, offererVideoSendCodec->mProfileLevelId);
UniquePtr<JsepCodecDescription> offererRecvCodec;
GetCodec(*mSessionOff, 0, sdp::kRecv, 0, 0, &offererRecvCodec);
@ -3930,12 +3930,12 @@ TEST_F(JsepSessionTest, TestH264Negotiation) {
ASSERT_EQ("H264", answererRecvCodec->mName);
const JsepVideoCodecDescription* answererVideoRecvCodec(
static_cast<const JsepVideoCodecDescription*>(answererRecvCodec.get()));
ASSERT_EQ((uint32_t)0x42e00d, answererVideoRecvCodec->mProfileLevelId);
ASSERT_EQ((uint32_t)0x42e01f, answererVideoRecvCodec->mProfileLevelId);
}
TEST_F(JsepSessionTest, TestH264NegotiationFails) {
ForceH264(*mSessionOff, 0x42000b);
ForceH264(*mSessionAns, 0x42e00d);
ForceH264(*mSessionAns, 0x42e01f);
AddTracks(*mSessionOff, "video");
AddTracks(*mSessionAns, "video");
@ -4016,7 +4016,7 @@ TEST_F(JsepSessionTest, TestH264NegotiationOffererNoFmtp) {
TEST_F(JsepSessionTest, TestH264LevelAsymmetryDisallowedByOffererWithLowLevel) {
ForceH264(*mSessionOff, 0x42e00b);
ForceH264(*mSessionAns, 0x42e00d);
ForceH264(*mSessionAns, 0x42e01f);
AddTracks(*mSessionOff, "video");
AddTracks(*mSessionAns, "video");
@ -4053,7 +4053,7 @@ TEST_F(JsepSessionTest, TestH264LevelAsymmetryDisallowedByOffererWithLowLevel) {
TEST_F(JsepSessionTest,
TestH264LevelAsymmetryDisallowedByOffererWithHighLevel) {
ForceH264(*mSessionOff, 0x42e00d);
ForceH264(*mSessionOff, 0x42e01f);
ForceH264(*mSessionAns, 0x42e00b);
AddTracks(*mSessionOff, "video");
@ -4091,7 +4091,7 @@ TEST_F(JsepSessionTest,
TEST_F(JsepSessionTest,
TestH264LevelAsymmetryDisallowedByAnswererWithLowLevel) {
ForceH264(*mSessionOff, 0x42e00d);
ForceH264(*mSessionOff, 0x42e01f);
ForceH264(*mSessionAns, 0x42e00b);
AddTracks(*mSessionOff, "video");
@ -4130,7 +4130,7 @@ TEST_F(JsepSessionTest,
TEST_F(JsepSessionTest,
TestH264LevelAsymmetryDisallowedByAnswererWithHighLevel) {
ForceH264(*mSessionOff, 0x42e00b);
ForceH264(*mSessionAns, 0x42e00d);
ForceH264(*mSessionAns, 0x42e01f);
AddTracks(*mSessionOff, "video");
AddTracks(*mSessionAns, "video");

6
media/webrtc/signaling/gtest/jsep_track_unittest.cpp
View file

@ -1482,7 +1482,7 @@ TEST_F(JsepTrackTest, RtcpFbWithPayloadTypeAsymmetry) {
"c=IN IP4 0.0.0.0\r\n"
"a=sendrecv\r\n"
"a=fmtp:136 "
"profile-level-id=42e00d;level-asymmetry-allowed=1;packetization-mode="
"profile-level-id=42e01f;level-asymmetry-allowed=1;packetization-mode="
"1\r\n"
"a=msid:stream_id\r\n"
"a=rtcp-fb:136 nack\r\n"
@ -1651,12 +1651,12 @@ TEST_F(JsepTrackTest, VideoSdpFmtpLine) {
EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 4, 2)));
EXPECT_EQ("H264", codec->mName);
EXPECT_EQ(
"profile-level-id=42e00d;level-asymmetry-allowed=1;packetization-mode=1",
"profile-level-id=42e01f;level-asymmetry-allowed=1;packetization-mode=1",
codec->mSdpFmtpLine.valueOr("nothing"));
EXPECT_TRUE((codec = GetVideoCodec(mSendAns, 4, 2)));
EXPECT_EQ("H264", codec->mName);
EXPECT_EQ(
"profile-level-id=42e00d;level-asymmetry-allowed=1;packetization-mode=1",
"profile-level-id=42e01f;level-asymmetry-allowed=1;packetization-mode=1",
codec->mSdpFmtpLine.valueOr("nothing"));
EXPECT_TRUE((codec = GetVideoCodec(mSendOff, 4, 3)));

4
media/webrtc/signaling/gtest/videoconduit_unittests.cpp
View file

@ -2281,7 +2281,7 @@ TEST_F(VideoConduitTest, TestExternalRemoteSsrcCollision) {
}
TEST_F(VideoConduitTest, TestVideoConfigurationH264) {
const int profileLevelId1 = 0x42E00D;
const int profileLevelId1 = 0x42E01F;
const int profileLevelId2 = 0x64000C;
const char* sprop1 = "foo bar";
const char* sprop2 = "baz";
@ -2309,7 +2309,7 @@ TEST_F(VideoConduitTest, TestVideoConfigurationH264) {
ASSERT_TRUE(Call()->mVideoSendEncoderConfig);
auto& params = Call()->mVideoSendEncoderConfig->video_format.parameters;
EXPECT_EQ(params[cricket::kH264FmtpPacketizationMode], "0");
EXPECT_EQ(params[cricket::kH264FmtpProfileLevelId], "42e00d");
EXPECT_EQ(params[cricket::kH264FmtpProfileLevelId], "42e01f");
EXPECT_EQ(params[cricket::kH264FmtpSpropParameterSets], sprop1);
}

4
testing/web-platform/meta/media-capabilities/decodingInfo.webrtc.html.ini
View file

@ -32,10 +32,10 @@
bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825286
expected: FAIL
[Test that decodingInfo returns supported true for the codec video/H264; profile-level-id=42e00d;level-asymmetry-allowed=1;packetization-mode=1 returned by RTCRtpReceiver.getCapabilities()]
[Test that decodingInfo returns supported true for the codec video/H264; profile-level-id=42e01f;level-asymmetry-allowed=1;packetization-mode=1 returned by RTCRtpReceiver.getCapabilities()]
bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825286
expected: FAIL
[Test that decodingInfo returns supported true for the codec video/H264; profile-level-id=42e00d;level-asymmetry-allowed=1 returned by RTCRtpReceiver.getCapabilities()]
[Test that decodingInfo returns supported true for the codec video/H264; profile-level-id=42e01f;level-asymmetry-allowed=1 returned by RTCRtpReceiver.getCapabilities()]
bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825286
expected: FAIL

4
testing/web-platform/meta/media-capabilities/encodingInfo.webrtc.html.ini
View file

@ -34,10 +34,10 @@
bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825286
expected: FAIL
[Test that encodingInfo returns supported true for the codec video/H264; profile-level-id=42e00d;level-asymmetry-allowed=1;packetization-mode=1 returned by RTCRtpSender.getCapabilities()]
[Test that encodingInfo returns supported true for the codec video/H264; profile-level-id=42e01f;level-asymmetry-allowed=1;packetization-mode=1 returned by RTCRtpSender.getCapabilities()]
bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825286
expected: FAIL
[Test that encodingInfo returns supported true for the codec video/H264; profile-level-id=42e00d;level-asymmetry-allowed=1 returned by RTCRtpSender.getCapabilities()]
[Test that encodingInfo returns supported true for the codec video/H264; profile-level-id=42e01f;level-asymmetry-allowed=1 returned by RTCRtpSender.getCapabilities()]
bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825286
expected: FAIL