summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Update calls to IInterface::asBinder()Marco Nelissen2014-11-1427-79/+76
* am 9ac0177d: am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateFor...Eric Laurent2014-11-142-28/+15
|\
| * am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ...Eric Laurent2014-11-142-28/+15
| |\
| | * Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-devEric Laurent2014-11-142-28/+15
| | |\
| | | * remove AudioSystem::getOutputSamplingRateForAttr()Eric Laurent2014-11-122-28/+15
* | | | am 102b17b8: am 41907c44: am cede28e2: Merge "stagefright: add runtime debug ...Lajos Molnar2014-11-149-440/+764
|\ \ \ \ | |/ / /
| * | | am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" into...Lajos Molnar2014-11-149-440/+764
| |\ \ \ | | |/ /
| | * | 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
* | | | | am b6c785ee: am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in ...Chong Zhang2014-11-141-164/+105
|\ \ \ \ \ | |/ / / /
| * | | | am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode fo...Chong Zhang2014-11-141-164/+105
| |\ \ \ \ | | |/ / /
| | * | | 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
* | | | | | am 3c17893c: am 285dc585: am 12acd3f0: Merge "AnotherPacketSource: need reset...Wei Jia2014-11-141-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 285dc585: am 12acd3f0: Merge "AnotherPacketSource: need reset some members...Wei Jia2014-11-141-4/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "AnotherPacketSource: need reset some members before returning from que...Wei Jia2014-11-131-4/+4
| | |\ \ \ \
| | | * | | | AnotherPacketSource: need reset some members before returning from queueDisco...Wei Jia2014-11-131-4/+4
* | | | | | | am 39740c2a: am 85a5b99f: am 6641004b: Merge "Revert "mediaplayer: make frame...Lajos Molnar2014-11-141-20/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 85a5b99f: am 6641004b: Merge "Revert "mediaplayer: make frame-accurate avs...Lajos Molnar2014-11-131-20/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into lm...Lajos Molnar2014-11-131-20/+0
| | |\ \ \ \ \
| | | * | | | | Revert "mediaplayer: make frame-accurate avsync configurable"Lajos Molnar2014-11-071-20/+0
* | | | | | | | am 811c3ad2: am 2458928e: am e0b7ddcd: Merge "PlaylistFetcher: check ts progr...Robert Shih2014-11-143-6/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 2458928e: am e0b7ddcd: Merge "PlaylistFetcher: check ts program streams be...Robert Shih2014-11-133-6/+32
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "PlaylistFetcher: check ts program streams before disabling a/v" into l...Robert Shih2014-11-133-6/+32
| | |\ \ \ \ \ \
| | | * | | | | | PlaylistFetcher: check ts program streams before disabling a/vRobert Shih2014-11-123-6/+32
* | | | | | | | | am e1e814c7: am e418cfae: am 869e0798: Merge "MTP: add strict bounds checking...Mike Lockwood2014-11-1419-189/+386
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am e418cfae: am 869e0798: Merge "MTP: add strict bounds checking for all inco...Mike Lockwood2014-11-1319-189/+386
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "MTP: add strict bounds checking for all incoming packets" into lmp-mr1...Mike Lockwood2014-11-1319-189/+386
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | MTP: add strict bounds checking for all incoming packetsMike Lockwood2014-11-1219-189/+386
* | | | | | | | | am dd1b265e: am cf957fb7: am 94691b01: Merge "Fix Ogg Vorbis packet timestamp...Marco Nelissen2014-11-121-14/+61
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am cf957fb7: am 94691b01: Merge "Fix Ogg Vorbis packet timestamps" into lmp-m...Marco Nelissen2014-11-121-14/+61
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 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
* | | | | | | | | am cea67364: am 233ef496: Merge "Fix looping sound playback" into lmp-mr1-dev...Marco Nelissen2014-11-121-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 233ef496: Merge "Fix looping sound playback" into lmp-mr1-dev automerge: 5...Marco Nelissen2014-11-121-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Fix looping sound playback" into lmp-mr1-devMarco Nelissen2014-11-121-0/+5
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Fix looping sound playbackMarco Nelissen2014-11-111-0/+5
| | | |/ / / / /
* | | | | | | | Adjust to asBinder()'s new behaviorMarco Nelissen2014-11-121-3/+3
* | | | | | | | am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" in...Andy Hung2014-11-121-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" in...Andy Hung2014-11-121-2/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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
* | | | | | | | am 7382b352: am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber inst...Robert Shih2014-11-112-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTra...Robert Shih2014-11-112-4/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" in...Robert Shih2014-11-111-4/+5
| | |\ \ \ \ \ \
| | | * | | | | | MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndexRobert Shih2014-11-081-4/+5
| | * | | | | | | Merge "PlaylistFetcher: clear mStartup for .aac playlists after seek" into lm...Robert Shih2014-11-111-0/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | PlaylistFetcher: clear mStartup for .aac playlists after seekRobert Shih2014-11-071-0/+1
| | | |/ / / / / /
* | | | | | | | | am aa97f709: am 48cb6d7c: Merge "Fix short sound playback" into lmp-mr1-dev a...Marco Nelissen2014-11-111-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 48cb6d7c: Merge "Fix short sound playback" into lmp-mr1-devMarco Nelissen2014-11-111-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /