summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 597ce69a: Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" ↵Eino-Ville Talvala2014-12-051-0/+6
|\ | | | | | | | | | | | | into lmp-mr1-dev * commit '597ce69a77636eab073fc83ded01e8af51e887e2': Camera: Add support for SCENE_MODE_HDR for newer HALs
| * Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-devEino-Ville Talvala2014-12-051-0/+6
| |\
| | * Camera: Add support for SCENE_MODE_HDR for newer HALsEino-Ville Talvala2014-12-051-0/+6
| | | | | | | | | | | | | | | Bug: 18640480 Change-Id: I7b772d10b2bd136c78395fd2816114b27bb48d00
* | | am 9257000c: camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-051-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '9257000c453c1a6f6bf073ff0bf3ba7ef9baf183': camera: fix logging in ZslProcessor to avoid spam
| * | camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-051-1/+1
| |/ | | | | | | | | | | | | | | | | | | AF state mismatch while selecting ZSL candidate should not be treated as a warning. This results into undesriable spam in the logs. ALso, using ALOGVV is consistent with how AE state mismatch is handled in ZslProcessor3.cpp Bug: 18634318 Change-Id: Ia9d7f2bb98f784990b1a6f923983c35f622c3791
* | am d6e7f1e1: Merge "Fix for AOSP force virtualization mode" into lmp-mr1-devRicardo Garcia2014-12-051-4/+6
|\ \ | |/ | | | | | | * commit 'd6e7f1e1f8b1dfa6a87c7c0b1a5c68d435096b01': Fix for AOSP force virtualization mode
| * Merge "Fix for AOSP force virtualization mode" into lmp-mr1-devRicardo Garcia2014-12-051-4/+6
| |\
| | * Fix for AOSP force virtualization modeRicardo Garcia2014-12-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Forcing virtualization mode with AOSP code might erroneously return a failed code, whilst it was correct. Fixing the condition for Automatic mode. bug: 18538537 Change-Id: I5837ff40cfed04c99889813cd56ebe3d90793e74
* | | am b65842dd: Merge "Fix NuPlayer assertion on failure to create AudioTrack" ↵Andy Hung2014-12-0510-82/+88
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'b65842dd9447a7925046b2285b2aa8459dc63ed3': Fix NuPlayer assertion on failure to create AudioTrack
| * | Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-devAndy Hung2014-12-0510-82/+88
| |\ \
| | * | Fix NuPlayer assertion on failure to create AudioTrackAndy Hung2014-12-0310-82/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under heavy media load or monkey/stress testing, more than 32 AudioTracks may be created or memory resources may be scarce. Remove the assertion on failure to create AudioTrack and signal MEDIA_ERROR. Bug: 17319843 Change-Id: I5d4e200b5f50d800046851a33e035cdc6ff10075
* | | | am 76c156f7: Merge "fix threading in RTSPSource and StreamingSource" into ↵Chong Zhang2014-12-054-39/+172
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '76c156f71f398d08fd88100f499a8a41ddfd3808': fix threading in RTSPSource and StreamingSource
| * | | Merge "fix threading in RTSPSource and StreamingSource" into lmp-mr1-devChong Zhang2014-12-054-39/+172
| |\ \ \
| | * | | fix threading in RTSPSource and StreamingSourceChong Zhang2014-12-034-39/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18532335 Change-Id: I9c34401a928dc0ddbd0923aa5f127dc628efbb92
* | | | | am 852dc963: Merge "avc_util: try to find the first start code prefix ↵Wei Jia2014-12-052-17/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev * commit '852dc963a53487f2e2f197ab095299aed9c60a5e': avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
| * | | | Merge "avc_util: try to find the first start code prefix 0x000001 even ↵Wei Jia2014-12-052-17/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev
| | * | | | avc_util: try to find the first start code prefix 0x000001 even though there ↵Wei Jia2014-12-042-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is non-zero byte at the beginning of the buffer. ESQueue: allow one PES playload contains multiple ADTS AAC frames. Bug: 18532335 Change-Id: I1f42017cff139d5e932e0aaa3e7d33164d1a48e7
* | | | | | am db995fe3: Merge "Fix getTimestamp if offload thread is not initialized." ↵Andy Hung2014-12-051-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'db995fe3239276be9dfd9e446b10417e07948acc': Fix getTimestamp if offload thread is not initialized.
| * | | | | Merge "Fix getTimestamp if offload thread is not initialized." into lmp-mr1-devAndy Hung2014-12-051-1/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Fix getTimestamp if offload thread is not initialized.Andy Hung2014-12-031-1/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Returns INVALID_OPERATION. Bug: 18605649 Change-Id: I440fb687fbf9249098e049982fa83bcd1515fd80
* | | | | am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-051-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8790740d6bb1546dee6c87270976415503283820': media_codecs.xml: extend vorbis sample rate to 8-96kHz
| * | | | media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-041-1/+1
| | |/ / | |/| | | | | | | | | | | | | | Bug: 18615604 Change-Id: I0245556b8164959dd52fe677901cbfc517627cb4
* | | | am 814cbb4e: Merge "ESQueue: add frame length checking in validation of ADTS ↵Wei Jia2014-12-041-4/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | header." into lmp-mr1-dev * commit '814cbb4e33396fce559475270d6f6c0bd7c43fc5': ESQueue: add frame length checking in validation of ADTS header.
| * | | Merge "ESQueue: add frame length checking in validation of ADTS header." ↵Wei Jia2014-12-041-4/+19
| |\ \ \ | | | | | | | | | | | | | | | into lmp-mr1-dev
| | * | | ESQueue: add frame length checking in validation of ADTS header.Wei Jia2014-12-031-4/+19
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows an invalid ADTS buffer to be abandoned when frame length in the header exceeds buffer size. Bug: 18532335 Change-Id: I8057db525d06ff00ca24afd075a7c6c17b87eaa8
* | | | am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to ↵Hochi Huang2014-12-041-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | loudspeaker unexpectedly * commit '18f2f90cff65c384a4e8292cc3296dafafb43d52': [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
| * | | [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker ↵Hochi Huang2014-12-041-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | unexpectedly https://partner-android-review.git.corp.google.com/#/c/187894/ Change-Id: I3f9175bbc302e382155e568e66b88400ec05ffa5 Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
* | | am ab05b4cc: StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-031-0/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'ab05b4ccb8ea59079d7f773aa0e090029c479bad': StreamingSource: check mTSParser before dereferencing it.
| * | StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-021-0/+4
| |/ | | | | | | | | Bug: 18532335 Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
* | am f1828910: nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-022-6/+14
|\ \ | |/ | | | | | | * commit 'f1828910d48bbd22e1392e6ab0ce31298d1f115c': nuplayer: clear pending audio access unit on flush.
| * nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-012-6/+14
| | | | | | | | | | | | | | Also add flag to avoid reading on flush. Bug: 18540219 Change-Id: I2fc351c32c87db9a8c8c2aad12ee2bd56a0370ab
* | am d8731629: Merge "notify seek complete upon first video output frame" into ↵Chong Zhang2014-12-028-28/+107
|\ \ | |/ | | | | | | | | | | lmp-mr1-dev * commit 'd8731629bed46ff573b1ef904e5366d28f23dc0a': notify seek complete upon first video output frame
| * Merge "notify seek complete upon first video output frame" into lmp-mr1-devChong Zhang2014-12-028-28/+107
| |\
| | * notify seek complete upon first video output frameChong Zhang2014-12-018-28/+107
| | | | | | | | | | | | | | | Bug: 18541814 Change-Id: Ie4e0976885f26eb253460eab371cb181ea85f2db
* | | am f20c4356: Merge "AudioRecord: use audio attributes instead of audio ↵Eric Laurent2014-11-2613-146/+192
|\ \ \ | |/ / | | | | | | | | | | | | | | | source." into lmp-mr1-dev * commit 'f20c4356931ef72084b6b8e310f56b67715c6fb9': AudioRecord: use audio attributes instead of audio source.
| * | Merge "AudioRecord: use audio attributes instead of audio source." into ↵Eric Laurent2014-11-2613-146/+192
| |\ \ | | | | | | | | | | | | lmp-mr1-dev
| | * | AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-2513-146/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added AudioRecord constructor with audio attributes. Replaced AudioPolicymanager::getInput() by getInputForAttr(). No new functionality for now. Also: - Fixed warnings in AudioPolicyManager - Allocate audio session ID before calling getOutputForAttr() in AudioTrack. Bug: 16006090. Change-Id: I15df21e4411db688e3096dd801cf579d76d81711
* | | | am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED in async ↵Chong Zhang2014-11-261-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | mode" into lmp-mr1-dev * commit '5d2c5fcb5cbd262b6a238886a7ce43add03eee20': MediaCodec: resume codec if state is FLUSHED in async mode
| * | | Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into ↵Chong Zhang2014-11-261-0/+2
| |\ \ \ | | |/ / | |/| | | | | | lmp-mr1-dev
| | * | MediaCodec: resume codec if state is FLUSHED in async modeChong Zhang2014-11-261-0/+2
| | |/ | | | | | | | | | | | | | | | bug: 18513091 Change-Id: I192625c61834584f711de76db788c2c0332ae774
* | | am 087eb332: Merge "audio policy: do not route accessibility prompts to ↵Eric Laurent2014-11-261-0/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | compressed output" into lmp-mr1-dev * commit '087eb332cdd64026de27c914194127f8fda1a846': audio policy: do not route accessibility prompts to compressed output
| * | Merge "audio policy: do not route accessibility prompts to compressed ↵Eric Laurent2014-11-261-0/+15
| |\ \ | | | | | | | | | | | | output" into lmp-mr1-dev
| | * | audio policy: do not route accessibility prompts to compressed outputEric Laurent2014-11-251-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a digital output (HDMI or S/PDIF) is configured with a non linear PCM audio format it is likely that the audio HAL or HW will not be able to mix other sounds with the main media stream being played. In this case, do not condider HDMI or S/PDIF as a valid route for accessibilty strategy so that accessibility prompts are always audible. Bug: 18067208. Change-Id: If20603a1dc1dc470f206f841308bed2b87daf21c
* | | | am 72bf901c: Merge "audio policy: new getOutputForAttr() prototype." into ↵Eric Laurent2014-11-2617-341/+433
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '72bf901ca905ce154fe7866f06d25a01aadcf974': audio policy: new getOutputForAttr() prototype.
| * | | Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-devEric Laurent2014-11-2617-341/+433
| |\ \ \ | | |/ /
| | * | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-2517-341/+433
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update getOutputForAttr() prototype and group all logic dealing with audio attributes to stream type conversion in audio policy manager. getOutputForAttr(): - specifies the audio session (for future use) - returns a status code - receives either stream type (for legacy) or audio attributes - returns an updated streamtype Remove logic dealing with legacy stream types to attributes conversion from AudioTrack. Use correct type for audio sessions in other APIs (startOutput() ...). releaseOutput() specifies the audio session (for future use). Bug: 18067208. Change-Id: I1bfbe9626c04c7955d77f8a70aecfad2cb204817
* | | | am d325005e: Merge "Fix AudioTrack loop mode to play audio from buffer ↵Andy Hung2014-11-252-4/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | start" into lmp-mr1-dev * commit 'd325005e4a3be45c57e950f8c18b329c968602ce': Fix AudioTrack loop mode to play audio from buffer start
| * | | Merge "Fix AudioTrack loop mode to play audio from buffer start" into ↵Andy Hung2014-11-252-4/+9
| |\ \ \ | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | Fix AudioTrack loop mode to play audio from buffer startAndy Hung2014-11-242-4/+9
| | | |/ | | |/| | | | | | | | | | | | | Bug: 18217633 Change-Id: Ica77acf0a32832d9b04eb657ef2f4f5329f8fbda
* | | | am 512dd849: Merge "camera: fix frame deletion logic in mInFlightMap" into ↵Zhijun He2014-11-251-2/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '512dd849d0ef9e9988fedfbaf951b4b82523957c': camera: fix frame deletion logic in mInFlightMap
generated by cgit v1.1 at 2024-10-21 06:49:34 +0000