summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* getSampletime -> getSampleTimeMarco Nelissen2014-05-291-1/+1
| | | | Change-Id: I87aaa87be068d414903a0e1e22bfe4183cf45ab0
* Fix some NuPlayer issues.Marco Nelissen2014-05-282-7/+10
| | | | | | | Fixes OnSeekCompleted callback and calling getDuration immediately after prepare(). Change-Id: Ie58c509005cded278a0e50c87240b0a2d920b7d7
* Merge "IAudioPolicyService interface extension for patch panel"Eric Laurent2014-05-282-2/+275
|\
| * IAudioPolicyService interface extension for patch panelEric Laurent2014-05-272-2/+275
| | | | | | | | Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1
* | Merge "IAudioFlinger interface extension for patch panel"Eric Laurent2014-05-281-1/+171
|\ \ | |/
| * IAudioFlinger interface extension for patch panelEric Laurent2014-05-271-1/+171
| | | | | | | | Change-Id: Iaabe0a7e315d5725e00a74a6ed40339b98f20330
* | Merge "Remove codec callback for now."Marco Nelissen2014-05-271-1/+3
|\ \ | |/ |/|
| * Remove codec callback for now.Marco Nelissen2014-05-231-1/+3
| | | | | | | | Change-Id: I7ef3c1fc7aa1bfec958e6ea58bf95ae35a575e91
* | Merge "Move validation of frameCount from set to openRecord_l"Glenn Kasten2014-05-271-18/+24
|\ \
| * | Move validation of frameCount from set to openRecord_lGlenn Kasten2014-05-221-18/+24
| | | | | | | | | | | | | | | | | | | | | 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
* | | am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off ↵Elliott Hughes2014-05-231-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | <sys/atomics.h>." * commit '79262cfc14a9d8b5aa29d43e84ea91eedb9492ba': Move frameworks/av off <sys/atomics.h>.
| * \ \ am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '5b756bfdaa27c8b606720544bf507213cf47376d': Move frameworks/av off <sys/atomics.h>.
| | * \ \ am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0': Move frameworks/av off <sys/atomics.h>.
| | | * | | Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14903517 Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
* | | | | | resolved conflicts for merge of f285c91e to masterElliott Hughes2014-05-221-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65
| * | | | am c10b874c: am d5516339: Merge "Move frameworks/av from fdprintf to POSIX ↵Calin Juravle2014-05-221-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | dprintf." * commit 'c10b874c4d0d6208fb93a7aa0dc8af4418faad45': Move frameworks/av from fdprintf to POSIX dprintf.
| | * | | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'd551633916d3677da4dda10aba6837bdc6803ee0': Move frameworks/av from fdprintf to POSIX dprintf.
| | | * | Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11156955 Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
* | | | | resolved conflicts for merge of c0bf836f to masterElliott Hughes2014-05-211-31/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I5cf238fa56d6fff443b212870cf9dd7f1110e7da
| * | | | am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e': Move frameworks/av off private API.
| | * | | am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe': Move frameworks/av off private API.
| | | * | Move frameworks/av off private API.Elliott Hughes2014-05-211-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11156955 Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
* | | | | resolved conflicts for merge of b1080917 to masterElliott Hughes2014-05-211-10/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Iabbe3e95e29f28461ff722b550e8a9f35bd2528f
| * | | | am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'acbd9492996348bf4565fbaa5a14772f0f4ace38': Move frameworks/av off __futex_syscall3.
| | * | | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'd084206d5a4a5364211af46e4201311933e83bfc': Move frameworks/av off __futex_syscall3.
| | | * | Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-211-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11156955 Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
* | | | | Merge "audio policy: split audio policy library"Eric Laurent2014-05-221-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | audio policy: split audio policy libraryEric Laurent2014-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Remove the last of the references."Marco Nelissen2014-05-211-3/+3
|\ \ \ \ \
| * | | | | Remove the last of the references.Marco Nelissen2014-05-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id68cdab7e972e3e78e2065e56b8a095c3d496df2
* | | | | | Merge "Use pointers instead of references because C"Marco Nelissen2014-05-201-62/+101
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Use pointers instead of references because CMarco Nelissen2014-05-201-62/+101
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c84469e5ff977bf8bb91be2cc6c38a0c7f08609
* | | | | | Merge "Fix OGG recognition for 64 bit"Andy Hung2014-05-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix OGG recognition for 64 bitAndy Hung2014-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4cef86ca05e06f508929d109a52e375169c33bf9
* | | | | | Merge "Add docs, releaseOutputBufferAtTime, seekTo."Marco Nelissen2014-05-202-5/+26
|\ \ \ \ \ \
| * | | | | | Add docs, releaseOutputBufferAtTime, seekTo.Marco Nelissen2014-05-192-5/+26
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Iadd231b63e75b7937c13d2ebfef47aedeaeef5a1
* | | | | | Merge "Add HEVC decoder support to ACodec bug: 14571712"Rachad2014-05-192-0/+4
|\ \ \ \ \ \
| * | | | | | Add HEVC decoder support to ACodecRachad2014-05-142-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 14571712 Change-Id: I221625a42e143cb1c581059694f6730211e251ae
* | | | | | | Merge "Use new channel count functions for audio masks"Andy Hung2014-05-197-12/+17
|\ \ \ \ \ \ \
| * | | | | | | Use new channel count functions for audio masksAndy Hung2014-05-167-12/+17
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia658ab4b6320d19fdb50f123c930918724ff0ef3 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | | Merge "Pass stereo gains as packed minifloat"Glenn Kasten2014-05-193-7/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Pass stereo gains as packed minifloatGlenn Kasten2014-05-193-7/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Fix warnings, re-enable -Werror.Ruben Brunk2014-05-175-14/+15
| | | | | | | | | | | | | | | | | | Change-Id: Ic6b1a10f46f980f9a9d8d130600419a792703c44
* | | | | | FixbuildRuben Brunk2014-05-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4379964731b671f36a1e239b0f7665f595ac1c2d
* | | | | | camera2: Adding TIFF writing utilities.Ruben Brunk2014-05-1733-0/+4424
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 6b787cb8: am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix ↵Andreas Huber2014-05-161-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | uninitialized varibale warning" * commit '6b787cb8ddde9d411cab0964062d5d942a710ff8': libstagefright foundation: fix uninitialized varibale warning
| * | | | am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix ↵Andreas Huber2014-05-161-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | uninitialized varibale warning" * commit '1b8b8793c0e86865df456c3d26f969b1498041db': libstagefright foundation: fix uninitialized varibale warning
| | * | | am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale ↵Andreas Huber2014-05-161-1/+1
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | warning" * commit '3059e27d0e18a427f3c19889aac86ea31ec0d5d1': libstagefright foundation: fix uninitialized varibale warning
| | | * | libstagefright foundation: fix uninitialized varibale warningAmit Pundir2014-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Fix build.Marco Nelissen2014-05-151-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I2b0a3049c81b99ba233d5945e16dcddd975aa4f9