diff --git a/src/modules/utility/interface/file_player.h b/src/modules/utility/interface/file_player.h index b2faa7fa2f..29da8f15f3 100644 --- a/src/modules/utility/interface/file_player.h +++ b/src/modules/utility/interface/file_player.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 @@ -45,7 +45,7 @@ public: // API for playing audio from fileName to channel. // Note: codecInst is used for pre-encoded files. virtual WebRtc_Word32 StartPlayingFile( - const WebRtc_Word8* fileName, + const char* fileName, bool loop, WebRtc_UWord32 startPosition, float volumeScaling, @@ -83,7 +83,7 @@ public: virtual WebRtc_Word32 TimeUntilNextVideoFrame() { return -1;} virtual WebRtc_Word32 StartPlayingVideoFile( - const WebRtc_Word8* /*fileName*/, + const char* /*fileName*/, bool /*loop*/, bool /*videoOnly*/) { return -1;} diff --git a/src/modules/utility/interface/file_recorder.h b/src/modules/utility/interface/file_recorder.h index 147dea2b3c..eb460aebb9 100644 --- a/src/modules/utility/interface/file_recorder.h +++ b/src/modules/utility/interface/file_recorder.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 @@ -38,7 +38,7 @@ public: virtual FileFormats RecordingFileFormat() const = 0; virtual WebRtc_Word32 StartRecordingAudioFile( - const WebRtc_Word8* fileName, + const char* fileName, const CodecInst& codecInst, WebRtc_UWord32 notification, ACMAMRPackingFormat amrFormat = AMRFileStorage) = 0; @@ -71,7 +71,7 @@ public: // specifies the amr/amrwb storage format. // Note: the file format is AVI. virtual WebRtc_Word32 StartRecordingVideoFile( - const WebRtc_Word8* fileName, + const char* fileName, const CodecInst& audioCodecInst, const VideoCodec& videoCodecInst, ACMAMRPackingFormat amrFormat = AMRFileStorage, diff --git a/src/modules/utility/interface/rtp_dump.h b/src/modules/utility/interface/rtp_dump.h index 5f51990be0..9291a1c360 100644 --- a/src/modules/utility/interface/rtp_dump.h +++ b/src/modules/utility/interface/rtp_dump.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 @@ -31,7 +31,7 @@ public: // Open the file fileNameUTF8 for writing RTP/RTCP packets. // Note: this API also adds the rtpplay header. - virtual WebRtc_Word32 Start(const WebRtc_Word8* fileNameUTF8) = 0; + virtual WebRtc_Word32 Start(const char* fileNameUTF8) = 0; // Close the existing file. No more packets will be recorded. virtual WebRtc_Word32 Stop() = 0; diff --git a/src/modules/utility/source/file_player_impl.cc b/src/modules/utility/source/file_player_impl.cc index af7d615f32..0e22872724 100644 --- a/src/modules/utility/source/file_player_impl.cc +++ b/src/modules/utility/source/file_player_impl.cc @@ -228,7 +228,7 @@ WebRtc_Word32 FilePlayerImpl::SetAudioScaling(float scaleFactor) return -1; } -WebRtc_Word32 FilePlayerImpl::StartPlayingFile(const WebRtc_Word8* fileName, +WebRtc_Word32 FilePlayerImpl::StartPlayingFile(const char* fileName, bool loop, WebRtc_UWord32 startPosition, float volumeScaling, @@ -491,7 +491,7 @@ VideoFilePlayerImpl::~VideoFilePlayerImpl() } WebRtc_Word32 VideoFilePlayerImpl::StartPlayingVideoFile( - const WebRtc_Word8* fileName, + const char* fileName, bool loop, bool videoOnly) { diff --git a/src/modules/utility/source/file_player_impl.h b/src/modules/utility/source/file_player_impl.h index 8b9f6ae733..e15cb0994f 100644 --- a/src/modules/utility/source/file_player_impl.h +++ b/src/modules/utility/source/file_player_impl.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 @@ -39,7 +39,7 @@ public: const WebRtc_UWord32 frequencyInHz); virtual WebRtc_Word32 RegisterModuleFileCallback(FileCallback* callback); virtual WebRtc_Word32 StartPlayingFile( - const WebRtc_Word8* fileName, + const char* fileName, bool loop, WebRtc_UWord32 startPosition, float volumeScaling, @@ -90,7 +90,7 @@ public: // FilePlayer functions. virtual WebRtc_Word32 TimeUntilNextVideoFrame(); - virtual WebRtc_Word32 StartPlayingVideoFile(const WebRtc_Word8* fileName, + virtual WebRtc_Word32 StartPlayingVideoFile(const char* fileName, bool loop, bool videoOnly); virtual WebRtc_Word32 StopPlayingFile(); diff --git a/src/modules/utility/source/file_recorder_impl.cc b/src/modules/utility/source/file_recorder_impl.cc index 1ae4f30fae..07d16aa736 100644 --- a/src/modules/utility/source/file_recorder_impl.cc +++ b/src/modules/utility/source/file_recorder_impl.cc @@ -95,7 +95,7 @@ WebRtc_Word32 FileRecorderImpl::RegisterModuleFileCallback( } WebRtc_Word32 FileRecorderImpl::StartRecordingAudioFile( - const WebRtc_Word8* fileName, + const char* fileName, const CodecInst& codecInst, WebRtc_UWord32 notificationTimeMs, ACMAMRPackingFormat amrFormat) @@ -405,7 +405,7 @@ AviRecorder::~AviRecorder( ) } WebRtc_Word32 AviRecorder::StartRecordingVideoFile( - const WebRtc_Word8* fileName, + const char* fileName, const CodecInst& audioCodecInst, const VideoCodec& videoCodecInst, ACMAMRPackingFormat amrFormat, diff --git a/src/modules/utility/source/file_recorder_impl.h b/src/modules/utility/source/file_recorder_impl.h index 0bb2a90917..36841664d1 100644 --- a/src/modules/utility/source/file_recorder_impl.h +++ b/src/modules/utility/source/file_recorder_impl.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 @@ -50,7 +50,7 @@ public: virtual WebRtc_Word32 RegisterModuleFileCallback(FileCallback* callback); virtual FileFormats RecordingFileFormat() const; virtual WebRtc_Word32 StartRecordingAudioFile( - const WebRtc_Word8* fileName, + const char* fileName, const CodecInst& codecInst, WebRtc_UWord32 notificationTimeMs, ACMAMRPackingFormat amrFormat = AMRFileStorage); @@ -66,7 +66,7 @@ public: const AudioFrame& frame, const TickTime* playoutTS = NULL); virtual WebRtc_Word32 StartRecordingVideoFile( - const WebRtc_Word8* fileName, + const char* fileName, const CodecInst& audioCodecInst, const VideoCodec& videoCodecInst, ACMAMRPackingFormat amrFormat = AMRFileStorage, @@ -112,7 +112,7 @@ public: // FileRecorder functions. virtual WebRtc_Word32 StartRecordingVideoFile( - const WebRtc_Word8* fileName, + const char* fileName, const CodecInst& audioCodecInst, const VideoCodec& videoCodecInst, ACMAMRPackingFormat amrFormat = AMRFileStorage, diff --git a/src/modules/utility/source/rtp_dump_impl.cc b/src/modules/utility/source/rtp_dump_impl.cc index bcec2a8a4f..69a52ecc57 100644 --- a/src/modules/utility/source/rtp_dump_impl.cc +++ b/src/modules/utility/source/rtp_dump_impl.cc @@ -39,7 +39,7 @@ #endif // defined(_DEBUG) && defined(_WIN32) namespace webrtc { -const WebRtc_Word8 RTPFILE_VERSION[] = "1.0"; +const char RTPFILE_VERSION[] = "1.0"; const WebRtc_UWord32 MAX_UWORD32 = 0xffffffff; // This stucture is specified in the rtpdump documentation. @@ -87,7 +87,7 @@ RtpDumpImpl::~RtpDumpImpl() WEBRTC_TRACE(kTraceMemory, kTraceUtility, -1, "%s deleted", __FUNCTION__); } -WebRtc_Word32 RtpDumpImpl::Start(const WebRtc_Word8* fileNameUTF8) +WebRtc_Word32 RtpDumpImpl::Start(const char* fileNameUTF8) { if (fileNameUTF8 == NULL) @@ -109,7 +109,7 @@ WebRtc_Word32 RtpDumpImpl::Start(const WebRtc_Word8* fileNameUTF8) _startTime = GetTimeInMS(); // All rtp dump files start with #!rtpplay. - WebRtc_Word8 magic[16]; + char magic[16]; sprintf(magic, "#!rtpplay%s \n", RTPFILE_VERSION); if (_file.WriteText(magic) == -1) { @@ -125,7 +125,7 @@ WebRtc_Word32 RtpDumpImpl::Start(const WebRtc_Word8* fileNameUTF8) // as Wireshark since it makes more sense. // http://wiki.wireshark.org/rtpdump explains that an additional 2 bytes // of padding should be added to the header. - WebRtc_Word8 dummyHdr[16]; + char dummyHdr[16]; memset(dummyHdr, 0, 16); if (!_file.Write(dummyHdr, sizeof(dummyHdr))) { diff --git a/src/modules/utility/source/rtp_dump_impl.h b/src/modules/utility/source/rtp_dump_impl.h index 28b5a70bfe..9715c352c0 100644 --- a/src/modules/utility/source/rtp_dump_impl.h +++ b/src/modules/utility/source/rtp_dump_impl.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 @@ -22,7 +22,7 @@ public: RtpDumpImpl(); virtual ~RtpDumpImpl(); - virtual WebRtc_Word32 Start(const WebRtc_Word8* fileNameUTF8); + virtual WebRtc_Word32 Start(const char* fileNameUTF8); virtual WebRtc_Word32 Stop(); virtual bool IsActive() const; virtual WebRtc_Word32 DumpPacket(const WebRtc_UWord8* packet,