2014-10-21 12:48:29 +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 "modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
|
2014-10-21 12:48:29 +00:00
|
|
|
|
2018-10-23 12:03:01 +02:00
|
|
|
#include <cstdint>
|
2014-10-21 12:48:29 +00:00
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/audio_coding/codecs/g711/g711_interface.h"
|
|
|
|
|
#include "rtc_base/checks.h"
|
2014-10-21 12:48:29 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
2015-05-07 12:35:12 +02:00
|
|
|
bool AudioEncoderPcm::Config::IsOk() const {
|
|
|
|
|
return (frame_size_ms % 10 == 0) && (num_channels >= 1);
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-11 10:47:19 +00:00
|
|
|
AudioEncoderPcm::AudioEncoderPcm(const Config& config, int sample_rate_hz)
|
|
|
|
|
: sample_rate_hz_(sample_rate_hz),
|
|
|
|
|
num_channels_(config.num_channels),
|
2014-12-02 12:08:39 +00:00
|
|
|
payload_type_(config.payload_type),
|
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
|
|
|
num_10ms_frames_per_packet_(
|
|
|
|
|
static_cast<size_t>(config.frame_size_ms / 10)),
|
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
|
|
|
full_frame_samples_(config.num_channels * config.frame_size_ms *
|
|
|
|
|
sample_rate_hz / 1000),
|
2014-10-21 12:48:29 +00:00
|
|
|
first_timestamp_in_buffer_(0) {
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_CHECK_GT(sample_rate_hz, 0) << "Sample rate must be larger than 0 Hz";
|
|
|
|
|
RTC_CHECK_EQ(config.frame_size_ms % 10, 0)
|
2014-10-21 12:48:29 +00:00
|
|
|
<< "Frame size must be an integer multiple of 10 ms.";
|
|
|
|
|
speech_buffer_.reserve(full_frame_samples_);
|
|
|
|
|
}
|
|
|
|
|
|
2015-09-08 05:57:53 -07:00
|
|
|
AudioEncoderPcm::~AudioEncoderPcm() = default;
|
|
|
|
|
|
2015-02-18 12:00:32 +00:00
|
|
|
int AudioEncoderPcm::SampleRateHz() const {
|
2014-12-11 10:47:19 +00:00
|
|
|
return sample_rate_hz_;
|
2014-10-21 12:48:29 +00:00
|
|
|
}
|
2015-03-10 15:41:26 +00:00
|
|
|
|
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 AudioEncoderPcm::NumChannels() const {
|
2014-10-21 12:48:29 +00:00
|
|
|
return num_channels_;
|
|
|
|
|
}
|
2015-03-10 15:41:26 +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
|
|
|
size_t AudioEncoderPcm::Num10MsFramesInNextPacket() const {
|
2014-10-21 12:48:29 +00:00
|
|
|
return num_10ms_frames_per_packet_;
|
|
|
|
|
}
|
|
|
|
|
|
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 AudioEncoderPcm::Max10MsFramesInAPacket() const {
|
2014-12-08 21:15:55 +00:00
|
|
|
return num_10ms_frames_per_packet_;
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-18 14:58:34 +02:00
|
|
|
int AudioEncoderPcm::GetTargetBitrate() const {
|
Misc. small cleanups.
* Better param names
* Avoid using negative values for (bogus) placeholder channel counts (mostly in tests). Since channels will be changing to size_t, negative values will be illegal; it's sufficient to use 0 in these cases.
* Use arraysize()
* Use size_t for counting frames, samples, blocks, buffers, and bytes -- most of these are already size_t in most places, this just fixes some stragglers
* reinterpret_cast<int64_t>(void*) is not necessarily safe; use uintptr_t instead
* Remove unnecessary code, e.g. dead code, needlessly long/repetitive code, or function overrides that exactly match the base definition
* Fix indenting
* Use uint32_t for timestamps (matching how it's already a uint32_t in most places)
* Spelling
* RTC_CHECK_EQ(expected, actual)
* Rewrap
* Use .empty()
* Be more pedantic about matching int/int32_t/
* Remove pointless consts on input parameters to functions
* Add missing sanity checks
All this was found in the course of constructing https://codereview.webrtc.org/1316523002/ , and is being landed separately first.
BUG=none
TEST=none
Review URL: https://codereview.webrtc.org/1534193008
Cr-Commit-Position: refs/heads/master@{#11191}
2016-01-08 13:50:27 -08:00
|
|
|
return static_cast<int>(8 * BytesPerSample() * SampleRateHz() *
|
|
|
|
|
NumChannels());
|
2015-06-18 14:58:34 +02:00
|
|
|
}
|
|
|
|
|
|
2016-03-04 00:54:32 -08:00
|
|
|
AudioEncoder::EncodedInfo AudioEncoderPcm::EncodeImpl(
|
2015-03-19 08:50:26 +00:00
|
|
|
uint32_t rtp_timestamp,
|
2015-11-06 01:21:35 -08:00
|
|
|
rtc::ArrayView<const int16_t> audio,
|
2016-03-01 00:41:31 -08:00
|
|
|
rtc::Buffer* encoded) {
|
2014-10-21 12:48:29 +00:00
|
|
|
if (speech_buffer_.empty()) {
|
2015-01-27 18:24:45 +00:00
|
|
|
first_timestamp_in_buffer_ = rtp_timestamp;
|
2014-10-21 12:48:29 +00:00
|
|
|
}
|
2015-11-06 01:21:35 -08:00
|
|
|
speech_buffer_.insert(speech_buffer_.end(), audio.begin(), audio.end());
|
2015-03-10 15:41:26 +00:00
|
|
|
if (speech_buffer_.size() < full_frame_samples_) {
|
2015-03-19 08:50:26 +00:00
|
|
|
return EncodedInfo();
|
2014-10-21 12:48:29 +00:00
|
|
|
}
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_CHECK_EQ(speech_buffer_.size(), full_frame_samples_);
|
2015-03-19 08:50:26 +00:00
|
|
|
EncodedInfo info;
|
|
|
|
|
info.encoded_timestamp = first_timestamp_in_buffer_;
|
|
|
|
|
info.payload_type = payload_type_;
|
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
|
|
|
info.encoded_bytes = encoded->AppendData(
|
2016-04-18 06:14:33 -07:00
|
|
|
full_frame_samples_ * BytesPerSample(),
|
2016-03-01 00:41:31 -08:00
|
|
|
[&](rtc::ArrayView<uint8_t> encoded) {
|
|
|
|
|
return EncodeCall(&speech_buffer_[0], full_frame_samples_,
|
|
|
|
|
encoded.data());
|
|
|
|
|
});
|
2015-06-10 21:15:38 -07:00
|
|
|
speech_buffer_.clear();
|
2016-05-16 07:34:24 -07:00
|
|
|
info.encoder_type = GetCodecType();
|
2015-03-19 08:50:26 +00:00
|
|
|
return info;
|
2014-10-21 12:48:29 +00:00
|
|
|
}
|
|
|
|
|
|
2015-09-08 05:57:53 -07:00
|
|
|
void AudioEncoderPcm::Reset() {
|
|
|
|
|
speech_buffer_.clear();
|
|
|
|
|
}
|
|
|
|
|
|
2024-08-29 13:00:40 +00:00
|
|
|
std::optional<std::pair<TimeDelta, TimeDelta>>
|
2020-03-24 16:00:51 +01:00
|
|
|
AudioEncoderPcm::GetFrameLengthRange() const {
|
|
|
|
|
return {{TimeDelta::Millis(num_10ms_frames_per_packet_ * 10),
|
|
|
|
|
TimeDelta::Millis(num_10ms_frames_per_packet_ * 10)}};
|
|
|
|
|
}
|
|
|
|
|
|
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 AudioEncoderPcmA::EncodeCall(const int16_t* audio,
|
|
|
|
|
size_t input_len,
|
|
|
|
|
uint8_t* encoded) {
|
|
|
|
|
return WebRtcG711_EncodeA(audio, input_len, encoded);
|
2014-10-21 12:48:29 +00:00
|
|
|
}
|
|
|
|
|
|
Misc. small cleanups.
* Better param names
* Avoid using negative values for (bogus) placeholder channel counts (mostly in tests). Since channels will be changing to size_t, negative values will be illegal; it's sufficient to use 0 in these cases.
* Use arraysize()
* Use size_t for counting frames, samples, blocks, buffers, and bytes -- most of these are already size_t in most places, this just fixes some stragglers
* reinterpret_cast<int64_t>(void*) is not necessarily safe; use uintptr_t instead
* Remove unnecessary code, e.g. dead code, needlessly long/repetitive code, or function overrides that exactly match the base definition
* Fix indenting
* Use uint32_t for timestamps (matching how it's already a uint32_t in most places)
* Spelling
* RTC_CHECK_EQ(expected, actual)
* Rewrap
* Use .empty()
* Be more pedantic about matching int/int32_t/
* Remove pointless consts on input parameters to functions
* Add missing sanity checks
All this was found in the course of constructing https://codereview.webrtc.org/1316523002/ , and is being landed separately first.
BUG=none
TEST=none
Review URL: https://codereview.webrtc.org/1534193008
Cr-Commit-Position: refs/heads/master@{#11191}
2016-01-08 13:50:27 -08:00
|
|
|
size_t AudioEncoderPcmA::BytesPerSample() const {
|
2015-06-18 14:58:34 +02:00
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-16 07:34:24 -07:00
|
|
|
AudioEncoder::CodecType AudioEncoderPcmA::GetCodecType() const {
|
|
|
|
|
return AudioEncoder::CodecType::kPcmA;
|
|
|
|
|
}
|
|
|
|
|
|
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 AudioEncoderPcmU::EncodeCall(const int16_t* audio,
|
|
|
|
|
size_t input_len,
|
|
|
|
|
uint8_t* encoded) {
|
|
|
|
|
return WebRtcG711_EncodeU(audio, input_len, encoded);
|
2014-10-21 12:48:29 +00:00
|
|
|
}
|
|
|
|
|
|
Misc. small cleanups.
* Better param names
* Avoid using negative values for (bogus) placeholder channel counts (mostly in tests). Since channels will be changing to size_t, negative values will be illegal; it's sufficient to use 0 in these cases.
* Use arraysize()
* Use size_t for counting frames, samples, blocks, buffers, and bytes -- most of these are already size_t in most places, this just fixes some stragglers
* reinterpret_cast<int64_t>(void*) is not necessarily safe; use uintptr_t instead
* Remove unnecessary code, e.g. dead code, needlessly long/repetitive code, or function overrides that exactly match the base definition
* Fix indenting
* Use uint32_t for timestamps (matching how it's already a uint32_t in most places)
* Spelling
* RTC_CHECK_EQ(expected, actual)
* Rewrap
* Use .empty()
* Be more pedantic about matching int/int32_t/
* Remove pointless consts on input parameters to functions
* Add missing sanity checks
All this was found in the course of constructing https://codereview.webrtc.org/1316523002/ , and is being landed separately first.
BUG=none
TEST=none
Review URL: https://codereview.webrtc.org/1534193008
Cr-Commit-Position: refs/heads/master@{#11191}
2016-01-08 13:50:27 -08:00
|
|
|
size_t AudioEncoderPcmU::BytesPerSample() const {
|
2015-06-18 14:58:34 +02:00
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-16 07:34:24 -07:00
|
|
|
AudioEncoder::CodecType AudioEncoderPcmU::GetCodecType() const {
|
|
|
|
|
return AudioEncoder::CodecType::kPcmU;
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-21 12:48:29 +00:00
|
|
|
} // namespace webrtc
|