Prepare to rename RTC_NOTREACHED to RTC_DCHECK_NOTREACHED

Add implementation of RTC_DCHECK_NOTREACHED equal to the RTC_NOTREACHED.
The new macros will replace the old one when old one's usage will be
removed. The idea of the renaming to provide a clear signal that this
is debug build only macros and will be stripped in the production build.

Bug: webrtc:9065
Change-Id: I4c35d8b03e74a4b3fd1ae75dba2f9c05643101db
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/237802
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35348}
This commit is contained in:
Artem Titov
2021-11-15 16:57:07 +01:00
committed by WebRTC LUCI CQ
parent f5ea3b96cd
commit d3251968d1
263 changed files with 604 additions and 583 deletions

View File

@ -36,7 +36,7 @@ class CallbackWithSeverityLogSink : public rtc::LogSink {
CallbackWithSeverityLogSink(RTCCallbackLoggerMessageAndSeverityHandler callbackHandler)
: callback_handler_(callbackHandler) {}
void OnLogMessage(const std::string& message) override { RTC_NOTREACHED(); }
void OnLogMessage(const std::string& message) override { RTC_DCHECK_NOTREACHED(); }
void OnLogMessage(const std::string& message, rtc::LoggingSeverity severity) override {
if (callback_handler_) {

View File

@ -35,7 +35,7 @@
- (instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory) *)factory
nativeMediaSource:(rtc::scoped_refptr<webrtc::MediaSourceInterface>)nativeMediaSource
type:(RTCMediaSourceType)type {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return nil;
}

View File

@ -61,10 +61,10 @@ const NSString * const kRTCH264CodecName = @(cricket::kH264CodecName);
_kind = kRTCMediaStreamTrackKindVideo;
break;
case cricket::MEDIA_TYPE_DATA:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
break;
case cricket::MEDIA_TYPE_UNSUPPORTED:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
break;
}
if (nativeParameters.clock_rate) {
@ -94,7 +94,7 @@ const NSString * const kRTCH264CodecName = @(cricket::kH264CodecName);
} else if (_kind == kRTCMediaStreamTrackKindVideo) {
parameters.kind = cricket::MEDIA_TYPE_VIDEO;
} else {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
if (_clockRate != nil) {
parameters.clock_rate = absl::optional<int>(_clockRate.intValue);

View File

@ -95,7 +95,7 @@
} else if (string == webrtc::SessionDescriptionInterface::kRollback) {
return RTCSdpTypeRollback;
} else {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return RTCSdpTypeOffer;
}
}

View File

@ -112,7 +112,7 @@ NSObject *ValueFromStatsMember(const RTCStatsMemberInterface *member) {
return [dictionary copy];
}
default:
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
}

View File

@ -44,7 +44,7 @@ static webrtc::ObjCVideoTrackSource *getObjCVideoSource(
- (instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory) *)factory
nativeMediaSource:(rtc::scoped_refptr<webrtc::MediaSourceInterface>)nativeMediaSource
type:(RTCMediaSourceType)type {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return nil;
}

View File

@ -33,16 +33,16 @@
#pragma mark - RTC_OBJC_TYPE(RTCVideoDecoder)
- (void)setCallback:(RTCVideoDecoderCallback)callback {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
- (NSInteger)startDecodeWithNumberOfCores:(int)numberOfCores {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return 0;
}
- (NSInteger)releaseDecoder {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return 0;
}
@ -50,12 +50,12 @@
missingFrames:(BOOL)missingFrames
codecSpecificInfo:(nullable id<RTC_OBJC_TYPE(RTCCodecSpecificInfo)>)info
renderTimeMs:(int64_t)renderTimeMs {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return 0;
}
- (NSString *)implementationName {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return nil;
}

View File

@ -33,54 +33,54 @@
#pragma mark - RTC_OBJC_TYPE(RTCVideoEncoder)
- (void)setCallback:(RTCVideoEncoderCallback)callback {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
}
- (NSInteger)startEncodeWithSettings:(RTC_OBJC_TYPE(RTCVideoEncoderSettings) *)settings
numberOfCores:(int)numberOfCores {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return 0;
}
- (NSInteger)releaseEncoder {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return 0;
}
- (NSInteger)encode:(RTC_OBJC_TYPE(RTCVideoFrame) *)frame
codecSpecificInfo:(nullable id<RTC_OBJC_TYPE(RTCCodecSpecificInfo)>)info
frameTypes:(NSArray<NSNumber *> *)frameTypes {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return 0;
}
- (int)setBitrate:(uint32_t)bitrateKbit framerate:(uint32_t)framerate {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return 0;
}
- (NSString *)implementationName {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return nil;
}
- (nullable RTC_OBJC_TYPE(RTCVideoEncoderQpThresholds) *)scalingSettings {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return nil;
}
- (NSInteger)resolutionAlignment {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return 1;
}
- (BOOL)applyAlignmentToAllSimulcastLayers {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return NO;
}
- (BOOL)supportsNativeHandle {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return NO;
}
@end

View File

@ -126,7 +126,7 @@ static NSString *const shaderSource = MTL_STRINGIFY(
mtlPixelFormat = MTLPixelFormatRGBA8Unorm;
isARGB = true;
} else {
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
return NO;
}

View File

@ -153,12 +153,12 @@ static const NSInteger kMaxInflightBuffers = 1;
}
- (NSString *)shaderSource {
RTC_NOTREACHED() << "Virtual method not implemented in subclass.";
RTC_DCHECK_NOTREACHED() << "Virtual method not implemented in subclass.";
return nil;
}
- (void)uploadTexturesToRenderEncoder:(id<MTLRenderCommandEncoder>)renderEncoder {
RTC_NOTREACHED() << "Virtual method not implemented in subclass.";
RTC_DCHECK_NOTREACHED() << "Virtual method not implemented in subclass.";
}
- (void)getWidth:(int *)width
@ -168,7 +168,7 @@ static const NSInteger kMaxInflightBuffers = 1;
cropX:(int *)cropX
cropY:(int *)cropY
ofFrame:(nonnull RTC_OBJC_TYPE(RTCVideoFrame) *)frame {
RTC_NOTREACHED() << "Virtual method not implemented in subclass.";
RTC_DCHECK_NOTREACHED() << "Virtual method not implemented in subclass.";
}
- (BOOL)setupTexturesForFrame:(nonnull RTC_OBJC_TYPE(RTCVideoFrame) *)frame {

View File

@ -116,7 +116,7 @@
return 0; // Scaling RGBA frames does not require a temporary buffer.
}
}
RTC_NOTREACHED() << "Unsupported pixel format.";
RTC_DCHECK_NOTREACHED() << "Unsupported pixel format.";
return 0;
}
@ -146,7 +146,9 @@
[self cropAndScaleARGBTo:outputPixelBuffer];
break;
}
default: { RTC_NOTREACHED() << "Unsupported pixel format."; }
default: {
RTC_DCHECK_NOTREACHED() << "Unsupported pixel format.";
}
}
return YES;
@ -242,7 +244,9 @@
}
break;
}
default: { RTC_NOTREACHED() << "Unsupported pixel format."; }
default: {
RTC_DCHECK_NOTREACHED() << "Unsupported pixel format.";
}
}
CVPixelBufferUnlockBaseAddress(_pixelBuffer, kCVPixelBufferLock_ReadOnly);

