OSDN Git Service

android-x86/frameworks-av.git
10 years agoCamera3: Separate the video and preview size filtering
Zhijun He [Wed, 28 May 2014 21:57:54 +0000 (14:57 -0700)]
Camera3: Separate the video and preview size filtering

Supported video sizes were generated from supported preview sizes, which
effectively filtered out sizes larger than 1080p. This change filters the
supported video sizes based on the media profiles supported h.264 max video
frame width and height.

Bug: 15287656

Change-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65

10 years agoDO NOT MERGE - AudioFlinger: increase per client memory pool
Eric Laurent [Tue, 10 Jun 2014 00:31:51 +0000 (17:31 -0700)]
DO NOT MERGE - AudioFlinger: increase per client memory pool

Temporary workaround for issue 14057166 allowing
AudioTracks from a given client to use up to 4MB
of shared memory.

Bug: 14057166.
Change-Id: I19adb8d424ed170df61c1cd706be3d10788edfc1

10 years agoMerge "audio policy: added audio HAL version in audio_policy.conf" into lmp-preview-dev
Eric Laurent [Sat, 7 Jun 2014 00:01:42 +0000 (00:01 +0000)]
Merge "audio policy: added audio HAL version in audio_policy.conf" into lmp-preview-dev

10 years agoaudio policy: added audio HAL version in audio_policy.conf
Eric Laurent [Fri, 6 Jun 2014 21:56:52 +0000 (14:56 -0700)]
audio policy: added audio HAL version in audio_policy.conf

Each hardware module section in audio_policy.conf indicates
the audio HAL version it implements.

Also added a template audio_policy.conf file with examples
of device and gain descriptors added for audio HAL version3.0.

Bug: 14815883.
Change-Id: Id219d121f81f687363f6c18f2d1684b2448dcdf4

10 years agoMerge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-preview-dev
Lajos Molnar [Fri, 6 Jun 2014 22:59:08 +0000 (22:59 +0000)]
Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-preview-dev

10 years agostagefright: added support, and SoftOMX decoder, for HEVC
Harish Mahendrakar [Tue, 20 May 2014 16:30:59 +0000 (09:30 -0700)]
stagefright: added support, and SoftOMX decoder, for HEVC

also fixed QuerySupportedProfileLevels in
SoftVideoDecoderOMXComponent.cpp

Bug: 14571712
Change-Id: Ifa3793f7c1b18ac5e8c0a096848c998cabd9e777

10 years agoWe still need the raw codec
Marco Nelissen [Thu, 5 Jun 2014 22:52:54 +0000 (15:52 -0700)]
We still need the raw codec

It's used for FLAC and PCM Wav, which output PCM data.
b/15320804

Change-Id: I67921a45dd4a3a175fce412e055728859e2309ba

10 years agoMerge "AudioFlinger: fix PatchPanel debug log." into lmp-preview-dev
Eric Laurent [Thu, 5 Jun 2014 17:26:30 +0000 (17:26 +0000)]
Merge "AudioFlinger: fix PatchPanel debug log." into lmp-preview-dev

10 years agoMerge "Squashed commit of the following:" into lmp-preview-dev
Glenn Kasten [Thu, 5 Jun 2014 14:44:32 +0000 (14:44 +0000)]
Merge "Squashed commit of the following:" into lmp-preview-dev

10 years agoMerge "MediaCodecList: remove force-added codecs for videoeditor" into lmp-preview-dev
Lajos Molnar [Thu, 5 Jun 2014 14:36:18 +0000 (14:36 +0000)]
Merge "MediaCodecList: remove force-added codecs for videoeditor" into lmp-preview-dev

10 years agoSquashed commit of the following:
Glenn Kasten [Thu, 5 Jun 2014 03:31:46 +0000 (20:31 -0700)]
Squashed commit of the following:

commit 9128d6ffec43731d723f9b394f243d940f4c7e41
Author: Glenn Kasten <gkasten@google.com>
Date:   Tue May 13 10:38:42 2014 -0700

    Use of fast capture by normal capture

    Will only configure fast capture path if the input buffer size is less than
    10 ms and the input sample rate is same as the primary output sample rate.

    Change-Id: I4a7cdc6069d750845412c626d27e83f72a1ab397

commit 2e5e0806a5abe7499848358ef5fde5c26405000d
Author: Glenn Kasten <gkasten@google.com>
Date:   Mon Jun 2 08:29:22 2014 -0700

    Add mPrimaryOutputSampleRate

    Change-Id: I46b527fc3f2b5a5720a74b4f0b9a8f2e0d570b09

commit baf1d73467923996d1b1f2a9237260cc5697e050
Author: Andy Hung <hunga@google.com>
Date:   Fri May 30 10:42:03 2014 -0700

    Change parameter type for volume to float in AudioMixer

    Change-Id: I4da1505ce852505f86f8e5b87f60e8edceeb30e0

commit 40fe20fa9760cd03c69778c2021cf7a490d75ece
Author: Andy Hung <hunga@google.com>
Date:   Fri May 30 10:35:47 2014 -0700

    Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixer

    Change-Id: Ic040311305026f0b4c4280a5b3bef7a447ac1da3

