webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h - Issue 1868143002: Convert CNG into C++ and remove it from AudioDecoder

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h

Issue 1868143002: Convert CNG into C++ and remove it from AudioDecoder (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fixed a few show-stopping (albeit small) compiler complaints Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/codecs/audio_decoder.cc ('k') | webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc » ('j') | webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h

diff --git a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h

index 1384cd511ee3b7f85306bc08dbdc79bb88fdc9a3..4d14d418dea189312fe92f1de05835606783d839 100644

--- a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h

+++ b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h

@@ -21,11 +21,6 @@

namespace webrtc {

-// Deleter for use with unique_ptr.

-struct CngInstDeleter {

- void operator()(CNG_enc_inst* ptr) const { WebRtcCng_FreeEnc(ptr); }

-};

class Vad;

class AudioEncoderCng final : public AudioEncoder {

@@ -85,7 +80,7 @@ class AudioEncoderCng final : public AudioEncoder {

std::vector<uint32_t> rtp_timestamps_;

bool last_frame_active_;

std::unique_ptr<Vad> vad_;

- std::unique_ptr<CNG_enc_inst, CngInstDeleter> cng_inst_;

+ std::unique_ptr<ComfortNoiseEncoder> cng_encoder_;

RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCng);

};