diff options
316 files changed, 406 insertions, 406 deletions
diff --git a/common_audio/resampler/include/resampler.h b/common_audio/resampler/include/resampler.h index ee0065e9..4f570312 100644 --- a/common_audio/resampler/include/resampler.h +++ b/common_audio/resampler/include/resampler.h @@ -111,6 +111,6 @@ private: Resampler* slave_right_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_RESAMPLER_RESAMPLER_H_ diff --git a/common_audio/resampler/resampler.cc b/common_audio/resampler/resampler.cc index df2a5474..071e551d 100644 --- a/common_audio/resampler/resampler.cc +++ b/common_audio/resampler/resampler.cc @@ -1081,4 +1081,4 @@ int Resampler::Pull(int16_t* samplesOut, int desiredLen, int &outLen) } } -} // namespace webrtc +} // namespace webrtc diff --git a/common_video/interface/video_image.h b/common_video/interface/video_image.h index 2a7c4459..a7b65fd2 100644 --- a/common_video/interface/video_image.h +++ b/common_video/interface/video_image.h @@ -64,6 +64,6 @@ public: bool _completeFrame; }; -} // namespace webrtc +} // namespace webrtc #endif // COMMON_VIDEO_INTERFACE_VIDEO_IMAGE_H diff --git a/common_video/jpeg/data_manager.cc b/common_video/jpeg/data_manager.cc index 72380e7c..80971f9c 100644 --- a/common_video/jpeg/data_manager.cc +++ b/common_video/jpeg/data_manager.cc @@ -83,4 +83,4 @@ termSource (j_decompress_ptr cinfo) // } -} // end of namespace webrtc +} // namespace webrtc diff --git a/common_video/jpeg/data_manager.h b/common_video/jpeg/data_manager.h index 61609eca..8c569784 100644 --- a/common_video/jpeg/data_manager.h +++ b/common_video/jpeg/data_manager.h @@ -62,7 +62,7 @@ skipInputData(j_decompress_ptr cinfo, long num_bytes); void termSource (j_decompress_ptr cinfo); -} // end of namespace webrtc +} // namespace webrtc #endif /* WEBRTC_COMMON_VIDEO_JPEG_DATA_MANAGER */ diff --git a/modules/audio_coding/main/source/acm_dtmf_detection.h b/modules/audio_coding/main/source/acm_dtmf_detection.h index cd265fed..43a9047a 100644 --- a/modules/audio_coding/main/source/acm_dtmf_detection.h +++ b/modules/audio_coding/main/source/acm_dtmf_detection.h @@ -33,6 +33,6 @@ class ACMDTMFDetection { ACMResampler resampler_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_SOURCE_ACM_DTMF_DETECTION_H_ diff --git a/modules/audio_coding/main/source/acm_isac_macros.h b/modules/audio_coding/main/source/acm_isac_macros.h index 99d70845..6ae4526f 100644 --- a/modules/audio_coding/main/source/acm_isac_macros.h +++ b/modules/audio_coding/main/source/acm_isac_macros.h @@ -67,7 +67,7 @@ namespace webrtc { #define ACM_ISAC_GETDECSAMPRATE ACMISACFixGetDecSampRate // local Impl #endif -} //namespace +} // namespace #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_SOURCE_ACM_ISAC_MACROS_H_ diff --git a/modules/audio_coding/neteq/test/NetEqRTPplay.cc b/modules/audio_coding/neteq/test/NetEqRTPplay.cc index 3ad8e050..b3003eda 100644 --- a/modules/audio_coding/neteq/test/NetEqRTPplay.cc +++ b/modules/audio_coding/neteq/test/NetEqRTPplay.cc @@ -1269,7 +1269,7 @@ void parsePtypeFile(FILE *ptypeFile, std::map<uint8_t, decoderStruct>* decoders) } n = fscanf(ptypeFile, "%s %i\n", codec, &pt); - } // end while + } // end while } diff --git a/modules/audio_coding/neteq/test/RTPencode.cc b/modules/audio_coding/neteq/test/RTPencode.cc index 45313be8..a5e65b61 100644 --- a/modules/audio_coding/neteq/test/RTPencode.cc +++ b/modules/audio_coding/neteq/test/RTPencode.cc @@ -1571,7 +1571,7 @@ int NetEQTest_init_coders(enum WebRtcNetEQDecoder coder, int enc_frameSize, int if (ok != 0) { return(ok); } - } // end for + } // end for return(0); } @@ -1974,7 +1974,7 @@ int NetEQTest_encode(int coder, int16_t *indata, int frameLen, unsigned char * e encoded += cdlen; totalLen += cdlen; - } // end for + } // end for first_cng=1; return(totalLen); diff --git a/modules/audio_coding/neteq4/test/RTPencode.cc b/modules/audio_coding/neteq4/test/RTPencode.cc index 2c385564..370fc05f 100644 --- a/modules/audio_coding/neteq4/test/RTPencode.cc +++ b/modules/audio_coding/neteq4/test/RTPencode.cc @@ -1383,7 +1383,7 @@ int NetEQTest_init_coders(webrtc::NetEqDecoder coder, int enc_frameSize, int bit if (ok != 0) { return(ok); } - } // end for + } // end for return(0); } @@ -1669,7 +1669,7 @@ int NetEQTest_encode(int coder, int16_t *indata, int frameLen, unsigned char * e encoded += cdlen; totalLen += cdlen; - } // end for + } // end for first_cng=1; return(totalLen); diff --git a/modules/audio_conference_mixer/interface/audio_conference_mixer.h b/modules/audio_conference_mixer/interface/audio_conference_mixer.h index 711dd512..352537d6 100644 --- a/modules/audio_conference_mixer/interface/audio_conference_mixer.h +++ b/modules/audio_conference_mixer/interface/audio_conference_mixer.h @@ -80,6 +80,6 @@ public: protected: AudioConferenceMixer() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_H_ diff --git a/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h b/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h index fac071f4..ba04b5a4 100644 --- a/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h +++ b/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h @@ -100,6 +100,6 @@ protected: AudioRelayReceiver() {} virtual ~AudioRelayReceiver() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ diff --git a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc index 107949bf..ab9d803e 100644 --- a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc @@ -1217,4 +1217,4 @@ bool AudioConferenceMixerImpl::LimitMixedAudio(AudioFrame& mixedAudio) } return true; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h index 46a9a8bf..261cd88d 100644 --- a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h +++ b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h @@ -203,6 +203,6 @@ private: // Used for inhibiting saturation in mixing. scoped_ptr<AudioProcessing> _limiter; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_ diff --git a/modules/audio_conference_mixer/source/audio_frame_manipulator.cc b/modules/audio_conference_mixer/source/audio_frame_manipulator.cc index 6c1106dc..679d608f 100644 --- a/modules/audio_conference_mixer/source/audio_frame_manipulator.cc +++ b/modules/audio_conference_mixer/source/audio_frame_manipulator.cc @@ -36,7 +36,7 @@ const float rampArray[] = {0.0000f, 0.0127f, 0.0253f, 0.0380f, 0.9114f, 0.9241f, 0.9367f, 0.9494f, 0.9620f, 0.9747f, 0.9873f, 1.0000f}; const int rampSize = sizeof(rampArray)/sizeof(rampArray[0]); -} // namespace +} // namespace namespace webrtc { void CalculateEnergy(AudioFrame& audioFrame) @@ -78,4 +78,4 @@ void RampOut(AudioFrame& audioFrame) (audioFrame.samples_per_channel_ - rampSize) * sizeof(audioFrame.data_[0])); } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_conference_mixer/source/audio_frame_manipulator.h b/modules/audio_conference_mixer/source/audio_frame_manipulator.h index fdf5d333..2da3a4d0 100644 --- a/modules/audio_conference_mixer/source/audio_frame_manipulator.h +++ b/modules/audio_conference_mixer/source/audio_frame_manipulator.h @@ -21,6 +21,6 @@ void CalculateEnergy(AudioFrame& audioFrame); void RampIn(AudioFrame& audioFrame); void RampOut(AudioFrame& audioFrame); -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_FRAME_MANIPULATOR_H_ diff --git a/modules/audio_conference_mixer/source/level_indicator.cc b/modules/audio_conference_mixer/source/level_indicator.cc index 2bac42c6..3c573d41 100644 --- a/modules/audio_conference_mixer/source/level_indicator.cc +++ b/modules/audio_conference_mixer/source/level_indicator.cc @@ -73,4 +73,4 @@ int32_t LevelIndicator::GetLevel() return _currentLevel; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_conference_mixer/source/level_indicator.h b/modules/audio_conference_mixer/source/level_indicator.h index fdf78371..b0e87ffa 100644 --- a/modules/audio_conference_mixer/source/level_indicator.h +++ b/modules/audio_conference_mixer/source/level_indicator.h @@ -32,6 +32,6 @@ private: uint32_t _count; uint32_t _currentLevel; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_LEVEL_INDICATOR_H_ diff --git a/modules/audio_conference_mixer/source/memory_pool.h b/modules/audio_conference_mixer/source/memory_pool.h index 36f22487..3c7e1b71 100644 --- a/modules/audio_conference_mixer/source/memory_pool.h +++ b/modules/audio_conference_mixer/source/memory_pool.h @@ -117,6 +117,6 @@ int32_t MemoryPool<MemoryType>::PushMemory(MemoryType*& memory) } return _ptrImpl->PushMemory(memory); } -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ diff --git a/modules/audio_conference_mixer/source/memory_pool_posix.h b/modules/audio_conference_mixer/source/memory_pool_posix.h index 3dd4e0e7..6d4dccf8 100644 --- a/modules/audio_conference_mixer/source/memory_pool_posix.h +++ b/modules/audio_conference_mixer/source/memory_pool_posix.h @@ -163,6 +163,6 @@ int32_t MemoryPoolImpl<MemoryType>::CreateMemory( } return 0; } -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_GENERIC_H_ diff --git a/modules/audio_conference_mixer/source/memory_pool_win.h b/modules/audio_conference_mixer/source/memory_pool_win.h index 571b978f..772a123a 100644 --- a/modules/audio_conference_mixer/source/memory_pool_win.h +++ b/modules/audio_conference_mixer/source/memory_pool_win.h @@ -194,6 +194,6 @@ MemoryPoolItem<MemoryType>* MemoryPoolImpl<MemoryType>::CreateMemory() ++_createdMemory; return returnValue; } -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_WINDOWS_H_ diff --git a/modules/audio_conference_mixer/source/time_scheduler.cc b/modules/audio_conference_mixer/source/time_scheduler.cc index bfb7f01b..738f8262 100644 --- a/modules/audio_conference_mixer/source/time_scheduler.cc +++ b/modules/audio_conference_mixer/source/time_scheduler.cc @@ -99,4 +99,4 @@ int32_t TimeScheduler::TimeToNextUpdate( updateTimeInMS = (updateTimeInMS < 0) ? 0 : updateTimeInMS; return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_conference_mixer/source/time_scheduler.h b/modules/audio_conference_mixer/source/time_scheduler.h index 83d3a97b..5a770066 100644 --- a/modules/audio_conference_mixer/source/time_scheduler.h +++ b/modules/audio_conference_mixer/source/time_scheduler.h @@ -42,6 +42,6 @@ private: int64_t _periodicityInTicks; uint32_t _missedPeriods; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ diff --git a/modules/audio_device/android/audio_device_jni_android.cc b/modules/audio_device/android/audio_device_jni_android.cc index 8afdc502..d6375382 100644 --- a/modules/audio_device/android/audio_device_jni_android.cc +++ b/modules/audio_device/android/audio_device_jni_android.cc @@ -2730,7 +2730,7 @@ bool AudioDeviceAndroidJni::PlayThreadProcess() Lock(); - } // _playing + } // _playing if (_shutdownPlayThread) { @@ -2867,7 +2867,7 @@ bool AudioDeviceAndroidJni::RecThreadProcess() Lock(); } - } // _recording + } // _recording if (_shutdownRecThread) { @@ -2898,4 +2898,4 @@ bool AudioDeviceAndroidJni::RecThreadProcess() return true; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_device/android/audio_device_jni_android.h b/modules/audio_device/android/audio_device_jni_android.h index 33aa9523..dee9eac5 100644 --- a/modules/audio_device/android/audio_device_jni_android.h +++ b/modules/audio_device/android/audio_device_jni_android.h @@ -264,6 +264,6 @@ class AudioDeviceAndroidJni : public AudioDeviceGeneric { static jclass globalScClass; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_JNI_ANDROID_H diff --git a/modules/audio_device/android/audio_device_utility_android.cc b/modules/audio_device/android/audio_device_utility_android.cc index c21972fa..b3dadf43 100644 --- a/modules/audio_device/android/audio_device_utility_android.cc +++ b/modules/audio_device/android/audio_device_utility_android.cc @@ -47,4 +47,4 @@ int32_t AudioDeviceUtilityAndroid::Init() return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_device/android/audio_device_utility_android.h b/modules/audio_device/android/audio_device_utility_android.h index 24644b89..ae66e428 100644 --- a/modules/audio_device/android/audio_device_utility_android.h +++ b/modules/audio_device/android/audio_device_utility_android.h @@ -35,6 +35,6 @@ private: int32_t _id; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_ANDROID_H diff --git a/modules/audio_device/dummy/audio_device_utility_dummy.h b/modules/audio_device/dummy/audio_device_utility_dummy.h index c8bb1808..5cc49d39 100644 --- a/modules/audio_device/dummy/audio_device_utility_dummy.h +++ b/modules/audio_device/dummy/audio_device_utility_dummy.h @@ -27,6 +27,6 @@ public: virtual int32_t Init() { return 0; } }; -} // namespace webrtc +} // namespace webrtc #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_UTILITY_DUMMY_H_ diff --git a/modules/audio_device/ios/audio_device_utility_ios.cc b/modules/audio_device/ios/audio_device_utility_ios.cc index bb4a1c18..b8cf218f 100644 --- a/modules/audio_device/ios/audio_device_utility_ios.cc +++ b/modules/audio_device/ios/audio_device_utility_ios.cc @@ -42,4 +42,4 @@ int32_t AudioDeviceUtilityIPhone::Init() { return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_device/ios/audio_device_utility_ios.h b/modules/audio_device/ios/audio_device_utility_ios.h index 2892a7d0..e9f8c545 100644 --- a/modules/audio_device/ios/audio_device_utility_ios.h +++ b/modules/audio_device/ios/audio_device_utility_ios.h @@ -31,6 +31,6 @@ private: AudioDeviceModule::ErrorCode _lastError; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_IPHONE_H diff --git a/modules/audio_device/linux/audio_device_pulse_linux.cc b/modules/audio_device/linux/audio_device_pulse_linux.cc index 56329a37..bc3e6213 100644 --- a/modules/audio_device/linux/audio_device_pulse_linux.cc +++ b/modules/audio_device/linux/audio_device_pulse_linux.cc @@ -2954,7 +2954,7 @@ bool AudioDeviceLinuxPulse::PlayThreadProcess() EnableWriteCallback(); PaUnLock(); - } // _playing + } // _playing UnLock(); return true; @@ -3103,7 +3103,7 @@ bool AudioDeviceLinuxPulse::RecThreadProcess() EnableReadCallback(); PaUnLock(); - } // _recording + } // _recording UnLock(); return true; diff --git a/modules/audio_device/linux/audio_device_utility_linux.cc b/modules/audio_device/linux/audio_device_utility_linux.cc index 2de4bacf..a053f5b1 100644 --- a/modules/audio_device/linux/audio_device_utility_linux.cc +++ b/modules/audio_device/linux/audio_device_utility_linux.cc @@ -51,4 +51,4 @@ int32_t AudioDeviceUtilityLinux::Init() } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_device/linux/audio_device_utility_linux.h b/modules/audio_device/linux/audio_device_utility_linux.h index 22549c61..75e52b4e 100644 --- a/modules/audio_device/linux/audio_device_utility_linux.h +++ b/modules/audio_device/linux/audio_device_utility_linux.h @@ -31,6 +31,6 @@ private: int32_t _id; }; -} // namespace webrtc +} // namespace webrtc #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_UTILITY_LINUX_H_ diff --git a/modules/audio_device/mac/audio_device_mac.cc b/modules/audio_device/mac/audio_device_mac.cc index a7e78baf..3cf742b8 100644 --- a/modules/audio_device/mac/audio_device_mac.cc +++ b/modules/audio_device/mac/audio_device_mac.cc @@ -2271,7 +2271,7 @@ AudioDeviceMac::GetNumberDevices(const AudioObjectPropertyScope scope, free(bufferList); bufferList = NULL; - } // for + } // for } if (!listOK) @@ -3269,4 +3269,4 @@ bool AudioDeviceMac::KeyPressed() const{ } return(key_down); } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_device/mac/audio_device_mac.h b/modules/audio_device/mac/audio_device_mac.h index bdcad34b..19eb7c79 100644 --- a/modules/audio_device/mac/audio_device_mac.h +++ b/modules/audio_device/mac/audio_device_mac.h @@ -379,6 +379,6 @@ private: int _renderBufSizeSamples; }; -} // namespace webrtc +} // namespace webrtc #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_MAC_AUDIO_DEVICE_MAC_H_ diff --git a/modules/audio_device/mac/audio_device_utility_mac.cc b/modules/audio_device/mac/audio_device_utility_mac.cc index ac8e118e..0aa74c0b 100644 --- a/modules/audio_device/mac/audio_device_utility_mac.cc +++ b/modules/audio_device/mac/audio_device_utility_mac.cc @@ -50,4 +50,4 @@ int32_t AudioDeviceUtilityMac::Init() return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_device/mac/audio_device_utility_mac.h b/modules/audio_device/mac/audio_device_utility_mac.h index 6c48b380..5a96cd8a 100644 --- a/modules/audio_device/mac/audio_device_utility_mac.h +++ b/modules/audio_device/mac/audio_device_utility_mac.h @@ -31,6 +31,6 @@ private: int32_t _id; }; -} // namespace webrtc +} // namespace webrtc #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_MAC_AUDIO_DEVICE_UTILITY_MAC_H_ diff --git a/modules/audio_device/mac/audio_mixer_manager_mac.cc b/modules/audio_device/mac/audio_mixer_manager_mac.cc index db4cfab8..e7a8b52a 100644 --- a/modules/audio_device/mac/audio_mixer_manager_mac.cc +++ b/modules/audio_device/mac/audio_mixer_manager_mac.cc @@ -1163,5 +1163,5 @@ void AudioMixerManagerMac::logCAMsg(const TraceLevel level, #endif } -} // namespace webrtc +} // namespace webrtc // EOF diff --git a/modules/audio_device/mac/audio_mixer_manager_mac.h b/modules/audio_device/mac/audio_mixer_manager_mac.h index 8c89e719..c5024d12 100644 --- a/modules/audio_device/mac/audio_mixer_manager_mac.h +++ b/modules/audio_device/mac/audio_mixer_manager_mac.h @@ -75,6 +75,6 @@ private: }; -} //namespace webrtc +} // namespace webrtc #endif // AUDIO_MIXER_MAC_H diff --git a/modules/audio_device/test/func_test_manager.cc b/modules/audio_device/test/func_test_manager.cc index 5eccbe68..e48cd338 100644 --- a/modules/audio_device/test/func_test_manager.cc +++ b/modules/audio_device/test/func_test_manager.cc @@ -443,7 +443,7 @@ int32_t AudioTransportImpl::NeedMorePlayData( } _audioList.PopFront(); } - } // if (_fullDuplex) + } // if (_fullDuplex) if (_playFromFile && _playFile.Open()) { @@ -475,7 +475,7 @@ int32_t AudioTransportImpl::NeedMorePlayData( audio16++; } } - } // if (_playFromFile && _playFile.Open()) + } // if (_playFromFile && _playFile.Open()) _playCount++; @@ -550,7 +550,7 @@ int32_t AudioTransportImpl::NeedMorePlayData( { TEST_LOG("++"); } - } // if (_playCount % 100 == 0) + } // if (_playCount % 100 == 0) nSamplesOut = nSamples; @@ -880,7 +880,7 @@ int32_t FuncTestManager::TestAudioLayerSelection() TEST_LOG("\nActiveAudioLayer: kWindowsCoreAudio <=> " "switch was possible\n \n"); } - } // if (tryWinWave || tryWinCore) + } // if (tryWinWave || tryWinCore) PRINT_TEST_RESULTS; @@ -2460,7 +2460,7 @@ int32_t FuncTestManager::TestDeviceRemoval() loopCount++; } - } // loopCount + } // loopCount EXPECT_EQ(0, audioDevice->Terminate()); EXPECT_FALSE(audioDevice->Initialized()); @@ -2729,6 +2729,6 @@ int32_t FuncTestManager::TestAdvancedMBAPI() return 0; } -} // namespace webrtc +} // namespace webrtc // EOF diff --git a/modules/audio_device/test/func_test_manager.h b/modules/audio_device/test/func_test_manager.h index 0036b5c9..ea39d282 100644 --- a/modules/audio_device/test/func_test_manager.h +++ b/modules/audio_device/test/func_test_manager.h @@ -218,6 +218,6 @@ private: AudioTransportImpl* _audioTransport; }; -} // namespace webrtc +} // namespace webrtc #endif // #ifndef WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H diff --git a/modules/audio_device/win/audio_device_core_win.cc b/modules/audio_device/win/audio_device_core_win.cc index f7321512..7811fffd 100644 --- a/modules/audio_device/win/audio_device_core_win.cc +++ b/modules/audio_device/win/audio_device_core_win.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#pragma warning(disable: 4995) // name was marked as #pragma deprecated +#pragma warning(disable: 4995) // name was marked as #pragma deprecated #if (_MSC_VER >= 1310) && (_MSC_VER < 1400) // Reports the major and minor versions of the compiler. diff --git a/modules/audio_processing/ns/ns_core.c b/modules/audio_processing/ns/ns_core.c index e7093c7f..124a66d8 100644 --- a/modules/audio_processing/ns/ns_core.c +++ b/modules/audio_processing/ns/ns_core.c @@ -276,7 +276,7 @@ void WebRtcNs_NoiseEstimation(NSinst_t* inst, float* magn, float* noise) { inst->density[offset + i] = ((float)inst->counter[s] * inst->density[offset + i] + (float)1.0 / ((float)2.0 * WIDTH)) / (float)(inst->counter[s] + 1); } - } // end loop over magnitude spectrum + } // end loop over magnitude spectrum if (inst->counter[s] >= END_STARTUP_LONG) { inst->counter[s] = 0; @@ -288,7 +288,7 @@ void WebRtcNs_NoiseEstimation(NSinst_t* inst, float* magn, float* noise) { } inst->counter[s]++; - } // end loop over simultaneous estimates + } // end loop over simultaneous estimates // Sequentially update the noise during startup if (inst->updates < END_STARTUP_LONG) { @@ -522,7 +522,7 @@ void WebRtcNs_FeatureParameterExtraction(NSinst_t* inst, int flag) { inst->histSpecDiff[i] = 0; } } - } // end of flag == 1 + } // end of flag == 1 } // Compute spectral flatness on input spectrum @@ -855,7 +855,7 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, } outFrameHB[i] = (short)dTmp; } - } // end of H band gain computation + } // end of H band gain computation // return 0; } @@ -1006,14 +1006,14 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, snrLocPrior[i] = DD_PR_SNR * previousEstimateStsa[i] + ((float)1.0 - DD_PR_SNR) * snrLocPost[i]; // post and prior snr needed for step 2 - } // end of loop over freqs + } // end of loop over freqs #ifdef PROCESS_FLOW_1 for (i = 0; i < inst->magnLen; i++) { // gain filter tmpFloat1 = inst->overdrive + snrLocPrior[i]; tmpFloat2 = (float)snrLocPrior[i] / tmpFloat1; theFilter[i] = (float)tmpFloat2; - } // end of loop over freqs + } // end of loop over freqs #endif // done with step 1: dd computation of prior and post snr @@ -1085,7 +1085,7 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, noise[i] = noiseUpdateTmp; } } - } // end of freq loop + } // end of freq loop // done with step 2: noise update // @@ -1105,7 +1105,7 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, tmpFloat1 = inst->overdrive + snrPrior; tmpFloat2 = (float)snrPrior / tmpFloat1; theFilter[i] = (float)tmpFloat2; - } // end of loop over freqs + } // end of loop over freqs // done with step3 #endif #endif @@ -1204,7 +1204,7 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, factor = (float)1.0 / gain; } #endif - } // out of inst->gainmap==1 + } // out of inst->gainmap==1 // synthesis for (i = 0; i < inst->anaLen; i++) { @@ -1227,7 +1227,7 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, inst->outBuf[i] = fout[i + inst->blockLen10ms]; } } - } // end of if out.len==0 + } // end of if out.len==0 else { for (i = 0; i < inst->blockLen10ms; i++) { fout[i] = inst->outBuf[i]; @@ -1297,7 +1297,7 @@ int WebRtcNs_ProcessCore(NSinst_t* inst, } outFrameHB[i] = (short)dTmp; } - } // end of H band gain computation + } // end of H band gain computation // return 0; diff --git a/modules/audio_processing/ns/nsx_core.c b/modules/audio_processing/ns/nsx_core.c index bf86c728..6076d3fd 100644 --- a/modules/audio_processing/ns/nsx_core.c +++ b/modules/audio_processing/ns/nsx_core.c @@ -588,7 +588,7 @@ static void NoiseEstimationC(NsxInst_t* inst, width_factor, countDiv, 15); inst->noiseEstDensity[offset + i] = tmp16no1 + tmp16no2; } - } // end loop over magnitude spectrum + } // end loop over magnitude spectrum if (counter >= END_STARTUP_LONG) { inst->noiseEstCounter[s] = 0; @@ -598,7 +598,7 @@ static void NoiseEstimationC(NsxInst_t* inst, } inst->noiseEstCounter[s]++; - } // end loop over simultaneous estimates + } // end loop over simultaneous estimates // Sequentially update the noise during startup if (inst->blockIndex < END_STARTUP_LONG) { @@ -1146,7 +1146,7 @@ void WebRtcNsx_FeatureParameterExtraction(NsxInst_t* inst, int flag) { WebRtcSpl_ZerosArrayW16(inst->histLrt, HIST_PAR_EST); WebRtcSpl_ZerosArrayW16(inst->histSpecDiff, HIST_PAR_EST); WebRtcSpl_ZerosArrayW16(inst->histSpecFlat, HIST_PAR_EST); - } // end of flag == 1 + } // end of flag == 1 } @@ -1874,7 +1874,7 @@ void WebRtcNsx_DataSynthesis(NsxInst_t* inst, short* outFrame) { tmp16no2 = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT(inst->priorNonSpeechProb, gainFactor2, 14); // Q13; gainFactor = tmp16no1 + tmp16no2; // Q13 - } // out of flag_gain_map==1 + } // out of flag_gain_map==1 // Synthesis, read out fully processed segment, and update synthesis buffer. WebRtcNsx_SynthesisUpdate(inst, outFrame, gainFactor); @@ -1960,7 +1960,7 @@ int WebRtcNsx_ProcessCore(NsxInst_t* inst, short* speechFrame, short* speechFram for (i = 0; i < inst->blockLen10ms; i++) { outFrameHB[i] = inst->dataBufHBFX[i]; // Q0 } - } // end of H band gain computation + } // end of H band gain computation return 0; } @@ -2153,7 +2153,7 @@ int WebRtcNsx_ProcessCore(NsxInst_t* inst, short* speechFrame, short* speechFram priorSnr = tmpU32no1 + tmpU32no2 + 512; // Q22 (added 512 for rounding) // priorLocSnr = 1 + 2*priorSnr priorLocSnr[i] = 2048 + WEBRTC_SPL_RSHIFT_U32(priorSnr, 10); // Q11 - } // end of loop over frequencies + } // end of loop over frequencies // done with step 1: DD computation of prior and post SNR // STEP 2: compute speech/noise likelihood @@ -2314,7 +2314,7 @@ int WebRtcNsx_ProcessCore(NsxInst_t* inst, short* speechFrame, short* speechFram tmp32no2 += tmp32no1; // Q(qMagn) } inst->avgMagnPause[i] = tmp32no2; - } // end of frequency loop + } // end of frequency loop norm32no1 = WebRtcSpl_NormU32(maxNoiseU32); qNoise = inst->prevQNoise + norm32no1 - 5; @@ -2389,7 +2389,7 @@ int WebRtcNsx_ProcessCore(NsxInst_t* inst, short* speechFrame, short* speechFram inst->noiseSupFilter[i] = (uint16_t)WebRtcSpl_DivU32U16(tmpU32no1, END_STARTUP_SHORT); } - } // end of loop over frequencies + } // end of loop over frequencies //done with step3 // save noise and magnitude spectrum for next frame @@ -2484,7 +2484,7 @@ int WebRtcNsx_ProcessCore(NsxInst_t* inst, short* speechFrame, short* speechFram outFrameHB[i] = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT(gainTimeDomainHB, inst->dataBufHBFX[i], 14); // Q0 } - } // end of H band gain computation + } // end of H band gain computation return 0; } diff --git a/modules/audio_processing/ns/nsx_core_neon.c b/modules/audio_processing/ns/nsx_core_neon.c index 2cb2e4e2..1fc8a86c 100644 --- a/modules/audio_processing/ns/nsx_core_neon.c +++ b/modules/audio_processing/ns/nsx_core_neon.c @@ -291,7 +291,7 @@ void WebRtcNsx_NoiseEstimationNeon(NsxInst_t* inst, __asm__("vbit %q0, %q1, %q2":: "w"(tmp16x8_1), "w"(tmp16x8_0), "w"(tmp16x8_4)); vst1q_s16(&inst->noiseEstDensity[offset + i], tmp16x8_1); - } // End loop over magnitude spectrum + } // End loop over magnitude spectrum // Last iteration over magnitude spectrum: // compute delta @@ -348,7 +348,7 @@ void WebRtcNsx_NoiseEstimationNeon(NsxInst_t* inst, } inst->noiseEstCounter[s]++; - } // end loop over simultaneous estimates + } // end loop over simultaneous estimates // Sequentially update the noise during startup if (inst->blockIndex < END_STARTUP_LONG) { diff --git a/modules/desktop_capture/mac/desktop_configuration.mm b/modules/desktop_capture/mac/desktop_configuration.mm index e9b9863a..a917b5dc 100644 --- a/modules/desktop_capture/mac/desktop_configuration.mm +++ b/modules/desktop_capture/mac/desktop_configuration.mm @@ -83,7 +83,7 @@ MacDisplayConfiguration GetConfigurationForScreen(NSScreen* screen) { return display_config; } -} // namespace +} // namespace MacDisplayConfiguration::MacDisplayConfiguration() : id(0), diff --git a/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc b/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc index f83d76e1..5dcbc52a 100644 --- a/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc +++ b/modules/desktop_capture/mac/scoped_pixel_buffer_object.cc @@ -52,4 +52,4 @@ void ScopedPixelBufferObject::Release() { } } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/desktop_capture/mac/scoped_pixel_buffer_object.h b/modules/desktop_capture/mac/scoped_pixel_buffer_object.h index b4f6ad13..73d425ae 100644 --- a/modules/desktop_capture/mac/scoped_pixel_buffer_object.h +++ b/modules/desktop_capture/mac/scoped_pixel_buffer_object.h @@ -36,6 +36,6 @@ class ScopedPixelBufferObject { DISALLOW_COPY_AND_ASSIGN(ScopedPixelBufferObject); }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SCOPED_PIXEL_BUFFER_OBJECT_H_ diff --git a/modules/interface/module_common_types.h b/modules/interface/module_common_types.h index 7baa7e98..57a1dfb9 100644 --- a/modules/interface/module_common_types.h +++ b/modules/interface/module_common_types.h @@ -1067,6 +1067,6 @@ inline uint32_t LatestTimestamp(uint32_t timestamp1, uint32_t timestamp2) { timestamp2; } -} // namespace webrtc +} // namespace webrtc #endif // MODULE_COMMON_TYPES_H diff --git a/modules/media_file/interface/media_file.h b/modules/media_file/interface/media_file.h index 78dcf927..5ee40fd6 100644 --- a/modules/media_file/interface/media_file.h +++ b/modules/media_file/interface/media_file.h @@ -223,5 +223,5 @@ protected: MediaFile() {} virtual ~MediaFile() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_H_ diff --git a/modules/media_file/interface/media_file_defines.h b/modules/media_file/interface/media_file_defines.h index d3093019..7cc54369 100644 --- a/modules/media_file/interface/media_file_defines.h +++ b/modules/media_file/interface/media_file_defines.h @@ -47,5 +47,5 @@ public: protected: FileCallback() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_DEFINES_H_ diff --git a/modules/media_file/source/avi_file.cc b/modules/media_file/source/avi_file.cc index b3830731..bfc0b8ac 100644 --- a/modules/media_file/source/avi_file.cc +++ b/modules/media_file/source/avi_file.cc @@ -1763,4 +1763,4 @@ void AviFile::WriteIndex() } PutLE32LengthFromCurrent(static_cast<long>(idxChunkSize)); } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/media_file/source/avi_file.h b/modules/media_file/source/avi_file.h index 83a51fc7..39ae3261 100644 --- a/modules/media_file/source/avi_file.h +++ b/modules/media_file/source/avi_file.h @@ -271,6 +271,6 @@ private: ListWrapper* _indexList; // Elements are of type AVIINDEXENTRY. }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_MEDIA_FILE_SOURCE_AVI_FILE_H_ diff --git a/modules/media_file/source/media_file_impl.cc b/modules/media_file/source/media_file_impl.cc index fa66677f..275ca20b 100644 --- a/modules/media_file/source/media_file_impl.cc +++ b/modules/media_file/source/media_file_impl.cc @@ -1368,4 +1368,4 @@ bool MediaFileImpl::ValidFrequency(const uint32_t frequency) "Frequency should be 8000, 16000 or 32000 (Hz)"); return false; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/media_file/source/media_file_impl.h b/modules/media_file/source/media_file_impl.h index c7390306..33c45e92 100644 --- a/modules/media_file/source/media_file_impl.h +++ b/modules/media_file/source/media_file_impl.h @@ -236,6 +236,6 @@ private: FileCallback* _ptrCallback; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_IMPL_H_ diff --git a/modules/media_file/source/media_file_utility.cc b/modules/media_file/source/media_file_utility.cc index 4e23899c..58869aa0 100644 --- a/modules/media_file/source/media_file_utility.cc +++ b/modules/media_file/source/media_file_utility.cc @@ -55,7 +55,7 @@ struct WAVE_CHUNK_header int8_t fmt_ckID[4]; int32_t fmt_ckSize; }; -} // unnamed namespace +} // unnamed namespace namespace webrtc { ModuleFileUtility::ModuleFileUtility(const int32_t id) @@ -2559,4 +2559,4 @@ uint32_t ModuleFileUtility::PlayoutPositionMs() return 0; } } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/media_file/source/media_file_utility.h b/modules/media_file/source/media_file_utility.h index 049f25f5..8376169a 100644 --- a/modules/media_file/source/media_file_utility.h +++ b/modules/media_file/source/media_file_utility.h @@ -343,5 +343,5 @@ private: VideoCodec _videoCodec; #endif }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_UTILITY_H_ diff --git a/modules/remote_bitrate_estimator/include/bwe_defines.h b/modules/remote_bitrate_estimator/include/bwe_defines.h index 4fe5d916..f915a0fa 100644 --- a/modules/remote_bitrate_estimator/include/bwe_defines.h +++ b/modules/remote_bitrate_estimator/include/bwe_defines.h @@ -52,6 +52,6 @@ public: uint32_t _incomingBitRate; double _noiseVar; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_ diff --git a/modules/remote_bitrate_estimator/remote_rate_control.cc b/modules/remote_bitrate_estimator/remote_rate_control.cc index 36ecdb29..d07b7d80 100644 --- a/modules/remote_bitrate_estimator/remote_rate_control.cc +++ b/modules/remote_bitrate_estimator/remote_rate_control.cc @@ -381,4 +381,4 @@ void RemoteRateControl::StateStr(BandwidthUsage state, char* str) { assert(false); } } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/remote_bitrate_estimator/remote_rate_control.h b/modules/remote_bitrate_estimator/remote_rate_control.h index 4d16c720..87a57217 100644 --- a/modules/remote_bitrate_estimator/remote_rate_control.h +++ b/modules/remote_bitrate_estimator/remote_rate_control.h @@ -75,6 +75,6 @@ class RemoteRateControl { float beta_; unsigned int rtt_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_REMOTE_RATE_CONTROL_H_ diff --git a/modules/rtp_rtcp/interface/rtp_rtcp.h b/modules/rtp_rtcp/interface/rtp_rtcp.h index 5d114480..5c25fbe9 100644 --- a/modules/rtp_rtcp/interface/rtp_rtcp.h +++ b/modules/rtp_rtcp/interface/rtp_rtcp.h @@ -932,5 +932,5 @@ class RtpRtcp : public Module { */ virtual int32_t RequestKeyFrame() = 0; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_INTERFACE_RTP_RTCP_H_ diff --git a/modules/rtp_rtcp/interface/rtp_rtcp_defines.h b/modules/rtp_rtcp/interface/rtp_rtcp_defines.h index d3a33666..500ab53a 100644 --- a/modules/rtp_rtcp/interface/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/interface/rtp_rtcp_defines.h @@ -307,5 +307,5 @@ class NullRtpAudioFeedback : public RtpAudioFeedback { const uint8_t volume) {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_INTERFACE_RTP_RTCP_DEFINES_H_ diff --git a/modules/rtp_rtcp/source/H264/bitstream_builder.cc b/modules/rtp_rtcp/source/H264/bitstream_builder.cc index 7909f887..3551782f 100644 --- a/modules/rtp_rtcp/source/H264/bitstream_builder.cc +++ b/modules/rtp_rtcp/source/H264/bitstream_builder.cc @@ -577,4 +577,4 @@ BitstreamBuilder::AddSuffix(const uint8_t numBits, const uint32_t rest) } } } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/H264/bitstream_builder.h b/modules/rtp_rtcp/source/H264/bitstream_builder.h index bdfa08d2..bf1efaf7 100644 --- a/modules/rtp_rtcp/source/H264/bitstream_builder.h +++ b/modules/rtp_rtcp/source/H264/bitstream_builder.h @@ -47,6 +47,6 @@ private: uint32_t _byteOffset; uint8_t _bitOffset; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_H264_BITSTREAM_BUILDER_H_ diff --git a/modules/rtp_rtcp/source/H264/bitstream_parser.cc b/modules/rtp_rtcp/source/H264/bitstream_parser.cc index 43b13986..d6505d21 100644 --- a/modules/rtp_rtcp/source/H264/bitstream_parser.cc +++ b/modules/rtp_rtcp/source/H264/bitstream_parser.cc @@ -214,4 +214,4 @@ BitstreamParser::GetUE() } return retVal; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/H264/bitstream_parser.h b/modules/rtp_rtcp/source/H264/bitstream_parser.h index 4ba55604..6e3d3077 100644 --- a/modules/rtp_rtcp/source/H264/bitstream_parser.h +++ b/modules/rtp_rtcp/source/H264/bitstream_parser.h @@ -41,6 +41,6 @@ private: uint32_t _byteOffset; uint8_t _bitOffset; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_H264_BITSTREAM_PARSER_H_ diff --git a/modules/rtp_rtcp/source/H264/h264_information.cc b/modules/rtp_rtcp/source/H264/h264_information.cc index e75ddf5a..ddb34eb6 100644 --- a/modules/rtp_rtcp/source/H264/h264_information.cc +++ b/modules/rtp_rtcp/source/H264/h264_information.cc @@ -815,4 +815,4 @@ H264Information::SetLayerLengths() return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/H264/h264_information.h b/modules/rtp_rtcp/source/H264/h264_information.h index e51b9e1a..42b0b883 100644 --- a/modules/rtp_rtcp/source/H264/h264_information.h +++ b/modules/rtp_rtcp/source/H264/h264_information.h @@ -165,6 +165,6 @@ private: uint32_t _remLength; H264Info _info; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_H264_H264_INFORMATION_H_ diff --git a/modules/rtp_rtcp/source/H264/rtp_sender_h264.cc b/modules/rtp_rtcp/source/H264/rtp_sender_h264.cc index 75f2655e..d62f50b4 100644 --- a/modules/rtp_rtcp/source/H264/rtp_sender_h264.cc +++ b/modules/rtp_rtcp/source/H264/rtp_sender_h264.cc @@ -466,7 +466,7 @@ RTPSenderH264::SendH264_STAP_A(const FrameType frameType, } } return 0; -} // end STAP-A +} // end STAP-A // STAP-A for H.264 SVC int32_t @@ -660,7 +660,7 @@ RTPSenderH264::SendH264_STAP_A_PACSI(const FrameType frameType, } } return 0; -} // end STAP-A +} // end STAP-A int32_t RTPSenderH264::SendH264_FU_A(const FrameType frameType, @@ -1277,4 +1277,4 @@ RTPSenderH264::SendH264(const FrameType frameType, } return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/H264/rtp_sender_h264.h b/modules/rtp_rtcp/source/H264/rtp_sender_h264.h index 60e71b29..92a4de6d 100644 --- a/modules/rtp_rtcp/source/H264/rtp_sender_h264.h +++ b/modules/rtp_rtcp/source/H264/rtp_sender_h264.h @@ -174,6 +174,6 @@ private: }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_H264_RTP_SENDER_H264_H_ diff --git a/modules/rtp_rtcp/source/forward_error_correction.h b/modules/rtp_rtcp/source/forward_error_correction.h index 32e8158a..1e7695fc 100644 --- a/modules/rtp_rtcp/source/forward_error_correction.h +++ b/modules/rtp_rtcp/source/forward_error_correction.h @@ -308,5 +308,5 @@ class ForwardErrorCorrection { FecPacketList fec_packet_list_; bool fec_packet_received_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_H_ diff --git a/modules/rtp_rtcp/source/forward_error_correction_internal.cc b/modules/rtp_rtcp/source/forward_error_correction_internal.cc index 124fc65a..f718f316 100644 --- a/modules/rtp_rtcp/source/forward_error_correction_internal.cc +++ b/modules/rtp_rtcp/source/forward_error_correction_internal.cc @@ -370,7 +370,7 @@ void GeneratePacketMasks(int num_media_packets, int num_fec_packets, num_mask_bytes, packet_mask, mask_table); } // End of UEP modification -} //End of GetPacketMasks +} //End of GetPacketMasks } // namespace internal } // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc b/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc index bb914403..10566d6c 100644 --- a/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc @@ -124,4 +124,4 @@ TEST_F(RtcpFormatRembTest, TestCompund) { EXPECT_EQ(0, rtcp_sender_->SetREMBData(1234, 2, SSRCs)); EXPECT_EQ(0, rtcp_sender_->SendRTCP(kRtcpRemb)); } -} // namespace +} // namespace diff --git a/modules/rtp_rtcp/source/rtcp_receiver.cc b/modules/rtp_rtcp/source/rtcp_receiver.cc index 0dde10bf..b86728ae 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver.cc +++ b/modules/rtp_rtcp/source/rtcp_receiver.cc @@ -1449,4 +1449,4 @@ void RTCPReceiver::PacketTimeout() } } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtcp_receiver.h b/modules/rtp_rtcp/source/rtcp_receiver.h index 51b07aba..a86eef44 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver.h +++ b/modules/rtp_rtcp/source/rtcp_receiver.h @@ -243,5 +243,5 @@ protected: uint16_t _rtt; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ diff --git a/modules/rtp_rtcp/source/rtcp_receiver_help.cc b/modules/rtp_rtcp/source/rtcp_receiver_help.cc index 8d833a44..1ad734cc 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver_help.cc +++ b/modules/rtp_rtcp/source/rtcp_receiver_help.cc @@ -197,4 +197,4 @@ void RTCPReceiveInformation::VerifyAndAllocateBoundingSet( const uint32_t minimumSize) { TmmbnBoundingSet.VerifyAndAllocateSet(minimumSize); } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtcp_receiver_help.h b/modules/rtp_rtcp/source/rtcp_receiver_help.h index 2c2c375e..a7ffab98 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver_help.h +++ b/modules/rtp_rtcp/source/rtcp_receiver_help.h @@ -130,7 +130,7 @@ private: std::vector<int64_t> _tmmbrSetTimeouts; }; -} // end namespace RTCPHelp -} // namespace webrtc +} // end namespace RTCPHelp +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_ diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc index 83d62c2c..29057378 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/modules/rtp_rtcp/source/rtcp_sender.cc @@ -2136,4 +2136,4 @@ RTCPSender::SetTMMBN(const TMMBRSet* boundingSet, } return -1; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtcp_sender.h b/modules/rtp_rtcp/source/rtcp_sender.h index 34a08380..9be2f3f9 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.h +++ b/modules/rtp_rtcp/source/rtcp_sender.h @@ -269,6 +269,6 @@ private: uint32_t _pliCount; uint32_t _fullIntraRequestCount; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ diff --git a/modules/rtp_rtcp/source/rtcp_utility.cc b/modules/rtp_rtcp/source/rtcp_utility.cc index c1314fb3..0e6a2218 100644 --- a/modules/rtp_rtcp/source/rtcp_utility.cc +++ b/modules/rtp_rtcp/source/rtcp_utility.cc @@ -1524,4 +1524,4 @@ RTCPUtility::RTCPPacketIterator::Current() return &_header; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtcp_utility.h b/modules/rtp_rtcp/source/rtcp_utility.h index f6e1b72c..606384ab 100644 --- a/modules/rtp_rtcp/source/rtcp_utility.h +++ b/modules/rtp_rtcp/source/rtcp_utility.h @@ -441,6 +441,6 @@ namespace RTCPUtility { RTCPCommonHeader _header; }; -} // RTCPUtility -} // namespace webrtc +} // RTCPUtility +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_ diff --git a/modules/rtp_rtcp/source/rtp_header_extension.cc b/modules/rtp_rtcp/source/rtp_header_extension.cc index c2b6424b..daf7e1f5 100644 --- a/modules/rtp_rtcp/source/rtp_header_extension.cc +++ b/modules/rtp_rtcp/source/rtp_header_extension.cc @@ -178,4 +178,4 @@ void RtpHeaderExtensionMap::GetCopy(RtpHeaderExtensionMap* map) const { it++; } } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtp_receiver.cc b/modules/rtp_rtcp/source/rtp_receiver.cc index cce3b29d..4fc557fa 100644 --- a/modules/rtp_rtcp/source/rtp_receiver.cc +++ b/modules/rtp_rtcp/source/rtp_receiver.cc @@ -822,7 +822,7 @@ int32_t RTPReceiver::CheckPayloadChanged( rtp_media_receiver_->GetLastMediaSpecificPayload(specific_payload); is_red = false; } - } // End critsect. + } // End critsect. if (re_initialize_decoder) { if (-1 == rtp_media_receiver_->InvokeOnInitializeDecoder( @@ -1137,4 +1137,4 @@ void RTPReceiver::ProcessBitrate() { "RTPReceiverPacketRate", ssrc_, PacketRate()); } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtp_receiver.h b/modules/rtp_rtcp/source/rtp_receiver.h index 33ce9393..ce7e0a2b 100644 --- a/modules/rtp_rtcp/source/rtp_receiver.h +++ b/modules/rtp_rtcp/source/rtp_receiver.h @@ -237,6 +237,6 @@ class RTPReceiver : public Bitrate { int payload_type_rtx_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_H_ diff --git a/modules/rtp_rtcp/source/rtp_rtcp_config.h b/modules/rtp_rtcp/source/rtp_rtcp_config.h index 40835405..7d124b1c 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_config.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_config.h @@ -47,7 +47,7 @@ enum { DTMF_OUTBAND_MAX = 20}; enum { RTP_MAX_BURST_SLEEP_TIME = 500 }; enum { RTP_AUDIO_LEVEL_UNIQUE_ID = 0xbede }; enum { RTP_MAX_PACKETS_PER_FRAME= 512 }; // must be multiple of 32 -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_CONFIG_H_ diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.cc b/modules/rtp_rtcp/source/rtp_sender_audio.cc index b5684aa8..0a45d3c6 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.cc +++ b/modules/rtp_rtcp/source/rtp_sender_audio.cc @@ -474,7 +474,7 @@ int32_t RTPSenderAudio::SendAudio( } } _lastPayloadType = payloadType; - } // end critical section + } // end critical section TRACE_EVENT_INSTANT2("webrtc_rtp", "Audio::Send", "timestamp", captureTimeStamp, "seqnum", _rtpSender->SequenceNumber()); @@ -631,4 +631,4 @@ RTPSenderAudio::SendTelephoneEventPacket(const bool ended, return retVal; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.h b/modules/rtp_rtcp/source/rtp_sender_audio.h index 6e4ffc09..7074e7b2 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.h +++ b/modules/rtp_rtcp/source/rtp_sender_audio.h @@ -121,6 +121,6 @@ private: uint8_t _audioLevelIndicationID; uint8_t _audioLevel_dBov; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc index 07ab3102..1db43777 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -507,4 +507,4 @@ int RTPSenderVideo::SetSelectiveRetransmissions(uint8_t settings) { return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h index 7b9b34f3..4c406d75 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/modules/rtp_rtcp/source/rtp_sender_video.h @@ -137,6 +137,6 @@ private: // Bitrate used for video payload and RTP headers Bitrate _videoBitrate; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ diff --git a/modules/rtp_rtcp/source/ssrc_database.cc b/modules/rtp_rtcp/source/ssrc_database.cc index 0da29c09..1e57970c 100644 --- a/modules/rtp_rtcp/source/ssrc_database.cc +++ b/modules/rtp_rtcp/source/ssrc_database.cc @@ -214,4 +214,4 @@ uint32_t SSRCDatabase::GenerateRandom() return ssrc; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/ssrc_database.h b/modules/rtp_rtcp/source/ssrc_database.h index e21b111b..e1f90e79 100644 --- a/modules/rtp_rtcp/source/ssrc_database.h +++ b/modules/rtp_rtcp/source/ssrc_database.h @@ -57,6 +57,6 @@ private: CriticalSectionWrapper* _critSect; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_SSRC_DATABASE_H_ diff --git a/modules/rtp_rtcp/source/tmmbr_help.cc b/modules/rtp_rtcp/source/tmmbr_help.cc index 8d865435..ecdf6b87 100644 --- a/modules/rtp_rtcp/source/tmmbr_help.cc +++ b/modules/rtp_rtcp/source/tmmbr_help.cc @@ -479,4 +479,4 @@ bool TMMBRHelp::CalcMinBitRate( uint32_t* minBitrateKbit) const { } return true; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/rtp_rtcp/source/tmmbr_help.h b/modules/rtp_rtcp/source/tmmbr_help.h index 29bc70c0..a6d1f47f 100644 --- a/modules/rtp_rtcp/source/tmmbr_help.h +++ b/modules/rtp_rtcp/source/tmmbr_help.h @@ -110,6 +110,6 @@ private: float* _ptrIntersectionBoundingSet; float* _ptrMaxPRBoundingSet; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ diff --git a/modules/rtp_rtcp/source/video_codec_information.h b/modules/rtp_rtcp/source/video_codec_information.h index b5cc0633..456b3bb9 100644 --- a/modules/rtp_rtcp/source/video_codec_information.h +++ b/modules/rtp_rtcp/source/video_codec_information.h @@ -23,6 +23,6 @@ public: virtual RtpVideoCodecTypes Type() = 0; virtual ~VideoCodecInformation(){}; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_VIDEO_CODEC_INFORMATION_H_ diff --git a/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h b/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h index 2d4d568d..2e8d676e 100644 --- a/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h +++ b/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h @@ -185,4 +185,4 @@ const float kMaxResidualLossBurstyMask[kNumberCodes] = { 0.009657f }; -} // namespace +} // namespace diff --git a/modules/rtp_rtcp/test/testFec/test_fec.cc b/modules/rtp_rtcp/test/testFec/test_fec.cc index 1c7b1066..336d1830 100644 --- a/modules/rtp_rtcp/test/testFec/test_fec.cc +++ b/modules/rtp_rtcp/test/testFec/test_fec.cc @@ -473,11 +473,11 @@ TEST(FecTest, FecTest) { } timeStamp += 90000 / 30; } // loop over numImpPackets - } // loop over FecPackets - } // loop over numMediaPackets + } // loop over FecPackets + } // loop over numMediaPackets delete[] packetMask; } // loop over loss rates - } // loop over mask types + } // loop over mask types // Have DecodeFEC free allocated memory. fec.ResetState(&recoveredPacketList); diff --git a/modules/utility/interface/audio_frame_operations.h b/modules/utility/interface/audio_frame_operations.h index 4705cee6..4154e5e1 100644 --- a/modules/utility/interface/audio_frame_operations.h +++ b/modules/utility/interface/audio_frame_operations.h @@ -53,6 +53,6 @@ class AudioFrameOperations { static int ScaleWithSat(float scale, AudioFrame& frame); }; -} // namespace webrtc +} // namespace webrtc #endif // #ifndef WEBRTC_VOICE_ENGINE_AUDIO_FRAME_OPERATIONS_H_ diff --git a/modules/utility/interface/file_player.h b/modules/utility/interface/file_player.h index 43ab5007..7f5ecb49 100644 --- a/modules/utility/interface/file_player.h +++ b/modules/utility/interface/file_player.h @@ -107,5 +107,5 @@ protected: virtual ~FilePlayer() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_UTILITY_INTERFACE_FILE_PLAYER_H_ diff --git a/modules/utility/interface/file_recorder.h b/modules/utility/interface/file_recorder.h index 2c3268d6..f8139336 100644 --- a/modules/utility/interface/file_recorder.h +++ b/modules/utility/interface/file_recorder.h @@ -86,5 +86,5 @@ protected: virtual ~FileRecorder() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_UTILITY_INTERFACE_FILE_RECORDER_H_ diff --git a/modules/utility/interface/process_thread.h b/modules/utility/interface/process_thread.h index 3e25bd0d..75c9b185 100644 --- a/modules/utility/interface/process_thread.h +++ b/modules/utility/interface/process_thread.h @@ -30,5 +30,5 @@ public: protected: virtual ~ProcessThread(); }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_UTILITY_INTERFACE_PROCESS_THREAD_H_ diff --git a/modules/utility/interface/rtp_dump.h b/modules/utility/interface/rtp_dump.h index 9a852d07..62b8bf5b 100644 --- a/modules/utility/interface/rtp_dump.h +++ b/modules/utility/interface/rtp_dump.h @@ -48,5 +48,5 @@ public: protected: virtual ~RtpDump(); }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_UTILITY_INTERFACE_RTP_DUMP_H_ diff --git a/modules/utility/source/audio_frame_operations.cc b/modules/utility/source/audio_frame_operations.cc index 2e13de4f..b21216d3 100644 --- a/modules/utility/source/audio_frame_operations.cc +++ b/modules/utility/source/audio_frame_operations.cc @@ -107,5 +107,5 @@ int AudioFrameOperations::ScaleWithSat(float scale, AudioFrame& frame) { return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/utility/source/coder.cc b/modules/utility/source/coder.cc index 85fb6988..3cef5e50 100644 --- a/modules/utility/source/coder.cc +++ b/modules/utility/source/coder.cc @@ -124,4 +124,4 @@ int32_t AudioCoder::SendData( _encodedLengthInBytes = payloadSize; return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/utility/source/coder.h b/modules/utility/source/coder.h index 9dd2566b..a831c557 100644 --- a/modules/utility/source/coder.h +++ b/modules/utility/source/coder.h @@ -59,6 +59,6 @@ private: uint32_t _decodeTimestamp; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ diff --git a/modules/utility/source/file_player_impl.cc b/modules/utility/source/file_player_impl.cc index 52ebe32b..3a06c72d 100644 --- a/modules/utility/source/file_player_impl.cc +++ b/modules/utility/source/file_player_impl.cc @@ -728,4 +728,4 @@ int32_t VideoFilePlayerImpl::SetUpVideoDecoder() return 0; } #endif // WEBRTC_MODULE_UTILITY_VIDEO -} // namespace webrtc +} // namespace webrtc diff --git a/modules/utility/source/file_player_impl.h b/modules/utility/source/file_player_impl.h index ebf0da17..c6d6b5c1 100644 --- a/modules/utility/source/file_player_impl.h +++ b/modules/utility/source/file_player_impl.h @@ -118,5 +118,5 @@ private: }; #endif //WEBRTC_MODULE_UTILITY_VIDEO -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_ diff --git a/modules/utility/source/file_recorder_impl.cc b/modules/utility/source/file_recorder_impl.cc index fefa4dc0..9e5db72e 100644 --- a/modules/utility/source/file_recorder_impl.cc +++ b/modules/utility/source/file_recorder_impl.cc @@ -793,4 +793,4 @@ int32_t AviRecorder::WriteEncodedAudioData( } #endif // WEBRTC_MODULE_UTILITY_VIDEO -} // namespace webrtc +} // namespace webrtc diff --git a/modules/utility/source/file_recorder_impl.h b/modules/utility/source/file_recorder_impl.h index f8921d07..a55b73e4 100644 --- a/modules/utility/source/file_recorder_impl.h +++ b/modules/utility/source/file_recorder_impl.h @@ -159,5 +159,5 @@ private: int64_t _writtenVideoMS; }; #endif // WEBRTC_MODULE_UTILITY_VIDEO -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_UTILITY_SOURCE_FILE_RECORDER_IMPL_H_ diff --git a/modules/utility/source/process_thread_impl.cc b/modules/utility/source/process_thread_impl.cc index 61b3e332..2cd2a775 100644 --- a/modules/utility/source/process_thread_impl.cc +++ b/modules/utility/source/process_thread_impl.cc @@ -186,4 +186,4 @@ bool ProcessThreadImpl::Process() } return true; } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/utility/source/process_thread_impl.h b/modules/utility/source/process_thread_impl.h index 7edb5653..99cd2b22 100644 --- a/modules/utility/source/process_thread_impl.h +++ b/modules/utility/source/process_thread_impl.h @@ -42,6 +42,6 @@ private: ListWrapper _modules; ThreadWrapper* _thread; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ diff --git a/modules/utility/source/rtp_dump_impl.cc b/modules/utility/source/rtp_dump_impl.cc index 74de4ac6..9cc35c31 100644 --- a/modules/utility/source/rtp_dump_impl.cc +++ b/modules/utility/source/rtp_dump_impl.cc @@ -278,4 +278,4 @@ inline uint16_t RtpDumpImpl::RtpDumpHtons(uint16_t x) const return 0; #endif } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/utility/source/rtp_dump_impl.h b/modules/utility/source/rtp_dump_impl.h index bb72dff3..b14c5972 100644 --- a/modules/utility/source/rtp_dump_impl.h +++ b/modules/utility/source/rtp_dump_impl.h @@ -44,5 +44,5 @@ private: FileWrapper& _file; uint32_t _startTime; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_UTILITY_SOURCE_RTP_DUMP_IMPL_H_ diff --git a/modules/utility/source/video_coder.cc b/modules/utility/source/video_coder.cc index 01e4ae05..cff2bddf 100644 --- a/modules/utility/source/video_coder.cc +++ b/modules/utility/source/video_coder.cc @@ -148,5 +148,5 @@ int32_t VideoCoder::SendData( _videoEncodedData->payloadSize = payloadSize; return 0; } -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULE_UTILITY_VIDEO diff --git a/modules/utility/source/video_coder.h b/modules/utility/source/video_coder.h index c69c3e46..e1460ef3 100644 --- a/modules/utility/source/video_coder.h +++ b/modules/utility/source/video_coder.h @@ -63,6 +63,6 @@ private: I420VideoFrame* _decodedVideo; EncodedVideoData* _videoEncodedData; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULE_UTILITY_VIDEO #endif // WEBRTC_MODULES_UTILITY_SOURCE_VIDEO_CODER_H_ diff --git a/modules/utility/source/video_frames_queue.cc b/modules/utility/source/video_frames_queue.cc index 039c9e83..85f85178 100644 --- a/modules/utility/source/video_frames_queue.cc +++ b/modules/utility/source/video_frames_queue.cc @@ -126,5 +126,5 @@ int32_t VideoFramesQueue::SetRenderDelay(uint32_t renderDelay) { _renderDelayMs = renderDelay; return 0; } -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULE_UTILITY_VIDEO diff --git a/modules/utility/source/video_frames_queue.h b/modules/utility/source/video_frames_queue.h index af6821ee..18c43750 100644 --- a/modules/utility/source/video_frames_queue.h +++ b/modules/utility/source/video_frames_queue.h @@ -56,6 +56,6 @@ class VideoFramesQueue { // Estimated render delay. uint32_t _renderDelayMs; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULE_UTILITY_VIDEO #endif // WEBRTC_MODULES_UTILITY_SOURCE_VIDEO_FRAMES_QUEUE_H_ diff --git a/modules/video_capture/device_info_impl.cc b/modules/video_capture/device_info_impl.cc index a1749346..7f4913f2 100644 --- a/modules/video_capture/device_info_impl.cc +++ b/modules/video_capture/device_info_impl.cc @@ -394,7 +394,7 @@ int32_t DeviceInfoImpl::GetOrientation(const char* deviceUniqueIdUTF8, orientation = kCameraRotate0; return -1; } -} //namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc diff --git a/modules/video_capture/device_info_impl.h b/modules/video_capture/device_info_impl.h index 1634c611..b8772db4 100644 --- a/modules/video_capture/device_info_impl.h +++ b/modules/video_capture/device_info_impl.h @@ -63,6 +63,6 @@ protected: char* _lastUsedDeviceName; uint32_t _lastUsedDeviceNameLength; }; -} //namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_ diff --git a/modules/video_capture/include/video_capture.h b/modules/video_capture/include/video_capture.h index ca04fb7b..e3d674b1 100644 --- a/modules/video_capture/include/video_capture.h +++ b/modules/video_capture/include/video_capture.h @@ -152,5 +152,5 @@ protected: virtual ~VideoCaptureModule() {}; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_H_ diff --git a/modules/video_capture/include/video_capture_factory.h b/modules/video_capture/include/video_capture_factory.h index 06219e3a..ec92d31e 100644 --- a/modules/video_capture/include/video_capture_factory.h +++ b/modules/video_capture/include/video_capture_factory.h @@ -44,6 +44,6 @@ class VideoCaptureFactory { ~VideoCaptureFactory(); }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_FACTORY_H_ diff --git a/modules/video_capture/linux/device_info_linux.cc b/modules/video_capture/linux/device_info_linux.cc index 186fdea3..add9b989 100644 --- a/modules/video_capture/linux/device_info_linux.cc +++ b/modules/video_capture/linux/device_info_linux.cc @@ -326,5 +326,5 @@ int32_t DeviceInfoLinux::FillCapabilityMap(int fd) return _captureCapabilities.Size(); } -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc diff --git a/modules/video_capture/linux/device_info_linux.h b/modules/video_capture/linux/device_info_linux.h index 6aa53b8a..a3e53cf8 100644 --- a/modules/video_capture/linux/device_info_linux.h +++ b/modules/video_capture/linux/device_info_linux.h @@ -48,6 +48,6 @@ private: bool IsDeviceNameMatches(const char* name, const char* deviceUniqueIdUTF8); }; -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_ diff --git a/modules/video_capture/linux/video_capture_linux.cc b/modules/video_capture/linux/video_capture_linux.cc index 0e7b597b..4cbebb3f 100644 --- a/modules/video_capture/linux/video_capture_linux.cc +++ b/modules/video_capture/linux/video_capture_linux.cc @@ -496,5 +496,5 @@ int32_t VideoCaptureModuleV4L2::CaptureSettings(VideoCaptureCapability& settings return 0; } -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc diff --git a/modules/video_capture/linux/video_capture_linux.h b/modules/video_capture/linux/video_capture_linux.h index e4b6dc6c..896b89d7 100644 --- a/modules/video_capture/linux/video_capture_linux.h +++ b/modules/video_capture/linux/video_capture_linux.h @@ -58,7 +58,7 @@ private: }; Buffer *_pool; }; -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_ diff --git a/modules/video_capture/video_capture_delay.h b/modules/video_capture/video_capture_delay.h index 4352644b..f8924e25 100644 --- a/modules/video_capture/video_capture_delay.h +++ b/modules/video_capture/video_capture_delay.h @@ -31,6 +31,6 @@ struct DelayValues DelayValue delayValues[NoOfDelayValues]; }; -} //namespace videocapturemodule -} //namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_DELAY_H_ diff --git a/modules/video_capture/video_capture_factory.cc b/modules/video_capture/video_capture_factory.cc index 6a6b5981..99a07088 100644 --- a/modules/video_capture/video_capture_factory.cc +++ b/modules/video_capture/video_capture_factory.cc @@ -29,4 +29,4 @@ VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo( return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(id); } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/video_capture/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc index 9192dd6c..357abc38 100644 --- a/modules/video_capture/video_capture_impl.cc +++ b/modules/video_capture/video_capture_impl.cc @@ -433,5 +433,5 @@ uint32_t VideoCaptureImpl::CalculateFrameRate(const TickTime& now) return nrOfFrames; } -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc diff --git a/modules/video_capture/video_capture_impl.h b/modules/video_capture/video_capture_impl.h index 6133f751..f0d49651 100644 --- a/modules/video_capture/video_capture_impl.h +++ b/modules/video_capture/video_capture_impl.h @@ -136,6 +136,6 @@ private: // Delta used for translating between NTP and internal timestamps. const int64_t delta_ntp_internal_ms_; }; -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_VIDEO_CAPTURE_IMPL_H_ diff --git a/modules/video_capture/windows/device_info_ds.cc b/modules/video_capture/windows/device_info_ds.cc index 14606b7b..bd4523a8 100644 --- a/modules/video_capture/windows/device_info_ds.cc +++ b/modules/video_capture/windows/device_info_ds.cc @@ -809,5 +809,5 @@ int32_t DeviceInfoDS::DisplayCaptureSettingsDialogBox( filter->Release(); return 0; } -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc diff --git a/modules/video_capture/windows/device_info_ds.h b/modules/video_capture/windows/device_info_ds.h index 7dc3e6c6..f8e73765 100644 --- a/modules/video_capture/windows/device_info_ds.h +++ b/modules/video_capture/windows/device_info_ds.h @@ -103,6 +103,6 @@ private: bool _CoUninitializeIsRequired; }; -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_ diff --git a/modules/video_capture/windows/help_functions_ds.cc b/modules/video_capture/windows/help_functions_ds.cc index 5c78e6b8..f7ed9572 100644 --- a/modules/video_capture/windows/help_functions_ds.cc +++ b/modules/video_capture/windows/help_functions_ds.cc @@ -115,6 +115,6 @@ BOOL PinMatchesCategory(IPin *pPin, REFGUID Category) } return bFound; } -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc diff --git a/modules/video_capture/windows/help_functions_ds.h b/modules/video_capture/windows/help_functions_ds.h index 9765796c..d675f929 100644 --- a/modules/video_capture/windows/help_functions_ds.h +++ b/modules/video_capture/windows/help_functions_ds.h @@ -30,6 +30,6 @@ IPin* GetInputPin(IBaseFilter* filter); IPin* GetOutputPin(IBaseFilter* filter, REFGUID Category); BOOL PinMatchesCategory(IPin *pPin, REFGUID Category); -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_HELP_FUNCTIONS_DS_H_ diff --git a/modules/video_capture/windows/sink_filter_ds.cc b/modules/video_capture/windows/sink_filter_ds.cc index b0f9b448..0c78917f 100644 --- a/modules/video_capture/windows/sink_filter_ds.cc +++ b/modules/video_capture/windows/sink_filter_ds.cc @@ -526,5 +526,5 @@ STDMETHODIMP CaptureSinkFilter::GetClassID( OUT CLSID * pCLSID ) return S_OK; } -} // namespace videocapturemodule -} //namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc diff --git a/modules/video_capture/windows/sink_filter_ds.h b/modules/video_capture/windows/sink_filter_ds.h index 010bc7e6..4966a26d 100644 --- a/modules/video_capture/windows/sink_filter_ds.h +++ b/modules/video_capture/windows/sink_filter_ds.h @@ -95,6 +95,6 @@ private: VideoCaptureExternal& _captureObserver; int32_t _moduleId; }; -} // namespace videocapturemodule -} // namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_SINK_FILTER_DS_H_ diff --git a/modules/video_capture/windows/video_capture_ds.cc b/modules/video_capture/windows/video_capture_ds.cc index 9aa03a8d..085967b8 100644 --- a/modules/video_capture/windows/video_capture_ds.cc +++ b/modules/video_capture/windows/video_capture_ds.cc @@ -409,5 +409,5 @@ HRESULT VideoCaptureDS::ConnectDVCamera() } return hr; } -} // namespace videocapturemodule -} //namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc diff --git a/modules/video_capture/windows/video_capture_ds.h b/modules/video_capture/windows/video_capture_ds.h index dd4afbc7..44040393 100644 --- a/modules/video_capture/windows/video_capture_ds.h +++ b/modules/video_capture/windows/video_capture_ds.h @@ -76,6 +76,6 @@ protected: IPin* _outputDvPin; }; -} // namespace videocapturemodule -} //namespace webrtc +} // namespace videocapturemodule +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_ diff --git a/modules/video_coding/codecs/interface/video_codec_interface.h b/modules/video_coding/codecs/interface/video_codec_interface.h index 8f3c5efc..f80d21e9 100644 --- a/modules/video_coding/codecs/interface/video_codec_interface.h +++ b/modules/video_coding/codecs/interface/video_codec_interface.h @@ -247,6 +247,6 @@ public: virtual VideoDecoder* Copy() { return NULL; } }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H diff --git a/modules/video_coding/main/interface/video_coding.h b/modules/video_coding/main/interface/video_coding.h index 0198ca57..53c92f63 100644 --- a/modules/video_coding/main/interface/video_coding.h +++ b/modules/video_coding/main/interface/video_coding.h @@ -589,6 +589,6 @@ public: virtual int StopDebugRecording() = 0; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_INTERFACE_VIDEO_CODING_H_ diff --git a/modules/video_coding/main/source/codec_timer.h b/modules/video_coding/main/source/codec_timer.h index f3a18634..3acc0d3e 100644 --- a/modules/video_coding/main/source/codec_timer.h +++ b/modules/video_coding/main/source/codec_timer.h @@ -56,6 +56,6 @@ private: }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_CODEC_TIMER_H_ diff --git a/modules/video_coding/main/source/content_metrics_processing.cc b/modules/video_coding/main/source/content_metrics_processing.cc index 99160c9a..504bdcc1 100644 --- a/modules/video_coding/main/source/content_metrics_processing.cc +++ b/modules/video_coding/main/source/content_metrics_processing.cc @@ -122,4 +122,4 @@ void VCMContentMetricsProcessing::UpdateRecursiveAvg( recursive_avg_->motion_magnitude + recursive_avg_factor_ * contentMetrics->motion_magnitude; } -} // end of namespace +} // namespace diff --git a/modules/video_coding/main/source/encoded_frame.h b/modules/video_coding/main/source/encoded_frame.h index a36da0ce..90cc4812 100644 --- a/modules/video_coding/main/source/encoded_frame.h +++ b/modules/video_coding/main/source/encoded_frame.h @@ -120,6 +120,6 @@ protected: RTPFragmentationHeader _fragmentation; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_ENCODED_FRAME_H_ diff --git a/modules/video_coding/main/source/er_tables_xor.h b/modules/video_coding/main/source/er_tables_xor.h index 99163ba5..3068d7a6 100644 --- a/modules/video_coding/main/source/er_tables_xor.h +++ b/modules/video_coding/main/source/er_tables_xor.h @@ -38737,6 +38737,6 @@ static const unsigned char kAvgFECRecoveryXOR[kSizeAvgFECRecoveryXOR] = { }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_ER_TABLES_XOR_H_ diff --git a/modules/video_coding/main/source/fec_tables_xor.h b/modules/video_coding/main/source/fec_tables_xor.h index 27db9a45..28c67b45 100644 --- a/modules/video_coding/main/source/fec_tables_xor.h +++ b/modules/video_coding/main/source/fec_tables_xor.h @@ -6476,6 +6476,6 @@ static const unsigned char kCodeRateXORTable[kSizeCodeRateXORTable] = { }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_FEC_TABLES_XOR_H_ diff --git a/modules/video_coding/main/source/frame_buffer.h b/modules/video_coding/main/source/frame_buffer.h index 245302d5..7a986885 100644 --- a/modules/video_coding/main/source/frame_buffer.h +++ b/modules/video_coding/main/source/frame_buffer.h @@ -93,6 +93,6 @@ private: int64_t _latestPacketTimeMs; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_ diff --git a/modules/video_coding/main/source/generic_decoder.cc b/modules/video_coding/main/source/generic_decoder.cc index f90d7f93..fdb97b55 100644 --- a/modules/video_coding/main/source/generic_decoder.cc +++ b/modules/video_coding/main/source/generic_decoder.cc @@ -223,4 +223,4 @@ bool VCMGenericDecoder::External() const return _isExternal; } -} // namespace +} // namespace diff --git a/modules/video_coding/main/source/generic_decoder.h b/modules/video_coding/main/source/generic_decoder.h index 21cb4c1d..f65f30fb 100644 --- a/modules/video_coding/main/source/generic_decoder.h +++ b/modules/video_coding/main/source/generic_decoder.h @@ -119,6 +119,6 @@ protected: }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ diff --git a/modules/video_coding/main/source/generic_encoder.cc b/modules/video_coding/main/source/generic_encoder.cc index e10bccd9..7831b3d7 100644 --- a/modules/video_coding/main/source/generic_encoder.cc +++ b/modules/video_coding/main/source/generic_encoder.cc @@ -272,4 +272,4 @@ void VCMEncodedFrameCallback::CopyCodecSpecific(const CodecSpecificInfo& info, } } } -} // namespace webrtc +} // namespace webrtc diff --git a/modules/video_coding/main/source/generic_encoder.h b/modules/video_coding/main/source/generic_encoder.h index e7bd835e..85476619 100644 --- a/modules/video_coding/main/source/generic_encoder.h +++ b/modules/video_coding/main/source/generic_encoder.h @@ -144,6 +144,6 @@ private: bool _internalSource; }; // end of VCMGenericEncoder class -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ diff --git a/modules/video_coding/main/source/inter_frame_delay.h b/modules/video_coding/main/source/inter_frame_delay.h index 5b16dbb7..64f4c7be 100644 --- a/modules/video_coding/main/source/inter_frame_delay.h +++ b/modules/video_coding/main/source/inter_frame_delay.h @@ -61,6 +61,6 @@ private: int64_t _dTS; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ diff --git a/modules/video_coding/main/source/internal_defines.h b/modules/video_coding/main/source/internal_defines.h index 0ea163c7..ed2c2a3b 100644 --- a/modules/video_coding/main/source/internal_defines.h +++ b/modules/video_coding/main/source/internal_defines.h @@ -53,6 +53,6 @@ inline int32_t VCMId(const int32_t vcmId, const int32_t receiverId = 0) return static_cast<int32_t>((vcmId << 16) + receiverId); } -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_INTERNAL_DEFINES_H_ diff --git a/modules/video_coding/main/source/jitter_estimator.h b/modules/video_coding/main/source/jitter_estimator.h index 2c81d418..3a24c74e 100644 --- a/modules/video_coding/main/source/jitter_estimator.h +++ b/modules/video_coding/main/source/jitter_estimator.h @@ -149,6 +149,6 @@ private: enum { kFsAccuStartupSamples = 5 }; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ diff --git a/modules/video_coding/main/source/media_opt_util.h b/modules/video_coding/main/source/media_opt_util.h index 19342692..7460688d 100644 --- a/modules/video_coding/main/source/media_opt_util.h +++ b/modules/video_coding/main/source/media_opt_util.h @@ -390,7 +390,7 @@ private: int _numLayers; }; -} // namespace media_optimization -} // namespace webrtc +} // namespace media_optimization +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_ diff --git a/modules/video_coding/main/source/nack_fec_tables.h b/modules/video_coding/main/source/nack_fec_tables.h index 3769d941..acf62bf0 100644 --- a/modules/video_coding/main/source/nack_fec_tables.h +++ b/modules/video_coding/main/source/nack_fec_tables.h @@ -122,6 +122,6 @@ const uint16_t VCMNackFecTable[100] = { }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_NACK_FEC_TABLES_H_ diff --git a/modules/video_coding/main/source/packet.h b/modules/video_coding/main/source/packet.h index 54cd00f9..43c05867 100644 --- a/modules/video_coding/main/source/packet.h +++ b/modules/video_coding/main/source/packet.h @@ -53,5 +53,5 @@ protected: void CopyCodecSpecifics(const RTPVideoHeader& videoHeader); }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_PACKET_H_ diff --git a/modules/video_coding/main/source/qm_select.cc b/modules/video_coding/main/source/qm_select.cc index fdaaa84f..aaf5d7f7 100644 --- a/modules/video_coding/main/source/qm_select.cc +++ b/modules/video_coding/main/source/qm_select.cc @@ -956,4 +956,4 @@ bool VCMQmRobustness::SetUepProtection(uint8_t code_rate_delta, // Default. return false; } -} // end of namespace +} // namespace diff --git a/modules/video_coding/main/source/qm_select.h b/modules/video_coding/main/source/qm_select.h index 4a74fa54..0d8ca293 100644 --- a/modules/video_coding/main/source/qm_select.h +++ b/modules/video_coding/main/source/qm_select.h @@ -370,6 +370,6 @@ class VCMQmRobustness : public VCMQmMethod { uint8_t prev_packet_loss_; uint8_t prev_code_rate_delta_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_QM_SELECT_H_ diff --git a/modules/video_coding/main/source/qm_select_data.h b/modules/video_coding/main/source/qm_select_data.h index 4d4f3397..742bd720 100644 --- a/modules/video_coding/main/source/qm_select_data.h +++ b/modules/video_coding/main/source/qm_select_data.h @@ -222,7 +222,7 @@ const float kSpatialErr2x2VsHoriz = 0.1f; // percentage to favor 2x2 over H const float kSpatialErr2X2VsVert = 0.1f; // percentage to favor 2x2 over V const float kSpatialErrVertVsHoriz = 0.1f; // percentage to favor H over V -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_QM_SELECT_DATA_H_ diff --git a/modules/video_coding/main/source/rtt_filter.h b/modules/video_coding/main/source/rtt_filter.h index 74798416..da7bb7b5 100644 --- a/modules/video_coding/main/source/rtt_filter.h +++ b/modules/video_coding/main/source/rtt_filter.h @@ -65,6 +65,6 @@ private: uint32_t _driftBuf[kMaxDriftJumpCount]; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_RTT_FILTER_H_ diff --git a/modules/video_coding/main/source/timestamp_extrapolator.h b/modules/video_coding/main/source/timestamp_extrapolator.h index 59915162..13ca37df 100644 --- a/modules/video_coding/main/source/timestamp_extrapolator.h +++ b/modules/video_coding/main/source/timestamp_extrapolator.h @@ -58,6 +58,6 @@ private: const double _P11; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_TIMESTAMP_EXTRAPOLATOR_H_ diff --git a/modules/video_coding/main/source/timestamp_map.h b/modules/video_coding/main/source/timestamp_map.h index 083df776..069feeb4 100644 --- a/modules/video_coding/main/source/timestamp_map.h +++ b/modules/video_coding/main/source/timestamp_map.h @@ -47,6 +47,6 @@ private: int32_t _length; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ diff --git a/modules/video_coding/main/source/video_coding_impl.cc b/modules/video_coding/main/source/video_coding_impl.cc index 55e4288f..c996b85f 100644 --- a/modules/video_coding/main/source/video_coding_impl.cc +++ b/modules/video_coding/main/source/video_coding_impl.cc @@ -482,7 +482,7 @@ VideoCodingModuleImpl::SetChannelParameters(uint32_t target_bitrate, else { return VCM_UNINITIALIZED; - } // encoder + } // encoder }// send side return VCM_OK; } diff --git a/modules/video_coding/main/source/video_coding_impl.h b/modules/video_coding/main/source/video_coding_impl.h index 0ffc14f0..632db50e 100644 --- a/modules/video_coding/main/source/video_coding_impl.h +++ b/modules/video_coding/main/source/video_coding_impl.h @@ -327,5 +327,5 @@ private: bool owns_event_factory_; bool frame_dropper_enabled_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ diff --git a/modules/video_coding/main/test/codec_database_test.cc b/modules/video_coding/main/test/codec_database_test.cc index 23daf38f..b62995ca 100644 --- a/modules/video_coding/main/test/codec_database_test.cc +++ b/modules/video_coding/main/test/codec_database_test.cc @@ -359,7 +359,7 @@ CodecDataBaseTest::Perform(CmdArgs& args) { printf("frame number:%d\n",frameCnt); } - } // end for:encode-decode + } // end for:encode-decode // byte count for codec specific printf("Total bytes encoded: %f \n\n",(8.0/1000)*(encodeCallCDT->EncodedBytes()/((int)10/VideoCodingModule::NumberOfCodecs()))); @@ -375,14 +375,14 @@ CodecDataBaseTest::Perform(CmdArgs& args) printf("PSNR from encoder-decoder send-receive control test" "is %f\n\n", psnr.average); } - } // end: iterate codecs + } // end: iterate codecs rewind(_sourceFile); delete [] tmpBuffer; delete decodeCallCDT; delete encodeCallCDT; // closing and calculating PSNR for prior encoder-decoder test TearDown(); // closing open files - } // end of #codecs >1 + } // end of #codecs >1 delete waitEvent; Print(); diff --git a/modules/video_coding/main/test/generic_codec_test.cc b/modules/video_coding/main/test/generic_codec_test.cc index c03d896f..1a9ca397 100644 --- a/modules/video_coding/main/test/generic_codec_test.cc +++ b/modules/video_coding/main/test/generic_codec_test.cc @@ -343,7 +343,7 @@ GenericCodecTest::Perform(CmdArgs& args) totalBytesOneSec = _encodeCompleteCallback->EncodedBytes();//totalBytes; } TEST(_vcm->TimeUntilNextProcess() >= 0); - } // video seq. encode done + } // video seq. encode done TEST(_vcm->TimeUntilNextProcess() == 0); _vcm->Process(); // Let the module calculate its send bit rate estimate // estimating rates @@ -368,7 +368,7 @@ GenericCodecTest::Perform(CmdArgs& args) printf("frame count: %d delta, %d key\n", frameCount.numDeltaFrames, frameCount.numKeyFrames); }// end per codec - } // end rate control test + } // end rate control test /********************************/ /* Encoder Pipeline Delay Test */ /******************************/ @@ -399,10 +399,10 @@ GenericCodecTest::Perform(CmdArgs& args) sourceFrame.set_timestamp(_timeStamp); _vcm->AddVideoFrame(sourceFrame); encodeComplete = _encodeCompleteCallback->EncodeComplete(); - } // first frame encoded + } // first frame encoded printf ("\n Codec type = %s \n", _sendCodec.plName); printf(" Encoder pipeline delay = %d frames\n", _frameCnt - 1); - } // end for all codecs + } // end for all codecs /********************************/ /* Encoder Packet Size Test */ @@ -457,7 +457,7 @@ GenericCodecTest::Perform(CmdArgs& args) _vcm->Process(); } IncrementDebugClock(_frameRate); - } // first frame encoded + } // first frame encoded delete &rtpModule; Print(); diff --git a/modules/video_coding/main/test/video_rtp_play.cc b/modules/video_coding/main/test/video_rtp_play.cc index 6591a823..2da6a820 100644 --- a/modules/video_coding/main/test/video_rtp_play.cc +++ b/modules/video_coding/main/test/video_rtp_play.cc @@ -25,7 +25,7 @@ const uint32_t kConfigRenderDelayMs = 0; const uint32_t kConfigMinPlayoutDelayMs = 0; const int64_t kConfigMaxRuntimeMs = -1; -} // namespace +} // namespace int RtpPlay(const CmdArgs& args) { std::string trace_file = webrtc::test::OutputPath() + "receiverTestTrace.txt"; diff --git a/modules/video_coding/main/test/video_rtp_play_mt.cc b/modules/video_coding/main/test/video_rtp_play_mt.cc index 1ff05dd1..34f32063 100644 --- a/modules/video_coding/main/test/video_rtp_play_mt.cc +++ b/modules/video_coding/main/test/video_rtp_play_mt.cc @@ -32,7 +32,7 @@ const uint32_t kConfigRenderDelayMs = 0; const uint32_t kConfigMinPlayoutDelayMs = 0; const int64_t kConfigMaxRuntimeMs = 10000; -} // namespace +} // namespace bool PlayerThread(void* obj) { assert(obj); diff --git a/modules/video_coding/utility/include/exp_filter.h b/modules/video_coding/utility/include/exp_filter.h index 42fbe3f0..d8c37a30 100644 --- a/modules/video_coding/utility/include/exp_filter.h +++ b/modules/video_coding/utility/include/exp_filter.h @@ -53,6 +53,6 @@ private: const float _max; }; // end of ExpFilter class -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_INCLUDE_EXP_FILTER_H_ diff --git a/modules/video_coding/utility/include/frame_dropper.h b/modules/video_coding/utility/include/frame_dropper.h index 09ac94ad..4c1c168c 100644 --- a/modules/video_coding/utility/include/frame_dropper.h +++ b/modules/video_coding/utility/include/frame_dropper.h @@ -91,6 +91,6 @@ private: float _max_time_drops; }; // end of VCMFrameDropper class -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_INCLUDE_FRAME_DROPPER_H_ diff --git a/modules/video_processing/main/interface/video_processing.h b/modules/video_processing/main/interface/video_processing.h index 09a4b2e8..094900d8 100644 --- a/modules/video_processing/main/interface/video_processing.h +++ b/modules/video_processing/main/interface/video_processing.h @@ -299,6 +299,6 @@ public: }; -} //namespace +} // namespace #endif diff --git a/modules/video_processing/main/interface/video_processing_defines.h b/modules/video_processing/main/interface/video_processing_defines.h index fd47979a..7a3536c7 100644 --- a/modules/video_processing/main/interface/video_processing_defines.h +++ b/modules/video_processing/main/interface/video_processing_defines.h @@ -38,6 +38,6 @@ enum VideoFrameResampling kBox, // Box inteprolation }; -} //namespace +} // namespace #endif diff --git a/modules/video_processing/main/source/brightness_detection.cc b/modules/video_processing/main/source/brightness_detection.cc index 5f44f09c..1e7e939d 100644 --- a/modules/video_processing/main/source/brightness_detection.cc +++ b/modules/video_processing/main/source/brightness_detection.cc @@ -193,4 +193,4 @@ VPMBrightnessDetection::ProcessFrame(const I420VideoFrame& frame, } } -} //namespace +} // namespace diff --git a/modules/video_processing/main/source/brightness_detection.h b/modules/video_processing/main/source/brightness_detection.h index 506e26df..22248d60 100644 --- a/modules/video_processing/main/source/brightness_detection.h +++ b/modules/video_processing/main/source/brightness_detection.h @@ -39,6 +39,6 @@ private: uint32_t _frameCntDark; }; -} //namespace +} // namespace #endif // VPM_BRIGHTNESS_DETECTION_H diff --git a/modules/video_processing/main/source/color_enhancement.cc b/modules/video_processing/main/source/color_enhancement.cc index ed568faa..b5247676 100644 --- a/modules/video_processing/main/source/color_enhancement.cc +++ b/modules/video_processing/main/source/color_enhancement.cc @@ -59,6 +59,6 @@ namespace VideoProcessing return VPM_OK; } -} //namespace +} // namespace -} //namespace webrtc +} // namespace webrtc diff --git a/modules/video_processing/main/source/color_enhancement.h b/modules/video_processing/main/source/color_enhancement.h index f720da2b..f8baaa77 100644 --- a/modules/video_processing/main/source/color_enhancement.h +++ b/modules/video_processing/main/source/color_enhancement.h @@ -24,6 +24,6 @@ namespace VideoProcessing int32_t ColorEnhancement(I420VideoFrame* frame); } -} //namespace +} // namespace #endif // VPM_COLOR_ENHANCEMENT_H diff --git a/modules/video_processing/main/source/color_enhancement_private.h b/modules/video_processing/main/source/color_enhancement_private.h index 863135c9..d4aadfca 100644 --- a/modules/video_processing/main/source/color_enhancement_private.h +++ b/modules/video_processing/main/source/color_enhancement_private.h @@ -268,6 +268,6 @@ static const uint8_t colorTable[256][256] = { {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255} }; -} //namespace +} // namespace #endif // VPM_COLOR_ENHANCEMENT_PRIVATE_H diff --git a/modules/video_processing/main/source/content_analysis.cc b/modules/video_processing/main/source/content_analysis.cc index a5b75aff..a500991d 100644 --- a/modules/video_processing/main/source/content_analysis.cc +++ b/modules/video_processing/main/source/content_analysis.cc @@ -333,4 +333,4 @@ VPMContentAnalysis::ContentMetrics() } -} // namespace +} // namespace diff --git a/modules/video_processing/main/source/content_analysis.h b/modules/video_processing/main/source/content_analysis.h index 4cdd185c..a1e485f1 100644 --- a/modules/video_processing/main/source/content_analysis.h +++ b/modules/video_processing/main/source/content_analysis.h @@ -87,6 +87,6 @@ private: }; // end of VPMContentAnalysis class definition -} // namespace +} // namespace #endif diff --git a/modules/video_processing/main/source/deflickering.cc b/modules/video_processing/main/source/deflickering.cc index 74d0e12a..a4b55c1c 100644 --- a/modules/video_processing/main/source/deflickering.cc +++ b/modules/video_processing/main/source/deflickering.cc @@ -447,4 +447,4 @@ int32_t VPMDeflickering::DetectFlicker() return retVal; } -} //namespace +} // namespace diff --git a/modules/video_processing/main/source/deflickering.h b/modules/video_processing/main/source/deflickering.h index ae02bfea..94b08361 100644 --- a/modules/video_processing/main/source/deflickering.h +++ b/modules/video_processing/main/source/deflickering.h @@ -60,6 +60,6 @@ private: uint8_t _quantHistUW8[kFrameHistorySize][kNumQuants]; }; -} //namespace +} // namespace #endif // VPM_DEFLICKERING_H diff --git a/modules/video_processing/main/source/denoising.cc b/modules/video_processing/main/source/denoising.cc index c0ea0fbc..42ea2684 100644 --- a/modules/video_processing/main/source/denoising.cc +++ b/modules/video_processing/main/source/denoising.cc @@ -177,4 +177,4 @@ VPMDenoising::ProcessFrame(I420VideoFrame* frame) return numPixelsChanged; } -} //namespace +} // namespace diff --git a/modules/video_processing/main/source/denoising.h b/modules/video_processing/main/source/denoising.h index 4b2cb87a..b9d09c08 100644 --- a/modules/video_processing/main/source/denoising.h +++ b/modules/video_processing/main/source/denoising.h @@ -40,7 +40,7 @@ private: int _denoiseFrameCnt; // Counter for subsampling in time }; -} //namespace +} // namespace #endif // VPM_DENOISING_H diff --git a/modules/video_processing/main/source/frame_preprocessor.cc b/modules/video_processing/main/source/frame_preprocessor.cc index 54eeef27..fc952c0b 100644 --- a/modules/video_processing/main/source/frame_preprocessor.cc +++ b/modules/video_processing/main/source/frame_preprocessor.cc @@ -186,4 +186,4 @@ VPMFramePreprocessor::ContentMetrics() const return _contentMetrics; } -} //namespace +} // namespace diff --git a/modules/video_processing/main/source/frame_preprocessor.h b/modules/video_processing/main/source/frame_preprocessor.h index e3edfc82..f2d94a23 100644 --- a/modules/video_processing/main/source/frame_preprocessor.h +++ b/modules/video_processing/main/source/frame_preprocessor.h @@ -81,6 +81,6 @@ private: }; // end of VPMFramePreprocessor class definition -} //namespace +} // namespace #endif // VPM_FRAME_PREPROCESS_H diff --git a/modules/video_processing/main/source/spatial_resampler.cc b/modules/video_processing/main/source/spatial_resampler.cc index 89a449a1..f66153da 100644 --- a/modules/video_processing/main/source/spatial_resampler.cc +++ b/modules/video_processing/main/source/spatial_resampler.cc @@ -119,4 +119,4 @@ VPMSimpleSpatialResampler::ApplyResample(int32_t width, return true; } -} //namespace +} // namespace diff --git a/modules/video_processing/main/source/spatial_resampler.h b/modules/video_processing/main/source/spatial_resampler.h index 43368d12..69d5cf88 100644 --- a/modules/video_processing/main/source/spatial_resampler.h +++ b/modules/video_processing/main/source/spatial_resampler.h @@ -62,6 +62,6 @@ private: Scaler _scaler; }; -} //namespace +} // namespace #endif diff --git a/modules/video_processing/main/source/video_decimator.cc b/modules/video_processing/main/source/video_decimator.cc index e2d09e38..84a6cad1 100644 --- a/modules/video_processing/main/source/video_decimator.cc +++ b/modules/video_processing/main/source/video_decimator.cc @@ -232,4 +232,4 @@ VPMVideoDecimator::ProcessIncomingFrameRate(int64_t now) } } -} //namespace +} // namespace diff --git a/modules/video_processing/main/source/video_decimator.h b/modules/video_processing/main/source/video_decimator.h index 0ea0019f..0a6a1408 100644 --- a/modules/video_processing/main/source/video_decimator.h +++ b/modules/video_processing/main/source/video_decimator.h @@ -60,6 +60,6 @@ private: }; -} //namespace +} // namespace #endif diff --git a/modules/video_processing/main/source/video_processing_impl.cc b/modules/video_processing/main/source/video_processing_impl.cc index 7fd4f6e5..4546f911 100644 --- a/modules/video_processing/main/source/video_processing_impl.cc +++ b/modules/video_processing/main/source/video_processing_impl.cc @@ -290,4 +290,4 @@ VideoProcessingModuleImpl::EnableContentAnalysis(bool enable) _framePreProcessor.EnableContentAnalysis(enable); } -} //namespace +} // namespace diff --git a/modules/video_processing/main/source/video_processing_impl.h b/modules/video_processing/main/source/video_processing_impl.h index 57556ec2..278aa7b1 100644 --- a/modules/video_processing/main/source/video_processing_impl.h +++ b/modules/video_processing/main/source/video_processing_impl.h @@ -85,6 +85,6 @@ private: VPMFramePreprocessor _framePreProcessor; }; -} // namespace +} // namespace #endif diff --git a/modules/video_render/android/video_render_android_impl.h b/modules/video_render/android/video_render_android_impl.h index d8c8fe71..61f079b4 100644 --- a/modules/video_render/android/video_render_android_impl.h +++ b/modules/video_render/android/video_render_android_impl.h @@ -146,6 +146,6 @@ class VideoRenderAndroid: IVideoRender { ThreadWrapper* _javaRenderThread; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_IMPL_H_ diff --git a/modules/video_render/android/video_render_android_native_opengl2.cc b/modules/video_render/android/video_render_android_native_opengl2.cc index a50ca897..99d7f896 100644 --- a/modules/video_render/android/video_render_android_native_opengl2.cc +++ b/modules/video_render/android/video_render_android_native_opengl2.cc @@ -447,4 +447,4 @@ jint AndroidNativeOpenGl2Channel::CreateOpenGLNative( return _openGLRenderer.Setup(width, height); } -} //namespace webrtc +} // namespace webrtc diff --git a/modules/video_render/android/video_render_android_native_opengl2.h b/modules/video_render/android/video_render_android_native_opengl2.h index 16a5c62f..57b5eda8 100644 --- a/modules/video_render/android/video_render_android_native_opengl2.h +++ b/modules/video_render/android/video_render_android_native_opengl2.h @@ -91,6 +91,6 @@ class AndroidNativeOpenGl2Renderer: private VideoRenderAndroid { jclass _javaRenderClass; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_NATIVE_OPENGL2_H_ diff --git a/modules/video_render/external/video_render_external_impl.cc b/modules/video_render/external/video_render_external_impl.cc index a0ef3f4b..6f37baeb 100644 --- a/modules/video_render/external/video_render_external_impl.cc +++ b/modules/video_render/external/video_render_external_impl.cc @@ -201,5 +201,5 @@ int32_t VideoRenderExternalImpl::RenderFrame( { return 0; } -} //namespace webrtc +} // namespace webrtc diff --git a/modules/video_render/external/video_render_external_impl.h b/modules/video_render/external/video_render_external_impl.h index 3a5472b7..11791eaf 100644 --- a/modules/video_render/external/video_render_external_impl.h +++ b/modules/video_render/external/video_render_external_impl.h @@ -125,7 +125,7 @@ private: bool _fullscreen; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_IMPL_H_ diff --git a/modules/video_render/i_video_render.h b/modules/video_render/i_video_render.h index da3ade5a..76ad8e6c 100644 --- a/modules/video_render/i_video_render.h +++ b/modules/video_render/i_video_render.h @@ -128,6 +128,6 @@ public: const float bottom) = 0; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_I_VIDEO_RENDER_H_ diff --git a/modules/video_render/include/video_render.h b/modules/video_render/include/video_render.h index 725cbba0..de001206 100644 --- a/modules/video_render/include/video_render.h +++ b/modules/video_render/include/video_render.h @@ -288,5 +288,5 @@ public: const bool mirrorXAxis, const bool mirrorYAxis) = 0; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_H_ diff --git a/modules/video_render/include/video_render_defines.h b/modules/video_render/include/video_render_defines.h index 992b821f..135deae3 100644 --- a/modules/video_render/include/video_render_defines.h +++ b/modules/video_render/include/video_render_defines.h @@ -88,6 +88,6 @@ enum Rotation kRotation270 = 3 }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_DEFINES_H_ diff --git a/modules/video_render/linux/video_render_linux_impl.cc b/modules/video_render/linux/video_render_linux_impl.cc index b50c1bd3..76dc2042 100644 --- a/modules/video_render/linux/video_render_linux_impl.cc +++ b/modules/video_render/linux/video_render_linux_impl.cc @@ -266,5 +266,5 @@ int32_t VideoRenderLinuxImpl::SetBitmap(const void* bitMap, return -1; } -} //namespace webrtc +} // namespace webrtc diff --git a/modules/video_render/linux/video_render_linux_impl.h b/modules/video_render/linux/video_render_linux_impl.h index 3318ddfe..0ee0d578 100644 --- a/modules/video_render/linux/video_render_linux_impl.h +++ b/modules/video_render/linux/video_render_linux_impl.h @@ -126,5 +126,5 @@ private: VideoX11Render* _ptrX11Render; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_RENDER_LINUX_IMPL_H_ diff --git a/modules/video_render/linux/video_x11_channel.cc b/modules/video_render/linux/video_x11_channel.cc index da10a97f..fb550029 100644 --- a/modules/video_render/linux/video_x11_channel.cc +++ b/modules/video_render/linux/video_x11_channel.cc @@ -312,6 +312,6 @@ int32_t VideoX11Channel::GetStreamProperties(uint32_t& zOrder, } -} //namespace webrtc +} // namespace webrtc diff --git a/modules/video_render/linux/video_x11_channel.h b/modules/video_render/linux/video_x11_channel.h index 30d27e89..9571311b 100644 --- a/modules/video_render/linux/video_x11_channel.h +++ b/modules/video_render/linux/video_x11_channel.h @@ -91,6 +91,6 @@ private: }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_ diff --git a/modules/video_render/linux/video_x11_render.cc b/modules/video_render/linux/video_x11_render.cc index 570883cc..14e2a0d5 100644 --- a/modules/video_render/linux/video_x11_render.cc +++ b/modules/video_render/linux/video_x11_render.cc @@ -150,5 +150,5 @@ int32_t VideoX11Render::GetIncomingStreamProperties( return -1; } -} //namespace webrtc +} // namespace webrtc diff --git a/modules/video_render/linux/video_x11_render.h b/modules/video_render/linux/video_x11_render.h index 5c15a0d0..978388c2 100644 --- a/modules/video_render/linux/video_x11_render.h +++ b/modules/video_render/linux/video_x11_render.h @@ -53,6 +53,6 @@ private: }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_RENDER_H_ diff --git a/modules/video_render/mac/video_render_agl.cc b/modules/video_render/mac/video_render_agl.cc index e9b5f386..125bc4d5 100644 --- a/modules/video_render/mac/video_render_agl.cc +++ b/modules/video_render/mac/video_render_agl.cc @@ -1784,7 +1784,7 @@ int VideoRenderAGL::CalculateVisibleRegion(ControlRef control, RgnHandle &visibl continue; } - } // next child control + } // next child control } lastControl = tempControl; GetSuperControl(tempControl, &subControl); @@ -1996,7 +1996,7 @@ void VideoRenderAGL::UnlockAGLCntx() _renderCritSec.Leave(); } -} //namespace webrtc +} // namespace webrtc #endif // CARBON_RENDERING diff --git a/modules/video_render/mac/video_render_agl.h b/modules/video_render/mac/video_render_agl.h index e446fb17..3da1af82 100644 --- a/modules/video_render/mac/video_render_agl.h +++ b/modules/video_render/mac/video_render_agl.h @@ -173,7 +173,7 @@ class VideoRenderAGL { }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ diff --git a/modules/video_render/mac/video_render_mac_carbon_impl.cc b/modules/video_render/mac/video_render_mac_carbon_impl.cc index f3fb2de3..1d2110d1 100644 --- a/modules/video_render/mac/video_render_mac_carbon_impl.cc +++ b/modules/video_render/mac/video_render_mac_carbon_impl.cc @@ -292,6 +292,6 @@ int32_t VideoRenderMacCarbonImpl::SetBitmap(const void* bitMap, } -} //namespace webrtc +} // namespace webrtc #endif // CARBON_RENDERING diff --git a/modules/video_render/mac/video_render_mac_carbon_impl.h b/modules/video_render/mac/video_render_mac_carbon_impl.h index b0cb0fc9..e41f6b53 100644 --- a/modules/video_render/mac/video_render_mac_carbon_impl.h +++ b/modules/video_render/mac/video_render_mac_carbon_impl.h @@ -142,7 +142,7 @@ private: }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_MAC_CARBON_IMPL_H_ #endif // CARBON_RENDERING diff --git a/modules/video_render/mac/video_render_mac_cocoa_impl.h b/modules/video_render/mac/video_render_mac_cocoa_impl.h index 5507f064..edfa2866 100644 --- a/modules/video_render/mac/video_render_mac_cocoa_impl.h +++ b/modules/video_render/mac/video_render_mac_cocoa_impl.h @@ -137,7 +137,7 @@ private: }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_MAC_COCOA_IMPL_H_ #endif // COCOA_RENDERING diff --git a/modules/video_render/mac/video_render_mac_cocoa_impl.mm b/modules/video_render/mac/video_render_mac_cocoa_impl.mm index c518c1f0..41c7049a 100644 --- a/modules/video_render/mac/video_render_mac_cocoa_impl.mm +++ b/modules/video_render/mac/video_render_mac_cocoa_impl.mm @@ -264,6 +264,6 @@ int32_t VideoRenderMacCocoaImpl::FullScreenRender(void* window, const bool enabl return -1; } -} //namespace webrtc +} // namespace webrtc #endif // COCOA_RENDERING diff --git a/modules/video_render/mac/video_render_nsopengl.h b/modules/video_render/mac/video_render_nsopengl.h index 3e5af3a4..30d5e25e 100644 --- a/modules/video_render/mac/video_render_nsopengl.h +++ b/modules/video_render/mac/video_render_nsopengl.h @@ -184,7 +184,7 @@ private: // variables NSRect _windowRefSuperViewFrame; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_NSOPENGL_H_ #endif // COCOA_RENDERING diff --git a/modules/video_render/mac/video_render_nsopengl.mm b/modules/video_render/mac/video_render_nsopengl.mm index 5b80bddd..c83ba23b 100644 --- a/modules/video_render/mac/video_render_nsopengl.mm +++ b/modules/video_render/mac/video_render_nsopengl.mm @@ -1260,6 +1260,6 @@ void VideoRenderNSOpenGL::UnlockAGLCntx() */ -} //namespace webrtc +} // namespace webrtc #endif // COCOA_RENDERING diff --git a/modules/video_render/video_render_impl.cc b/modules/video_render/video_render_impl.cc index a6cff878..d0ad7c32 100644 --- a/modules/video_render/video_render_impl.cc +++ b/modules/video_render/video_render_impl.cc @@ -998,4 +998,4 @@ int32_t ModuleVideoRenderImpl::MirrorRenderStream(const int renderId, return incomingStream->EnableMirroring(enable, mirrorXAxis, mirrorYAxis); } -} //namespace webrtc +} // namespace webrtc diff --git a/modules/video_render/video_render_impl.h b/modules/video_render/video_render_impl.h index 49bd77b8..2f620836 100644 --- a/modules/video_render/video_render_impl.h +++ b/modules/video_render/video_render_impl.h @@ -222,6 +222,6 @@ private: MapWrapper& _streamRenderMap; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_IMPL_H_ diff --git a/modules/video_render/windows/i_video_render_win.h b/modules/video_render/windows/i_video_render_win.h index f9680ba2..6d5e91f3 100644 --- a/modules/video_render/windows/i_video_render_win.h +++ b/modules/video_render/windows/i_video_render_win.h @@ -106,5 +106,5 @@ public: }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_I_VIDEO_RENDER_WIN_H_ diff --git a/modules/video_render/windows/video_render_direct3d9.cc b/modules/video_render/windows/video_render_direct3d9.cc index 87a23c35..5e9d1224 100644 --- a/modules/video_render/windows/video_render_direct3d9.cc +++ b/modules/video_render/windows/video_render_direct3d9.cc @@ -1174,5 +1174,5 @@ int32_t VideoRenderDirect3D9::ConfigureRenderer(const uint32_t channel, return 0; } -} //namespace webrtc +} // namespace webrtc diff --git a/modules/video_render/windows/video_render_direct3d9.h b/modules/video_render/windows/video_render_direct3d9.h index 9688f77e..4d4fe9a9 100644 --- a/modules/video_render/windows/video_render_direct3d9.h +++ b/modules/video_render/windows/video_render_direct3d9.h @@ -250,6 +250,6 @@ private: DWORD _availableMemory; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECT3D9_H_ diff --git a/modules/video_render/windows/video_render_windows_impl.cc b/modules/video_render/windows/video_render_windows_impl.cc index 686f778c..093b1f38 100644 --- a/modules/video_render/windows/video_render_windows_impl.cc +++ b/modules/video_render/windows/video_render_windows_impl.cc @@ -342,5 +342,5 @@ int32_t VideoRenderWindowsImpl::SetBitmap(const void* bitMap, return error; } -} //namespace webrtc +} // namespace webrtc diff --git a/modules/video_render/windows/video_render_windows_impl.h b/modules/video_render/windows/video_render_windows_impl.h index ec730fea..64f59c03 100644 --- a/modules/video_render/windows/video_render_windows_impl.h +++ b/modules/video_render/windows/video_render_windows_impl.h @@ -135,6 +135,6 @@ private: IVideoRenderWin* _ptrRendererWin; }; -} //namespace webrtc +} // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_WINDOWS_IMPL_H_ diff --git a/system_wrappers/interface/condition_variable_wrapper.h b/system_wrappers/interface/condition_variable_wrapper.h index 29d2dfe1..151f00ec 100644 --- a/system_wrappers/interface/condition_variable_wrapper.h +++ b/system_wrappers/interface/condition_variable_wrapper.h @@ -37,6 +37,6 @@ class ConditionVariableWrapper { virtual void WakeAll() = 0; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CONDITION_VARIABLE_WRAPPER_H_ diff --git a/system_wrappers/interface/cpu_features_wrapper.h b/system_wrappers/interface/cpu_features_wrapper.h index eacfe409..85152ba1 100644 --- a/system_wrappers/interface/cpu_features_wrapper.h +++ b/system_wrappers/interface/cpu_features_wrapper.h @@ -45,7 +45,7 @@ extern WebRtc_CPUInfo WebRtc_GetCPUInfoNoASM; extern uint64_t WebRtc_GetCPUFeaturesARM(void); #if defined(__cplusplus) || defined(c_plusplus) -} // extern "C" +} // extern "C" #endif #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CPU_FEATURES_WRAPPER_H_ diff --git a/system_wrappers/interface/cpu_info.h b/system_wrappers/interface/cpu_info.h index 70864272..fa8c3881 100644 --- a/system_wrappers/interface/cpu_info.h +++ b/system_wrappers/interface/cpu_info.h @@ -24,6 +24,6 @@ class CpuInfo { static uint32_t number_of_cores_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CPU_INFO_H_ diff --git a/system_wrappers/interface/critical_section_wrapper.h b/system_wrappers/interface/critical_section_wrapper.h index 167951d9..0253a282 100644 --- a/system_wrappers/interface/critical_section_wrapper.h +++ b/system_wrappers/interface/critical_section_wrapper.h @@ -56,6 +56,6 @@ class CriticalSectionScoped { CriticalSectionWrapper* ptr_crit_sec_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CRITICAL_SECTION_WRAPPER_H_ diff --git a/system_wrappers/interface/event_wrapper.h b/system_wrappers/interface/event_wrapper.h index 4ee18a6f..7a18232f 100644 --- a/system_wrappers/interface/event_wrapper.h +++ b/system_wrappers/interface/event_wrapper.h @@ -55,6 +55,6 @@ class EventWrapper { virtual bool StopTimer() = 0; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_EVENT_WRAPPER_H_ diff --git a/system_wrappers/interface/file_wrapper.h b/system_wrappers/interface/file_wrapper.h index 2ab6875b..5de6774a 100644 --- a/system_wrappers/interface/file_wrapper.h +++ b/system_wrappers/interface/file_wrapper.h @@ -73,6 +73,6 @@ class FileWrapper : public InStream, public OutStream { virtual int Rewind() = 0; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_FILE_WRAPPER_H_ diff --git a/system_wrappers/interface/map_wrapper.h b/system_wrappers/interface/map_wrapper.h index c0c332ec..86643e59 100644 --- a/system_wrappers/interface/map_wrapper.h +++ b/system_wrappers/interface/map_wrapper.h @@ -70,6 +70,6 @@ class MapWrapper { std::map<int, MapItem*> map_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_MAP_WRAPPER_H_ diff --git a/system_wrappers/interface/rw_lock_wrapper.h b/system_wrappers/interface/rw_lock_wrapper.h index 91305c15..80eb5da8 100644 --- a/system_wrappers/interface/rw_lock_wrapper.h +++ b/system_wrappers/interface/rw_lock_wrapper.h @@ -63,6 +63,6 @@ class WriteLockScoped { RWLockWrapper& rw_lock_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_RW_LOCK_WRAPPER_H_ diff --git a/system_wrappers/interface/scoped_ptr.h b/system_wrappers/interface/scoped_ptr.h index 74b6ad36..84113d83 100644 --- a/system_wrappers/interface/scoped_ptr.h +++ b/system_wrappers/interface/scoped_ptr.h @@ -253,6 +253,6 @@ void swap(scoped_ptr_malloc<T,FF>& a, scoped_ptr_malloc<T,FF>& b) { a.swap(b); } -} // namespace webrtc +} // namespace webrtc #endif // #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_SCOPED_PTR_H_ diff --git a/system_wrappers/interface/thread_wrapper.h b/system_wrappers/interface/thread_wrapper.h index e8323636..d9e7d8a3 100644 --- a/system_wrappers/interface/thread_wrapper.h +++ b/system_wrappers/interface/thread_wrapper.h @@ -89,6 +89,6 @@ class ThreadWrapper { virtual bool Stop() = 0; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_THREAD_WRAPPER_H_ diff --git a/system_wrappers/source/atomic32_posix.cc b/system_wrappers/source/atomic32_posix.cc index 38f36e09..614f3333 100644 --- a/system_wrappers/source/atomic32_posix.cc +++ b/system_wrappers/source/atomic32_posix.cc @@ -54,4 +54,4 @@ int32_t Atomic32::Value() const { return value_; } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/condition_variable.cc b/system_wrappers/source/condition_variable.cc index f36f7e24..577949d3 100644 --- a/system_wrappers/source/condition_variable.cc +++ b/system_wrappers/source/condition_variable.cc @@ -38,4 +38,4 @@ ConditionVariableWrapper* ConditionVariableWrapper::CreateConditionVariable() { #endif } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/condition_variable_posix.cc b/system_wrappers/source/condition_variable_posix.cc index 41e80234..846cd63b 100644 --- a/system_wrappers/source/condition_variable_posix.cc +++ b/system_wrappers/source/condition_variable_posix.cc @@ -129,4 +129,4 @@ void ConditionVariablePosix::WakeAll() { pthread_cond_broadcast(&cond_); } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/condition_variable_posix.h b/system_wrappers/source/condition_variable_posix.h index 53adcdbf..6e69746e 100644 --- a/system_wrappers/source/condition_variable_posix.h +++ b/system_wrappers/source/condition_variable_posix.h @@ -35,6 +35,6 @@ class ConditionVariablePosix : public ConditionVariableWrapper { pthread_cond_t cond_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_CONDITION_VARIABLE_POSIX_H_ diff --git a/system_wrappers/source/cpu_info.cc b/system_wrappers/source/cpu_info.cc index 9e2628ab..c482d879 100644 --- a/system_wrappers/source/cpu_info.cc +++ b/system_wrappers/source/cpu_info.cc @@ -61,4 +61,4 @@ uint32_t CpuInfo::DetectNumberOfCores() { return number_of_cores_; } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/critical_section.cc b/system_wrappers/source/critical_section.cc index 1b4511d8..c5865887 100644 --- a/system_wrappers/source/critical_section.cc +++ b/system_wrappers/source/critical_section.cc @@ -25,4 +25,4 @@ CriticalSectionWrapper* CriticalSectionWrapper::CreateCriticalSection() { #endif } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/critical_section_posix.cc b/system_wrappers/source/critical_section_posix.cc index ac659400..36b9f137 100644 --- a/system_wrappers/source/critical_section_posix.cc +++ b/system_wrappers/source/critical_section_posix.cc @@ -39,4 +39,4 @@ CriticalSectionPosix::Leave() { (void) pthread_mutex_unlock(&mutex_); } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/critical_section_posix.h b/system_wrappers/source/critical_section_posix.h index f09aba07..6a0426c0 100644 --- a/system_wrappers/source/critical_section_posix.h +++ b/system_wrappers/source/critical_section_posix.h @@ -31,6 +31,6 @@ class CriticalSectionPosix : public CriticalSectionWrapper { friend class ConditionVariablePosix; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_POSIX_H_ diff --git a/system_wrappers/source/critical_section_win.cc b/system_wrappers/source/critical_section_win.cc index 7acb0076..b5149d1e 100644 --- a/system_wrappers/source/critical_section_win.cc +++ b/system_wrappers/source/critical_section_win.cc @@ -30,4 +30,4 @@ CriticalSectionWindows::Leave() { LeaveCriticalSection(&crit); } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/critical_section_win.h b/system_wrappers/source/critical_section_win.h index be4dd742..be237acc 100644 --- a/system_wrappers/source/critical_section_win.h +++ b/system_wrappers/source/critical_section_win.h @@ -33,6 +33,6 @@ class CriticalSectionWindows : public CriticalSectionWrapper { friend class ConditionVariableNativeWin; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_WIN_H_ diff --git a/system_wrappers/source/event.cc b/system_wrappers/source/event.cc index 18ac4f04..75571b55 100644 --- a/system_wrappers/source/event.cc +++ b/system_wrappers/source/event.cc @@ -30,4 +30,4 @@ EventWrapper* EventWrapper::Create() { return EventPosix::Create(); #endif } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/event_posix.cc b/system_wrappers/source/event_posix.cc index c3291892..1188bc8c 100644 --- a/system_wrappers/source/event_posix.cc +++ b/system_wrappers/source/event_posix.cc @@ -280,4 +280,4 @@ bool EventPosix::StopTimer() { return true; } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/file_impl.cc b/system_wrappers/source/file_impl.cc index c9bd8258..190f3995 100644 --- a/system_wrappers/source/file_impl.cc +++ b/system_wrappers/source/file_impl.cc @@ -248,4 +248,4 @@ int FileWrapperImpl::FlushImpl() { return -1; } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/file_impl.h b/system_wrappers/source/file_impl.h index c810b048..5dbbcfb0 100644 --- a/system_wrappers/source/file_impl.h +++ b/system_wrappers/source/file_impl.h @@ -59,6 +59,6 @@ class FileWrapperImpl : public FileWrapper { char file_name_utf8_[kMaxFileNameSize]; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_FILE_IMPL_H_ diff --git a/system_wrappers/source/list_no_stl.cc b/system_wrappers/source/list_no_stl.cc index b5f61371..5c9f5af0 100644 --- a/system_wrappers/source/list_no_stl.cc +++ b/system_wrappers/source/list_no_stl.cc @@ -238,4 +238,4 @@ void ListWrapper::PushFrontImpl(ListItem* item) { size_++; } -} //namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/list_stl.cc b/system_wrappers/source/list_stl.cc index 1dac0c9b..81b6f0cc 100644 --- a/system_wrappers/source/list_stl.cc +++ b/system_wrappers/source/list_stl.cc @@ -204,4 +204,4 @@ int ListWrapper::Erase(ListItem* item) { return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/map.cc b/system_wrappers/source/map.cc index aad6f5c2..63ec54fb 100644 --- a/system_wrappers/source/map.cc +++ b/system_wrappers/source/map.cc @@ -138,4 +138,4 @@ int MapWrapper::Erase(const int id) { return -1; } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/map_no_stl.cc b/system_wrappers/source/map_no_stl.cc index 572925bb..171483e1 100644 --- a/system_wrappers/source/map_no_stl.cc +++ b/system_wrappers/source/map_no_stl.cc @@ -177,4 +177,4 @@ int MapNoStl::Remove(MapNoStlItem* item) { return 0; } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/map_no_stl.h b/system_wrappers/source/map_no_stl.h index 9d8f5d88..23c559d5 100644 --- a/system_wrappers/source/map_no_stl.h +++ b/system_wrappers/source/map_no_stl.h @@ -65,6 +65,6 @@ class MapNoStl { DISALLOW_COPY_AND_ASSIGN(MapNoStl); }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_MAP_NO_STL_H_ diff --git a/system_wrappers/source/set_thread_name_win.h b/system_wrappers/source/set_thread_name_win.h index 76d18bf7..cca126f1 100644 --- a/system_wrappers/source/set_thread_name_win.h +++ b/system_wrappers/source/set_thread_name_win.h @@ -104,5 +104,5 @@ void SetThreadName(DWORD dwThreadID, LPCSTR szThreadName) { } } -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_THREAD_WINDOWS_SET_NAME_H_ diff --git a/system_wrappers/source/sort.cc b/system_wrappers/source/sort.cc index 8c774bb2..c3b61e01 100644 --- a/system_wrappers/source/sort.cc +++ b/system_wrappers/source/sort.cc @@ -483,4 +483,4 @@ int32_t KeySort(void* data, void* key, uint32_t num_of_elements, #endif } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/thread.cc b/system_wrappers/source/thread.cc index 2fe6a610..6f023f86 100644 --- a/system_wrappers/source/thread.cc +++ b/system_wrappers/source/thread.cc @@ -28,4 +28,4 @@ ThreadWrapper* ThreadWrapper::CreateThread(ThreadRunFunction func, #endif } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/thread_posix.cc b/system_wrappers/source/thread_posix.cc index b1b445f6..8a24ae58 100644 --- a/system_wrappers/source/thread_posix.cc +++ b/system_wrappers/source/thread_posix.cc @@ -355,4 +355,4 @@ void ThreadPosix::Run() { } } -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/thread_posix.h b/system_wrappers/source/thread_posix.h index 67db496a..bacf908a 100644 --- a/system_wrappers/source/thread_posix.h +++ b/system_wrappers/source/thread_posix.h @@ -68,6 +68,6 @@ class ThreadPosix : public ThreadWrapper { pthread_t thread_; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_THREAD_POSIX_H_ diff --git a/system_wrappers/source/thread_win.cc b/system_wrappers/source/thread_win.cc index 2e029e7e..c68ee1ad 100644 --- a/system_wrappers/source/thread_win.cc +++ b/system_wrappers/source/thread_win.cc @@ -195,4 +195,4 @@ void ThreadWindows::Run() { critsect_stop_->Leave(); }; -} // namespace webrtc +} // namespace webrtc diff --git a/system_wrappers/source/thread_win.h b/system_wrappers/source/thread_win.h index 2705f778..11226766 100644 --- a/system_wrappers/source/thread_win.h +++ b/system_wrappers/source/thread_win.h @@ -60,6 +60,6 @@ class ThreadWindows : public ThreadWrapper { }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_THREAD_WIN_H_ diff --git a/test/channel_transport/udp_socket2_win.cc b/test/channel_transport/udp_socket2_win.cc index b244f722..97cd5e10 100644 --- a/test/channel_transport/udp_socket2_win.cc +++ b/test/channel_transport/udp_socket2_win.cc @@ -508,7 +508,7 @@ void UdpSocket2Windows::IOCompleted(PerIoContext* pIOContext, OutstandingCallCompleted(); return; } - } // if (pIOContext == NULL || error == ERROR_OPERATION_ABORTED) + } // if (pIOContext == NULL || error == ERROR_OPERATION_ABORTED) if(pIOContext->ioOperation == OP_WRITE) { diff --git a/video_engine/test/auto_test/automated/vie_api_integration_test.cc b/video_engine/test/auto_test/automated/vie_api_integration_test.cc index a39ef0f4..5ba17f26 100644 --- a/video_engine/test/auto_test/automated/vie_api_integration_test.cc +++ b/video_engine/test/auto_test/automated/vie_api_integration_test.cc @@ -52,4 +52,4 @@ TEST_F(DISABLED_ON_MAC(ViEApiIntegrationTest), RunsRtpRtcpTestWithoutErrors) { tests_->ViERtpRtcpAPITest(); } -} // namespace +} // namespace diff --git a/video_engine/test/auto_test/automated/vie_standard_integration_test.cc b/video_engine/test/auto_test/automated/vie_standard_integration_test.cc index f517bcc2..0990fa2c 100644 --- a/video_engine/test/auto_test/automated/vie_standard_integration_test.cc +++ b/video_engine/test/auto_test/automated/vie_standard_integration_test.cc @@ -65,4 +65,4 @@ TEST_F(ViEStandardIntegrationTest, MAYBE_RunsRtpRtcpTestWithoutErrors) { tests_->ViERtpRtcpStandardTest(); } -} // namespace +} // namespace diff --git a/voice_engine/channel.cc b/voice_engine/channel.cc index 6bfb259a..dbcccf1a 100644 --- a/voice_engine/channel.cc +++ b/voice_engine/channel.cc @@ -5324,5 +5324,5 @@ int Channel::SetRedPayloadType(int red_payload_type) { return 0; } -} // namespace voe -} // namespace webrtc +} // namespace voe +} // namespace webrtc diff --git a/voice_engine/channel.h b/voice_engine/channel.h index d05cd21a..a1e16feb 100644 --- a/voice_engine/channel.h +++ b/voice_engine/channel.h @@ -551,8 +551,8 @@ private: bool _rxNsIsEnabled; }; -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H diff --git a/voice_engine/channel_manager.cc b/voice_engine/channel_manager.cc index 5adfcbef..4b203176 100644 --- a/voice_engine/channel_manager.cc +++ b/voice_engine/channel_manager.cc @@ -156,6 +156,6 @@ Channel* ScopedChannel::GetNextChannel(void*& iterator) const return static_cast<Channel*> (it->GetItem()); } -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/channel_manager.h b/voice_engine/channel_manager.h index 49e7bf76..723ff043 100644 --- a/voice_engine/channel_manager.h +++ b/voice_engine/channel_manager.h @@ -82,8 +82,8 @@ private: MapWrapper _channels; }; -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H diff --git a/voice_engine/channel_manager_base.cc b/voice_engine/channel_manager_base.cc index 25d40586..440a0ea9 100644 --- a/voice_engine/channel_manager_base.cc +++ b/voice_engine/channel_manager_base.cc @@ -222,6 +222,6 @@ void ChannelManagerBase::GetChannels(MapWrapper& channels) const } } -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/channel_manager_base.h b/voice_engine/channel_manager_base.h index a61bf5a7..1db19033 100644 --- a/voice_engine/channel_manager_base.h +++ b/voice_engine/channel_manager_base.h @@ -80,8 +80,8 @@ private: RWLockWrapper* _itemsRWLockPtr; }; -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_BASE_H diff --git a/voice_engine/dtmf_inband.h b/voice_engine/dtmf_inband.h index c867143c..eb045c92 100644 --- a/voice_engine/dtmf_inband.h +++ b/voice_engine/dtmf_inband.h @@ -82,6 +82,6 @@ private: uint32_t _delaySinceLastToneMS; // time since last generated tone [ms] }; -} // namespace webrtc +} // namespace webrtc #endif // #ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_H_ diff --git a/voice_engine/dtmf_inband_queue.h b/voice_engine/dtmf_inband_queue.h index fa4967ab..5ca3f9c5 100644 --- a/voice_engine/dtmf_inband_queue.h +++ b/voice_engine/dtmf_inband_queue.h @@ -45,6 +45,6 @@ private: uint8_t _DtmfLevel[kDtmfInbandMax]; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_DTMF_INBAND_QUEUE_H diff --git a/voice_engine/include/voe_audio_processing.h b/voice_engine/include/voe_audio_processing.h index 51ca9520..3ba7b1a2 100644 --- a/voice_engine/include/voe_audio_processing.h +++ b/voice_engine/include/voe_audio_processing.h @@ -232,6 +232,6 @@ protected: virtual ~VoEAudioProcessing() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_H diff --git a/voice_engine/include/voe_base.h b/voice_engine/include/voe_base.h index 2958108c..1a06c2ee 100644 --- a/voice_engine/include/voe_base.h +++ b/voice_engine/include/voe_base.h @@ -186,6 +186,6 @@ protected: virtual ~VoEBase() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_H diff --git a/voice_engine/include/voe_codec.h b/voice_engine/include/voe_codec.h index 4126965d..e69737d6 100644 --- a/voice_engine/include/voe_codec.h +++ b/voice_engine/include/voe_codec.h @@ -147,6 +147,6 @@ protected: virtual ~VoECodec() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_CODEC_H diff --git a/voice_engine/include/voe_hardware.h b/voice_engine/include/voe_hardware.h index 8236f65f..5c247d74 100644 --- a/voice_engine/include/voe_hardware.h +++ b/voice_engine/include/voe_hardware.h @@ -136,6 +136,6 @@ protected: virtual ~VoEHardware() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_HARDWARE_H diff --git a/voice_engine/include/voe_neteq_stats.h b/voice_engine/include/voe_neteq_stats.h index 7b7c47fe..f4e8f7b5 100644 --- a/voice_engine/include/voe_neteq_stats.h +++ b/voice_engine/include/voe_neteq_stats.h @@ -40,6 +40,6 @@ protected: virtual ~VoENetEqStats() {} }; -} // namespace webrtc +} // namespace webrtc #endif // #ifndef WEBRTC_VOICE_ENGINE_VOE_NETEQ_STATS_H diff --git a/voice_engine/include/voe_network.h b/voice_engine/include/voe_network.h index 15a770bd..7bcf9033 100644 --- a/voice_engine/include/voe_network.h +++ b/voice_engine/include/voe_network.h @@ -119,6 +119,6 @@ protected: virtual ~VoENetwork() {} }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_NETWORK_H diff --git a/voice_engine/include/voe_video_sync.h b/voice_engine/include/voe_video_sync.h index a3770eab..ef811a96 100644 --- a/voice_engine/include/voe_video_sync.h +++ b/voice_engine/include/voe_video_sync.h @@ -99,6 +99,6 @@ protected: virtual ~VoEVideoSync() { } }; -} // namespace webrtc +} // namespace webrtc #endif // #ifndef WEBRTC_VOICE_ENGINE_VOE_VIDEO_SYNC_H diff --git a/voice_engine/level_indicator.cc b/voice_engine/level_indicator.cc index 12ca906e..61dfbcda 100644 --- a/voice_engine/level_indicator.cc +++ b/voice_engine/level_indicator.cc @@ -100,4 +100,4 @@ int16_t AudioLevel::LevelFullRange() const } // namespace voe -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/monitor_module.cc b/voice_engine/monitor_module.cc index ef863f90..2389a51c 100644 --- a/voice_engine/monitor_module.cc +++ b/voice_engine/monitor_module.cc @@ -87,6 +87,6 @@ MonitorModule::Process() return 0; } -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/monitor_module.h b/voice_engine/monitor_module.h index d55baec6..ebe4acaa 100644 --- a/voice_engine/monitor_module.h +++ b/voice_engine/monitor_module.h @@ -56,8 +56,8 @@ private: int32_t _lastProcessTime; }; -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc #endif // VOICE_ENGINE_MONITOR_MODULE diff --git a/voice_engine/output_mixer.cc b/voice_engine/output_mixer.cc index b928455b..dba96fe7 100644 --- a/voice_engine/output_mixer.cc +++ b/voice_engine/output_mixer.cc @@ -655,6 +655,6 @@ OutputMixer::InsertInbandDtmfTone() return 0; } -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/output_mixer.h b/voice_engine/output_mixer.h index 5a423c2a..fc9afd8c 100644 --- a/voice_engine/output_mixer.h +++ b/voice_engine/output_mixer.h @@ -147,8 +147,8 @@ private: bool _outputFileRecording; }; -} // namespace voe +} // namespace voe -} // namespace werbtc +} // namespace werbtc #endif // VOICE_ENGINE_OUTPUT_MIXER_H_ diff --git a/voice_engine/shared_data.cc b/voice_engine/shared_data.cc index 88f66fd3..e993778b 100644 --- a/voice_engine/shared_data.cc +++ b/voice_engine/shared_data.cc @@ -118,6 +118,6 @@ void SharedData::SetLastError(int32_t error, TraceLevel level, _engineStatistics.SetLastError(error, level, msg); } -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/shared_data.h b/voice_engine/shared_data.h index b20225f0..a841547a 100644 --- a/voice_engine/shared_data.h +++ b/voice_engine/shared_data.h @@ -83,7 +83,7 @@ protected: virtual ~SharedData(); }; -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H diff --git a/voice_engine/statistics.cc b/voice_engine/statistics.cc index 0c2b4682..a1faae74 100644 --- a/voice_engine/statistics.cc +++ b/voice_engine/statistics.cc @@ -94,6 +94,6 @@ int32_t Statistics::LastError() const return _lastError; } -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/statistics.h b/voice_engine/statistics.h index 7d9582ee..3dab9162 100644 --- a/voice_engine/statistics.h +++ b/voice_engine/statistics.h @@ -48,6 +48,6 @@ class Statistics } // namespace voe -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_STATISTICS_H diff --git a/voice_engine/test/auto_test/voe_cpu_test.cc b/voice_engine/test/auto_test/voe_cpu_test.cc index 1367ddcd..dddbb2cd 100644 --- a/voice_engine/test/auto_test/voe_cpu_test.cc +++ b/voice_engine/test/auto_test/voe_cpu_test.cc @@ -98,4 +98,4 @@ int VoECpuTest::DoTest() { return 0; } -} // namespace voetest +} // namespace voetest diff --git a/voice_engine/test/auto_test/voe_cpu_test.h b/voice_engine/test/auto_test/voe_cpu_test.h index 92d30c85..74ba3e92 100644 --- a/voice_engine/test/auto_test/voe_cpu_test.h +++ b/voice_engine/test/auto_test/voe_cpu_test.h @@ -26,6 +26,6 @@ class VoECpuTest { VoETestManager& _mgr; }; -} // namespace voetest +} // namespace voetest #endif // WEBRTC_VOICE_ENGINE_VOE_CPU_TEST_H diff --git a/voice_engine/test/auto_test/voe_extended_test.cc b/voice_engine/test/auto_test/voe_extended_test.cc index 38b3cdc0..9568e89c 100644 --- a/voice_engine/test/auto_test/voe_extended_test.cc +++ b/voice_engine/test/auto_test/voe_extended_test.cc @@ -1600,7 +1600,7 @@ int VoEExtendedTest::TestCodec() { } } ANL(); - } // for (int index = 0; index < nCodecs; index++) + } // for (int index = 0; index < nCodecs; index++) // restore PCMU const CodecInst tmp = { 0, "PCMU", 8000, 160, 1, 64000 }; @@ -5304,4 +5304,4 @@ int VoEExtendedTest::TestVolumeControl() return 0; } -} // namespace voetest +} // namespace voetest diff --git a/voice_engine/test/auto_test/voe_extended_test.h b/voice_engine/test/auto_test/voe_extended_test.h index f0a62b5a..0c5d4e18 100644 --- a/voice_engine/test/auto_test/voe_extended_test.h +++ b/voice_engine/test/auto_test/voe_extended_test.h @@ -469,5 +469,5 @@ class VoEExtendedTest : public VoiceEngineObserver, bool _sending[32]; }; -} // namespace voetest +} // namespace voetest #endif // WEBRTC_VOICE_ENGINE_VOE_EXTENDED_TEST_H diff --git a/voice_engine/test/auto_test/voe_standard_test.cc b/voice_engine/test/auto_test/voe_standard_test.cc index 751cd8e1..fed756d9 100644 --- a/voice_engine/test/auto_test/voe_standard_test.cc +++ b/voice_engine/test/auto_test/voe_standard_test.cc @@ -496,7 +496,7 @@ int run_auto_test(TestType test_type, ExtendedSelection ext_selection) { xtend.TestPassed("VolumeControl"); } api_manager.GetExtendedMenuSelection(ext_selection); - } // while (extendedSel != XSEL_None) + } // while (extendedSel != XSEL_None) } else if (test_type == Stress) { VoEStressTest stressTest(test_manager); result = stressTest.DoTest(); @@ -524,7 +524,7 @@ int run_auto_test(TestType test_type, ExtendedSelection ext_selection) { return 0; } -} // namespace voetest +} // namespace voetest int RunInManualMode() { using namespace voetest; diff --git a/voice_engine/test/auto_test/voe_standard_test.h b/voice_engine/test/auto_test/voe_standard_test.h index 41700473..0710ce65 100644 --- a/voice_engine/test/auto_test/voe_standard_test.h +++ b/voice_engine/test/auto_test/voe_standard_test.h @@ -229,6 +229,6 @@ class VoETestManager { ResourceManager resource_manager_; }; -} // namespace voetest +} // namespace voetest #endif // WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H diff --git a/voice_engine/test/auto_test/voe_stress_test.cc b/voice_engine/test/auto_test/voe_stress_test.cc index b79c1935..bd154043 100644 --- a/voice_engine/test/auto_test/voe_stress_test.cc +++ b/voice_engine/test/auto_test/voe_stress_test.cc @@ -79,8 +79,8 @@ int VoEStressTest::DoTest() { // Should not be possible printf("Invalid selection! (Test code error)\n"); assert(false); - } // switch - } // while + } // switch + } // while return 0; } @@ -409,4 +409,4 @@ bool VoEStressTest::ProcessExtraApi() { return true; } -} // namespace voetest +} // namespace voetest diff --git a/voice_engine/test/auto_test/voe_stress_test.h b/voice_engine/test/auto_test/voe_stress_test.h index ae3da2fb..15653bc5 100644 --- a/voice_engine/test/auto_test/voe_stress_test.h +++ b/voice_engine/test/auto_test/voe_stress_test.h @@ -44,6 +44,6 @@ class VoEStressTest { ThreadWrapper* _ptrExtraApiThread; }; -} // namespace voetest +} // namespace voetest #endif // WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H diff --git a/voice_engine/test/auto_test/voe_test_interface.h b/voice_engine/test/auto_test/voe_test_interface.h index dd109dcb..d5693d97 100644 --- a/voice_engine/test/auto_test/voe_test_interface.h +++ b/voice_engine/test/auto_test/voe_test_interface.h @@ -49,5 +49,5 @@ enum ExtendedSelection { // Main test function int runAutoTest(TestType testType, ExtendedSelection extendedSel); -} // namespace voetest +} // namespace voetest #endif // WEBRTC_VOICE_ENGINE_VOE_TEST_INTERFACE_H diff --git a/voice_engine/test/auto_test/voe_unit_test.cc b/voice_engine/test/auto_test/voe_unit_test.cc index b092ae32..c67de57a 100644 --- a/voice_engine/test/auto_test/voe_unit_test.cc +++ b/voice_engine/test/auto_test/voe_unit_test.cc @@ -210,8 +210,8 @@ int VoEUnitTest::DoTest() { // Should not be possible printf("Invalid selection! (Test code error)\n"); assert(false); - } // switch - } // while + } // switch + } // while return ret; } @@ -1083,4 +1083,4 @@ int VoEUnitTest::MixerTest() { return 0; } -} // namespace voetest +} // namespace voetest diff --git a/voice_engine/test/auto_test/voe_unit_test.h b/voice_engine/test/auto_test/voe_unit_test.h index 69af78cb..fb80b3dd 100644 --- a/voice_engine/test/auto_test/voe_unit_test.h +++ b/voice_engine/test/auto_test/voe_unit_test.h @@ -67,5 +67,5 @@ class VoEUnitTest : public Encryption { int _extChannel; }; -} // namespace voetest +} // namespace voetest #endif // WEBRTC_VOICE_ENGINE_VOE_UNIT_TEST_H diff --git a/voice_engine/transmit_mixer.cc b/voice_engine/transmit_mixer.cc index f594ef0e..9c7e03ea 100644 --- a/voice_engine/transmit_mixer.cc +++ b/voice_engine/transmit_mixer.cc @@ -1420,6 +1420,6 @@ bool TransmitMixer::IsStereoChannelSwappingEnabled() { return swap_stereo_channels_; } -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/transmit_mixer.h b/voice_engine/transmit_mixer.h index 450f1254..1b575af4 100644 --- a/voice_engine/transmit_mixer.h +++ b/voice_engine/transmit_mixer.h @@ -236,6 +236,6 @@ private: #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H -} // namespace voe +} // namespace voe } // namespace webrtc diff --git a/voice_engine/utility.cc b/voice_engine/utility.cc index 5bd87f83..5b7ee814 100644 --- a/voice_engine/utility.cc +++ b/voice_engine/utility.cc @@ -120,6 +120,6 @@ void Utility::ScaleWithSat(int16_t vector[], float scale, } } -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/utility.h b/voice_engine/utility.h index b51dc035..fcb4462e 100644 --- a/voice_engine/utility.h +++ b/voice_engine/utility.h @@ -51,8 +51,8 @@ public: uint16_t len); }; -} // namespace voe +} // namespace voe -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_UTILITY_H diff --git a/voice_engine/voe_audio_processing_impl.cc b/voice_engine/voe_audio_processing_impl.cc index a1743ea5..430f86dc 100644 --- a/voice_engine/voe_audio_processing_impl.cc +++ b/voice_engine/voe_audio_processing_impl.cc @@ -1086,4 +1086,4 @@ bool VoEAudioProcessingImpl::IsStereoChannelSwappingEnabled() { #endif // #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/voe_audio_processing_impl.h b/voice_engine/voe_audio_processing_impl.h index 562e8ba7..309d997b 100644 --- a/voice_engine/voe_audio_processing_impl.h +++ b/voice_engine/voe_audio_processing_impl.h @@ -107,6 +107,6 @@ class VoEAudioProcessingImpl : public VoEAudioProcessing { voe::SharedData* _shared; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_IMPL_H diff --git a/voice_engine/voe_base_impl.cc b/voice_engine/voe_base_impl.cc index 09f22d44..f9934573 100644 --- a/voice_engine/voe_base_impl.cc +++ b/voice_engine/voe_base_impl.cc @@ -1241,4 +1241,4 @@ int32_t VoEBaseImpl::TerminateInternal() return _shared->statistics().SetUnInitialized(); } -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/voe_base_impl.h b/voice_engine/voe_base_impl.h index fbd9092c..4665e808 100644 --- a/voice_engine/voe_base_impl.h +++ b/voice_engine/voe_base_impl.h @@ -124,6 +124,6 @@ private: }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H diff --git a/voice_engine/voe_call_report_impl.cc b/voice_engine/voe_call_report_impl.cc index 9f3177d8..cf76850d 100644 --- a/voice_engine/voe_call_report_impl.cc +++ b/voice_engine/voe_call_report_impl.cc @@ -408,4 +408,4 @@ int VoECallReportImpl::WriteReportToFile(const char* fileNameUTF8) #endif // WEBRTC_VOICE_ENGINE_CALL_REPORT_API -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/voe_call_report_impl.h b/voice_engine/voe_call_report_impl.h index e8b81f22..b9927f56 100644 --- a/voice_engine/voe_call_report_impl.h +++ b/voice_engine/voe_call_report_impl.h @@ -52,6 +52,6 @@ private: voe::SharedData* _shared; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_CALL_REPORT_IMPL_H diff --git a/voice_engine/voe_codec_impl.cc b/voice_engine/voe_codec_impl.cc index 0cc4e025..6cc791af 100644 --- a/voice_engine/voe_codec_impl.cc +++ b/voice_engine/voe_codec_impl.cc @@ -764,4 +764,4 @@ int VoECodecImpl::RemoveSecondarySendCodec(int channel) { #endif // WEBRTC_VOICE_ENGINE_CODEC_API -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/voe_codec_impl.h b/voice_engine/voe_codec_impl.h index ab120f82..ec6cbd7c 100644 --- a/voice_engine/voe_codec_impl.h +++ b/voice_engine/voe_codec_impl.h @@ -92,6 +92,6 @@ private: voe::SharedData* _shared; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_CODEC_IMPL_H diff --git a/voice_engine/voe_dtmf_impl.h b/voice_engine/voe_dtmf_impl.h index e779b69b..e879f8de 100644 --- a/voice_engine/voe_dtmf_impl.h +++ b/voice_engine/voe_dtmf_impl.h @@ -61,6 +61,6 @@ private: voe::SharedData* _shared; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_DTMF_IMPL_H diff --git a/voice_engine/voe_encryption_impl.h b/voice_engine/voe_encryption_impl.h index 47e38e00..6d482fff 100644 --- a/voice_engine/voe_encryption_impl.h +++ b/voice_engine/voe_encryption_impl.h @@ -35,6 +35,6 @@ private: voe::SharedData* _shared; }; -} // namespace webrtc +} // namespace webrtc #endif // #ifndef WEBRTC_VOICE_ENGINE_VOE_ENCRYPTION_IMPL_H diff --git a/voice_engine/voe_hardware_impl.cc b/voice_engine/voe_hardware_impl.cc index b2690da7..5a293fc1 100644 --- a/voice_engine/voe_hardware_impl.cc +++ b/voice_engine/voe_hardware_impl.cc @@ -807,4 +807,4 @@ int VoEHardwareImpl::PlayoutSampleRate(unsigned int* samples_per_sec) const { #endif // WEBRTC_VOICE_ENGINE_HARDWARE_API -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/voe_hardware_impl.h b/voice_engine/voe_hardware_impl.h index eddaf377..4e06f978 100644 --- a/voice_engine/voe_hardware_impl.h +++ b/voice_engine/voe_hardware_impl.h @@ -75,6 +75,6 @@ private: voe::SharedData* _shared; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_HARDWARE_IMPL_H diff --git a/voice_engine/voe_neteq_stats_impl.cc b/voice_engine/voe_neteq_stats_impl.cc index aa53ceb5..661c8c65 100644 --- a/voice_engine/voe_neteq_stats_impl.cc +++ b/voice_engine/voe_neteq_stats_impl.cc @@ -75,4 +75,4 @@ int VoENetEqStatsImpl::GetNetworkStatistics(int channel, #endif // #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/voe_network_impl.cc b/voice_engine/voe_network_impl.cc index 6b4b9773..62521706 100644 --- a/voice_engine/voe_network_impl.cc +++ b/voice_engine/voe_network_impl.cc @@ -319,4 +319,4 @@ int VoENetworkImpl::GetPeriodicDeadOrAliveStatus(int channel, sampleTimeSeconds); } -} // namespace webrtc +} // namespace webrtc diff --git a/voice_engine/voe_network_impl.h b/voice_engine/voe_network_impl.h index cfa3ffc3..194899b4 100644 --- a/voice_engine/voe_network_impl.h +++ b/voice_engine/voe_network_impl.h @@ -62,6 +62,6 @@ private: voe::SharedData* _shared; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_NETWORK_IMPL_H diff --git a/voice_engine/voe_video_sync_impl.h b/voice_engine/voe_video_sync_impl.h index 932c8cd6..e0ec3f2f 100644 --- a/voice_engine/voe_video_sync_impl.h +++ b/voice_engine/voe_video_sync_impl.h @@ -48,6 +48,6 @@ private: voe::SharedData* _shared; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_VIDEO_SYNC_IMPL_H diff --git a/voice_engine/voe_volume_control_impl.h b/voice_engine/voe_volume_control_impl.h index f19d9a34..cdbc4280 100644 --- a/voice_engine/voe_volume_control_impl.h +++ b/voice_engine/voe_volume_control_impl.h @@ -66,6 +66,6 @@ private: voe::SharedData* _shared; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_VOLUME_CONTROL_IMPL_H diff --git a/voice_engine/voice_engine_defines.h b/voice_engine/voice_engine_defines.h index e1e9cdfa..2d69979e 100644 --- a/voice_engine/voice_engine_defines.h +++ b/voice_engine/voice_engine_defines.h @@ -123,7 +123,7 @@ enum { kVoiceEngineMinRtpExtensionId = 1 }; // Max 4-bit ID for RTP extension enum { kVoiceEngineMaxRtpExtensionId = 14 }; -} // namespace webrtc +} // namespace webrtc // TODO(ajm): we shouldn't be using the precompiler for this. // Use enums or bools as appropriate. @@ -218,7 +218,7 @@ inline int VoEChannelId(int moduleId) return (int) (moduleId & 0xffff); } -} // namespace webrtc +} // namespace webrtc // ---------------------------------------------------------------------------- // Platform settings diff --git a/voice_engine/voice_engine_impl.cc b/voice_engine/voice_engine_impl.cc index eca098ef..781a66ae 100644 --- a/voice_engine/voice_engine_impl.cc +++ b/voice_engine/voice_engine_impl.cc @@ -38,7 +38,7 @@ VoiceEngine* GetVoiceEngine() } return self; } -} // extern "C" +} // extern "C" int VoiceEngineImpl::AddRef() { return ++_ref_count; @@ -155,4 +155,4 @@ int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context) #endif } -} //namespace webrtc +} // namespace webrtc diff --git a/voice_engine/voice_engine_impl.h b/voice_engine/voice_engine_impl.h index 01190744..55c42095 100644 --- a/voice_engine/voice_engine_impl.h +++ b/voice_engine/voice_engine_impl.h @@ -154,6 +154,6 @@ private: Atomic32 _ref_count; }; -} // namespace webrtc +} // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H |