From 855ced733697c2c9157f5827c7a96ba5d3447999 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Mon, 5 Mar 2012 16:07:51 +0000 Subject: [PATCH] Further cleanup WebRtc_Word8 Review URL: https://webrtc-codereview.appspot.com/426008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1835 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/test/audio_device_test_api.cc | 4 ++-- .../main/test/func_test_manager.cc | 18 +++++++++--------- .../audio_device/main/test/func_test_manager.h | 5 ++--- .../test/auto_test/interface/tb_I420_codec.h | 6 +++--- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/modules/audio_device/main/test/audio_device_test_api.cc b/src/modules/audio_device/main/test/audio_device_test_api.cc index b78288aff..d4dee6eea 100644 --- a/src/modules/audio_device/main/test/audio_device_test_api.cc +++ b/src/modules/audio_device/main/test/audio_device_test_api.cc @@ -411,8 +411,8 @@ int api_test() // PlayoutDeviceName // ================= - WebRtc_Word8 name[kAdmMaxDeviceNameSize]; - WebRtc_Word8 guid[kAdmMaxGuidSize]; + char name[kAdmMaxDeviceNameSize]; + char guid[kAdmMaxGuidSize]; nDevices = audioDevice->PlayoutDevices(); diff --git a/src/modules/audio_device/main/test/func_test_manager.cc b/src/modules/audio_device/main/test/func_test_manager.cc index 61ff86066..c11f98ac3 100644 --- a/src/modules/audio_device/main/test/func_test_manager.cc +++ b/src/modules/audio_device/main/test/func_test_manager.cc @@ -144,7 +144,7 @@ AudioTransportImpl::~AudioTransportImpl() // ---------------------------------------------------------------------------- WebRtc_Word32 AudioTransportImpl::SetFilePlayout(bool enable, - const WebRtc_Word8* fileName) + const char* fileName) { _playFromFile = enable; if (enable) @@ -916,8 +916,8 @@ WebRtc_Word32 FuncTestManager::TestDeviceEnumeration() TEST(audioDevice->Init() == 0); TEST(audioDevice->Initialized() == true); - WebRtc_Word8 name[kAdmMaxDeviceNameSize]; - WebRtc_Word8 guid[kAdmMaxGuidSize]; + char name[kAdmMaxDeviceNameSize]; + char guid[kAdmMaxGuidSize]; const WebRtc_Word16 nPlayoutDevices(audioDevice->PlayoutDevices()); TEST(nPlayoutDevices >= 0); @@ -1008,8 +1008,8 @@ WebRtc_Word32 FuncTestManager::TestDeviceSelection() bool available(false); WebRtc_Word16 nDevices(-1); - WebRtc_Word8 name[kAdmMaxDeviceNameSize]; - WebRtc_Word8 guid[kAdmMaxGuidSize]; + char name[kAdmMaxDeviceNameSize]; + char guid[kAdmMaxGuidSize]; // ======= // Playout @@ -2512,8 +2512,8 @@ WebRtc_Word32 FuncTestManager::TestExtra() WebRtc_Word32 FuncTestManager::SelectRecordingDevice() { WebRtc_Word16 nDevices = _audioDevice->RecordingDevices(); - WebRtc_Word8 name[kAdmMaxDeviceNameSize]; - WebRtc_Word8 guid[kAdmMaxGuidSize]; + char name[kAdmMaxDeviceNameSize]; + char guid[kAdmMaxGuidSize]; WebRtc_Word32 ret(-1); #ifdef _WIN32 @@ -2574,8 +2574,8 @@ WebRtc_Word32 FuncTestManager::SelectRecordingDevice() WebRtc_Word32 FuncTestManager::SelectPlayoutDevice() { WebRtc_Word16 nDevices = _audioDevice->PlayoutDevices(); - WebRtc_Word8 name[kAdmMaxDeviceNameSize]; - WebRtc_Word8 guid[kAdmMaxGuidSize]; + char name[kAdmMaxDeviceNameSize]; + char guid[kAdmMaxGuidSize]; #ifdef _WIN32 TEST_LOG("\nSelect Playout Device\n \n"); diff --git a/src/modules/audio_device/main/test/func_test_manager.h b/src/modules/audio_device/main/test/func_test_manager.h index 5efae5059..528ba486c 100644 --- a/src/modules/audio_device/main/test/func_test_manager.h +++ b/src/modules/audio_device/main/test/func_test_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -118,8 +118,7 @@ public: ~AudioTransportImpl(); public: - WebRtc_Word32 SetFilePlayout(bool enable, const WebRtc_Word8* fileName = - NULL); + WebRtc_Word32 SetFilePlayout(bool enable, const char* fileName = NULL); void SetFullDuplex(bool enable); void SetSpeakerVolume(bool enable) { diff --git a/src/video_engine/test/auto_test/interface/tb_I420_codec.h b/src/video_engine/test/auto_test/interface/tb_I420_codec.h index d6be4b2b9..085379669 100644 --- a/src/video_engine/test/auto_test/interface/tb_I420_codec.h +++ b/src/video_engine/test/auto_test/interface/tb_I420_codec.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -27,9 +27,9 @@ public: TbI420Encoder(); virtual ~TbI420Encoder(); - static WebRtc_Word32 VersionStatic(WebRtc_Word8* version, + static WebRtc_Word32 VersionStatic(char* version, WebRtc_Word32 length); - virtual WebRtc_Word32 Version(WebRtc_Word8 *version, + virtual WebRtc_Word32 Version(char* version, WebRtc_Word32 length) const; virtual WebRtc_Word32 InitEncode(const webrtc::VideoCodec* codecSettings,