summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make AudioFlinger::instantiate() more resilient when called from separate moduleGlenn Kasten2013-07-1913-21/+69
* 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
| | |\ \ \ \
* | | \ \ \ \ am 0a95b17c: (-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-090-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-07-090-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge "Pass additional arg to acquireBuffer calls."Andy McFadden2013-07-115-7/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Pass additional arg to acquireBuffer calls.Andy McFadden2013-07-085-7/+7
* | | | | | | | am adaa78c9: am a2520db0: camera2/3: set preview callback oneshot flag during...Zhijun He2013-07-111-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am a2520db0: camera2/3: set preview callback oneshot flag during still captureZhijun He2013-07-091-0/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | camera2/3: set preview callback oneshot flag during still captureZhijun He2013-07-081-0/+1
| | | |/ / / / | | |/| | | |
* | | | | | | Fix type error in AudioTrack::processAudioBufferGlenn Kasten2013-07-101-1/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | am 06a4604e: am 4a5c009b: Camera2/3: As a fallback, unilaterally free old rec...Eino-Ville Talvala2013-07-082-14/+119
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffersEino-Ville Talvala2013-07-082-14/+119
| |\ \ \ \ \ | | |/ / / /
| | * | | | Camera2/3: As a fallback, unilaterally free old recording buffersEino-Ville Talvala2013-07-082-14/+119
* | | | | | am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-080-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-080-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-07-080-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
* | | | | | am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to stage-a...Jean-Baptiste Queru2013-07-081-1/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-masterJean-Baptiste Queru2013-07-081-1/+12
| |\ \ \ \ \
| | * \ \ \ \ resolved conflicts for merge of c158971f to stage-aosp-masterJean-Baptiste Queru2013-07-081-1/+12
| | |\ \ \ \ \
| | | * \ \ \ \ Merge "Store rtsp accessunit until PLAY response parsed"Jean-Baptiste Queru2013-07-081-1/+12
| | | |\ \ \ \ \