This changes the following module directories:
* webrtc/modules/audio_conference_mixer/interface
* webrtc/modules/interface
* webrtc/modules/media_file/interface
* webrtc/modules/rtp_rtcp/interface
* webrtc/modules/utility/interface
To avoid breaking downstream, I followed this recipe:
1. Copy the interface dir to a new sibling directory: include
2. Update the header guards in the include directory to match the style guide.
3. Update the header guards in the interface directory to match the ones in include. This is required to avoid getting redefinitions in the not-yet-updated downstream code.
4. Add a pragma warning in the header files in the interface dir. Example:
#pragma message("WARNING: webrtc/modules/interface is DEPRECATED; "
"use webrtc/modules/include")
5. Search for all source references to webrtc/modules/interface and update them to webrtc/modules/include (*.c*,*.h,*.mm,*.S)
6. Update all GYP+GN files. This required manual inspection since many subdirectories of webrtc/modules referenced the interface dir using ../interface etc(*.gyp*,*.gn*)
BUG=5095
TESTED=Passing compile-trybots with --clobber flag:
git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel -m tryserver.webrtc
R=stefan@webrtc.org, tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1417683006 .
Cr-Commit-Position: refs/heads/master@{#10500}
59 lines
2.2 KiB
C++
59 lines
2.2 KiB
C++
/*
|
|
* 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
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_AUDIO_FRAME_OPERATIONS_H_
|
|
#define WEBRTC_MODULES_UTILITY_INCLUDE_AUDIO_FRAME_OPERATIONS_H_
|
|
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioFrame;
|
|
|
|
// TODO(andrew): consolidate this with utility.h and audio_frame_manipulator.h.
|
|
// Change reference parameters to pointers. Consider using a namespace rather
|
|
// than a class.
|
|
class AudioFrameOperations {
|
|
public:
|
|
// Upmixes mono |src_audio| to stereo |dst_audio|. This is an out-of-place
|
|
// operation, meaning src_audio and dst_audio must point to different
|
|
// buffers. It is the caller's responsibility to ensure that |dst_audio| is
|
|
// sufficiently large.
|
|
static void MonoToStereo(const int16_t* src_audio, size_t samples_per_channel,
|
|
int16_t* dst_audio);
|
|
// |frame.num_channels_| will be updated. This version checks for sufficient
|
|
// buffer size and that |num_channels_| is mono.
|
|
static int MonoToStereo(AudioFrame* frame);
|
|
|
|
// Downmixes stereo |src_audio| to mono |dst_audio|. This is an in-place
|
|
// operation, meaning |src_audio| and |dst_audio| may point to the same
|
|
// buffer.
|
|
static void StereoToMono(const int16_t* src_audio, size_t samples_per_channel,
|
|
int16_t* dst_audio);
|
|
// |frame.num_channels_| will be updated. This version checks that
|
|
// |num_channels_| is stereo.
|
|
static int StereoToMono(AudioFrame* frame);
|
|
|
|
// Swap the left and right channels of |frame|. Fails silently if |frame| is
|
|
// not stereo.
|
|
static void SwapStereoChannels(AudioFrame* frame);
|
|
|
|
// Zeros out the audio and sets |frame.energy| to zero.
|
|
static void Mute(AudioFrame& frame);
|
|
|
|
static int Scale(float left, float right, AudioFrame& frame);
|
|
|
|
static int ScaleWithSat(float scale, AudioFrame& frame);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // #ifndef WEBRTC_MODULES_UTILITY_INCLUDE_AUDIO_FRAME_OPERATIONS_H_
|