2014-11-26 20:21:38 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2014 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "common_audio/channel_buffer.h"
|
2014-11-26 20:21:38 +00:00
|
|
|
|
2018-10-23 12:03:01 +02:00
|
|
|
#include <cstdint>
|
|
|
|
|
|
|
|
|
|
#include "common_audio/include/audio_util.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "rtc_base/checks.h"
|
2016-02-24 05:22:32 -08:00
|
|
|
|
2014-11-26 20:21:38 +00:00
|
|
|
namespace webrtc {
|
|
|
|
|
|
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
|
|
|
IFChannelBuffer::IFChannelBuffer(size_t num_frames,
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
size_t num_channels,
|
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 num_bands)
|
2014-11-26 20:21:38 +00:00
|
|
|
: ivalid_(true),
|
2015-02-10 22:52:15 +00:00
|
|
|
ibuf_(num_frames, num_channels, num_bands),
|
2014-11-26 20:21:38 +00:00
|
|
|
fvalid_(true),
|
2015-02-10 22:52:15 +00:00
|
|
|
fbuf_(num_frames, num_channels, num_bands) {}
|
2014-11-26 20:21:38 +00:00
|
|
|
|
2016-08-29 13:10:29 -07:00
|
|
|
IFChannelBuffer::~IFChannelBuffer() = default;
|
|
|
|
|
|
2014-11-26 20:21:38 +00:00
|
|
|
ChannelBuffer<int16_t>* IFChannelBuffer::ibuf() {
|
|
|
|
|
RefreshI();
|
|
|
|
|
fvalid_ = false;
|
|
|
|
|
return &ibuf_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ChannelBuffer<float>* IFChannelBuffer::fbuf() {
|
|
|
|
|
RefreshF();
|
|
|
|
|
ivalid_ = false;
|
|
|
|
|
return &fbuf_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const ChannelBuffer<int16_t>* IFChannelBuffer::ibuf_const() const {
|
|
|
|
|
RefreshI();
|
|
|
|
|
return &ibuf_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const ChannelBuffer<float>* IFChannelBuffer::fbuf_const() const {
|
|
|
|
|
RefreshF();
|
|
|
|
|
return &fbuf_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void IFChannelBuffer::RefreshF() const {
|
|
|
|
|
if (!fvalid_) {
|
2016-02-24 05:22:32 -08:00
|
|
|
RTC_DCHECK(ivalid_);
|
2016-06-30 15:33:37 -07:00
|
|
|
fbuf_.set_num_channels(ibuf_.num_channels());
|
2015-02-10 22:52:15 +00:00
|
|
|
const int16_t* const* int_channels = ibuf_.channels();
|
|
|
|
|
float* const* float_channels = fbuf_.channels();
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
for (size_t i = 0; i < ibuf_.num_channels(); ++i) {
|
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 j = 0; j < ibuf_.num_frames(); ++j) {
|
2015-02-10 22:52:15 +00:00
|
|
|
float_channels[i][j] = int_channels[i][j];
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-11-26 20:21:38 +00:00
|
|
|
fvalid_ = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void IFChannelBuffer::RefreshI() const {
|
|
|
|
|
if (!ivalid_) {
|
2016-02-24 05:22:32 -08:00
|
|
|
RTC_DCHECK(fvalid_);
|
2015-02-10 22:52:15 +00:00
|
|
|
int16_t* const* int_channels = ibuf_.channels();
|
2016-06-30 15:33:37 -07:00
|
|
|
ibuf_.set_num_channels(fbuf_.num_channels());
|
2015-02-10 22:52:15 +00:00
|
|
|
const float* const* float_channels = fbuf_.channels();
|
2016-06-30 15:33:37 -07:00
|
|
|
for (size_t i = 0; i < fbuf_.num_channels(); ++i) {
|
2015-02-10 22:52:15 +00:00
|
|
|
FloatS16ToS16(float_channels[i], ibuf_.num_frames(), int_channels[i]);
|
|
|
|
|
}
|
2014-11-26 20:21:38 +00:00
|
|
|
ivalid_ = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace webrtc
|