commit 37c9a2b49f876abc5ff537a9ec036d7f0a423775
Author: Andy Hung <hunga@google.com>
Date:   Thu May 29 21:33:13 2014 -0700

    Refactor setVolumeRampVariables in AudioMixer

    Change-Id: I8fcf3101bcea292de7c65433fa578f1c9cdd0974

commit 397070eca31f121d5d3993de1bfea99aaea5d4f3
Author: Andy Hung <hunga@google.com>
Date:   Thu May 29 18:52:38 2014 -0700

    Fix floating point output from mixer

    A buffer pointer was being erroneously reset to buffer start,
    potentially causing an audio glitch. The floating point
    output mode is not enabled at this time, but will be in
    the future.

    Change-Id: If8b6414d232f064f3a2e2c5a6da889a91b27fb24

commit 2e61aa5b33b2247bbc5d4eaa0b519df9accd4bbc
Author: Andy Hung <hunga@google.com>
Date:   Fri May 23 21:22:17 2014 -0700

    Add multiple format capability to FastMixer

    Floating point data from MixerThread into FastMixer.
    Multiple output format capability from FastMixer to Sink.

    Change-Id: I0da17810ee71381a39a006c46faec71108d22c26

commit b9ea653c702a785bbd23a66c5e588d40b4192c4e
Author: Andy Hung <hunga@google.com>
Date:   Thu May 29 15:53:09 2014 -0700

    Avoid resetting BufferProviders in mixer unnecessarily

    Change-Id: Iad85c4dfd21be1dbf89dc11906106b34219376f8

commit 7f1a6d6da21c616f80cf9ba21bea11b419ec561b
Author: Andy Hung <hunga@google.com>
Date:   Tue May 27 12:32:17 2014 -0700

    Update dynamic resampler buffer fetching

    Make the criteria tight for fetching to avoid storing
    excessive frame data internal to the resampler.
    This should reduce jitter in frame delivery computation.

    Bug: 14962343
    Change-Id: I7adaf714d11c272696ccdbf218bda994c7217477

commit b5e4aac07b9a02f0c803c090058602b03ac09ebb
Author: Glenn Kasten <gkasten@google.com>
Date:   Tue May 27 12:30:54 2014 -0700

    Allow kFastTrackMultiplier to be specified per device

    Change-Id: I4eaaaf038df720cec4f5d9221d1b632970f9e3dd

commit b93cd97a52af31122df2da2cc0415cda888c8c73
Author: Andy Hung <hunga@google.com>
Date:   Fri May 23 21:13:31 2014 -0700

    Rename mixBuffer to mMixerBuffer in FastMixer

    Likewise mixBufferState becomes mMixerBufferState.
    This harmonizes with the naming in AF::MixerThread.

    Change-Id: I1255d7c07cc2c6ee925d7430925236d2bd163122

commit 8340758622b9711365a8801806cbdf934803c63f
Author: Andy Hung <hunga@google.com>
Date:   Mon May 12 16:51:41 2014 -0700

    Add multiple format capability to AudioMixer

    Change-Id: I04ac1cafd90b6ed652f8d51888ad07576678f0bc
Signed-off-by: Andy Hung <hunga@google.com>
commit 6b695b9d094820c232a897a3fabbe83d2b7193fe
Author: Glenn Kasten <gkasten@google.com>
Date:   Thu Mar 13 14:59:31 2014 -0700

    Start adding FastCapture based on FastThread WIP

    This version supports at most one fast capture client.

    Change-Id: Idf609bfc80ae22433433d66a5232c043c65506df

commit e951ad05a2c388471d7e2806d91e7d51325a150a
Author: Glenn Kasten <gkasten@google.com>
Date:   Mon May 12 11:06:26 2014 -0700

    Move validation of frameCount from set to openRecord_l

    This move is needed because frameCount is validated on server side for
    fast tracks (as should be done for normal tracks too).

    Change-Id: I6d99e80869fd90fab373cf60ef348c01f075fbca

commit 73e76992dbba794894837c38e5472312ea829cf3
Author: Glenn Kasten <gkasten@google.com>
Date:   Tue May 13 10:41:52 2014 -0700

    Allow track buffer "allocation" to be from pipe

    Change-Id: Ib9ac170f8e8b7746b3588157a56cbee3b753a1cb

commit 60de1d7ded05c6304037d4858b401094b1d2b4d3
Author: Andy Hung <hunga@google.com>
Date:   Fri May 9 15:02:21 2014 -0700

    Add format parameter to getTrackName() and track_t

    Change-Id: Ia152a839014e235fbfb656104c15d7c1b456d02e
Signed-off-by: Andy Hung <hunga@google.com>
Change-Id: Ied0ade8b25d23e89bb03319a7e3135c238f735b9

10 years agoAudioFlinger: fix PatchPanel debug log.
Eric Laurent [Thu, 5 Jun 2014 03:02:57 +0000 (20:02 -0700)]
AudioFlinger: fix PatchPanel debug log.

