Commit graph

111 commits

Author SHA1 Message Date
John Grossman
47bf3d7ea5 Extend the audio HAL interface to support get/set master mute
(cherry picked from commit d245968b7ef0be5c776c9aefff3eca9e293d1b35)

> Extend the audio HAL interface to support get/set master mute
>
> Hand merge from ics-aah
>
> > Extend the audio HAL interface to support get/set master mute: DO NOT MERGE
> >
> > Extend the audio HAL interface to allow HALs to optionally support HW
> > level master mute.  This follows the same pattern as master volume and
> > is part of the fix for bug 6828363.  Because of the divergences
> > between ICS and master, this change will need to be merged by hand.
> >
> > Signed-off-by: John Grossman <johngro@google.com>
> > Change-Id: Ica6f5e37e13d13dde60463966f41f271ffa104fd
>
> Change-Id: I5e7aea6d7da0012dcc077281f9077fc04cfb9889
> Signed-off-by: John Grossman <johngro@google.com>

Change-Id: I2011cc5bc41ca7081ce255a4bfba65f36f899bc4
Signed-off-by: John Grossman <johngro@google.com>
2012-08-07 15:59:07 -07:00
Jesse Hall
f9d6cd7dee Add multi-display and flip fence to HWC
Change-Id: I3b0446050648e2b386ffb32976c9943b6fd9793d
2012-08-07 12:26:59 -07:00
Jesse Hall
85ab59a147 Revert "Add multi-display and flip fence to HWC"
This reverts commit 1d51b2b9fc713da6de18117bc19508ecdfde4f23

Change-Id: I1ae46d8cae1cb3064800cd24df56347b05eb6059
2012-07-31 12:16:24 -07:00
Jesse Hall
65bed1f947 Add multi-display and flip fence to HWC
Change-Id: I31b4fc293220bc51169971df93347dd35fdc30ef
2012-07-30 16:52:21 -07:00
Glenn Kasten
48915acb39 struct effect_descriptor_s const correctness
Also struct audio_stream in audio_stream_frame_size

Change-Id: Ie0de708e38a1850c186a8b4eb5f491adc44b3275
2012-07-24 07:53:14 -07:00
Glenn Kasten
a635449697 Use audio_channel_mask_t consistently
Change-Id: Ib832c0b707b1e0b82adf4ab3d4d18a2dc459d240
2012-06-25 10:45:43 -07:00
Jesse Hall
d479ad22a0 Introduce HWC_DEVICE_API_VERSION_1_0
The new version adds an acquire and release fence to each layer,
providing explicit producer->hwc and hwc->producer synchronization.

Change-Id: Ibd6e3c7b3515c012c767246e6d6514274fdef01d
2012-06-18 15:53:25 -07:00
Jean-Baptiste Queru
186f8c5268 am 8405fe5a: am 1fbbb08d: Merge "remove seemed useless gralloc_open() call in fb_device_open()"
* commit '8405fe5a5203af18f39fd47b35606f0b32cd956c':
  remove seemed useless gralloc_open() call in fb_device_open()
2012-06-12 15:18:23 -07:00
Jean-Baptiste Queru
8405fe5a52 am 1fbbb08d: Merge "remove seemed useless gralloc_open() call in fb_device_open()"
* commit '1fbbb08ddda4321ccdb05345658044c1f0235997':
  remove seemed useless gralloc_open() call in fb_device_open()
2012-06-12 15:16:18 -07:00
Eino-Ville Talvala
15d4e5d073 Merge "Add RAW_SENSOR to gralloc sample" 2012-05-14 15:57:29 -07:00
Eino-Ville Talvala
984272d92e Add RAW_SENSOR to gralloc sample
Change-Id: I0621bd70896385c3d522d283a1be714f5f29df3b
2012-05-07 11:01:17 -07:00
Colin Cross
a3e364144c remove triggering suspend from power hal
PowerManagerService will trigger suspend after calling into the
power hal, remove it from here.

