summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* am 72afcd5d: am 5ea5b020: Merge "WA: Queue extra buffers on output port ↵Lajos Molnar2013-11-181-0/+2
|\ | | | | | | | | | | | | during reconfig if input EOS-ed" into klp-dev * commit '72afcd5da296b1f5fb38ef037054855aaea88054': WA: Queue extra buffers on output port during reconfig if input EOS-ed
| * Merge "WA: Queue extra buffers on output port during reconfig if input ↵Lajos Molnar2013-11-191-0/+2
| |\ | | | | | | | | | EOS-ed" into klp-dev
| | * WA: Queue extra buffers on output port during reconfig if input EOS-edLajos Molnar2013-11-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some codecs may return input buffers before having them processed. This causes a halt if we already signaled an EOS on the input port. For now keep submitting output meta buffers one at a time if the input EOS-ed, but the output not yet. Normally, we submit an output buffer for each input buffer that is with the component (waiting to be processed). Change-Id: I8a1251bfb504f40f1e4085a1e220bf9a4d0b05d9 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11433909
* | | am 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for ↵Eric Laurent2013-11-152-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | offload" into klp-dev * commit '576e89b523d7705545032edc67d98d9ab1dedbd2': AwesomePlayer: correct stream type for offload
| * | AwesomePlayer: correct stream type for offloadEric Laurent2013-11-142-1/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | canOffloadStream() function in stagefright utils forces the stream type to AUDIO_STREAM_MUSIC when querying the audio policy manager if a particular track is offloadable or not. This causes MP3 ringtones to be offloaded which is not a validated use case. The fix consists in using the actual stream type read from the AudioSink. Bug: 11410937. Change-Id: I44b8e033a8e785a79cdc291b142f80b5580bdc4d
| * Merge "Only initialize sniffers once, don't hold mutex while sniffing" into ↵Marco Nelissen2013-11-131-1/+3
| |\ | | | | | | | | | klp-dev
| | * Only initialize sniffers once, don't hold mutex while sniffingMarco Nelissen2013-11-111-1/+3
| | | | | | | | | | | | | | | | | | b/11482896 Change-Id: Ie036554b4c9e7e8863cb07901d414ea457f1b2f1 (cherry picked from commit 377fce69297a0e5b7c3b266a7602b17146785635)
* | | am db50cb5f: am caee8747: Merge "configure bitrate and bitrate mode at ↵Andreas Huber2013-11-111-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | encoder initialization for VP8/9" into klp-dev * commit 'db50cb5f7ae6d2beacd8a4fa4a8991035b3c88e7': configure bitrate and bitrate mode at encoder initialization for VP8/9
| * | Merge "configure bitrate and bitrate mode at encoder initialization for ↵Andreas Huber2013-11-121-0/+1
| |\ \ | | |/ | |/| | | | VP8/9" into klp-dev
| | * configure bitrate and bitrate mode at encoder initialization for VP8/9Andreas Huber2013-11-051-0/+1
| | | | | | | | | | | | | | | Change-Id: I0389264db4102cabb0c6fcb4ca223d85cc9e86fb related-to-bug: 11536167
* | | am cc5aeced: am e100b813: Merge "StageFrightRecorder: do not use meta-data ↵Lajos Molnar2013-11-111-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | mode for software encoders" into klp-dev * commit 'cc5aeced30609326c7495eca1286163af3933fe1': StageFrightRecorder: do not use meta-data mode for software encoders
| * | Merge "StageFrightRecorder: do not use meta-data mode for software encoders" ↵Lajos Molnar2013-11-111-2/+4
| |\ \ | | | | | | | | | | | | into klp-dev
| | * | StageFrightRecorder: do not use meta-data mode for software encodersLajos Molnar2013-10-301-2/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera HAL v1 uses vendor-specific camera-source meta-data mode, but software encoders use generic gralloc-source mode, so they are not compatible. Change-Id: I0d1bab8eada26dcb70c97b1eec83f06d1f331239 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11446505
* | | Only initialize sniffers once, don't hold mutex while sniffingMarco Nelissen2013-11-111-1/+3
| | | | | | | | | | | | | | | | | | b/11482896 Change-Id: Ie036554b4c9e7e8863cb07901d414ea457f1b2f1
* | | am d9d8b7b6: am fd6ecdd3: Camera HAL3/API1: Add support for the partial ↵Eino-Ville Talvala2013-11-061-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | result quirk. * commit 'd9d8b7b63514ceea143968b3f114c52755dda9ef': Camera HAL3/API1: Add support for the partial result quirk.
| * | Camera HAL3/API1: Add support for the partial result quirk.Eino-Ville Talvala2013-11-061-0/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Camera2Client: - Detect partial result quirk - Camera3Device: - Accumulate all partial results together - Fire off 3A-only result once all 3A states are available - FrameProcessorBase: - Filter out partials, don't send to listeners - FrameProcessor: - Skip face detect on partials - Make sure to only handle a 3A update for a given frame once - Trigger AF notifications when AF mode or trigger changes, to properly detect all AF transitions. Bug: 11115603 Change-Id: Iea8aa73c568701562a46071f7ea100624251d10b
| * Assign blame for playback wakelocks.Marco Nelissen2013-10-252-3/+8
| | | | | | | | | | | | | | | | | | | | | | Set a work source for the playback wakelock, so that playback is counted against the requesting app instead of the media server. Cherrypicked from master. b/9464621 Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
* | Support TS + AC3 for ATSC standardChangwan Ryu2013-11-061-0/+2
| | | | | | | | Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
* | Support AC3 in stagefrightChangwan Ryu2013-11-062-0/+3
| | | | | | | | Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
* | Assign blame for playback wakelocks.Marco Nelissen2013-10-252-3/+8
| | | | | | | | | | | | | | Set a work source for the playback wakelock, so that playback is counted against the requesting app instead of the media server. Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
* | am 77177fa2: am 95c03858: Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-181-2/+3
|\ \ | |/ | | | | | | * commit '77177fa20773d02b4f9c4147ecb98107f019fa7d': Allow releaseBuffer after flush
| * Allow releaseBuffer after flushGlenn Kasten2013-10-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | After AudioTrack start checks for pending flush, allow releaseBuffer on any previously obtained buffer. For example, this can happen if the resampler has obtained a buffer but not released the whole buffer yet. Note that the resampler will be reading obsolete data. Bug: 11285590 Change-Id: I0614fbb62e43604aac3089cce4b7797c87a306b5
* | am b2059ff3: am f8f15b05: Merge "Fix race condition in AudioTrack::pause ↵Glenn Kasten2013-10-161-0/+1
|\ \ | |/ | | | | | | | | | | followed by start" into klp-dev * commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734': Fix race condition in AudioTrack::pause followed by start
| * Merge "Fix race condition in AudioTrack::pause followed by start" into klp-devGlenn Kasten2013-10-171-0/+1
| |\
| | * Fix race condition in AudioTrack::pause followed by startGlenn Kasten2013-10-161-0/+1
| | | | | | | | | | | | | | | Bug: 11148722 Change-Id: Iec88f00c8510363d4418e4b8d5b34feb06ecf04d
* | | am 7f8c3973: am 120a8847: Merge "AudioTrack: fix head position after ↵Eric Laurent2013-10-161-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | restore" into klp-dev * commit '7f8c397378a7ee5abd395413be71388ad36d3ed2': AudioTrack: fix head position after restore
| * | AudioTrack: fix head position after restoreEric Laurent2013-10-161-0/+2
| |/ | | | | | | | | | | | | | | | | | | The head position transfered to the new track by restoreTrack_l() must take into account the frames that are dropped from the old track to avoid a non recoverable offset in the playback head position returned to applications. Bug: 11230062. Change-Id: I51143a08b95e8f264ed709ae2054360315f2b8b1
* | Merge "Add missing namespace for AudioTimestamp"Glenn Kasten2013-10-071-0/+4
|\ \
| * | Add missing namespace for AudioTimestampGlenn Kasten2013-09-291-0/+4
| | | | | | | | | | | | Change-Id: I775624b71b4446ee6d1599c6614ab8a8340bbfdb
* | | resolved conflicts for merge of 9a7d11f0 to masterGlenn Kasten2013-10-071-0/+3
|\ \ \ | | |/ | |/| | | | Change-Id: Ie4d101185a93d37ec280f608813ad62a077a584e
| * | Merge "Cleanup openRecord error handling" into klp-devGlenn Kasten2013-10-071-0/+3
| |\ \
| | * | Cleanup openRecord error handlingGlenn Kasten2013-09-241-0/+3
| | | | | | | | | | | | | | | | | | | | Bug: 10888816 Change-Id: I84897dd7d30b370640b54e928f230604b873cb68
* | | | am 38ea22bb: am b2d71d3a: Merge "Camera API 2, Device 2/3: Implement idle ↵Eino-Ville Talvala2013-10-043-6/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | and shutter callbacks" into klp-dev * commit '38ea22bb3a841dd37cc2be0fdca8c5e4ba3cf6db': Camera API 2, Device 2/3: Implement idle and shutter callbacks
| * | | Merge "Camera API 2, Device 2/3: Implement idle and shutter callbacks" into ↵Eino-Ville Talvala2013-10-033-6/+20
| |\ \ \ | | | | | | | | | | | | | | | klp-dev
| | * | | Camera API 2, Device 2/3: Implement idle and shutter callbacksEino-Ville Talvala2013-10-023-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update callback Binder interface - Rename frameId to be requestId to be consistent and disambiguate from frameNumber. - Implement shutter callback from HAL2/3 notify() - Add in-flight tracking to HAL2 - Add requestId to in-flight tracking - Report requestId from shutter callback - Implement idle callback from HAL3 process_capture_result - Add new idle tracker thread - Update all idle waiting to use the tracker - Add reporting from request thread, all streams to tracker - Remove existing idle waiting infrastructure Bug: 10549462 Change-Id: I867bfc248e3848c50e71527e3561fe92dc037958
* | | | | am aa50cc78: am 56ce7260: IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-041-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'aa50cc78be8a1067a0694a97b04d5a24b80af475': IOMX: Add prepareForAdaptivePlayback method
| * | | | IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-031-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepareForAdaptivePlayback is the fallback mechanism to support seamless resolution change for devices that do not support dynamic output buffers. It is up to the codecs to handle this appropriately, but codecs that do not handle dynamic output buffers would request enough buffers up to the requested size in this method to avoid port reconfiguration on resolution changes. Change-Id: I58d4aa8ef1359ea3472735bbe9140c3132039b3d Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10192531 Related-to-bug: 7093648
* | | | am 6ec564ac: am 353fb9bf: Merge "MediaTimeProvider support fixes" into klp-devLajos Molnar2013-10-021-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6ec564aca718b4d01543ded38d47e1e6c0ae05d5': MediaTimeProvider support fixes
| * | | Merge "MediaTimeProvider support fixes" into klp-devLajos Molnar2013-10-011-0/+1
| |\ \ \
| | * | | MediaTimeProvider support fixesLajos Molnar2013-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add MEDIA_SKIPPED event when resuming at a different time than seeked to. Send MEDIA_STARTED/PAUSED events only when playing (vs. when doing seek previews) Change-Id: I243ebf054303755ea8863229c3211694f2c204a7 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10954008
* | | | | am 3424d6e1: am 1adf20ce: Merge "fix volume and effect enable delay on ↵Eric Laurent2013-10-011-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | offloaded tracks" into klp-dev * commit '3424d6e17637e0743ddf3bf4688af8ee36e69264': fix volume and effect enable delay on offloaded tracks
| * | | | fix volume and effect enable delay on offloaded tracksEric Laurent2013-09-301-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volume: add a method to wake up the mediaserver playback thread when a volume command is received on an offloaded track. Effects: call effect chain process on offloaded playback threads asynchronously from writes to allow effect state updates while waiting for async write callback. Bug: 10796540. Change-Id: Id2747ae88783575d1d7ffd6fc86fbd054ab2c739
* | | | am 2eab94f7: Effects Factory changes for effects offloadjpadmana2013-09-301-0/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '2eab94f7dfd41a65e13aca379a1aed97447f8884': Effects Factory changes for effects offload
| * | | Effects Factory changes for effects offloadjpadmana2013-09-271-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio_effects.conf - commented changes to illustrate the addition of Proxy and sub effects to the conf file Added an effectFactoryApi - EffectGetSubEffects for querying the sub effect descriptors from the factory. This api is used by the Proxy to get the sub effects Added functions and data structures in factory code for loading the sub effects gSubEffectList - has the Proxies and their corresponding sub effects - addSubEffect() - reads a sub effect node and adds to the gSubEffectList - findSubEffect() - searches through the gSubEffectList to find a SubEffect Bug: 8174034. Change-Id: Id7f6aa67c41db370d32beaf43a979ba4ac925928 Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
* | | | am 83f40005: Revert "Effects Factory changes for effects offload"Eric Laurent2013-09-301-24/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '83f400056ac913250f0926326ff78697c68d18a1': Revert "Effects Factory changes for effects offload"
| * | Revert "Effects Factory changes for effects offload"Eric Laurent2013-09-271-24/+0
| | | | | | | | | | | | | | | | | | This reverts commit 284c17e73bbff51cb5b1adcee98386d47733757a. Change-Id: I31db21e1ad4758b21356bfe4c4c64f15b2da8737
* | | am 369af71e: am 6914de6d: Merge "Camera: Implement getCameraCharacteristics" ↵Zhijun He2013-09-251-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | into klp-dev * commit '369af71eb7e402ee68b66b0f0ede5d4d40c857d1': Camera: Implement getCameraCharacteristics
| * | Camera: Implement getCameraCharacteristicsZhijun He2013-09-251-0/+5
| | | | | | | | | | | | | | | | | | Bug: 10904541 Bug: 10360518 Change-Id: Ie9ca6b3b0b5f2fe529e6b0decc193096e770a017
* | | am 8ee02943: am 1c7f35d1: Merge "soundpool: allocate shared memory heap by ↵Eric Laurent2013-09-243-4/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | client" into klp-dev * commit '8ee02943b61e0a7dd78e5596720261b185a223d5': soundpool: allocate shared memory heap by client
| * | soundpool: allocate shared memory heap by clientEric Laurent2013-09-243-4/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current SoundPool implementation allocates the shared memory heap containing decoded PCM samples in mediaserver process. When mediaserver process crashes, the shared memory heaps allocated by AudioCache cannot be mapped anymore in the new instance of mediaserver. This causes a silent failure to end playback of new sounds because AudioFlinger believes the new AudioTracks are opened in streaming mode and not static mode: it sees a NULL shared memory pointer when the track is created. The fix consists in allocating the memory heap in the client process. Thus the heap is not lost when mediaserver restarts. The global memory usage is the same as this is shared memory. Also added a way to detect that a shared memory is passed when the track is created but cannot be mapped on mediaserver side. Also fix a crash in SoundPool when ALOGV is enabled. Bug: 10894793. Change-Id: Ice6c66ec3b2a409d75dc903a508b6c6fbfb2e8a7