OSDN Git Service
Ruben Brunk [Fri, 23 May 2014 00:10:55 +0000 (00:10 +0000)]
am
47ed7dfd: cameraservice: Fix ICameraDeviceUser aidl order.
* commit '
47ed7dfdae7a41a7532978bd799fa9defd2b9980':
cameraservice: Fix ICameraDeviceUser aidl order.
The Android Automerger [Fri, 23 May 2014 00:10:55 +0000 (00:10 +0000)]
am
24adc040: merge in master-release history after reset to
77a3374a6170fb5f0168169bc4bc3fa9baf318eb
* commit '
24adc0400381612a97e8b30d83484f4107819d5c':
Revert "camera: Fix setParameters for Preview FPS single/range values"
stagefright: allow for minUndequeuedBufs to be one less
camera3: Remove old vendor tag ops dependencies.
Revert "Convert AudioFlinger mSinkBuffer to flexible format"
Fix freeze on pause
audioflinger: fix race condition in SyncEvent callback
Support "data:" URIs again in mediaplayer...
frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default
libstagefright: Delay release of wakelock in TimedEventQueue
Revert "stagefright: fix TimedEventQueue wakelock"
Eric Laurent [Thu, 22 May 2014 19:23:26 +0000 (12:23 -0700)]
audioflinger: test min HAL version instead of current
Change-Id: Ibce2353b4390329b4c1a453e829178e3986c25a7
Ruben Brunk [Thu, 22 May 2014 20:09:57 +0000 (13:09 -0700)]
cameraservice: Fix ICameraDeviceUser aidl order.
Bug:
15167467
Change-Id: I19eb3d2ff86c0b395b6358e018c677b6e2d45c75
Ruben Brunk [Thu, 22 May 2014 20:36:45 +0000 (20:36 +0000)]
Merge "cameraservice: Fix ICameraDeviceUser aidl order."
Ruben Brunk [Thu, 22 May 2014 20:09:57 +0000 (13:09 -0700)]
cameraservice: Fix ICameraDeviceUser aidl order.
Change-Id: I19eb3d2ff86c0b395b6358e018c677b6e2d45c75
Elliott Hughes [Thu, 22 May 2014 17:14:43 +0000 (10:14 -0700)]
resolved conflicts for merge of
f285c91e to master
Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65
The Android Automerger [Thu, 22 May 2014 14:21:54 +0000 (07:21 -0700)]
merge in master-release history after reset to
77a3374a6170fb5f0168169bc4bc3fa9baf318eb
Calin Juravle [Thu, 22 May 2014 13:44:20 +0000 (13:44 +0000)]
am
c10b874c: am
d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."
* commit '
c10b874c4d0d6208fb93a7aa0dc8af4418faad45':
Move frameworks/av from fdprintf to POSIX dprintf.
Calin Juravle [Thu, 22 May 2014 13:40:35 +0000 (13:40 +0000)]
am
d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."
* commit '
d551633916d3677da4dda10aba6837bdc6803ee0':
Move frameworks/av from fdprintf to POSIX dprintf.
Calin Juravle [Thu, 22 May 2014 13:36:22 +0000 (13:36 +0000)]
Merge "Move frameworks/av from fdprintf to POSIX dprintf."
The Android Automerger [Thu, 22 May 2014 12:50:13 +0000 (05:50 -0700)]
merge in master-release history after reset to
cbc09e47a6cd9164219948caf848303ba19efbb9
Elliott Hughes [Thu, 22 May 2014 08:22:06 +0000 (01:22 -0700)]
Move frameworks/av from fdprintf to POSIX dprintf.
Bug:
11156955
Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
Ruben Brunk [Thu, 22 May 2014 06:08:34 +0000 (06:08 +0000)]
Merge "camera2: Update CameraService for HAL1 shim."
Elliott Hughes [Thu, 22 May 2014 02:00:12 +0000 (19:00 -0700)]
resolved conflicts for merge of
58c26d95 to master
Change-Id: I77fa04553f6decaf2ae4b27b866d76478c0e7038
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.
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.
Elliott Hughes [Thu, 22 May 2014 01:47:50 +0000 (18:47 -0700)]
resolved conflicts for merge of
c0bf836f to master
Change-Id: I5cf238fa56d6fff443b212870cf9dd7f1110e7da
Elliott Hughes [Thu, 22 May 2014 01:45:47 +0000 (01:45 +0000)]
Merge "Restore 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
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.
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.
Elliott Hughes [Thu, 22 May 2014 01:23:41 +0000 (01:23 +0000)]
Merge "Move 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
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
Elliott Hughes [Thu, 22 May 2014 01:01:17 +0000 (18:01 -0700)]
resolved conflicts for merge of
b1080917 to master
Change-Id: Iabbe3e95e29f28461ff722b550e8a9f35bd2528f
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.
Eric Laurent [Thu, 22 May 2014 00:40:14 +0000 (00:40 +0000)]
Merge "audio policy: split audio policy library"
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.
Elliott Hughes [Thu, 22 May 2014 00:35:48 +0000 (00:35 +0000)]
Merge "Move 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
Marco Nelissen [Wed, 21 May 2014 16:08:05 +0000 (16:08 +0000)]
Merge "Remove the last of the references."
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
Marco Nelissen [Wed, 21 May 2014 14:53:04 +0000 (07:53 -0700)]
Remove the last of the references.
Change-Id: Id68cdab7e972e3e78e2065e56b8a095c3d496df2
The Android Automerger [Wed, 21 May 2014 12:50:02 +0000 (05:50 -0700)]
merge in master-release history after reset to
498692535c7ceecb3434a99c47e4c90ba3fdd90e
Eric Laurent [Tue, 20 May 2014 21:39:03 +0000 (21:39 +0000)]
Merge "audio policy: add new audio devices"
Marco Nelissen [Tue, 20 May 2014 20:05:55 +0000 (20:05 +0000)]
Merge "Fix include"
Marco Nelissen [Tue, 20 May 2014 20:05:12 +0000 (13:05 -0700)]
Fix include
Change-Id: I2c1e6b0e85ff608f942e54edf9bc5dd6f8716518
Marco Nelissen [Tue, 20 May 2014 18:31:01 +0000 (18:31 +0000)]
Merge "Use pointers instead of references because C"
Andy Hung [Tue, 20 May 2014 17:37:15 +0000 (17:37 +0000)]
Merge "Fix OGG recognition for 64 bit"
Marco Nelissen [Tue, 20 May 2014 15:45:18 +0000 (08:45 -0700)]
Use pointers instead of references because C
Change-Id: I5c84469e5ff977bf8bb91be2cc6c38a0c7f08609
The Android Automerger [Tue, 20 May 2014 12:49:56 +0000 (05:49 -0700)]
merge in master-release history after reset to
93c6fa7508cd0f5bb0ec80ea29ef8bfab4a6015f
Andy Hung [Tue, 20 May 2014 04:36:20 +0000 (21:36 -0700)]
Fix OGG recognition for 64 bit
Change-Id: I4cef86ca05e06f508929d109a52e375169c33bf9
Marco Nelissen [Tue, 20 May 2014 02:13:05 +0000 (02:13 +0000)]
Merge "Add docs, releaseOutputBufferAtTime, seekTo."
Andy Hung [Tue, 20 May 2014 01:04:48 +0000 (01:04 +0000)]
Merge "Update AudioMixer::getTrackName to save channelMask"
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
Rachad [Mon, 19 May 2014 23:00:04 +0000 (23:00 +0000)]
Merge "Add HEVC decoder support to ACodec bug:
14571712"
Andy Hung [Mon, 19 May 2014 22:06:18 +0000 (22:06 +0000)]
Merge "Use new channel count functions for audio masks"
Glenn Kasten [Mon, 19 May 2014 20:16:27 +0000 (20:16 +0000)]
Merge "Pass stereo gains as packed minifloat"
Marco Nelissen [Fri, 16 May 2014 15:07:28 +0000 (08:07 -0700)]
Add docs, releaseOutputBufferAtTime, seekTo.
Change-Id: Iadd231b63e75b7937c13d2ebfef47aedeaeef5a1
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
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
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
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
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"
The Android Automerger [Mon, 19 May 2014 12:49:40 +0000 (05:49 -0700)]
merge 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
The Android Automerger [Sat, 17 May 2014 12:50:41 +0000 (05:50 -0700)]
merge in master-release history after reset to
272b7f26c300d2029f278cf2af523cf94e513b89
Ruben Brunk [Sat, 17 May 2014 08:09:04 +0000 (01:09 -0700)]
Fix warnings, re-enable -Werror.
Change-Id: Ic6b1a10f46f980f9a9d8d130600419a792703c44
Ruben Brunk [Sat, 17 May 2014 07:39:17 +0000 (00:39 -0700)]
Fixbuild
Change-Id: I4379964731b671f36a1e239b0f7665f595ac1c2d
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
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>
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>
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
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
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
Andreas Huber [Fri, 16 May 2014 15:11:28 +0000 (15:11 +0000)]
Merge "libstagefright foundation: fix uninitialized varibale warning"
Marco Nelissen [Thu, 15 May 2014 22:26:14 +0000 (15:26 -0700)]
Fix build.
Change-Id: I2b0a3049c81b99ba233d5945e16dcddd975aa4f9
Marco Nelissen [Thu, 15 May 2014 21:58:36 +0000 (21:58 +0000)]
Merge "Unify error/status codes"
Marco Nelissen [Thu, 15 May 2014 21:17:25 +0000 (14:17 -0700)]
Unify error/status codes
Change-Id: Ib90cc2f2adc07ff146256931c92c0ec4becb86f5
Jeff Tinker [Thu, 15 May 2014 18:08:54 +0000 (18:08 +0000)]
Merge "Hook up event handling in NDK MediaDrm API"
Lajos Molnar [Thu, 15 May 2014 17:26:08 +0000 (10:26 -0700)]
ACodec: remove PTS log spam
Bug:
14976517
Bug:
11784827
Change-Id: Ibc1bbd80e7aac30b0f8f1e9ca2be1bb3e5e2ebbb
Jeff Tinker [Thu, 15 May 2014 01:39:25 +0000 (18:39 -0700)]
Hook up event handling in NDK MediaDrm API
Change-Id: I48ac1d3ca5405c5909454c7a553917b31b9a50e5
The Android Automerger [Thu, 15 May 2014 12:50:32 +0000 (05:50 -0700)]
merge in master-release history after reset to
d25b89d1e417082b7e4ee9db7c08ab8095d48d87
Amit Pundir [Thu, 15 May 2014 07:12:04 +0000 (12:42 +0530)]
libstagefright foundation: fix uninitialized varibale warning
gcc-4.9 reports warning for this uninitialized variable
and -Werror make this warning fatal.
Change-Id: I6901362246d53deeded78fa38ad656b167705346
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Andy Hung [Thu, 15 May 2014 04:30:49 +0000 (04:30 +0000)]
Merge "Send 64 bit OMX codec handling to 32 bit MediaServer"
Andy Hung [Wed, 14 May 2014 01:37:59 +0000 (18:37 -0700)]
Send 64 bit OMX codec handling to 32 bit MediaServer
This is a temporary fix for 64 bit OMX handling until 64 bit
codecs are more robust.
Bug:
13938273
Change-Id: Ifc79e360f9606f6c909b859d322b7dd5d416b26b
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Thu, 15 May 2014 03:18:48 +0000 (03:18 +0000)]
Merge "Update OMX messages for 64 bit"
Benoit Goby [Wed, 14 May 2014 23:47:13 +0000 (23:47 +0000)]
am
4b7c5444: am
e32106fd: screenrecord: Add raw frames output format
* commit '
4b7c5444f8af79f1f3e04e09bd03b84dec26facf':
screenrecord: Add raw frames output format
Andy Hung [Fri, 2 May 2014 18:05:04 +0000 (11:05 -0700)]
Update OMX messages for 64 bit
Change node_id and buffer_id to uint32_t.
Ensure IOMX messages are fixed size.
Remove 64 bit compile warnings in associated files.
Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>
Rachad [Tue, 6 May 2014 01:31:02 +0000 (18:31 -0700)]
Add HEVC decoder support to ACodec
bug:
14571712
Change-Id: I221625a42e143cb1c581059694f6730211e251ae
Marco Nelissen [Wed, 14 May 2014 18:12:46 +0000 (11:12 -0700)]
Only export necessary symbols
Change-Id: I869d7124c8cc555f4b09801a898f4dd3ecb072ec
Marco Nelissen [Wed, 14 May 2014 22:08:43 +0000 (22:08 +0000)]
Merge "Fix typos and pointer math."
Benoit Goby [Wed, 14 May 2014 22:04:12 +0000 (22:04 +0000)]
am
e32106fd: screenrecord: Add raw frames output format
* commit '
e32106fd5175afdf939ae397aece9caf378a4912':
screenrecord: Add raw frames output format
Jeff Tinker [Wed, 14 May 2014 21:34:06 +0000 (21:34 +0000)]
Merge "WIP: MediaDrm NDK APIs"
Marco Nelissen [Tue, 13 May 2014 23:22:19 +0000 (16:22 -0700)]
Fix typos and pointer math.
Change-Id: I07f33a57454d013844b56bc3e57fe0a271e8b38c
Glenn Kasten [Wed, 14 May 2014 15:06:00 +0000 (15:06 +0000)]
Merge "Pull up mFlags and isFastTrack from Track to TrackBase"
The Android Automerger [Wed, 14 May 2014 12:50:27 +0000 (05:50 -0700)]
merge in master-release history after reset to
cbe6fddebe3ec84176037de7f9681d2407fa1113
Jeff Tinker [Tue, 13 May 2014 16:31:15 +0000 (09:31 -0700)]
WIP: MediaDrm NDK APIs
Change-Id: I3ac08a3b027135c3fd2a9e95c5e8b3fd722df019
TODO: hooking up event handler, testing
Glenn Kasten [Tue, 13 May 2014 23:50:07 +0000 (23:50 +0000)]
Merge "Explicitly include Configuration.h"
Glenn Kasten [Tue, 13 May 2014 23:49:30 +0000 (23:49 +0000)]
Merge "Fix memory corruption if increaseSamplingN is not called"
Uday Gupta [Tue, 13 May 2014 18:19:17 +0000 (11:19 -0700)]
Codec Offload: Add NULL check as mCallbackThread is NULL
when offloaded HAL is running BLOCKING mode
b/
14897952
Change-Id: I159a33e1181c1a62d80ab4bd3337a35dafaad884
Signed-off-by: Uday Gupta <guptau@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Benoit Goby [Mon, 12 May 2014 22:59:50 +0000 (15:59 -0700)]
screenrecord: Add raw frames output format
This works like the frames output format but without a header so that
the output can be piped directly to mplayer:
adb shell screenrecord --output-format=raw-frames - | mplayer -demuxer
rawvideo -rawvideo w=320:h=240:format=rgb24 -
Change-Id: Ib5ed508fdca3a5d63e973c5189b3677c2d92b43f
Marco Nelissen [Fri, 9 May 2014 22:10:23 +0000 (15:10 -0700)]
Some crypto stuff, error codes
Add crypto/drm related functions, define some media errors
instead of using magic numbers in the code.
Change-Id: I5924cba0bfcdb3623073c9182a646b70f4ead5a5
Glenn Kasten [Tue, 13 May 2014 18:30:28 +0000 (11:30 -0700)]
Pull up mFlags and isFastTrack from Track to TrackBase
Change-Id: I6bd48292310be4e05758a11f617f50585904422d
Glenn Kasten [Tue, 13 May 2014 17:55:33 +0000 (10:55 -0700)]
Explicitly include Configuration.h
Must include Configuration.h in any source file with #ifdef or #if that
depends on Configuration.h. This avoid inconsistencies that could result
in subtle bugs.
Change-Id: I99fdf19d56e7c73de4e7d672b937336b932a2a00
Glenn Kasten [Tue, 13 May 2014 17:57:40 +0000 (10:57 -0700)]
Fix memory corruption if increaseSamplingN is not called
Change-Id: Icbf9aaf68c25ba3330ceb79167bd776cf0342d0d
Eric Laurent [Tue, 13 May 2014 17:18:14 +0000 (10:18 -0700)]
AudioFlinger: add specific mutex for client lists
Add a specific mutex to protect access to mClients and
mNotificationClients lists. This avoids locking the main AudioFlinger
mutex from inside thread loops and allows not to worry about
cross deadlocks when sending a config event with status reply while
keeping the ThreadBase or AudioFlinger mutex locked.
As a way of consequence, remove notification client list passed to
processConfigEvents_l() and audioConfigChanged() as the list
can now be accessed by locking client mutex only.
Change-Id: I228022204b6709a8bb60cc96d9514a6ffe59b62e
Marco Nelissen [Tue, 13 May 2014 14:46:11 +0000 (14:46 +0000)]
Merge "Add AMediaCodec callback"
The Android Automerger [Tue, 13 May 2014 12:50:04 +0000 (05:50 -0700)]
merge in master-release history after reset to
99119b4564cea78be7a94d432dd8d8a3664615b7