admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
webrtc_m130/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h

34 lines
1.1 KiB
C
Raw Normal View History

Initial upload of NetEq4 This is the first public upload of the new NetEq, version 4. It has been through extensive internal review during the course of the project. TEST=trybots Review URL: https://webrtc-codereview.appspot.com/1073005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3425 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-29 12:09:21 +00:00
/*
* Copyright (c) 2012 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.
*/
Rename neteq4 folder to neteq Keep the old neteq4/audio_decoder_unittests.isolate while waiting for a hard-coded reference to change. This CL effectively reverts r6257 "Rename neteq4 folder to neteq". BUG=2996 TBR=tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/21629004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6367 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-09 08:10:28 +00:00
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
Initial upload of NetEq4 This is the first public upload of the new NetEq, version 4. It has been through extensive internal review during the course of the project. TEST=trybots Review URL: https://webrtc-codereview.appspot.com/1073005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3425 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-29 12:09:21 +00:00
#include <assert.h>
Switch to using base/constructormagic.h and remove system_wrappers/interface/constructor_magic.h. Same as https://webrtc-codereview.appspot.com/19519004. The issue in http://chromegw.corp.google.com/i/internal.chromium.webrtc.fyi/builders/Linux... is solved by this change http://src.chromium.org/viewvc/chrome/trunk/src/third_party/libjingle/libjing... (tested locally). BUG=3380 R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/17619005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6218 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-21 21:18:46 +00:00
#include "webrtc/base/constructormagic.h"
Move the AudioDecoder interface out of NetEq It belongs with the codecs, next to the AudioEncoder interface. R=andrew@webrtc.org, henrik.lundin@webrtc.org, kjellander@webrtc.org Previously committed here: https://code.google.com/p/webrtc/source/detail?r=7798 and reverted here: https://code.google.com/p/webrtc/source/detail?r=7799 Review URL: https://webrtc-codereview.appspot.com/27309004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7839 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-09 10:12:53 +00:00
#include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
Remove the state_ member from AudioDecoder The subclasses that need a state pointer should declare them---with the right type, not void*, to get rid of all those casts. Two small but not quite trivial cleanups are included because they blocked the state_ removal: - AudioDecoderG722Stereo now inherits directly from AudioDecoder instead of being a subclass of AudioDecoderG722. - AudioDecoder now has a CngDecoderInstance member function, which is implemented only by AudioDecoderCng. This replaces the previous practice of calling AudioDecoder::state() and casting the result to a CNG_dec_inst*. It still isn't pretty, but now the blemish is plainly visible in the AudioDecoder class declaration. R=henrik.lundin@webrtc.org Review URL: https://webrtc-codereview.appspot.com/24169005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7644 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-06 07:54:31 +00:00
#ifdef WEBRTC_CODEC_G722
modules/audio_coding: Remove some codec include dirs Also clean up some include_dir entries and update the few references to them with absolute include paths instead. Finally fixed a few lint errors and invalid header guards. None of these are used downstream. BUG=webrtc:5095 TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=kwiberg@webrtc.org Review URL: https://codereview.webrtc.org/1438663003 . Cr-Commit-Position: refs/heads/master@{#10700}
2015-11-18 23:07:57 +01:00
#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
Remove the state_ member from AudioDecoder The subclasses that need a state pointer should declare them---with the right type, not void*, to get rid of all those casts. Two small but not quite trivial cleanups are included because they blocked the state_ removal: - AudioDecoderG722Stereo now inherits directly from AudioDecoder instead of being a subclass of AudioDecoderG722. - AudioDecoder now has a CngDecoderInstance member function, which is implemented only by AudioDecoderCng. This replaces the previous practice of calling AudioDecoder::state() and casting the result to a CNG_dec_inst*. It still isn't pretty, but now the blemish is plainly visible in the AudioDecoder class declaration. R=henrik.lundin@webrtc.org Review URL: https://webrtc-codereview.appspot.com/24169005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7644 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-06 07:54:31 +00:00
#endif
audio_coding: remove "main" directory This is the last piece of the old directory layout of the modules. Duplicated header files are left in audio_coding/main/include until downstream code is updated to the new location. They have pragma warnings added to them and identical header guards as the new headers to avoid breaking things. BUG=webrtc:5095 TESTED=Passing compile-trybots with --clobber flag: git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc NOTRY=True NOPRESUBMIT=True Review URL: https://codereview.webrtc.org/1481493004 Cr-Commit-Position: refs/heads/master@{#10803}
2015-11-26 04:44:54 -08:00
#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
Initial upload of NetEq4 This is the first public upload of the new NetEq, version 4. It has been through extensive internal review during the course of the project. TEST=trybots Review URL: https://webrtc-codereview.appspot.com/1073005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3425 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-29 12:09:21 +00:00
#include "webrtc/typedefs.h"
Delete old video defines in engine config. This CL deletes the old and not used video defines in engine_configurations.h and pre-pends voice_ to indicate there are only voice/audio defines left in the file. BUG=none R=solenberg@webrtc.org Review URL: https://codereview.webrtc.org/2401673002 . Cr-Commit-Position: refs/heads/master@{#14558}
2016-10-07 07:07:28 +02:00
#include "webrtc/voice_engine_configurations.h"
Initial upload of NetEq4 This is the first public upload of the new NetEq, version 4. It has been through extensive internal review during the course of the project. TEST=trybots Review URL: https://webrtc-codereview.appspot.com/1073005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3425 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-29 12:09:21 +00:00
namespace webrtc {
Make an enum class out of NetEqDecoder, and hide the neteq_decoders_ table This operation was relatively simple, since no one was doing anything fishy with this enum. A large number of lines had to be changed because the enum values now live in their own namespace, but this is arguably worth it since it is now much clearer what sort of constant they are. BUG=webrtc:5028 Review URL: https://codereview.webrtc.org/1424083002 Cr-Commit-Position: refs/heads/master@{#10449}
2015-10-29 06:20:28 -07:00
using NetEqDecoder = acm2::RentACodec::NetEqDecoder;
Move the AudioDecoder interface out of NetEq It belongs with the codecs, next to the AudioEncoder interface. R=andrew@webrtc.org, henrik.lundin@webrtc.org, kjellander@webrtc.org Previously committed here: https://code.google.com/p/webrtc/source/detail?r=7798 and reverted here: https://code.google.com/p/webrtc/source/detail?r=7799 Review URL: https://webrtc-codereview.appspot.com/27309004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7839 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-09 10:12:53 +00:00
// Returns true if |codec_type| is supported.
bool CodecSupported(NetEqDecoder codec_type);
Initial upload of NetEq4 This is the first public upload of the new NetEq, version 4. It has been through extensive internal review during the course of the project. TEST=trybots Review URL: https://webrtc-codereview.appspot.com/1073005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3425 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-29 12:09:21 +00:00
} // namespace webrtc
Rename neteq4 folder to neteq Keep the old neteq4/audio_decoder_unittests.isolate while waiting for a hard-coded reference to change. This CL effectively reverts r6257 "Rename neteq4 folder to neteq". BUG=2996 TBR=tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/21629004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6367 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-09 08:10:28 +00:00
#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
Reference in New Issue Copy Permalink