2014-12-02 11:45:51 +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.
|
|
|
|
|
*/
|
|
|
|
|
|
2015-11-18 23:07:57 +01:00
|
|
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_
|
|
|
|
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_
|
2014-12-02 11:45:51 +00:00
|
|
|
|
2016-02-14 01:10:03 -08:00
|
|
|
#include <memory>
|
|
|
|
|
|
2017-05-02 06:46:30 -07:00
|
|
|
#include "webrtc/api/audio_codecs/audio_encoder.h"
|
2017-06-17 17:41:59 -07:00
|
|
|
#include "webrtc/api/audio_codecs/g722/audio_encoder_g722_config.h"
|
2015-11-18 23:07:57 +01:00
|
|
|
#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
|
2017-07-06 19:44:34 +02:00
|
|
|
#include "webrtc/rtc_base/buffer.h"
|
|
|
|
|
#include "webrtc/rtc_base/constructormagic.h"
|
2014-12-02 11:45:51 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
2015-09-08 05:57:53 -07:00
|
|
|
struct CodecInst;
|
|
|
|
|
|
2017-06-17 17:41:59 -07:00
|
|
|
class AudioEncoderG722Impl final : public AudioEncoder {
|
2014-12-02 11:45:51 +00:00
|
|
|
public:
|
2017-06-17 17:41:59 -07:00
|
|
|
AudioEncoderG722Impl(const AudioEncoderG722Config& config, int payload_type);
|
|
|
|
|
explicit AudioEncoderG722Impl(const CodecInst& codec_inst);
|
|
|
|
|
~AudioEncoderG722Impl() override;
|
2014-12-02 11:45:51 +00:00
|
|
|
|
2015-03-04 12:58:35 +00:00
|
|
|
int SampleRateHz() const override;
|
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 NumChannels() const override;
|
2015-03-10 15:41:26 +00:00
|
|
|
int RtpTimestampRateHz() const override;
|
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 Num10MsFramesInNextPacket() const override;
|
|
|
|
|
size_t Max10MsFramesInAPacket() const override;
|
2015-06-18 14:58:34 +02:00
|
|
|
int GetTargetBitrate() const override;
|
2016-03-01 00:41:31 -08:00
|
|
|
void Reset() override;
|
|
|
|
|
|
2016-04-18 06:14:33 -07:00
|
|
|
protected:
|
2016-03-04 00:54:32 -08:00
|
|
|
EncodedInfo EncodeImpl(uint32_t rtp_timestamp,
|
|
|
|
|
rtc::ArrayView<const int16_t> audio,
|
|
|
|
|
rtc::Buffer* encoded) override;
|
2014-12-02 11:45:51 +00:00
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
// The encoder state for one channel.
|
|
|
|
|
struct EncoderState {
|
|
|
|
|
G722EncInst* encoder;
|
2016-02-14 01:10:03 -08:00
|
|
|
std::unique_ptr<int16_t[]> speech_buffer; // Queued up for encoding.
|
2015-04-23 13:53:22 +02:00
|
|
|
rtc::Buffer encoded_buffer; // Already encoded.
|
2014-12-02 11:45:51 +00:00
|
|
|
EncoderState();
|
|
|
|
|
~EncoderState();
|
|
|
|
|
};
|
|
|
|
|
|
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 SamplesPerChannel() const;
|
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
|
|
|
const size_t num_channels_;
|
2014-12-02 12:08:39 +00:00
|
|
|
const int 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
|
|
|
const size_t num_10ms_frames_per_packet_;
|
|
|
|
|
size_t num_10ms_frames_buffered_;
|
2014-12-02 11:45:51 +00:00
|
|
|
uint32_t first_timestamp_in_buffer_;
|
2016-02-14 01:10:03 -08:00
|
|
|
const std::unique_ptr<EncoderState[]> encoders_;
|
2015-04-23 13:53:22 +02:00
|
|
|
rtc::Buffer interleave_buffer_;
|
2017-06-17 17:41:59 -07:00
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderG722Impl);
|
2014-12-02 11:45:51 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
} // namespace webrtc
|
2015-11-18 23:07:57 +01:00
|
|
|
#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_
|