Change-Id: I98cc096413bd5c9e39a28b2bfc376d3d30544193
2012-05-03 19:01:02 -07:00
Mathias Agopian
5cb1de89a9 add version number to power HAL
Change-Id: I6acf4523b5878565035ea6c85bddd58f9b20ef1b
2012-04-26 19:49:40 -07:00
Todd Poynor
2f143fba74 hardware: libhardware: Power HAL add power hints -- DO NOT MERGE
Change-Id: I8ab0376e4f5d8ef09d5b1062cbfbb30c30c5bb96
Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-04-25 18:16:40 -07:00
Mike Lockwood
46a9809e9c Update USB audio HAL to use API
Also don't clear card and device when out_set_parameters is called
to set other parameters.

Change-Id: I4feda9f6a2e76cb45bbc8a8f8256bb1760302707
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-04-24 16:46:24 -07:00
Eric Laurent
da4b0b26d1 rename audio policy output flags.
Change-Id: I965fa9bcba45f223f2f2cbc4adccfb5491414c8b
2012-04-18 13:58:44 -07:00
Eric Laurent
55786bcf3c audio: updated audio HAL device API
Modified open output and input stream functions to add new
parameters needed by audio HAL. Also grouped parameters
in a config structure for clarity.

Change-Id: I60832d8e5b5e4a48f209a6d83f5ca9c044be61f1
2012-04-17 16:02:48 -07:00
Simon Wilson
19957a37a0 usbaudio: add initial usbaudio default HAL
Change-Id: I6e93b2512883f3697683a74cadb9a29113966bc0
2012-04-12 22:48:10 -07:00
suyi Yuan
539c9936ae remove seemed useless gralloc_open() call in fb_device_open()
Change-Id: I520e460bd558934c71042b5a4fdb03b3935ad720
Signed-off-by: suyi Yuan <yuan.suyi@gmail.com>
2012-03-15 15:27:02 +08:00
Rakesh Goyal
a776bb2e81 am 6d2bc4fc: am 4cbd62c2: add i2c_device_address member to nfc_pn544_device_t
* commit '6d2bc4fc11ca04326eaf982f97d13d6410a73af2':
  add i2c_device_address member to nfc_pn544_device_t
2012-03-09 11:43:56 -08:00
Rakesh Goyal
4cbd62c2ca add i2c_device_address member to nfc_pn544_device_t
Add I2C slave address. Multiple I2C addresses are possible
for PN544 module. Configure address according to board design.

Change-Id: I847e8f3db631f5039cf15143a9982f4b9b209f27
2012-03-09 08:51:15 -08:00
Eric Laurent
83c62ce4e3 audio policy: use audio_devices_t when appropriate
Change-Id: Iee57cf5c3bdfefd981e1ed5958df10171f8716e6
2012-03-08 13:45:03 -08:00
Todd Poynor
c82792c0a4 Power HAL: Add initial header file and default/legacy implementation
Change-Id: I43a515a8ffe72a9c4e7d5f7470a5e73e76d5e1b1
Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-02-17 16:26:32 -08:00
Mike J. Chen
5ad38a901d Modifications to audio_hal for Android@Home.
This is a squashed merge of the following changes:

Commit f560da61a5e128ca9f82f7fe939afcf1f09188c7
Author: John Grossman <johngro@google.com>
Date:   Thu Aug 11 15:34:55 2011 -0700

    Fill out a missing entry in the audio HAL function table.

    The entry for get_initial_master_volume was missing from the non-legacy audio
    HAL and needs to be filled out.  Also fix up the order of the comments
    describing the get_initial_master_volume method.

    Change-Id: I87d5415ef92611497a6dab4c657fc00367c4d80b

commit cea82facb63fd237a4ea6fb770605fcb500850ff
Author: Jason Simmons <jsimmons@google.com>
Date:   Thu Jun 16 14:24:24 2011 -0700

    Define a replacement for getSampleDelta that returns a DMA start time and count of samples queued

    Change-Id: I2d13f57b5a8c5b97fb3aa0a90834ce91c56864ef

commit 60a9acd7eee470a8d870218e8be618bfa3be15a5
Author: Mike J. Chen <mjchen@google.com>
Date:   Tue Jun 7 09:13:23 2011 -0700

    Add Android@Home extensions to new Audio HAL interface.

    Change-Id: I3ea4676d4b7d2afd78a5a7a7003ad5c437276d05
    Signed-off-by: Mike J. Chen <mjchen@google.com>