Bug: 14815883.
Change-Id: I71cf2ef74a96d3cdb27f2beb1b76b8979c738335

10 years agoMerge "DNG: Fix OpcodeList2 length field." into lmp-preview-dev
Ruben Brunk [Wed, 4 Jun 2014 23:33:00 +0000 (23:33 +0000)]
Merge "DNG: Fix OpcodeList2 length field." into lmp-preview-dev

10 years agoDNG: Fix OpcodeList2 length field.
Ruben Brunk [Wed, 4 Jun 2014 22:35:21 +0000 (15:35 -0700)]
DNG: Fix OpcodeList2 length field.

Bug: 15432434
Change-Id: I2a0e017f72c31cdbd30df1fdb32cdd5ff4af3649

10 years agoMerge "audio policy: new setAudioPortConfig implementation" into lmp-preview-dev
Eric Laurent [Wed, 4 Jun 2014 19:22:29 +0000 (19:22 +0000)]
Merge "audio policy: new setAudioPortConfig implementation" into lmp-preview-dev

10 years agoMerge "audio policy: removed raw pointers." into lmp-preview-dev
Eric Laurent [Wed, 4 Jun 2014 18:11:30 +0000 (18:11 +0000)]
Merge "audio policy: removed raw pointers." into lmp-preview-dev

10 years agoMerge "audio policy: add permission for routing APIs." into lmp-preview-dev
Eric Laurent [Wed, 4 Jun 2014 18:11:10 +0000 (18:11 +0000)]
Merge "audio policy: add permission for routing APIs." into lmp-preview-dev

10 years agoaudio policy: new setAudioPortConfig implementation
Eric Laurent [Tue, 3 Jun 2014 20:32:54 +0000 (13:32 -0700)]
audio policy: new setAudioPortConfig implementation

Rewrite setAudioPortConfig() to take advantage of the new
AudioPortConfig class.

The configuration is now checked against AudioPort capabilities
and stored in the AudioPortConfig.

Fix a bug where the config mask was not set properly when calling
setAudioPortConfig at the PatchPanel interface.

Remove debug log in IAudioPolicyService.

Bug: 14815883.
Change-Id: I7eb7683a96e049581c13f2a212486507883d008d

10 years agoaudio policy: removed raw pointers.
Eric Laurent [Mon, 2 Jun 2014 19:01:23 +0000 (12:01 -0700)]
audio policy: removed raw pointers.

Use only RefBase objects for the following classes:
- AudioOutputDescriptor
- AudioInputDescriptor
- HwModule
- EffectDescriptor

Create a common base class AudioPortConfig for:
AudioOutputDescriptor, AudioInputDescriptor and DeviceDescriptor

Bug: 14815883.

Change-Id: I1bd193ef1020780d8b94c13142029903615aba97

10 years agoMerge "Fix typos, remove callback functions - do not merge" into lmp-preview-dev
Marco Nelissen [Wed, 4 Jun 2014 00:27:02 +0000 (00:27 +0000)]
Merge "Fix typos, remove callback functions - do not merge" into lmp-preview-dev

10 years agoFix typos, remove callback functions - do not merge
Marco Nelissen [Mon, 2 Jun 2014 22:40:15 +0000 (15:40 -0700)]
Fix typos, remove callback functions - do not merge

b/15414091
Change-Id: I2f7b7ea6a7943a808de2c6a54fe810eefdee133e

10 years agoMerge "DNG: Add additional TIFF/EP tag definitions." into lmp-preview-dev
Ruben Brunk [Tue, 3 Jun 2014 23:39:06 +0000 (23:39 +0000)]
Merge "DNG: Add additional TIFF/EP tag definitions." into lmp-preview-dev

10 years agoDNG: Add additional TIFF/EP tag definitions.
Ruben Brunk [Tue, 3 Jun 2014 05:57:26 +0000 (22:57 -0700)]
DNG: Add additional TIFF/EP tag definitions.

Bug: 15112503
Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334

10 years agoaudio policy: add permission for routing APIs.
Eric Laurent [Thu, 29 May 2014 21:37:38 +0000 (14:37 -0700)]
audio policy: add permission for routing APIs.

Add check for signature or system permission
"android.permission.MODIFY_AUDIO_ROUTING" for routing
APIs.

Bug: 14815883.
Change-Id: Iefa0b9d90127a53e03a2e6d50dc93d8f4ae63e2f

10 years agoaudio policy: fix unitialized hw module in audio port
Eric Laurent [Mon, 2 Jun 2014 17:40:54 +0000 (10:40 -0700)]
audio policy: fix unitialized hw module in audio port

The hw module handle was not initialized when creating
and audio port configuration from an input stream descriptor.

Bug 15376641.

Change-Id: I6c784cded68a5c665fd22c3643765c63f70eb241

10 years agoaudio policy: add audio port gain control
Eric Laurent [Tue, 20 May 2014 18:30:42 +0000 (11:30 -0700)]
audio policy: add audio port gain control

Implement setAudioPortConfig() API to configure an
audio port.
Currently limited to gain control.

Bug: 14815883.

Change-Id: Ic1b268e5ba5c277e9f5b8fa63c81dd7c0b250024

10 years agoaudio policy: parse device descriptors in config file
Eric Laurent [Wed, 14 May 2014 15:52:28 +0000 (08:52 -0700)]
audio policy: parse device descriptors in config file

Implement parsing of audio_policy.conf for device and gain
controller definitions.
Copy audio_policy_conf.h from hardware_legacy.
New syntax for devices and gain controllers description will not
be parsed by legacy audio policy manager.

Bug: 14815883.

Change-Id: I7f1035d514dcf55fb3e45ed1f633a2f63ee398f5

10 years agoaudio policy: add routing update client interface
Eric Laurent [Tue, 20 May 2014 18:27:36 +0000 (11:27 -0700)]
audio policy: add routing update client interface

Added IAudioPolicyServiceClient client binder interface
for client process to receive notifications from AudioPolicyService
when audio ports are added/removed or audio patches created/released.

The audio patches owned by a given client are automatically released when
this client binder dies.

Bug: 14815883.

Change-Id: I6013f6aec03b50565cffb1ad2cd1f0f8852032c5

10 years agoaudio policy: implement routing control
Eric Laurent [Tue, 20 May 2014 18:18:06 +0000 (11:18 -0700)]
audio policy: implement routing control

Add implementation of audio routing control via AudioSystem APIs.

The following APIs are implemented:
- listAudioPorts(): return a list of devices and output/input mixers ports
that can be used as sources or sinks for audio patches.
- createAudioPatch()/releaseAudioPatch(): create/release a connection patch between
two audio ports (e.g. to connect input from an HDMI device to a speaker output device).
Only one client application can own a patch from a given source.
When an audio port (device or mix) is part of an application created patch, its routing cannot
not be changed by a policy decision.
- listAudioPatches(): return a list of existing patches.

Each audio port addition/removal and each audio patch creation/release increments a generation count.
This generation count is used to ensure consistency betwen calls to
listAudioPorts() and listAudioPatches().

Bug: 14815883.

Change-Id: I022b638c2f5f0bb41543c7cfca7488fb45cfdd80

10 years agoMediaCodecList: remove force-added codecs for videoeditor
Lajos Molnar [Thu, 29 May 2014 14:34:59 +0000 (07:34 -0700)]
MediaCodecList: remove force-added codecs for videoeditor

Bug: 15320804
Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e

10 years agoDO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormat
Vignesh Venkatasubramanian [Wed, 28 May 2014 14:59:35 +0000 (07:59 -0700)]
DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormat

Bug: 15114855
Change-Id: Idb184ae15986450423fc8cf116cf077600b3ea67
(cherry picked from commit 8c6693b73cb4aed9d1dcb8d5d0828a77b7471a55)

10 years agoMerge "DO NOT MERGE - IAudioPolicyService interface extension for patch panel" into...
Eric Laurent [Wed, 28 May 2014 22:22:38 +0000 (22:22 +0000)]
Merge "DO NOT MERGE - IAudioPolicyService interface extension for patch panel" into lmp-preview-dev

10 years agoMerge "DO NOT MERGE - audioflinger: first patch panel implementation." into lmp-previ...
Eric Laurent [Wed, 28 May 2014 22:22:33 +0000 (22:22 +0000)]
Merge "DO NOT MERGE - audioflinger: first patch panel implementation." into lmp-preview-dev

10 years agoMerge "DO NOT MERGE - IAudioFlinger interface extension for patch panel" into lmp...
Eric Laurent [Wed, 28 May 2014 22:22:25 +0000 (22:22 +0000)]
Merge "DO NOT MERGE - IAudioFlinger interface extension for patch panel" into lmp-preview-dev

10 years agoMerge "DO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error...
Eric Laurent [Wed, 28 May 2014 22:22:19 +0000 (22:22 +0000)]
Merge "DO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error" into lmp-preview-dev

10 years agoMerge "DO NOT MERGE - audio policy: enable use of new AudioPolicyManager" into lmp...
Eric Laurent [Wed, 28 May 2014 22:22:13 +0000 (22:22 +0000)]
Merge "DO NOT MERGE - audio policy: enable use of new AudioPolicyManager" into lmp-preview-dev

10 years agoMerge "DO NOT MERGE - audioflinger: test min HAL version instead of current" into...
Eric Laurent [Wed, 28 May 2014 22:10:41 +0000 (22:10 +0000)]
Merge "DO NOT MERGE - audioflinger: test min HAL version instead of current" into lmp-preview-dev

10 years agoMove to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart

Bug: 14298175
Change-Id: Iff6940aba8accfec14e729d53b71d2ed7e6c5027

10 years agoDO NOT MERGE - IAudioPolicyService interface extension for patch panel
Eric Laurent [Tue, 1 Apr 2014 17:34:16 +0000 (10:34 -0700)]
DO NOT MERGE - IAudioPolicyService interface extension for patch panel

Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1

10 years agoDO NOT MERGE - audioflinger: first patch panel implementation.
Eric Laurent [Tue, 20 May 2014 17:48:17 +0000 (10:48 -0700)]
DO NOT MERGE - audioflinger: first patch panel implementation.

Added a new PatchPanel subclass to AudioFlinger
to handle audio ports and audio patches configuration
and connection.
The first implementation does not add new functionnality.
AudioPolicyManager uses patch panel interface to control
device routing.
AudioFlinger:
- Added PatchPanel class. The first implementation does not
add new functionnality. PatchPanel handles routing commands
for audio HAL after 3.0 or converts to setParameters for audio
HALs before 3.0.
- Added config events to ThreadBase to control synchronized
audio patch connection.
AudioPolicyManager:
- Use PatchPanel API to control device selection isntead of setParameters.
- New base class AudioPort common to audio device descriptors
and input output stream profiles. This class is RefBase and groups
attributes common to audio ports.
- Use same device selection flow for input as for outputs:
 getNewInputDevice -> getDeviceForInptusiource -> setInputDevice

Change-Id: Idaa5a883b19a45816651c58cac697640dc717cd9

10 years agoDO NOT MERGE - IAudioFlinger interface extension for patch panel
Eric Laurent [Fri, 11 Apr 2014 16:22:20 +0000 (09:22 -0700)]
DO NOT MERGE - IAudioFlinger interface extension for patch panel

Change-Id: Iaabe0a7e315d5725e00a74a6ed40339b98f20330

10 years agoDO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error
Eric Laurent [Mon, 26 May 2014 23:03:08 +0000 (16:03 -0700)]
DO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error

AudioFlinger:openRecord() should not hold mClientLock when
releasing the local reference on AudioRecord as the destructor will
also lock mClientLock.
Same fix for AudioFlinger::createTrack().
Also make sure that AudioFlinger::createEffect() holds mClientLock
when clearing local reference to the Client in case of error.

Regression introduced by 021cf9634ab09c0753a40b7c9ef4ba603be5c3da

Bug: 15118096.
Change-Id: Ie961c398c8e0460bca9b95e2ee4ce6859316c275

10 years agoDO NOT MERGE - audio policy: enable use of new AudioPolicyManager
Eric Laurent [Fri, 23 May 2014 00:30:48 +0000 (17:30 -0700)]
DO NOT MERGE - audio policy: enable use of new AudioPolicyManager

Do not define USE_LEGACY_AUDIO_POLICY by default.
By default, all devices will now use the new audio policy implementation
in AudioPolicyManager.cpp

To continue using the legacy audio policy implemented by
AudioPolicyManagerBase in libhardware_legacy a device should
define USE_LEGACY_AUDIO_POLICY in its makefile.

Change-Id: I7b8cac3cbb24b11105ba6233501c7212f5985727

10 years agoDO NOT MERGE - audioflinger: test min HAL version instead of current
Eric Laurent [Thu, 22 May 2014 19:23:26 +0000 (12:23 -0700)]
DO NOT MERGE - audioflinger: test min HAL version instead of current

Change-Id: Ibce2353b4390329b4c1a453e829178e3986c25a7

10 years agocameraservice: Fix ICameraDeviceUser aidl order.
Ruben Brunk [Thu, 22 May 2014 20:09:57 +0000 (13:09 -0700)]
cameraservice: Fix ICameraDeviceUser aidl order.

Bug: 15167467

Change-Id: I19eb3d2ff86c0b395b6358e018c677b6e2d45c75

10 years agomerge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3fa9baf318eb
The Android Automerger [Thu, 22 May 2014 14:21:54 +0000 (07:21 -0700)]
merge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3fa9baf318eb

10 years agomerge in master-release history after reset to cbc09e47a6cd9164219948caf848303ba19efbb9
The Android Automerger [Thu, 22 May 2014 12:50:13 +0000 (05:50 -0700)]
merge in master-release history after reset to cbc09e47a6cd9164219948caf848303ba19efbb9

10 years agoMerge "camera2: Update CameraService for HAL1 shim."
Ruben Brunk [Thu, 22 May 2014 06:08:34 +0000 (06:08 +0000)]
Merge "camera2: Update CameraService for HAL1 shim."

10 years agoresolved conflicts for merge of 58c26d95 to master
Elliott Hughes [Thu, 22 May 2014 02:00:12 +0000 (19:00 -0700)]
resolved conflicts for merge of 58c26d95 to master

Change-Id: I77fa04553f6decaf2ae4b27b866d76478c0e7038

10 years agoam 9a59d411: am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."
Elliott Hughes [Thu, 22 May 2014 01:53:48 +0000 (01:53 +0000)]
am 9a59d411: am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."

* commit '9a59d411cbe68d6027c541854c6d7c1348e4ee3d':
  Restore accidentally-removed NULL timeout.

10 years agoam 85e6e87c: Merge "Restore accidentally-removed NULL timeout."
Elliott Hughes [Thu, 22 May 2014 01:49:44 +0000 (01:49 +0000)]
am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."

