summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* | 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
* 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 "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
* | Don't autoloop notificationsMarco Nelissen2014-11-181-0/+10
|/ | | | | | | | 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 HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-174-0/+47
|\
| * NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-064-0/+47
| | | | | | | | | | Bug: 17514665 Change-Id: I81c62553f2c5acb4d2436a9d8f04c10fdbe315d0
* | Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into ↵Wei Jia2014-11-151-1/+1
|\ \ | | | | | | | | | lmp-mr1-dev
| * | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | Bug: 18342383 Change-Id: I182928007814c146c01a86196c4fda1d46e74ea4
* | | Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-devRobert Shih2014-11-151-27/+37
|\ \ \
| * | | PlaylistFetcher: handle sporadic fetch errosRobert Shih2014-11-131-27/+37
| | | | | | | | | | | | | | | | | | | | Bug: 17490472 Change-Id: I2c04e2352f13db762b845f4d35db0a8b851a148c
* | | | Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-149-440/+764
|\ \ \ \
| * | | | stagefright: add runtime debug supportLajos Molnar2014-11-129-440/+764
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18285408 Change-Id: I56346f4652b2c5f7ef5fa3003fd8676051339384
* | | | | Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-devChong Zhang2014-11-131-164/+105
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Stagefright: use MediaCodec in async mode for recordingPraveen Chavan2014-11-121-164/+105
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Async mode reduces the number of messages posted between MediaCodec and MediaCodecSource. This reduces thread wakeups and helps reduce CPU utilization. Bug: 18246026 Change-Id: I4b0837f309fdd12e323c1dfa72525f5a31971a03
* | | | Merge "AnotherPacketSource: need reset some members before returning from ↵Wei Jia2014-11-131-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | queueDiscontinuity()." into lmp-mr1-dev
| * | | | AnotherPacketSource: need reset some members before returning from ↵Wei Jia2014-11-131-4/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queueDiscontinuity(). Bug: 18355014 Bug: 17511837 Change-Id: I4b623d3bc4fbeaf0e8bf4ddd96661469d17afe7a
* | | | Merge "PlaylistFetcher: check ts program streams before disabling a/v" into ↵Robert Shih2014-11-133-6/+32
|\ \ \ \ | |_|_|/ |/| | | | | | | lmp-mr1-dev
| * | | PlaylistFetcher: check ts program streams before disabling a/vRobert Shih2014-11-123-6/+32
| | | | | | | | | | | | | | | | | | | | Bug: 14648838 Change-Id: Ibf2b2cbb235f3d80bc33013e2afc053f13b9035f
* | | | Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-devMarco Nelissen2014-11-121-14/+61
|\ \ \ \
| * | | | Fix Ogg Vorbis packet timestampsMarco Nelissen2014-11-111-14/+61
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17586090 Change-Id: Iea88f7cc1f623cbea5df24169ea76181925fbb13
* | | | | Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-devAndy Hung2014-11-111-2/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | MediaCodec: Prevent stop() in the UNINITIALIZED stateAndy Hung2014-11-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return INVALID_OPERATION instead. This is a corner case when the decoder is still allocated, occurring after codec error. Bug: 18121124 Change-Id: If87e44dd40db48f63f965b765205f1e733663efd
* | | | | Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" ↵Robert Shih2014-11-111-4/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| * | | | | MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndexRobert Shih2014-11-081-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 18297854 Change-Id: I5e14a358576d9c7d25b7e421cd22428fb17a6e06
* | | | | | Merge "PlaylistFetcher: clear mStartup for .aac playlists after seek" into ↵Robert Shih2014-11-111-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | lmp-mr1-dev
| * | | | | PlaylistFetcher: clear mStartup for .aac playlists after seekRobert Shih2014-11-071-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 18296856 Change-Id: I26beabee338312eb2125b69284052c61aef611f0
* | | | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-073-3/+3
|\ \ \ \ \
| * | | | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-043-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passes the BufferItem for the queued buffer to the onFrameAvailable callback so the consumer can track the BufferQueue's contents. Bug: 18111837 Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
* | | | | Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer ↵Wei Jia2014-11-064-4/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | resulted from seek." into lmp-mr1-dev
| * | | | AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted ↵Wei Jia2014-11-064-4/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from seek. This will remove the unnecessary flush for seek. Bug: 17511837 Change-Id: I4b7acfc71a410372f5c630afb94b6a95d09d8974
* | | | Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-devJeff Tinker2014-11-061-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Pass resolution to Crypto plugin on format changeJeff Tinker2014-11-031-0/+10
| | |/ | |/| | | | | | | | | | Change-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101 related-to-bug: 16034599
* | | NuPlayer: reduce offload pause teardown timeout.Eric Laurent2014-10-291-1/+1
|/ / | | | | | | | | | | | | | | | | | | Waiting 60 seconds to teardown an offloaded path when paused is not needed and causes unecessary battery drain. 10 seconds is enough to avaoid teardown when it would be problematic (seek, pause for notifications, buffering...). Bug: 13505340. Change-Id: Ibcaa609b59e86ba2bc49539620bd77504d534c0c
* | libstagefright: set actual stride info for SW encoder input portLajos Molnar2014-10-254-1/+17
| | | | | | | | | | | | | | | | | | This fixes encoding flexible YUV content using SW encoders. Also skip setting input color format if it is flexible YUV, as it has already been translated to a color format supported by the codec. Bug: 18124320 Change-Id: I423782936986f4d6cf65ea9ef89ae77a92e30140
* | Merge "stagefright: return failure on malformed TS streams" into lmp-mr1-devChong Zhang2014-10-231-9/+23
|\ \ | |/ |/|
| * stagefright: return failure on malformed TS streamsDavid Yeh2014-10-211-9/+23
| | | | | | | | | | Bug: 18075193 Change-Id: I7bd97dea263e972a8de3429ed000cbd4913164bf
* | am c3ddddbd: Merge "release camera without holding CameraSource mutex" into ↵Chong Zhang2014-10-221-41/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev automerge: 168799c * commit 'c3ddddbd4ec1fe2c570a25925db6b396fb83badf': release camera without holding CameraSource mutex move audio sink open/close to NuPlayerRenderer Fix freed memory references audio policy: move intializations to onFirstRef() Fix VideoFrame class layout for 64/32 bit NuPlayer: wait for renderer flush before decoder shutdown Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp send available codec buffer count with codec notification mediarecorder: set level if setting default profile stagefright: move math templates into AUtils.h NuPlayer: Fix flush mode decoder error handling Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" GenericSource: support disconnect before NuCachedSource2 is created mediaplayer: make frame-accurate avsync configurable
| * \ Merge "release camera without holding CameraSource mutex" into lmp-devChong Zhang2014-10-221-41/+58
| |\ \ | | |/
| | * release camera without holding CameraSource mutexChong Zhang2014-10-211-41/+58
| | | | | | | | | | | | | | | Bug: 17997578 Change-Id: Iba93848ad10ba84d2d836573da7ce242c761582f
* | | am f04e8b5e: am 25842048: Merge "stagefright: try to free codec instance if ↵Lajos Molnar2014-10-222-0/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | MediaCodec.release hangs" into lmp-dev * commit 'f04e8b5e51cfc868e5e58e1ad234095c8b7505ad': stagefright: try to free codec instance if MediaCodec.release hangs
| * | Merge "stagefright: try to free codec instance if MediaCodec.release hangs" ↵Lajos Molnar2014-10-222-0/+29
| |\ \ | | | | | | | | | | | | into lmp-dev
| | * | stagefright: try to free codec instance if MediaCodec.release hangsLajos Molnar2014-10-212-0/+29
| | |/ | | | | | | | | | | | | Bug: 18033275 Change-Id: If86cd26566d7b75941976f37829bbec619800778
* | | am cd3fc4e3: am 6ce19d24: Merge "Stagefright: MediaCodec: shutdown allocated ↵Lajos Molnar2014-10-221-2/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | codec on error" into lmp-dev * commit 'cd3fc4e341abc224db6876c5a028cb94606dc4e8': Stagefright: MediaCodec: shutdown allocated codec on error