Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: webrtc/modules/utility/include/file_player.h

Issue 2035663002: Run "git cl format" on some files before I start to modify them (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@remove
Patch Set: rebase Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/modules/utility/include/file_recorder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/utility/include/file_player.h
diff --git a/webrtc/modules/utility/include/file_player.h b/webrtc/modules/utility/include/file_player.h
index b064e3021b54a40b85919043e7353f051e49ec66..d11261de869733971b291ea9106894ad59dfca1b 100644
--- a/webrtc/modules/utility/include/file_player.h
+++ b/webrtc/modules/utility/include/file_player.h
@@ -19,68 +19,62 @@
namespace webrtc {
class FileCallback;
-class FilePlayer
-{
-public:
- // The largest decoded frame size in samples (60ms with 32kHz sample rate).
- enum {MAX_AUDIO_BUFFER_IN_SAMPLES = 60*32};
- enum {MAX_AUDIO_BUFFER_IN_BYTES = MAX_AUDIO_BUFFER_IN_SAMPLES*2};
-
- // Note: will return NULL for unsupported formats.
- static FilePlayer* CreateFilePlayer(const uint32_t instanceID,
- const FileFormats fileFormat);
-
- static void DestroyFilePlayer(FilePlayer* player);
-
- // Read 10 ms of audio at |frequencyInHz| to |outBuffer|. |lengthInSamples|
- // will be set to the number of samples read (not the number of samples per
- // channel).
- virtual int Get10msAudioFromFile(
- int16_t* outBuffer,
- size_t& lengthInSamples,
- int frequencyInHz) = 0;
-
- // Register callback for receiving file playing notifications.
- virtual int32_t RegisterModuleFileCallback(
- FileCallback* callback) = 0;
-
- // API for playing audio from fileName to channel.
- // Note: codecInst is used for pre-encoded files.
- virtual int32_t StartPlayingFile(
- const char* fileName,
- bool loop,
- uint32_t startPosition,
- float volumeScaling,
- uint32_t notification,
- uint32_t stopPosition = 0,
- const CodecInst* codecInst = NULL) = 0;
-
- // Note: codecInst is used for pre-encoded files.
- virtual int32_t StartPlayingFile(
- InStream& sourceStream,
- uint32_t startPosition,
- float volumeScaling,
- uint32_t notification,
- uint32_t stopPosition = 0,
- const CodecInst* codecInst = NULL) = 0;
-
- virtual int32_t StopPlayingFile() = 0;
-
- virtual bool IsPlayingFile() const = 0;
-
- virtual int32_t GetPlayoutPosition(uint32_t& durationMs) = 0;
-
- // Set audioCodec to the currently used audio codec.
- virtual int32_t AudioCodec(CodecInst& audioCodec) const = 0;
-
- virtual int32_t Frequency() const = 0;
-
- // Note: scaleFactor is in the range [0.0 - 2.0]
- virtual int32_t SetAudioScaling(float scaleFactor) = 0;
-
-protected:
- virtual ~FilePlayer() {}
-
+class FilePlayer {
+ public:
+ // The largest decoded frame size in samples (60ms with 32kHz sample rate).
+ enum { MAX_AUDIO_BUFFER_IN_SAMPLES = 60 * 32 };
+ enum { MAX_AUDIO_BUFFER_IN_BYTES = MAX_AUDIO_BUFFER_IN_SAMPLES * 2 };
+
+ // Note: will return NULL for unsupported formats.
+ static FilePlayer* CreateFilePlayer(const uint32_t instanceID,
+ const FileFormats fileFormat);
+
+ static void DestroyFilePlayer(FilePlayer* player);
+
+ // Read 10 ms of audio at |frequencyInHz| to |outBuffer|. |lengthInSamples|
+ // will be set to the number of samples read (not the number of samples per
+ // channel).
+ virtual int Get10msAudioFromFile(int16_t* outBuffer,
+ size_t& lengthInSamples,
+ int frequencyInHz) = 0;
+
+ // Register callback for receiving file playing notifications.
+ virtual int32_t RegisterModuleFileCallback(FileCallback* callback) = 0;
+
+ // API for playing audio from fileName to channel.
+ // Note: codecInst is used for pre-encoded files.
+ virtual int32_t StartPlayingFile(const char* fileName,
+ bool loop,
+ uint32_t startPosition,
+ float volumeScaling,
+ uint32_t notification,
+ uint32_t stopPosition = 0,
+ const CodecInst* codecInst = NULL) = 0;
+
+ // Note: codecInst is used for pre-encoded files.
+ virtual int32_t StartPlayingFile(InStream& sourceStream,
+ uint32_t startPosition,
+ float volumeScaling,
+ uint32_t notification,
+ uint32_t stopPosition = 0,
+ const CodecInst* codecInst = NULL) = 0;
+
+ virtual int32_t StopPlayingFile() = 0;
+
+ virtual bool IsPlayingFile() const = 0;
+
+ virtual int32_t GetPlayoutPosition(uint32_t& durationMs) = 0;
+
+ // Set audioCodec to the currently used audio codec.
+ virtual int32_t AudioCodec(CodecInst& audioCodec) const = 0;
+
+ virtual int32_t Frequency() const = 0;
+
+ // Note: scaleFactor is in the range [0.0 - 2.0]
+ virtual int32_t SetAudioScaling(float scaleFactor) = 0;
+
+ protected:
+ virtual ~FilePlayer() {}
};
} // namespace webrtc
-#endif // WEBRTC_MODULES_UTILITY_INCLUDE_FILE_PLAYER_H_
+#endif // WEBRTC_MODULES_UTILITY_INCLUDE_FILE_PLAYER_H_
« no previous file with comments | « no previous file | webrtc/modules/utility/include/file_recorder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698