* commit '85e6e87c41bba51729cee8958a5c30157c8dc674':
  Restore accidentally-removed NULL timeout.

10 years agoresolved conflicts for merge of c0bf836f to master
Elliott Hughes [Thu, 22 May 2014 01:47:50 +0000 (18:47 -0700)]
resolved conflicts for merge of c0bf836f to master

Change-Id: I5cf238fa56d6fff443b212870cf9dd7f1110e7da

10 years agoMerge "Restore accidentally-removed NULL timeout."
Elliott Hughes [Thu, 22 May 2014 01:45:47 +0000 (01:45 +0000)]
Merge "Restore accidentally-removed NULL timeout."

10 years agoRestore accidentally-removed NULL timeout.
Elliott Hughes [Thu, 22 May 2014 01:44:27 +0000 (18:44 -0700)]
Restore accidentally-removed NULL timeout.

Change-Id: I933c80fea50950243f109acf8d6350013aaa811f

10 years agoam ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."
Elliott Hughes [Thu, 22 May 2014 01:32:20 +0000 (01:32 +0000)]
am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."

* commit 'ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e':
  Move frameworks/av off private API.

10 years agoam 3b6da6bf: Merge "Move frameworks/av off private API."
Elliott Hughes [Thu, 22 May 2014 01:28:18 +0000 (01:28 +0000)]
am 3b6da6bf: Merge "Move frameworks/av off private API."

* commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe':
  Move frameworks/av off private API.

10 years agoMerge "Move frameworks/av off private API."
Elliott Hughes [Thu, 22 May 2014 01:23:41 +0000 (01:23 +0000)]
Merge "Move frameworks/av off private API."

10 years agoMove frameworks/av off private API.
Elliott Hughes [Thu, 22 May 2014 00:55:51 +0000 (17:55 -0700)]
Move frameworks/av off private API.

Bug: 11156955
Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea

10 years agocamera2: Update CameraService for HAL1 shim.
Ruben Brunk [Sat, 10 May 2014 02:57:56 +0000 (19:57 -0700)]
camera2: Update CameraService for HAL1 shim.

Updates the camera service to handle shim connections.

Changes include:
- Adds begin/end configure binder calls.
- Adds cache for shim client static camera metadata.
- Implements basic getCameraCharacteristic functionality for shim clients.

Bug: 15116722
Bug: 15117269

Change-Id: I510c5888ca15f8e7d3b8ed1680ff1c7f8f514744

10 years agoresolved conflicts for merge of b1080917 to master
Elliott Hughes [Thu, 22 May 2014 01:01:17 +0000 (18:01 -0700)]
resolved conflicts for merge of b1080917 to master

Change-Id: Iabbe3e95e29f28461ff722b550e8a9f35bd2528f

10 years agoam acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."
Elliott Hughes [Thu, 22 May 2014 00:41:52 +0000 (00:41 +0000)]
am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."

* commit 'acbd9492996348bf4565fbaa5a14772f0f4ace38':
  Move frameworks/av off __futex_syscall3.

10 years agoMerge "audio policy: split audio policy library"
Eric Laurent [Thu, 22 May 2014 00:40:14 +0000 (00:40 +0000)]
Merge "audio policy: split audio policy library"

10 years agoam d084206d: Merge "Move frameworks/av off __futex_syscall3."
Elliott Hughes [Thu, 22 May 2014 00:39:10 +0000 (00:39 +0000)]
am d084206d: Merge "Move frameworks/av off __futex_syscall3."

* commit 'd084206d5a4a5364211af46e4201311933e83bfc':
  Move frameworks/av off __futex_syscall3.

10 years agoMerge "Move frameworks/av off __futex_syscall3."
Elliott Hughes [Thu, 22 May 2014 00:35:48 +0000 (00:35 +0000)]
Merge "Move frameworks/av off __futex_syscall3."

10 years agoMove frameworks/av off __futex_syscall3.
Elliott Hughes [Thu, 22 May 2014 00:31:18 +0000 (17:31 -0700)]
Move frameworks/av off __futex_syscall3.

Bug: 11156955
Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512

10 years agoMerge "Remove the last of the references."
Marco Nelissen [Wed, 21 May 2014 16:08:05 +0000 (16:08 +0000)]
Merge "Remove the last of the references."

10 years agoaudio policy: split audio policy library
Eric Laurent [Wed, 21 May 2014 15:14:08 +0000 (08:14 -0700)]
audio policy: split audio policy library

Split audio policy library into a service part and a policy part.
This will allow OEMs to customize the policy part:
- libaudiopolicyservice for the service.
- libaudiopolicymanager for the policy.

Two build options can be defined in device make file to select
the policy library:
- USE_LEGACY_AUDIO_POLICY = 1: this will use the legacy policy
in hardware/libhardware_legacy implemented by AudioPolicyManagerBase class.
This policy is loaded as a harware module and exposes the audio policy HAL
defined in include/hardware/audio_policy.h and is in a library called
audio_policy.XXX.so (e.g audio_policy.default.so)

The legacy HAL will not be updated with new features.

If USE_LEGACY_AUDIO_POLICY is not defined, the policy is implemented by
a class named AudioPolicyManager exposing an interface defined in
AudioPolicyInterface.h.
The corresponding library is libaudiopolicymanager.so.

New features will be added only to AudioPolicyInterface.h

The default implementation is provided here in file AudioPolicyManager.cpp

OEMs wanting to cutomize the policy can implement the AudioPolicyManager class
and provide the libaudiopolicymanager.so library.
In this case the device make file should define:
- USE_CUSTOM_AUDIO_POLICY = 1

For now, USE_LEGACY_AUDIO_POLICY = 1 is forced in audio policy service make file.
This will be removed when the new audio policy is enabled.

Change-Id: I066799dacc9b182b468a43d48ff7798c9109a414

10 years agoRemove the last of the references.
Marco Nelissen [Wed, 21 May 2014 14:53:04 +0000 (07:53 -0700)]
Remove the last of the references.

Change-Id: Id68cdab7e972e3e78e2065e56b8a095c3d496df2

10 years agomerge in master-release history after reset to 498692535c7ceecb3434a99c47e4c90ba3fdd90e
The Android Automerger [Wed, 21 May 2014 12:50:02 +0000 (05:50 -0700)]
merge in master-release history after reset to 498692535c7ceecb3434a99c47e4c90ba3fdd90e

10 years agoMerge "audio policy: add new audio devices"
Eric Laurent [Tue, 20 May 2014 21:39:03 +0000 (21:39 +0000)]
Merge "audio policy: add new audio devices"

10 years agoMerge "Fix include"
Marco Nelissen [Tue, 20 May 2014 20:05:55 +0000 (20:05 +0000)]
Merge "Fix include"

10 years agoFix include
Marco Nelissen [Tue, 20 May 2014 20:05:12 +0000 (13:05 -0700)]
Fix include

Change-Id: I2c1e6b0e85ff608f942e54edf9bc5dd6f8716518

10 years agoMerge "Use pointers instead of references because C"
Marco Nelissen [Tue, 20 May 2014 18:31:01 +0000 (18:31 +0000)]
Merge "Use pointers instead of references because C"

10 years agoMerge "Fix OGG recognition for 64 bit"
Andy Hung [Tue, 20 May 2014 17:37:15 +0000 (17:37 +0000)]
Merge "Fix OGG recognition for 64 bit"

10 years agoUse pointers instead of references because C
Marco Nelissen [Tue, 20 May 2014 15:45:18 +0000 (08:45 -0700)]
Use pointers instead of references because C

Change-Id: I5c84469e5ff977bf8bb91be2cc6c38a0c7f08609

10 years agomerge in master-release history after reset to 93c6fa7508cd0f5bb0ec80ea29ef8bfab4a6015f
The Android Automerger [Tue, 20 May 2014 12:49:56 +0000 (05:49 -0700)]
merge in master-release history after reset to 93c6fa7508cd0f5bb0ec80ea29ef8bfab4a6015f

10 years agoFix OGG recognition for 64 bit
Andy Hung [Tue, 20 May 2014 04:36:20 +0000 (21:36 -0700)]
Fix OGG recognition for 64 bit

Change-Id: I4cef86ca05e06f508929d109a52e375169c33bf9

10 years agoMerge "Add docs, releaseOutputBufferAtTime, seekTo."
Marco Nelissen [Tue, 20 May 2014 02:13:05 +0000 (02:13 +0000)]
Merge "Add docs, releaseOutputBufferAtTime, seekTo."

10 years agoMerge "Update AudioMixer::getTrackName to save channelMask"
Andy Hung [Tue, 20 May 2014 01:04:48 +0000 (01:04 +0000)]
Merge "Update AudioMixer::getTrackName to save channelMask"

10 years agoaudio policy: add new audio devices
Eric Laurent [Tue, 20 May 2014 00:26:41 +0000 (17:26 -0700)]
audio policy: add new audio devices

Add entries for new audio devices to string to enum table used
for audio_policy.conf file parsing.

Change-Id: Ica04c34af037d890a343af0b9eeb2ff0e5c86b02

10 years agoMerge "Add HEVC decoder support to ACodec bug: 14571712"
Rachad [Mon, 19 May 2014 23:00:04 +0000 (23:00 +0000)]
Merge "Add HEVC decoder support to ACodec bug: 14571712"

10 years agoMerge "Use new channel count functions for audio masks"
Andy Hung [Mon, 19 May 2014 22:06:18 +0000 (22:06 +0000)]
Merge "Use new channel count functions for audio masks"

10 years agoMerge "Pass stereo gains as packed minifloat"
Glenn Kasten [Mon, 19 May 2014 20:16:27 +0000 (20:16 +0000)]
Merge "Pass stereo gains as packed minifloat"

10 years agoAdd docs, releaseOutputBufferAtTime, seekTo.
Marco Nelissen [Fri, 16 May 2014 15:07:28 +0000 (08:07 -0700)]
Add docs, releaseOutputBufferAtTime, seekTo.