Change-Id: I09f3756d12a1ce4f9af39610ed857890742a72df
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>

Conflicts:

	include/hardware/audio.h
	modules/audio/audio_hw.c
2012-02-10 08:58:32 -08:00
Mike J. Chen
ad255ee424 Add a HAL representing a system-wide local time counter.
This is a squashed merge of the following changes:

commit 9def1ae65f6b4d6a8fdec147fdcd34f22f08174a
Author: John Grossman <johngro@google.com>
Date:   Fri Aug 12 11:47:20 2011 -0700

    Change the signature of set_local_slew.

    Changed the definition of the slew function in the local time HAL to take an
    int16 instead of an int32 and to use the full range of the int instead of
    attempting to imply any particular PPM range.

    Change-Id: Ia67f50e77f1fe674a63ec69460e830d1191ef5a0

commit afab51327453d1bfc7423f8ce7a28933d8fc49b2
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 17:29:07 2011 -0700

    Remove "primary" from the local_time HAL.

    Interface instances are a pattern which should only be used by audio.  Remove
    its use from the local_time HAL.

    Change-Id: If4c458cf16a02d9dc63c04185111ae793fc57801

commit 1c26e59a66e75ccb31027f42183aaa32bde6e456
Author: John Grossman <johngro@google.com>
Date:   Fri Jun 17 14:19:24 2011 -0700

    Refactor the local/common clock services.

    This change is one of a set of 5 changes made to different repositories.  Look
    for this comment in all of them.

    Refactor the local/common clock services to match android best
    practice.  Notable changes include

    + The kernel no longer knows anything about common time.  Common time has been
      moved completely up into user land.  This has an impact on the accuracy of the
      timesync debugging code, and the netfilter assisted approach to network based
      timesync is going to have to be modified.
    + The timesync driver used by A@H is now just local time driver.
    + The kernel no longer needs access to the linear transform math code, and it
      has been removed.
    + A new HAL has been introduced to expose the concept of local time to the
      system.
    + A non-slewable stub implementation of the local time HAL based on
      CLOCK_MONOTONIC has been added.
    + The old library has been eliminated.  Its functionality has been
      distributed among the common time binder service, the local time hal and the
      linear transform utility code.
    + All clients of the old library have been changed to be clients of
      the binder service, the hal and the utility code.
    + The reset_tt utilities have been removed, they no longer have a purpose in the
      system.

    Change-Id: I39843b94f9b6d13f63b22145a2edcafe4ca87349

Change-Id: Ib264c992d564b99ef7c7847a788e4fa7f5e101b4
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>

Conflicts:

	modules/Android.mk
2012-02-10 08:57:16 -08:00
Glenn Kasten
ae2e42b244 Use audio_source_t consistently
Change-Id: Ie25ddeb091646b7e24149b3b23a18ce0807e1891
2012-01-26 16:47:25 -08:00
Glenn Kasten
ea84c55f2c Merge "Use audio_format_t consistently" 2012-01-20 14:50:29 -08:00
Glenn Kasten
080a80212b Audio policy HAL set_ringer_mode is deprecated
Change-Id: If0f82d5c1cb9a0faf70f5a8434f68cdc39784ee6
2012-01-18 15:15:07 -08:00
Eric Laurent
d4cf73b362 Merge "audio policy: manage stream volume per device" 2012-01-17 17:34:53 -08:00
Glenn Kasten
fad1f606a2 Merge "set_mode and set_phone_state now take audio_mode_t" 2012-01-17 11:33:22 -08:00
Eric Laurent
ca20b17b41 audio policy: manage stream volume per device
Improve volume management by keeping track of volume for each type
of device independently.

Added functions at the audio policy interface to set and get stream volume
for a particular device.

Change-Id: Ic8899e82e48193cb65b3673e9d20383efed943b5
2012-01-17 09:10:45 -08:00
Glenn Kasten
5161a847dd Use audio_stream_type_t consistently
Change-Id: I1e92f018a07e4b1b73ef8d4de461ef1e08bc48e7
2012-01-12 16:55:03 -08:00
Glenn Kasten
fe79eb3f06 Use audio_format_t consistently
Was sometimes int or uint32_t

