Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Moving IPlayer.aidl to frameworks/av/."

Browse Source
This commit is contained in:
Ivan Lozano
2017-09-01 23:07:07 +00:00
committed by Android (Google) Code Review
parent 28a8114a12 330d876a62
commit 9f6a292f6a
6 changed files with 8 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@@ -453,7 +453,7 @@ LOCAL_SRC_FILES += \
media/java/android/media/IMediaScannerListener.aidl \
media/java/android/media/IMediaScannerService.aidl \
media/java/android/media/IPlaybackConfigDispatcher.aidl \
media/java/android/media/IPlayer.aidl \
../av/media/libaudioclient/aidl/android/media/IPlayer.aidl \
media/java/android/media/IRecordingConfigDispatcher.aidl \
media/java/android/media/IRemoteDisplayCallback.aidl \
media/java/android/media/IRemoteDisplayProvider.aidl \
@@ -587,6 +587,7 @@ LOCAL_AIDL_INCLUDES += \
LOCAL_AIDL_INCLUDES += \
frameworks/av/camera/aidl \
frameworks/av/drm/libmediadrm/aidl \
frameworks/av/media/libaudioclient/aidl \
frameworks/native/aidl/gui \
system/netd/server/binder \
system/bt/binder

2
core/jni/android_media_AudioTrack.cpp
View File

@@ -44,6 +44,8 @@
using namespace android;
using ::android::media::VolumeShaper;
// ----------------------------------------------------------------------------
static const char* const kClassPathName = "android/media/AudioTrack";
static const char* const kAudioAttributesClassPathName = "android/media/AudioAttributes";

33
media/java/android/media/IPlayer.aidl
View File

@@ -1,33 +0,0 @@
/*
* Copyright (C) 2016 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.media;
import android.media.VolumeShaper;
/**
* @hide
*/
interface IPlayer {
oneway void start();
oneway void pause();
oneway void stop();
oneway void setVolume(float vol);
oneway void setPan(float pan);
oneway void setStartDelayMs(int delayMs);
oneway void applyVolumeShaper(in VolumeShaper.Configuration configuration,
in VolumeShaper.Operation operation);
}

21
media/java/android/media/VolumeShaper.aidl
View File

@@ -1,21 +0,0 @@
/*
* Copyright 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.media;
parcelable VolumeShaper.Configuration;
parcelable VolumeShaper.Operation;
parcelable VolumeShaper.State;

2
media/jni/android_media_MediaPlayer.cpp
View File

@@ -78,6 +78,8 @@ static StateExceptionFields gStateExceptionFields;
using namespace android;
using media::VolumeShaper;
// ----------------------------------------------------------------------------
struct fields_t {

2
media/jni/android_media_VolumeShaper.h
View File

@@ -21,6 +21,8 @@
namespace android {
using media::VolumeShaper;
// This entire class is inline as it is used from both core and media
struct VolumeShaperHelper {
struct fields_t {