summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Add a few more APIs to MediaCodecList.Andreas Huber2012-04-024-43/+155
| | | | | | | | | | | | | | | | | | | | Change-Id: I5ac193cd40c82bbcd87c1e55003b78102e8d4674
* | | | | AudioFlinger track flags and server's fast policyGlenn Kasten2012-04-022-9/+63
| | | | | | | | | | | | | | | | | | | | Change-Id: I72358c8e6829d173b3e60ced8a8babc089869fac
* | | | | Merge "Update AudioParameter"Glenn Kasten2012-04-022-12/+14
|\ \ \ \ \
| * | | | | Update AudioParameterGlenn Kasten2012-04-012-12/+14
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use definitions for AUDIO_PARAMETER_STREAM_* from <hardware/audio.h> instead of repeating these constants. String constants are const char * const. Change-Id: I1c9ebe0bc9c827d719d3181aea55251c6db28ec4
* | | | | Merge "AudioTrack client fast policy"Glenn Kasten2012-04-022-6/+25
|\ \ \ \ \
| * | | | | AudioTrack client fast policyGlenn Kasten2012-04-022-6/+25
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I42ce691df3f586ac061b62237f35a263a0116f1f
* | | | | Merge "const methods and comments"Glenn Kasten2012-04-022-22/+26
|\ \ \ \ \
| * | | | | const methods and commentsGlenn Kasten2012-04-022-22/+26
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Ifd16750174fdb15b72507787502b587562ffc99e
* | | | | Merge "Add gapless playback support for NuPlayer"Marco Nelissen2012-04-028-15/+85
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add gapless playback support for NuPlayerMarco Nelissen2012-04-028-15/+85
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes NuPlayer use a SkipCutBuffer when needed, and adds a new AudioSink method to retrieve the number of frames written so far, so NuPlayerRenderer can calculate how much data it can write without blocking. Also make some more methods const. Change-Id: Id7d253ad8a7b85e9a84ca2baafbe32817b16c744
* | | | AudioMixer default track parametersGlenn Kasten2012-04-011-23/+33
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the default initialization of track parameters from the AudioMixer constructor to getTrackName(). This fixes a bug where the defaults were only valid the first time a name was allocated. Also added a switch case for parameter FORMAT. Change-Id: I07abd3aaf7f4efe9825a761d2bc662aaee2c6db0
* | | Make AudioTrack/AudioRecord handle more than 2^32 framesMarco Nelissen2012-03-303-13/+42
| | | | | | | | | | | | | | | b/6160363 Change-Id: I471815012c6a113ec2c4dd7676e8fa288a70bc76
* | | Merge "implemented synchronous audio capture"Eric Laurent2012-03-308-30/+347
|\ \ \
| * | | implemented synchronous audio captureEric Laurent2012-03-298-30/+347
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the infrastructure to support the synchronization of playback and capture actions on specific events. The first requirement for this feature is to synchronize the audio capture start with the full rendering of a given audio content. The applications can further be extended to other use cases (synchronized playback start...) by adding new synchronization events and new synchronous control methods on player or recorders. Also added a method to query the audio session from a ToneGenerator. Change-Id: I51f1167290d9cafdf2fbcdf9e4785156973af44c
* | | Merge "Copied MODULE_LICENSE_APACH2 and NOTICE from frameworks/base to ↵James Dong2012-03-302-0/+324
|\ \ \ | | | | | | | | | | | | frameworks/av"
| * | | Copied MODULE_LICENSE_APACH2 and NOTICE from frameworks/base to frameworks/avJames Dong2012-03-282-0/+324
| |/ / | | | | | | | | | Change-Id: I48c927b9690bf902ab167d60171c0ee7995687e0
* | | reduce IPCs in BufferQueueMathias Agopian2012-03-292-5/+2
| |/ |/| | | | | Change-Id: I1f8c32a771a411476d225adc62d1f07c24f39a3e
* | Implementation of a raw audio "decoder".Andreas Huber2012-03-297-0/+317
| | | | | | | | Change-Id: Ie89f01e59dd8106883937188afbb407550f0ac92
* | Merge "Add ABuffer support to SkipCutBuffer"Marco Nelissen2012-03-293-9/+47
|\ \ | |/ |/|
| * Add ABuffer support to SkipCutBufferMarco Nelissen2012-03-293-9/+47
| | | | | | | | | | | | | | | | Add support for ABuffer to SkipCutBuffer, and make it (re)allocate an appropriately sized buffer when needed, rather then relying on the caller to tell it ahead of time how big the buffers are going to be. Change-Id: I8b5c9ba5dd2fc13ef8870b7d4fe93a1bfdc7a626
* | Merge "Removed unnecessary include JNI from two drm Android.mk files"James Dong2012-03-282-2/+0
|\ \
| * | Removed unnecessary include JNI from two drm Android.mk filesJames Dong2012-03-282-2/+0
| |/ | | | | | | Change-Id: I7b7a1acce4d6db748ff193270e73bc3582ba2380
* | Fix deadlock in camera destruction after client app's crashKeun young Park2012-03-282-18/+60
|/ | | | | | | | | | | | | | | | | | | | | | | * why deadlock happened: when an app (CTS camera test) crashes while using camera, its binder is closed and reference counter is decreased. If camera is inside callback, sp<Client> inside callback will hold the Client instance, and Client instance is destroyed when the callback ends as sp<Client> to hold it no longer exists. The destructor of Client instance tries to clean up camera H/W which tries to stop threads created by camera HAL including the thread context where the callback is running. This causes deadlock where the callback thread itself is waiting for itself to terminate. Note that the deadlock will not happen if camera callback is not active. In that case, closing of binder will force the destruction of Client instance, and the destruction happens in binder thread. * Fix: Forces Client descruction in binder thread - remove sp<Client> from callbacks to prevent destruction in callback context - add client lock to allow callback to use raw pointer safely. This prevents the destructor from deleting the instance while callback is using it. - add status change inside destructor with client lock to safely destroy Client Bug: 6214383 Change-Id: Ic6d6396d4d95ce9e72a16ec2480ae65c100fe806
* AV Android make files changesJames Dong2012-03-2851-174/+188
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* Merge media files with history from frameworks/base.gitAnatol Pomozov2012-03-282333-0/+657121
|\
| * Merge "Use a status_t return type for GL functors"Romain Guy2012-03-261-0/+17
| |\
| | * Use a status_t return type for GL functorsRomain Guy2012-03-261-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | WebView needs more fine-grained control over the behavior of the framework upon execution of the display lists. The new status_t allows WebView to requests its functor to be re-executed directly without causing a redraw of the entire hierarchy. Change-Id: I97a8141dc5c6eeb6805b6024cc1e76fce07d24cc
| * | stagefright: compile without chromium for pdk buildsColin Cross2012-03-262-5/+10
| | | | | | | | | | | | Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
| * | Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-2627-38/+900
| |\ \
| | * | Provisional support for secure decryption of media streams.Andreas Huber2012-03-2627-38/+900
| | | | | | | | | | | | | | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
| * | | Merge "Removed code related to simulator build in TimedEventQueue to get rid ↵James Dong2012-03-261-21/+0
| |\ \ \ | | | | | | | | | | | | | | | of the dependency on jni.h"
| | * | | Removed code related to simulator build in TimedEventQueue to get rid of the ↵James Dong2012-03-261-21/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependency on jni.h o related-to-bug: 6214141 Change-Id: I548d84a9888be884d3903dc9dea9235258792165
| * | | Merge "fix visualizer inactivity detection"Eric Laurent2012-03-261-9/+24
| |\ \ \
| | * | | fix visualizer inactivity detectionEric Laurent2012-03-261-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current method implemented by the visualizer to detect that audioflinger has stopped providing audio buffers does not work if the application reads pcm captures too fast. The fix consist in implementing a method based on real time measurement only. One drawback is that the new method makes use of system calls that add some overhead to the process and capture functions. Change-Id: I53bd596b856f1cc7f0f47e08413af3335227100b
| * | | | Merge "reorganize SoundPool and JetPlayer code."Eric Laurent2012-03-267-5/+1332
| |\ \ \ \
| | * | | | reorganize SoundPool and JetPlayer code.Eric Laurent2012-03-267-5/+1332
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize SoundPool and JetPlayer code to be ready for the creation of libmedia_native. Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation). Remove dependencies on nativehelper/jni.h from JetPlayer. Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
| * | | | Merge changes Ib4d0e0c0,Iea8f4a23Colin Cross2012-03-265-16/+104
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | * changes: libmedia: remove skia include stagefright: remove dependency on skia
| | * | | libmedia: remove skia includeColin Cross2012-03-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skia is not used in this file, remove the unnecessary include. Change-Id: Ib4d0e0c0090c6b37ff8cfb816c0d8ba82a9638a4
| | * | | stagefright: remove dependency on skiaColin Cross2012-03-244-15/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skia is only used to write a jpeg file, link directly to libjpeg instead. Change-Id: Iea8f4a2347c38328776541d2b74bcbdea3f62041
| * | | | Add TRACK_FAST for IAudioFlinger::createTrackGlenn Kasten2012-03-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently not implemented by client or server Change-Id: Ib11dda57db3eeb871bcc7b546e340078776875f5
| * | | | Merge "IAudioFlinger::createTrack and openRecord flags"Glenn Kasten2012-03-267-27/+28
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | IAudioFlinger::createTrack and openRecord flagsGlenn Kasten2012-03-197-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | createTrack and openRecord don't need the "old" flags parameter, which was either audio_policy_output_t or audio_in_acoustics_t shifted left by 16 bits. But they do need "new" flags, which are defined by the application use case. Initially, the only application use case flag is timed output, but others are planned. For output, the audio_policy_output_t flags are passed to AudioSystem::getOutput, which returns an audio_io_handle_t, and that handle is then passed to createTrack. So createTrack doesn't need the old flags parameter. For input, the audio_in_acoustics_t flags are passed to AudioSystem::getInput, which returns an audio_io_handle_t, and that handle is then passed to openRecord. So openRecord doesn't need the old flags parameter. Change-Id: I18a9870911846cca69d420c19fe6a9face2fe8c4
| * | | | remove jni.h include from IOMX.hColin Cross2012-03-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jni.h is not used in IOMX.h and is not available in pdk builds, remove it. Change-Id: I9bc8fd70f617942712d9f684c6fc927bf18be753
| * | | | Merge "Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files."James Dong2012-03-2412-20/+0
| |\ \ \ \
| | * | | | Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.James Dong2012-03-2412-20/+0
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | o related-to-bug: 6214141 Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
| * | | | Fixed missing return value from a method should have returned status_tJames Dong2012-03-241-1/+1
| |/ / / | | | | | | | | | | | | Change-Id: I83ad2735eaf8a8dfa5f8f29f30aec1311b3222de
| * | | Merge "Revert "Split libmedia into libmedia and libmedia_native""Glenn Kasten2012-03-232-44/+37
| |\ \ \
| | * | | Revert "Split libmedia into libmedia and libmedia_native"Glenn Kasten2012-03-232-44/+37
| | | | | | | | | | | | | | | This reverts commit 0a3edd38df0743dcc7091bb7ebf29e7e7dadc7cb
| * | | | Merge "Revert "AudioFlinger does not need libmedia any more""Glenn Kasten2012-03-231-0/+1
| |\ \ \ \
| | * | | | Revert "AudioFlinger does not need libmedia any more"Glenn Kasten2012-03-231-0/+1
| | | | | | | | | | | | | | | | | | This reverts commit c920dee060ac69684be33210ee44b99a5fc3e8b2