Change-Id: Iadd231b63e75b7937c13d2ebfef47aedeaeef5a1

10 years agoPass stereo gains as packed minifloat
Glenn Kasten [Sat, 22 Mar 2014 00:53:17 +0000 (17:53 -0700)]
Pass stereo gains as packed minifloat

This will allow (eventually) a greater dynamic range for gains.
However there are still a few remaining places in effects and mixer
that will also need to be changed in order to get the full benefit.

Also fixes a minor bug: was not checking for NaN in AudioTrack C++.

Change-Id: I63bce9e82e0a61546d8ff475fb94bcb700d99c96

10 years agoam be2664da: am 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check as mCallb...
Eric Laurent [Mon, 19 May 2014 15:35:27 +0000 (15:35 +0000)]
am be2664da: am 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"

* commit 'be2664dac34a6a9d9f754d4097b32158d4947cd2':
  Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode

10 years agoam 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread...
Eric Laurent [Mon, 19 May 2014 15:32:11 +0000 (15:32 +0000)]
am 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"

* commit '4c9bde7a3e636d3ecccd7905d142dbbb80e977a0':
  Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode

10 years agoam ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when...
Eric Laurent [Mon, 19 May 2014 15:28:51 +0000 (15:28 +0000)]
am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"

* commit 'ce473c32705e2d1c5fcc817198101e1220b3c8f7':
  Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode

10 years agoMerge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL...
Eric Laurent [Mon, 19 May 2014 15:26:37 +0000 (15:26 +0000)]
Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"

10 years agomerge in master-release history after reset to 272b7f26c300d2029f278cf2af523cf94e513b89
The Android Automerger [Mon, 19 May 2014 12:49:40 +0000 (05:49 -0700)]
merge in master-release history after reset to 272b7f26c300d2029f278cf2af523cf94e513b89

10 years agomerge in master-release history after reset to 272b7f26c300d2029f278cf2af523cf94e513b89
The Android Automerger [Sun, 18 May 2014 12:49:42 +0000 (05:49 -0700)]
merge in master-release history after reset to 272b7f26c300d2029f278cf2af523cf94e513b89

10 years agomerge in master-release history after reset to 272b7f26c300d2029f278cf2af523cf94e513b89
The Android Automerger [Sat, 17 May 2014 12:50:41 +0000 (05:50 -0700)]
merge in master-release history after reset to 272b7f26c300d2029f278cf2af523cf94e513b89

10 years agoFix warnings, re-enable -Werror.
Ruben Brunk [Sat, 17 May 2014 08:09:04 +0000 (01:09 -0700)]
Fix warnings, re-enable -Werror.

Change-Id: Ic6b1a10f46f980f9a9d8d130600419a792703c44

10 years agoFixbuild
Ruben Brunk [Sat, 17 May 2014 07:39:17 +0000 (00:39 -0700)]
Fixbuild

Change-Id: I4379964731b671f36a1e239b0f7665f595ac1c2d

10 years agocamera2: Adding TIFF writing utilities.
Ruben Brunk [Mon, 28 Apr 2014 23:39:12 +0000 (16:39 -0700)]
camera2: Adding TIFF writing utilities.

Adds a native image utilities library with support for:
- Writing TIFF 6.0 and TIFF EP compliant file headers.
- Additional tags defined in EXIF 2.3 and DNG 1.4 specs.

Change-Id: I7a4fef74bd5254d92baf08a3cf61af5de1b7ca83

10 years agoUpdate AudioMixer::getTrackName to save channelMask
Andy Hung [Wed, 14 May 2014 21:13:23 +0000 (14:13 -0700)]
Update AudioMixer::getTrackName to save channelMask

Change-Id: I4fb4abbff1b05bdd0f6e21b5f5f4c3f2a57ae28d
Signed-off-by: Andy Hung <hunga@google.com>
10 years agoUse new channel count functions for audio masks
Andy Hung [Fri, 16 May 2014 18:25:07 +0000 (11:25 -0700)]
Use new channel count functions for audio masks

Change-Id: Ia658ab4b6320d19fdb50f123c930918724ff0ef3
Signed-off-by: Andy Hung <hunga@google.com>
10 years agoam 6b787cb8: am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitia...
Andreas Huber [Fri, 16 May 2014 15:21:36 +0000 (15:21 +0000)]
am 6b787cb8: am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '6b787cb8ddde9d411cab0964062d5d942a710ff8':
  libstagefright foundation: fix uninitialized varibale warning

10 years agoam 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibal...
Andreas Huber [Fri, 16 May 2014 15:18:01 +0000 (15:18 +0000)]
am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '1b8b8793c0e86865df456c3d26f969b1498041db':
  libstagefright foundation: fix uninitialized varibale warning

10 years agoam 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"
Andreas Huber [Fri, 16 May 2014 15:14:38 +0000 (15:14 +0000)]
am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '3059e27d0e18a427f3c19889aac86ea31ec0d5d1':
  libstagefright foundation: fix uninitialized varibale warning