View File

@ -779,7 +779,7 @@ void AudioDeviceIOS::UpdateAudioUnit(bool can_play_or_record) {
switch (audio_unit_->GetState()) {
case VoiceProcessingAudioUnit::kInitRequired:
RTCLog(@"VPAU state: InitRequired");
RTC_NOTREACHED();
RTC_DCHECK_NOTREACHED();
break;
case VoiceProcessingAudioUnit::kUninitialized:
RTCLog(@"VPAU state: Uninitialized");
@ -1006,22 +1006,22 @@ int32_t AudioDeviceIOS::SpeakerVolumeIsAvailable(bool& available) {
}
int32_t AudioDeviceIOS::SetSpeakerVolume(uint32_t volume) {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
int32_t AudioDeviceIOS::SpeakerVolume(uint32_t& volume) const {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
int32_t AudioDeviceIOS::MaxSpeakerVolume(uint32_t& maxVolume) const {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
int32_t AudioDeviceIOS::MinSpeakerVolume(uint32_t& minVolume) const {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
@ -1031,12 +1031,12 @@ int32_t AudioDeviceIOS::SpeakerMuteIsAvailable(bool& available) {
}
int32_t AudioDeviceIOS::SetSpeakerMute(bool enable) {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
int32_t AudioDeviceIOS::SpeakerMute(bool& enabled) const {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
@ -1046,7 +1046,7 @@ int32_t AudioDeviceIOS::SetPlayoutDevice(uint16_t index) {
}
int32_t AudioDeviceIOS::SetPlayoutDevice(AudioDeviceModule::WindowsDeviceType) {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
@ -1064,12 +1064,12 @@ int32_t AudioDeviceIOS::MicrophoneMuteIsAvailable(bool& available) {
}
int32_t AudioDeviceIOS::SetMicrophoneMute(bool enable) {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
int32_t AudioDeviceIOS::MicrophoneMute(bool& enabled) const {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
@ -1109,36 +1109,36 @@ int32_t AudioDeviceIOS::MicrophoneVolumeIsAvailable(bool& available) {
}
int32_t AudioDeviceIOS::SetMicrophoneVolume(uint32_t volume) {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
int32_t AudioDeviceIOS::MicrophoneVolume(uint32_t& volume) const {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
int32_t AudioDeviceIOS::MaxMicrophoneVolume(uint32_t& maxVolume) const {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
int32_t AudioDeviceIOS::MinMicrophoneVolume(uint32_t& minVolume) const {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
int32_t AudioDeviceIOS::PlayoutDeviceName(uint16_t index,
char name[kAdmMaxDeviceNameSize],
char guid[kAdmMaxGuidSize]) {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
int32_t AudioDeviceIOS::RecordingDeviceName(uint16_t index,
char name[kAdmMaxDeviceNameSize],
char guid[kAdmMaxGuidSize]) {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}
@ -1148,7 +1148,7 @@ int32_t AudioDeviceIOS::SetRecordingDevice(uint16_t index) {
}
int32_t AudioDeviceIOS::SetRecordingDevice(AudioDeviceModule::WindowsDeviceType) {
RTC_NOTREACHED() << "Not implemented";
RTC_DCHECK_NOTREACHED() << "Not implemented";
return -1;
}