summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Support more channel configurations in MPEG4ExtractorJean-Michel Trivi2014-01-081-1/+158
* Update AAC decoder wrapper to latest FDK API for output channel countJean-Michel Trivi2013-12-271-2/+5
* am 42d89e5d: am b904d53f: am 8115f4b2: Merge "stagefright: do not offload LD-...Eric Laurent2013-12-212-0/+14
|\
| * am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-202-0/+14
| |\
| | * stagefright: do not offload LD-AAC decodingEric Laurent2013-12-212-0/+14
* | | am 5f7483eb: am 5a086733: am 1777ed30: Merge "stagefright: fix offloading HE-...Eric Laurent2013-12-211-17/+23
|\ \ \ | |/ /
| * | am 1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."Eric Laurent2013-12-201-17/+23
| |\ \ | | |/
| | * stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2013-12-191-17/+23
* | | Merge "Fix some (but not all) unused parameter warnings"Glenn Kasten2013-12-207-15/+15
|\ \ \
| * | | Fix some (but not all) unused parameter warningsGlenn Kasten2013-12-197-15/+15
* | | | Merge "Add versions of get/SetParameters without I/O handle"Glenn Kasten2013-12-201-0/+10
|\ \ \ \
| * | | | Add versions of get/SetParameters without I/O handleGlenn Kasten2013-12-191-0/+10
| |/ / /
* | | | Merge "Fix compile warning / incomplete initialization"Glenn Kasten2013-12-201-1/+1
|\ \ \ \
| * | | | Fix compile warning / incomplete initializationGlenn Kasten2013-12-191-1/+1
| |/ / /
* | | | am 33425f66: am d497b648: am 1f95555c: Merge "libeffects: do not use GNU old-...Nick Kralevich2013-12-182-14/+14
|\ \ \ \ | | |/ / | |/| |
| * | | am 1f95555c: Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-12-172-14/+14
| |\ \ \ | | | |/ | | |/|
| | * | libeffects: do not use GNU old-style field designatorssynergy dev2013-12-172-14/+14
| * | | am 274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQu...Eric Laurent2013-12-172-6/+9
| |\ \ \ | | |/ /
| | * | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-172-6/+9
| * | | am 645e4397: Merge "AudioTrack: fix position callback after restore"Eric Laurent2013-12-171-1/+0
| |\ \ \ | | |/ /
| | * | AudioTrack: fix position callback after restoreEric Laurent2013-12-171-1/+0
| * | | am 9060d498: Merge "update offloaded audio track sampling rate"Eric Laurent2013-12-174-2/+42
| |\ \ \ | | |/ /
| | * | update offloaded audio track sampling rateEric Laurent2013-12-174-2/+42
* | | | stagefright: Fix issue with tracking media format in packet sourceLajos Molnar2013-12-172-13/+44
| |_|/ |/| |
* | | am 5c474238: am 5893736d: am a67c7653: Merge "Increase kFastTrackMultiplier f...Glenn Kasten2013-12-171-4/+7
|\ \ \ | |/ /
| * | am a67c7653: Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-171-4/+7
| |\ \ | | |/
| | * Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-171-4/+7
| | |\
| | | * Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2013-12-041-4/+7
| | * | Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEADThe Android Open Source Project2013-12-0524-125/+338
| | |\ \ | | | |/ | | |/|
* | | | stagefright: Fix bugs in playlist fetcher logicLajos Molnar2013-12-162-29/+105
* | | | Merge "Better character set encoding detection"Marco Nelissen2013-12-128-1155/+2570
|\ \ \ \
| * | | | Better character set encoding detectionMarco Nelissen2013-12-118-1155/+2570
* | | | | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-102-6/+9
* | | | | Revert "stagefright: fix TimedEventQueue wakelock"Eric Laurent2013-12-102-15/+8
|/ / / /
* | | | stagefright: fix TimedEventQueue wakelockEric Laurent2013-12-062-8/+15
* | | | Add RecordThread media.log and deferred deallocationGlenn Kasten2013-12-051-1/+1
* | | | am 7ecfe4ec: am 92630351: Merge "NuPlayer: Use a software renderer when using...Marco Nelissen2013-12-024-2/+42
|\ \ \ \ | |/ / /
| * | | am 92630351: Merge "NuPlayer: Use a software renderer when using software cod...Marco Nelissen2013-11-284-2/+42
| |\ \ \ | | |/ /
| | * | Merge "NuPlayer: Use a software renderer when using software codecs"Marco Nelissen2013-11-284-2/+42
| | |\ \
| | | * | NuPlayer: Use a software renderer when using software codecsMartin Storsjo2013-09-254-2/+42
* | | | | AudioTrack: fix position callback after restoreEric Laurent2013-11-271-1/+0
* | | | | am 616c2cf1: am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"Marco Nelissen2013-11-261-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"Marco Nelissen2013-11-261-0/+6
| |\ \ \ \ | | |/ / /
| | * | | Fix SIGABRT when playing mp4 fileMarco Nelissen2013-11-251-0/+6
* | | | | Merge "Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initia...Robert Shih2013-11-261-1/+2
|\ \ \ \ \
| * | | | | Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initializationRobert Shih2013-11-221-1/+2
* | | | | | am 97f6618f: am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"Marco Nelissen2013-11-251-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"Marco Nelissen2013-11-251-1/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fixed data offset at parsing IPMP DescriptorsIchitaro Kohara2013-11-251-1/+2
| | * | | | Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEADThe Android Open Source Project2013-11-22178-4065/+13126
| | |\ \ \ \