summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Use AudioSystem::setLowRamDevice() to configure memory"Glenn Kasten2013-07-229-18/+109
|\
| * Use AudioSystem::setLowRamDevice() to configure memoryGlenn Kasten2013-07-199-18/+109
* | Merge "Revert "Fix Audioflinger crash when TeeSink is enabled""Glenn Kasten2013-07-221-3/+2
|\ \ | |/
| * Revert "Fix Audioflinger crash when TeeSink is enabled"Glenn Kasten2013-07-191-3/+2
* | Merge "Fix compile warning"Glenn Kasten2013-07-221-1/+1
|\ \
| * | Fix compile warningGlenn Kasten2013-07-191-1/+1
* | | Merge "camera2: Fix request ID bug"Zhijun He2013-07-201-1/+1
|\ \ \
| * | | camera2: Fix request ID bugZhijun He2013-07-191-1/+1
| |/ /
* | | Merge "update to new Consumer APIs"Mathias Agopian2013-07-208-20/+13
|\ \ \
| * | | update to new Consumer APIsMathias Agopian2013-07-168-20/+13
* | | | am f2d744d9: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-190-0/+0
|\ \ \ \
| * \ \ \ Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-190-0/+0
| |\ \ \ \
| | * | | | Camera2/3: Fix deadlock when starting recording before preview.Eino-Ville Talvala2013-07-187-89/+140
* | | | | | am b0177ff2: am 46910bdc: Camera2/3: Fix deadlock when starting recording bef...Eino-Ville Talvala2013-07-197-89/+140
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 46910bdc: Camera2/3: Fix deadlock when starting recording before preview.Eino-Ville Talvala2013-07-197-89/+140
| |\ \ \ \ \
| | * | | | | Camera2/3: Fix deadlock when starting recording before preview.Eino-Ville Talvala2013-07-187-89/+140
* | | | | | | Merge "Make AudioFlinger::instantiate() more resilient when called from separ...Glenn Kasten2013-07-1913-21/+69
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Make AudioFlinger::instantiate() more resilient when called from separate moduleGlenn Kasten2013-07-1913-21/+69
| | |_|_|_|/ | |/| | | |
* | | | | | Enable support for explicitly requesting an encoded keyframe from the vp8Andreas Huber2013-07-192-2/+36
* | | | | | Minor tweaks to DirectRenderer and ConverterAndreas Huber2013-07-195-60/+209
|/ / / / /
* | | | | Merge "ANetworkSession and ParsedMessage are now part of stagefright foundati...Andreas Huber2013-07-1822-42/+228
|\ \ \ \ \
| * | | | | ANetworkSession and ParsedMessage are now part of stagefright foundation.Andreas Huber2013-07-1822-42/+228
* | | | | | Merge "stagefright: set scaling mode for blank frames in ACodec"Dima Zavin2013-07-181-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | stagefright: set scaling mode for blank frames in ACodecDima Zavin2013-07-181-0/+8
* | | | | | Merge "Fix theoretical memory leak in mConfigEvents"Glenn Kasten2013-07-182-0/+7
|\ \ \ \ \ \
| * | | | | | Fix theoretical memory leak in mConfigEventsGlenn Kasten2013-07-172-0/+7
| |/ / / / /
* | | | | | Merge "Clean up references to AUDIO_FORMAT_PCM_8_24_BIT"Glenn Kasten2013-07-172-2/+2
|\ \ \ \ \ \
| * | | | | | Clean up references to AUDIO_FORMAT_PCM_8_24_BITGlenn Kasten2013-07-102-2/+2
* | | | | | | Merge "Support "suspension" of a video encoder in "surface-input" mode."Andreas Huber2013-07-1710-14/+187
|\ \ \ \ \ \ \
| * | | | | | | Support "suspension" of a video encoder in "surface-input" mode.Andreas Huber2013-07-1710-14/+187
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Experimental support for enabling the use of "surface input" mode"Andreas Huber2013-07-173-21/+158
|\ \ \ \ \ \ \
| * | | | | | | Experimental support for enabling the use of "surface input" modeAndreas Huber2013-07-173-21/+158
| |/ / / / / /
* | | | | | | Merge "Output more detailed error message if loading library fails"leozwang@google.com2013-07-173-1/+9
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Output more detailed error message if loading library failsleozwang@google.com2013-07-173-1/+9
* | | | | | | Merge "Fix indentation"Glenn Kasten2013-07-171-74/+74
|\ \ \ \ \ \ \
| * | | | | | | Fix indentationGlenn Kasten2013-07-101-74/+74
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Add comments"Glenn Kasten2013-07-178-3/+34
|\ \ \ \ \ \ \
| * | | | | | | Add commentsGlenn Kasten2013-07-108-3/+34
| |/ / / / / /
* | | | | | | Merge "Fix typo in logs"Glenn Kasten2013-07-171-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix typo in logsGlenn Kasten2013-07-021-2/+2
* | | | | | | Merge "always pass the BufferQueue explicitely to consumers"Mathias Agopian2013-07-168-8/+16
|\ \ \ \ \ \ \
| * | | | | | | always pass the BufferQueue explicitely to consumersMathias Agopian2013-07-128-8/+16
| | |_|/ / / / | |/| | | | |
* | | | | | | camera2: Implement ICameraDeviceUser::getCameraInfoIgor Murashkin2013-07-154-30/+21
|/ / / / / /
* | | | | | Merge "AudioTrackShared cleanup"Glenn Kasten2013-07-112-33/+34
|\ \ \ \ \ \
| * | | | | | AudioTrackShared cleanupGlenn Kasten2013-07-022-33/+34
| |/ / / / /
* | | | | | Merge "Fix AudioTrack::flush()"Glenn Kasten2013-07-111-0/+2
|\ \ \ \ \ \
| * | | | | | Fix AudioTrack::flush()Glenn Kasten2013-07-111-0/+2
* | | | | | | am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-100-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-07-100-0/+0
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
generated by cgit v1.1 at 2025-02-03 23:17:35 +0000