zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete dead code from JNI audio header.

Browse Source 
Bug: webrtc:9048
Change-Id: I912a50f84a3afbb7cd13357ba8b134323fd53ed9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180343
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31797}
This commit is contained in:
Sami Kalliomäki
2020-07-27 15:50:07 +02:00
committed by Commit Bot
parent 0bb2639060
commit b2b6cd3af9
3 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/android/BUILD.gn
View File

@ -570,8 +570,6 @@ if (current_os == "linux" || is_android) {
deps = [
":base_jni",
":builtin_audio_codecs_jni",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../api/audio_codecs:builtin_audio_encoder_factory",
"../../modules/audio_processing",
"../../modules/audio_processing:api",
"../../rtc_base:rtc_base_approved",

10
sdk/android/src/jni/pc/audio.cc
View File

@ -10,21 +10,11 @@
#include "sdk/android/src/jni/pc/audio.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "modules/audio_processing/include/audio_processing.h"
namespace webrtc {
namespace jni {
rtc::scoped_refptr<AudioDecoderFactory> CreateAudioDecoderFactory() {
return CreateBuiltinAudioDecoderFactory();
}
rtc::scoped_refptr<AudioEncoderFactory> CreateAudioEncoderFactory() {
return CreateBuiltinAudioEncoderFactory();
}
rtc::scoped_refptr<AudioProcessing> CreateAudioProcessing() {
return AudioProcessingBuilder().Create();
}

8
sdk/android/src/jni/pc/audio.h
View File

@ -11,20 +11,14 @@
#ifndef SDK_ANDROID_SRC_JNI_PC_AUDIO_H_
#define SDK_ANDROID_SRC_JNI_PC_AUDIO_H_
#include "api/scoped_refptr.h"
// Adding 'nogncheck' to disable the gn include headers check.
// We don't want this target depend on audio related targets
#include "api/audio_codecs/audio_decoder_factory.h" // nogncheck
#include "api/audio_codecs/audio_encoder_factory.h" // nogncheck
#include "api/scoped_refptr.h"
#include "modules/audio_processing/include/audio_processing.h" // nogncheck
namespace webrtc {
namespace jni {
rtc::scoped_refptr<AudioDecoderFactory> CreateAudioDecoderFactory();
rtc::scoped_refptr<AudioEncoderFactory> CreateAudioEncoderFactory();
rtc::scoped_refptr<AudioProcessing> CreateAudioProcessing();
} // namespace jni