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.cc

86 lines
2.8 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
#include "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>
Implementing stereo support for G.722 This CL implements stereo support for G.722 through a new class AudioDecoderG722Stereo derived from AudioDecoderG722. Also implementing tests for G.722 stereo. Review URL: https://webrtc-codereview.appspot.com/1073006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3452 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-02-01 11:49:28 +00:00
Remove the codec_type_ member from AudioDecoder It isn't actually required, as evidenced by the comparative ease with which it can be removed. R=henrik.lundin@webrtc.org Review URL: https://webrtc-codereview.appspot.com/31939004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7606 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-04 11:51:46 +00:00
#include "webrtc/base/checks.h"
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/g711/audio_decoder_pcm.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
#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/audio_decoder_g722.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
#endif
#ifdef WEBRTC_CODEC_ILBC
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/ilbc/audio_decoder_ilbc.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
#endif
#ifdef WEBRTC_CODEC_ISACFX
audio_coding: rename interface -> include BUG=webrtc:5095 R=henrik.lundin@webrtc.org TBR=tommi@webrtc.org Review URL: https://codereview.webrtc.org/1417173004 . Cr-Commit-Position: refs/heads/master@{#10444}
2015-10-29 11:31:02 +01:00
#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h"
#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.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
#endif
#ifdef WEBRTC_CODEC_ISAC
audio_coding: rename interface -> include BUG=webrtc:5095 R=henrik.lundin@webrtc.org TBR=tommi@webrtc.org Review URL: https://codereview.webrtc.org/1417173004 . Cr-Commit-Position: refs/heads/master@{#10444}
2015-10-29 11:31:02 +01:00
#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.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
#endif
#ifdef WEBRTC_CODEC_OPUS
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/opus/audio_decoder_opus.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
#endif
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/pcm16b/audio_decoder_pcm16b.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 {
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
bool CodecSupported(NetEqDecoder codec_type) {
switch (codec_type) {
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
case NetEqDecoder::kDecoderPCMu:
case NetEqDecoder::kDecoderPCMa:
case NetEqDecoder::kDecoderPCMu_2ch:
case NetEqDecoder::kDecoderPCMa_2ch:
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
#ifdef WEBRTC_CODEC_ILBC
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
case NetEqDecoder::kDecoderILBC:
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
#endif
#if defined(WEBRTC_CODEC_ISACFX) || defined(WEBRTC_CODEC_ISAC)
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
case NetEqDecoder::kDecoderISAC:
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
#endif
#ifdef WEBRTC_CODEC_ISAC
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
case NetEqDecoder::kDecoderISACswb:
#endif
case NetEqDecoder::kDecoderPCM16B:
case NetEqDecoder::kDecoderPCM16Bwb:
case NetEqDecoder::kDecoderPCM16Bswb32kHz:
case NetEqDecoder::kDecoderPCM16Bswb48kHz:
case NetEqDecoder::kDecoderPCM16B_2ch:
case NetEqDecoder::kDecoderPCM16Bwb_2ch:
case NetEqDecoder::kDecoderPCM16Bswb32kHz_2ch:
case NetEqDecoder::kDecoderPCM16Bswb48kHz_2ch:
case NetEqDecoder::kDecoderPCM16B_5ch:
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
#ifdef WEBRTC_CODEC_G722
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
case NetEqDecoder::kDecoderG722:
case NetEqDecoder::kDecoderG722_2ch:
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
#endif
#ifdef WEBRTC_CODEC_OPUS
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
case NetEqDecoder::kDecoderOpus:
case NetEqDecoder::kDecoderOpus_2ch:
#endif
case NetEqDecoder::kDecoderRED:
case NetEqDecoder::kDecoderAVT:
case NetEqDecoder::kDecoderCNGnb:
case NetEqDecoder::kDecoderCNGwb:
case NetEqDecoder::kDecoderCNGswb32kHz:
case NetEqDecoder::kDecoderCNGswb48kHz:
case NetEqDecoder::kDecoderArbitrary: {
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
return true;
}
default: {
return false;
}
}
}
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
Reference in New Issue Copy Permalink