diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc index 6f70297447..16dcbb59ab 100644 --- a/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc +++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc @@ -13,6 +13,7 @@ #include #include +#include #include #include "modules/rtp_rtcp/source/leb128.h" @@ -367,7 +368,7 @@ VideoRtpDepacketizerAv1::Parse(rtc::CopyOnWriteBuffer rtp_payload) { // new coded video sequence can't start from an OBU fragment. return std::nullopt; } - std::optional parsed(absl::in_place); + std::optional parsed(std::in_place); // To assemble frame, all of the rtp payload is required, including // aggregation header. diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc index ec8993b191..344bb3f1e1 100644 --- a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc +++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc @@ -39,7 +39,7 @@ VideoRtpDepacketizerGeneric::Parse(rtc::CopyOnWriteBuffer rtp_payload) { RTC_LOG(LS_WARNING) << "Empty payload."; return std::nullopt; } - std::optional parsed(absl::in_place); + std::optional parsed(std::in_place); const uint8_t* payload_data = rtp_payload.cdata(); uint8_t generic_header = payload_data[0]; diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.cc index 49a4a3764c..cb11329b5a 100644 --- a/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.cc +++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.cc @@ -63,7 +63,7 @@ std::optional ProcessStapAOrSingleNalu( rtc::CopyOnWriteBuffer rtp_payload) { const uint8_t* const payload_data = rtp_payload.cdata(); std::optional parsed_payload( - absl::in_place); + std::in_place); bool modified_buffer = false; parsed_payload->video_payload = rtp_payload; parsed_payload->video_header.width = 0; @@ -234,7 +234,7 @@ std::optional ParseFuaNalu( return std::nullopt; } std::optional parsed_payload( - absl::in_place); + std::in_place); uint8_t fnri = rtp_payload.cdata()[0] & (kH264FBit | kH264NriMask); uint8_t original_nal_type = rtp_payload.cdata()[1] & kH264TypeMask; bool first_fragment = (rtp_payload.cdata()[1] & kH264SBit) > 0; diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.cc index d16e638d06..e0ed2215af 100644 --- a/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.cc +++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.cc @@ -71,7 +71,7 @@ std::optional ProcessApOrSingleNalu( } const uint8_t* const payload_data = rtp_payload.cdata(); std::optional parsed_payload( - absl::in_place); + std::in_place); parsed_payload->video_header.width = 0; parsed_payload->video_header.height = 0; parsed_payload->video_header.codec = kVideoCodecH265; @@ -191,7 +191,7 @@ std::optional ParseFuNalu( return std::nullopt; } std::optional parsed_payload( - absl::in_place); + std::in_place); uint8_t f = rtp_payload.cdata()[0] & kH265FBit; uint8_t layer_id_h = rtp_payload.cdata()[0] & kH265LayerIDHMask; diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.cc index f4f4a794ea..f18e344baa 100644 --- a/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.cc +++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.cc @@ -20,7 +20,7 @@ namespace webrtc { std::optional VideoRtpDepacketizerRaw::Parse(rtc::CopyOnWriteBuffer rtp_payload) { - std::optional parsed(absl::in_place); + std::optional parsed(std::in_place); parsed->video_payload = std::move(rtp_payload); return parsed; } diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc index 157ad37aaa..709415771f 100644 --- a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc +++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc @@ -136,7 +136,7 @@ std::optional VideoRtpDepacketizerVp8::Parse(rtc::CopyOnWriteBuffer rtp_payload) { rtc::ArrayView payload(rtp_payload.cdata(), rtp_payload.size()); - std::optional result(absl::in_place); + std::optional result(std::in_place); int offset = ParseRtpPayload(payload, &result->video_header); if (offset == kFailedToParse) return std::nullopt; diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc index ebd27ffdea..574c7c8530 100644 --- a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc +++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc @@ -12,6 +12,8 @@ #include +#include + #include "api/video/video_codec_constants.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/video_coding/codecs/interface/common_constants.h" @@ -148,7 +150,7 @@ void ParseSsData(BitstreamReader& parser, RTPVideoHeaderVP9* vp9) { std::optional VideoRtpDepacketizerVp9::Parse(rtc::CopyOnWriteBuffer rtp_payload) { - std::optional result(absl::in_place); + std::optional result(std::in_place); int offset = ParseRtpPayload(rtp_payload, &result->video_header); if (offset == 0) return std::nullopt; diff --git a/rtc_base/bitstream_reader_unittest.cc b/rtc_base/bitstream_reader_unittest.cc index b9b51a2571..3a48e7d086 100644 --- a/rtc_base/bitstream_reader_unittest.cc +++ b/rtc_base/bitstream_reader_unittest.cc @@ -28,7 +28,7 @@ namespace { TEST(BitstreamReaderTest, InDebugModeRequiresToCheckOkStatusBeforeDestruction) { const uint8_t bytes[32] = {}; - std::optional reader(absl::in_place, bytes); + std::optional reader(std::in_place, bytes); EXPECT_GE(reader->ReadBits(7), 0u); #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(OS_ANDROID) @@ -40,7 +40,7 @@ TEST(BitstreamReaderTest, InDebugModeRequiresToCheckOkStatusBeforeDestruction) { TEST(BitstreamReaderTest, InDebugModeMayCheckRemainingBitsInsteadOfOkStatus) { const uint8_t bytes[32] = {}; - std::optional reader(absl::in_place, bytes); + std::optional reader(std::in_place, bytes); EXPECT_GE(reader->ReadBit(), 0); #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(OS_ANDROID)