summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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
* | | 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
* | | 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
* | | | media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-041-1/+1
|/ / / | | | | | | | | | | | | Bug: 18615604 Change-Id: I0245556b8164959dd52fe677901cbfc517627cb4
* | | 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
* | StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-021-0/+4
|/ | | | | Bug: 18532335 Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
* 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
* 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
* | Merge "AudioRecord: use audio attributes instead of audio source." into ↵Eric Laurent2014-11-264-39/+75
|\ \ | | | | | | | | | lmp-mr1-dev
| * | AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-254-39/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | 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
* | Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-devEric Laurent2014-11-264-223/+128
|\ \
| * | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-254-223/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | 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
* | | Merge "stagefright: add graceful handling when setting port definition" into ↵Lajos Molnar2014-11-251-12/+12
|\ \ \ | |_|/ |/| | | | | lmp-mr1-dev
| * | stagefright: add graceful handling when setting port definitionLajos Molnar2014-11-251-12/+12
| |/ | | | | | | | | | | | | | | | | - don't crash when count of buffers is incorrect, or when the buffer size decreases. This allows configuring SW video encoders for smaller than QCIF size. Bug: 18513091 Change-Id: Ibfcd6b883a892156e408e94fbc329103b9ac09ac
* | audio: new routing strategies and stream typesEric Laurent2014-11-211-1/+1
|/ | | | | | | | | | | | | Added new routing strategies and stream type for internal use by audio policy manager and audio flinger: - One for accessibility to allow different routing than media - One for re-routing (remote submix) in preparation of dynamic policies - Added stream type for "internal" audio flinger tracks used for audio patches and duplication. Bug: 18067208. Change-Id: I88f884b552e51e4a49c29125e5a1204cf58ff434
* Merge "tunnel NuPlayer source and decoder input" into lmp-mr1-devChong Zhang2014-11-2113-1296/+1505
|\
| * tunnel NuPlayer source and decoder inputChong Zhang2014-11-2013-1296/+1505
| | | | | | | | | | | | Bug: 18342383 Change-Id: Ieff1cd3bad2b39d46f127ddd5d5139b919992461
* | Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-devRonghua Wu2014-11-202-0/+8
|\ \ | |/ |/|
| * NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-11-192-0/+8
| | | | | | | | | | | | | | Also rememeber the pause time in NuPlayerDriver. Bug: 18436336 Change-Id: If09f680a0d0f9137bd55c5f94201eb3aa783278a
* | Merge "close fd if data source is reset without prepare" into lmp-mr1-devChong Zhang2014-11-201-1/+7
|\ \
| * | close fd if data source is reset without prepareChong Zhang2014-11-191-1/+7
| | | | | | | | | | | | | | | bug: 18434887 Change-Id: I70dff721710b7299d1ca1f8520278f82d355141d
* | | Merge "Fix missing loop count for static tracks." into lmp-mr1-devGlenn Kasten2014-11-201-22/+38
|\ \ \
| * | | Fix missing loop count for static tracks.Andy Hung2014-11-181-22/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StaticAudioTrackServerProxy::framesReady() previously returned only the contiguous frames, update to return the total available frames. This resolves short-count looping in SoundPool for FastTracks. Also (1) Removes the racy condition of reading two variables and (2) Fixes buffer->mNonContig to return the correct value and (3) Restores behavior that loop count of 1 goes back to loopStart once during playback. Bug: 11830751 Bug: 12070295 Bug: 17456842 Change-Id: I64906e6036bb00a1d7375b03efe6deb69d6478ca
* | | | Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-devMarco Nelissen2014-11-201-0/+6
|\ \ \ \
| * | | | When aggregating buffers, make sure we don't lose dataMarco Nelissen2014-11-191-0/+6
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 18277034 Change-Id: Ia8c35791eea88545a873cad339eb6b5fc25d1d97
* | | | Merge "AudioSystem: fix cross deadlock" into lmp-mr1-devEric Laurent2014-11-201-43/+58
|\ \ \ \
| * | | | AudioSystem: fix cross deadlockEric Laurent2014-11-201-43/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not hold gLockAPS when calling AudioPolicyService::registerClient() in get_audio_policy_service(). registerClient() will need to acquire the AudioPolicyService mutex and if at the same time a method called from AudioPolicyService (with mutex held) calls back into AudioSystem and get_audio_policy_service() a cross deadlock occurs. Same preventive fix for get_audio_flinger(). Use a separate mutex for notification client list in AudioPolicyService. This prevents deadlocking if registerClient() is called as a consequence of AudioFlinger calling back into AudioPolicyManager while executing a method with AudioPolicyService locked Bug: 18403952. Bug: 18450065. Change-Id: Ia832e41aede8bc6c843fc615508fbdd74e0863b5
* | | | | Merge "mediaplayer: request auto-frc for high quality avsync" into lmp-mr1-devLajos Molnar2014-11-201-0/+13
|\ \ \ \ \
| * | | | | mediaplayer: request auto-frc for high quality avsyncLajos Molnar2014-11-191-0/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 17383204 Change-Id: I7209305b4ff3c2386019d7a09d6a0536e9f21522
* | | | | stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-191-0/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use MediaFormat.setInteger("auto-frc", 1) to turn this feature on. If supported, this feature will show up in codec.getOutputFormat().getInteger("auto-frc") Otherwise, this key will not be present. Bug: 17383204 Change-Id: I03549b3ede4de156e9e2d81b3883010360bb42ae
* | | | Merge "NuPlayer: open audio sink in offload mode when resuming from timeout ↵Ronghua Wu2014-11-193-5/+36
|\ \ \ \ | | | | | | | | | | | | | | | teardown." into lmp-mr1-dev
| * | | | NuPlayer: open audio sink in offload mode when resuming from timeout teardown.Ronghua Wu2014-11-183-5/+36
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Also always recheck if a new stream can do offload. Bug: 18154425 Change-Id: I121877834bd963eeeba91a2b951fd30d5dc36a8b
* | | | Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-devEric Laurent2014-11-191-37/+47
|\ \ \ \
| * | | | AudioSystem: Add mutex for output cacheEric Laurent2014-11-191-37/+47
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross deadlock with AudioFlinger by adding a dedicated mutex to protect access to cached output list and parameters. Bug: 18410728. Change-Id: Ia31283b1972d8865a46e84e63695173c187eb781
* | | | Merge "HLS: fix live lock after missing the boat during configuration ↵Robert Shih2014-11-191-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | change" into lmp-mr1-dev
| * | | | HLS: fix live lock after missing the boat during configuration changeRobert Shih2014-11-181-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Bug:17488643 Change-Id: I4f5de42f86d6c616a67dc803f35c026b35347983
* | | | | Merge "Don't autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-192-0/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't autoloop notificationsMarco Nelissen2014-11-182-0/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps think it's cool to use ringtones as notification sounds, but ringtones often loop, which is not appropriate for notifications. Bug: 15929273 Change-Id: I77c4277801cb2561743f8c676ef76ab4d1668b08
* | | | Merge "NuPlayer: pass media time to selectTrack for responsiveness" into ↵Robert Shih2014-11-198-13/+39
|\ \ \ \ | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | NuPlayer: pass media time to selectTrack for responsivenessRobert Shih2014-11-198-13/+39
| |/ / / | | | | | | | | | | | | Bug: 18020001 Change-Id: Id50f8473992f39d8c0aa86a1fabb2601093d2572
generated by cgit v1.1 at 2024-05-18 02:49:44 +0000