summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge "audioflinger: refactor thread config events"Eric Laurent2014-05-094-384/+436
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | audioflinger: refactor thread config eventsEric Laurent2014-05-094-384/+436
* | | | | | | | Merge "IAudioFlinger::openRecord returns IMemory(s)"Glenn Kasten2014-05-0910-25/+106
|\ \ \ \ \ \ \ \
| * | | | | | | | IAudioFlinger::openRecord returns IMemory(s)Glenn Kasten2014-05-0910-25/+106
* | | | | | | | | Merge "Expose sample duration in MPEG4Extractor."Robert Shih2014-05-095-8/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Expose sample duration in MPEG4Extractor.Robert Shih2014-04-255-8/+27
* | | | | | | | | | Merge "PlaylistFetcher: start queueing AUs after the 1st IDR nalu"Robert Shih2014-05-092-0/+21
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | PlaylistFetcher: start queueing AUs after the 1st IDR naluRobert Shih2014-04-252-0/+21
* | | | | | | | | | Merge "stagefright: set PTS for SoftwareRenderer"Lajos Molnar2014-05-093-5/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stagefright: set PTS for SoftwareRendererLajos Molnar2014-05-073-5/+13
* | | | | | | | | | | MediaCodec: add renderAndReleaseOutputBuffer() method with timestampLajos Molnar2014-05-083-1/+50
* | | | | | | | | | | Merge "Allow BOM and space in WebVTT files"Lajos Molnar2014-05-092-1/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Allow BOM and space in WebVTT filesLajos Molnar2014-05-082-1/+28
| |/ / / / / / / / /
* | | | | | | | | | Merge "audio policy: fix mute delay when setting output device"Eric Laurent2014-05-081-18/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | audio policy: fix mute delay when setting output deviceEric Laurent2014-05-081-18/+25
* | | | | | | | | | | resolved conflicts for merge of cf79c7a5 to masterYing Wang2014-05-082-11/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 02483465: am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-086-27/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-086-27/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-086-27/+0
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-086-27/+0
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "Add client side support for more AUDIO_FORMAT_PCM_*"Glenn Kasten2014-05-082-9/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add client side support for more AUDIO_FORMAT_PCM_*Glenn Kasten2014-05-072-9/+22
* | | | | | | | | | | | Merge "Make AMediaCodec_create* APIs more like their Java counterparts"Marco Nelissen2014-05-082-11/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Make AMediaCodec_create* APIs more like their Java counterpartsMarco Nelissen2014-05-082-11/+16
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Add a per-thread heap that is read-only to clients"Glenn Kasten2014-05-082-0/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add a per-thread heap that is read-only to clientsGlenn Kasten2014-05-072-0/+19
* | | | | | | | | | Merge "audio policy: cleanup AudioPolicyService destructor"Eric Laurent2014-05-081-3/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | audio policy: cleanup AudioPolicyService destructorEric Laurent2014-05-071-3/+1
* | | | | | | | | | | Merge "Expand AMediaFormat"Marco Nelissen2014-05-072-12/+64
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Expand AMediaFormatMarco Nelissen2014-05-072-12/+64
* | | | | | | | | | | Merge "Add NDK version of MediaMuxer"Marco Nelissen2014-05-077-5/+180
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add NDK version of MediaMuxerMarco Nelissen2014-05-077-5/+180
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Fix a couple of fast capture typo bugs"Glenn Kasten2014-05-072-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix a couple of fast capture typo bugsGlenn Kasten2014-05-072-4/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge "Remove legacy omx_message variables"Andy Hung2014-05-074-52/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove legacy omx_message variablesAndy Hung2014-05-064-52/+12
* | | | | | | | | | | audio policy: fix typo in AudioPolicyManager constructorEric Laurent2014-05-071-6/+6
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "audio policy: update from libhardware_legacy"Eric Laurent2014-05-072-108/+349
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | audio policy: update from libhardware_legacyEric Laurent2014-05-062-108/+349
| |/ / / / / / / /
* | | | | | | | | Merge "MediaFormat owns its strings"Marco Nelissen2014-05-062-4/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MediaFormat owns its stringsMarco Nelissen2014-05-062-4/+19
* | | | | | | | | | Merge "Camera3: fix missing string in logging code"Zhijun He2014-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Camera3: fix missing string in logging codeZhijun He2014-05-061-1/+1
* | | | | | | | | | am 71171988: am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering ...Eric Laurent2014-05-062-10/+27
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering commands in i...Eric Laurent2014-05-062-10/+27
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_...Eric Laurent2014-05-062-10/+27
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "Fix memory leak when filtering commands in insertCommand_l()"Eric Laurent2014-05-062-10/+27
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix memory leak when filtering commands in insertCommand_l()Jesper Tragardh2014-04-112-10/+27
* | | | | | | | | | | Merge "Remove warnings in recordvideo"Andy Hung2014-05-061-5/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove warnings in recordvideoAndy Hung2014-05-051-5/+9