Change-Id: Ib3d82f5aefeda371c0439e43e72737a54882f519
2012-01-12 14:55:57 -08:00
Glenn Kasten
6df641e269 set_mode and set_phone_state now take audio_mode_t
Change-Id: I12a3a5ad6c3cadc6b9de8281f78edfef53908e2d
2012-01-12 10:06:24 -08:00
Steve Block
60d056bf29 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I0cbe865d464a37365fa3be84948b07e5a0d181d0
2012-01-08 11:03:25 +00:00
Steve Block
22d351317a Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I135fadaf10e95af1eb918889a22980c194c650ca
2012-01-05 23:27:52 +00:00
Steve Block
b224b78c14 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ia8b6f74b27098b3dba27f177a76264eb23f849ee
2012-01-04 20:07:12 +00:00
Steve Block
cee8501c16 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I98e83cc9d22f0ea8fbf397ccccd9ce7773119551
2012-01-03 22:31:17 +00:00
Martijn Coenen
44ae5b2476 New NFC HAL.
First implementation of a NFC HAL. This implementation doesn't
offer a generic NFC device HAL (yet), but offers typed interfaces
for different NFC controllers. Currently only the PN544 is supported.

Change-Id: I3ac04dcd767fb12a433edbe88ec7068eb1930a57
2011-11-04 09:05:22 -07:00
Eric Laurent
78d2c69af4 audio policy: register effect CPU on enable
Added a method on audio policy interface to register
audio effect CPU usage on enable and unregister on disable
instead of when the effect is created or destroyed.

Change-Id: Iee20bf70fee7302f817ec4c7d9bf7640caca2e95
2011-08-11 08:48:25 -07:00
Mathias Agopian
e25e1969dd get rid of overlay HAL
Change-Id: I1ba7ffac8776a8d59a5cc4e7688c3a5bd02e6647
2011-07-12 15:48:30 -07:00
Eric Laurent
f3008aa707 Audio HAL: added interface for audio preprocessing
Change-Id: I032f6dd8f9ad11283a3f0a6721018dabfd12236d
2011-07-08 09:59:52 -07:00
Dima Zavin
3bc15860a9 hardware: drop the _hal suffixes from audio.h and audio_policy.h
Change-Id: Ib9bfc4049cf350f72af3ee577ce4756ac4118cfc
Signed-off-by: Dima Zavin <dima@android.com>
2011-06-13 18:12:17 -07:00
Dima Zavin
1199865d0c hardware: move audio_policy.h to system/
Change-Id: I392c5f91db88ca923dead7202064169edc1cc0c7
Signed-off-by: Dima Zavin <dima@android.com>
2011-06-13 18:10:06 -07:00
Jean-Baptiste Queru
57adb36c30 Remove workarounds for buggy /dev/fb0 drivers
Change-Id: Ideadd5f39693d05cf29a81d9f87ed804d7e52380
2011-06-06 13:28:45 -07:00
Dima Zavin
aa21172bcd audio: move audio.h to system/core/include/system/audio.h
Change-Id: I523dfb361b1b3862cf8bc41c1691c607b2c815b0
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-12 14:10:06 -07:00
Mathias Agopian
03dd9c671d remove deprecated/unused HAL headers
copybit, overlay, sensors_deprecated are no longer supported.

Change-Id: Ie5da20bd4ff95f7565a162d628bf572a76327b7b
2011-04-28 20:09:45 -07:00
Dima Zavin
8cc353abc9 libhardware: add stub audio and audio_policy modules
Change-Id: Ib6c0c49dbc369b735b2ac5fb5b583de96c3e9f3e
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 14:08:57 -07:00
Dima Zavin
7e03316618 libhardware: add separate makefile for modules subdir
Change-Id: I787c444ee1c3a687ee6f8f551c359e5e908ed7f5
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 14:08:57 -07:00
Jean-Baptiste Queru
c9881d8c56 am cb4ea7ac: am 7b584867: am cd347fdf: Allow to force 16bpp when 32bpp has problems
* commit 'cb4ea7ac8af7ac0732f480dc4938e62566bd5550':
  Allow to force 16bpp when 32bpp has problems
2011-04-05 11:27:14 -07:00