2011-07-07 08:21:25 +00:00
|
|
|
/*
|
2012-04-24 19:47:00 +00:00
|
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
2011-07-07 08:21:25 +00:00
|
|
|
*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2015-11-04 08:31:52 +01:00
|
|
|
#include "webrtc/modules/include/module_common_types.h"
|
|
|
|
|
#include "webrtc/modules/utility/include/audio_frame_operations.h"
|
2011-07-07 08:21:25 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
2012-06-27 03:25:31 +00:00
|
|
|
void AudioFrameOperations::MonoToStereo(const int16_t* src_audio,
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
size_t samples_per_channel,
|
2012-06-27 03:25:31 +00:00
|
|
|
int16_t* dst_audio) {
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
for (size_t i = 0; i < samples_per_channel; i++) {
|
2012-06-27 03:25:31 +00:00
|
|
|
dst_audio[2 * i] = src_audio[i];
|
|
|
|
|
dst_audio[2 * i + 1] = src_audio[i];
|
2012-04-26 22:32:03 +00:00
|
|
|
}
|
2012-06-27 03:25:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int AudioFrameOperations::MonoToStereo(AudioFrame* frame) {
|
|
|
|
|
if (frame->num_channels_ != 1) {
|
2012-04-26 22:32:03 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2012-06-27 03:25:31 +00:00
|
|
|
if ((frame->samples_per_channel_ * 2) >= AudioFrame::kMaxDataSizeSamples) {
|
|
|
|
|
// Not enough memory to expand from mono to stereo.
|
|
|
|
|
return -1;
|
2012-04-26 22:32:03 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2012-06-27 03:25:31 +00:00
|
|
|
int16_t data_copy[AudioFrame::kMaxDataSizeSamples];
|
|
|
|
|
memcpy(data_copy, frame->data_,
|
|
|
|
|
sizeof(int16_t) * frame->samples_per_channel_);
|
|
|
|
|
MonoToStereo(data_copy, frame->samples_per_channel_, frame->data_);
|
|
|
|
|
frame->num_channels_ = 2;
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2012-04-26 22:32:03 +00:00
|
|
|
return 0;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2012-06-27 03:25:31 +00:00
|
|
|
void AudioFrameOperations::StereoToMono(const int16_t* src_audio,
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
size_t samples_per_channel,
|
2012-06-27 03:25:31 +00:00
|
|
|
int16_t* dst_audio) {
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
for (size_t i = 0; i < samples_per_channel; i++) {
|
2012-06-27 03:25:31 +00:00
|
|
|
dst_audio[i] = (src_audio[2 * i] + src_audio[2 * i + 1]) >> 1;
|
2012-04-26 22:32:03 +00:00
|
|
|
}
|
2012-06-27 03:25:31 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2012-06-27 03:25:31 +00:00
|
|
|
int AudioFrameOperations::StereoToMono(AudioFrame* frame) {
|
|
|
|
|
if (frame->num_channels_ != 2) {
|
|
|
|
|
return -1;
|
2012-04-26 22:32:03 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2012-06-27 03:25:31 +00:00
|
|
|
StereoToMono(frame->data_, frame->samples_per_channel_, frame->data_);
|
|
|
|
|
frame->num_channels_ = 1;
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2012-04-26 22:32:03 +00:00
|
|
|
return 0;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2012-04-24 19:47:00 +00:00
|
|
|
void AudioFrameOperations::SwapStereoChannels(AudioFrame* frame) {
|
2012-05-02 23:56:37 +00:00
|
|
|
if (frame->num_channels_ != 2) return;
|
2012-04-26 00:20:28 +00:00
|
|
|
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
for (size_t i = 0; i < frame->samples_per_channel_ * 2; i += 2) {
|
2012-05-02 23:56:37 +00:00
|
|
|
int16_t temp_data = frame->data_[i];
|
|
|
|
|
frame->data_[i] = frame->data_[i + 1];
|
|
|
|
|
frame->data_[i + 1] = temp_data;
|
2012-04-24 19:47:00 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-04-26 22:32:03 +00:00
|
|
|
void AudioFrameOperations::Mute(AudioFrame& frame) {
|
2012-05-02 23:56:37 +00:00
|
|
|
memset(frame.data_, 0, sizeof(int16_t) *
|
|
|
|
|
frame.samples_per_channel_ * frame.num_channels_);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2012-04-26 22:32:03 +00:00
|
|
|
int AudioFrameOperations::Scale(float left, float right, AudioFrame& frame) {
|
2012-05-02 23:56:37 +00:00
|
|
|
if (frame.num_channels_ != 2) {
|
2012-04-26 22:32:03 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
for (size_t i = 0; i < frame.samples_per_channel_; i++) {
|
2012-05-02 23:56:37 +00:00
|
|
|
frame.data_[2 * i] =
|
|
|
|
|
static_cast<int16_t>(left * frame.data_[2 * i]);
|
|
|
|
|
frame.data_[2 * i + 1] =
|
|
|
|
|
static_cast<int16_t>(right * frame.data_[2 * i + 1]);
|
2012-04-26 22:32:03 +00:00
|
|
|
}
|
|
|
|
|
return 0;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2012-04-26 22:32:03 +00:00
|
|
|
int AudioFrameOperations::ScaleWithSat(float scale, AudioFrame& frame) {
|
|
|
|
|
int32_t temp_data = 0;
|
|
|
|
|
|
|
|
|
|
// Ensure that the output result is saturated [-32768, +32767].
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
for (size_t i = 0; i < frame.samples_per_channel_ * frame.num_channels_;
|
2012-04-26 22:32:03 +00:00
|
|
|
i++) {
|
2012-05-02 23:56:37 +00:00
|
|
|
temp_data = static_cast<int32_t>(scale * frame.data_[i]);
|
2012-04-26 22:32:03 +00:00
|
|
|
if (temp_data < -32768) {
|
2012-05-02 23:56:37 +00:00
|
|
|
frame.data_[i] = -32768;
|
2012-04-26 22:32:03 +00:00
|
|
|
} else if (temp_data > 32767) {
|
2012-05-02 23:56:37 +00:00
|
|
|
frame.data_[i] = 32767;
|
2012-04-26 22:32:03 +00:00
|
|
|
} else {
|
2012-05-02 23:56:37 +00:00
|
|
|
frame.data_[i] = static_cast<int16_t>(temp_data);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2012-04-26 22:32:03 +00:00
|
|
|
}
|
|
|
|
|
return 0;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-07-03 15:12:26 +00:00
|
|
|
} // namespace webrtc
|