summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add AMediaCodec callback"Marco Nelissen2014-05-132-14/+117
|\
| * Add AMediaCodec callbackMarco Nelissen2014-05-092-14/+117
* | am 4ae3cfd8: (-s ours) am 21bde57f: Add frame dump outputAndy McFadden2014-05-130-0/+0
|\ \
| * \ am 21bde57f: Add frame dump outputAndy McFadden2014-05-128-87/+512
| |\ \
| | * | Add frame dump outputAndy McFadden2014-05-128-87/+512
* | | | am c1b0056e: (-s ours) am 2d11a203: Provide raw H.264 output from screenrecordAndy McFadden2014-05-130-0/+0
|\ \ \ \ | |/ / /
| * | | am 2d11a203: Provide raw H.264 output from screenrecordAndy McFadden2014-05-122-39/+116
| |\ \ \ | | |/ /
| | * | Provide raw H.264 output from screenrecordAndy McFadden2014-05-122-39/+116
* | | | Merge "Camera: Don't enable log spew by default for eng build"Zhijun He2014-05-122-8/+4
|\ \ \ \
| * | | | Camera: Don't enable log spew by default for eng buildZhijun He2014-05-122-8/+4
* | | | | Merge "audiopolicy: refactor audio command threads"Eric Laurent2014-05-122-118/+83
|\ \ \ \ \
| * | | | | audiopolicy: refactor audio command threadsEric Laurent2014-05-122-118/+83
* | | | | | am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry coun...Eino-Ville Talvala2014-05-121-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before read...Eino-Ville Talvala2014-05-121-0/+3
| |\ \ \ \
| | * \ \ \ am f02f06c4: Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| | |\ \ \ \
| | | * \ \ \ Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| | | |\ \ \ \
| | | | * | | | camera: check Intent entry count before reading itYuvraj Pasi2014-05-121-0/+3
* | | | | | | | Fix bit rot in AudioStreamInSourceGlenn Kasten2014-05-092-2/+2
* | | | | | | | Allow placement of Pipe buffer to be specifiedGlenn Kasten2014-05-092-5/+13
* | | | | | | | Explicitly ignore return value of __futex_syscall3Glenn Kasten2014-05-091-2/+2
* | | | | | | | Cache mCblk in local variable cblkGlenn Kasten2014-05-091-5/+7
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge "Remove obsolete IAudioRecord::getCblk()"Glenn Kasten2014-05-094-29/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-094-29/+1
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \