Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3887e244 authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Audio V4: Rename audio/device to audio/core 



The name device has already too many meaning, thus rename the main audio
api to core.

Bug: 38184704
Test: compile
Change-Id: I178dfef05af8f8579196affbe2cbc5f6c3f9af55
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent 62588b69

audio/README

+9 −9
Original line number Diff line number Diff line 
Directory structure of the audio HIDL related code.



audio

|-- 2.0              <== legacy 2.0 device HIDL (.hal) can not be moved to fit

|-- 2.0              <== legacy 2.0 core HIDL (.hal) can not be moved to fit

|                        the directory structure because already published

|

|-- common           <== code common to audio device and effect API

|-- common           <== code common to audio core and effect API

|   |-- 2.0

|   |   |-- default  <== code that wraps the legacy API

|   |   `-- vts      <== vts of 2.0 device and effect API common code

|   |   `-- vts      <== vts of 2.0 core and effect API common code

|   |-- 4.0

|   |   |-- default

|   |   `-- vts

|   |-- ...          <== The future versions should continue this structure

|   |   |-- default

|   |   `-- vts

|   `-- all_versions <== code common to all version of both device and effect API

|   `-- all_versions <== code common to all version of both core and effect API

|       |-- default

|       `-- vts      <== vts of device and effect API common version independent code

|       `-- vts      <== vts of core and effect API common version independent code

|

|-- device           <== code relative to the device API

|   |-- 2.0          <== 2.0 device API code (except .hal, see audio/2.0)

|-- core           <== code relative to the core API

|   |-- 2.0          <== 2.0 core API code (except .hal, see audio/2.0)

|   |   |-- default

|   |   `-- vts

|   |-- 4.0

|   |   |-- default  <== default implementation of the device 4.0 api

|   |   |-- default  <== default implementation of the core 4.0 api

|   |   `-- vts      <== vts code of the 4.0 API

|   |-- ...

|   |   |-- default

|   |   `-- vts

|   `-- all_versions

|       |-- default

|       `-- vts      <== vts of device API common version independent code

|       `-- vts      <== vts of core API common version independent code

|

`-- effect           <== idem for the effect API

    |-- 2.0

audio/common/README

+1 −1
Original line number Diff line number Diff line 
This folder contains code common to audio device and effect API
 
This folder contains code common to audio core and effect API

audio/device/2.0/default/Android.bp→audio/core/2.0/default/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ cc_library_shared { 


    header_libs: [

        "android.hardware.audio.common.util@all-versions",

        "android.hardware.audio@all-versions-impl",

        "android.hardware.audio.core@all-versions-impl",

        "libaudioclient_headers",

        "libaudio_system_headers",

        "libhardware_headers",

audio/device/2.0/default/Conversions.cpp→audio/core/2.0/default/Conversions.cpp

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#include "device/2.0/default/Conversions.h"

#include "core/2.0/default/Conversions.h"



#define AUDIO_HAL_VERSION V2_0

#include <device/all-versions/default/Conversions.impl.h>

#include <core/all-versions/default/Conversions.impl.h>

#undef AUDIO_HAL_VERSION

audio/device/2.0/default/Device.cpp→audio/core/2.0/default/Device.cpp

+6 −6
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


#define LOG_TAG "DeviceHAL"



#include "device/2.0/default/Device.h"

#include "core/2.0/default/Device.h"

#include <HidlUtils.h>

#include "device/2.0/default/Conversions.h"

#include "device/2.0/default/StreamIn.h"

#include "device/2.0/default/StreamOut.h"

#include "device/all-versions/default/Util.h"

#include "core/2.0/default/Conversions.h"

#include "core/2.0/default/StreamIn.h"

#include "core/2.0/default/StreamOut.h"

#include "core/all-versions/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <device/all-versions/default/Device.impl.h>

#include <core/all-versions/default/Device.impl.h>

#undef AUDIO_HAL_VERSION