Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make AudioFlinger::instantiate() more resilient when called from separate module | Glenn Kasten | 2013-07-19 | 13 | -21/+69 |
* | Merge "ANetworkSession and ParsedMessage are now part of stagefright foundati... | Andreas Huber | 2013-07-18 | 22 | -42/+228 |
|\ | |||||
| * | ANetworkSession and ParsedMessage are now part of stagefright foundation. | Andreas Huber | 2013-07-18 | 22 | -42/+228 |
* | | Merge "stagefright: set scaling mode for blank frames in ACodec" | Dima Zavin | 2013-07-18 | 1 | -0/+8 |
|\ \ | |/ |/| | |||||
| * | stagefright: set scaling mode for blank frames in ACodec | Dima Zavin | 2013-07-18 | 1 | -0/+8 |
* | | Merge "Fix theoretical memory leak in mConfigEvents" | Glenn Kasten | 2013-07-18 | 2 | -0/+7 |
|\ \ | |||||
| * | | Fix theoretical memory leak in mConfigEvents | Glenn Kasten | 2013-07-17 | 2 | -0/+7 |
| |/ | |||||
* | | Merge "Clean up references to AUDIO_FORMAT_PCM_8_24_BIT" | Glenn Kasten | 2013-07-17 | 2 | -2/+2 |
|\ \ | |||||
| * | | Clean up references to AUDIO_FORMAT_PCM_8_24_BIT | Glenn Kasten | 2013-07-10 | 2 | -2/+2 |
* | | | Merge "Support "suspension" of a video encoder in "surface-input" mode." | Andreas Huber | 2013-07-17 | 10 | -14/+187 |
|\ \ \ | |||||
| * | | | Support "suspension" of a video encoder in "surface-input" mode. | Andreas Huber | 2013-07-17 | 10 | -14/+187 |
* | | | | Merge "Experimental support for enabling the use of "surface input" mode" | Andreas Huber | 2013-07-17 | 3 | -21/+158 |
|\ \ \ \ | |||||
| * | | | | Experimental support for enabling the use of "surface input" mode | Andreas Huber | 2013-07-17 | 3 | -21/+158 |
| |/ / / | |||||
* | | | | Merge "Output more detailed error message if loading library fails" | leozwang@google.com | 2013-07-17 | 3 | -1/+9 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Output more detailed error message if loading library fails | leozwang@google.com | 2013-07-17 | 3 | -1/+9 |
* | | | | Merge "Fix indentation" | Glenn Kasten | 2013-07-17 | 1 | -74/+74 |
|\ \ \ \ | |||||
| * | | | | Fix indentation | Glenn Kasten | 2013-07-10 | 1 | -74/+74 |
| | |_|/ | |/| | | |||||
* | | | | Merge "Add comments" | Glenn Kasten | 2013-07-17 | 8 | -3/+34 |
|\ \ \ \ | |||||
| * | | | | Add comments | Glenn Kasten | 2013-07-10 | 8 | -3/+34 |
| |/ / / | |||||
* | | | | Merge "Fix typo in logs" | Glenn Kasten | 2013-07-17 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Fix typo in logs | Glenn Kasten | 2013-07-02 | 1 | -2/+2 |
* | | | | Merge "always pass the BufferQueue explicitely to consumers" | Mathias Agopian | 2013-07-16 | 8 | -8/+16 |
|\ \ \ \ | |||||
| * | | | | always pass the BufferQueue explicitely to consumers | Mathias Agopian | 2013-07-12 | 8 | -8/+16 |
| | |_|/ | |/| | | |||||
* | | | | camera2: Implement ICameraDeviceUser::getCameraInfo | Igor Murashkin | 2013-07-15 | 4 | -30/+21 |
|/ / / | |||||
* | | | Merge "AudioTrackShared cleanup" | Glenn Kasten | 2013-07-11 | 2 | -33/+34 |
|\ \ \ | |||||
| * | | | AudioTrackShared cleanup | Glenn Kasten | 2013-07-02 | 2 | -33/+34 |
| |/ / | |||||
* | | | Merge "Fix AudioTrack::flush()" | Glenn Kasten | 2013-07-11 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Fix AudioTrack::flush() | Glenn Kasten | 2013-07-11 | 1 | -0/+2 |
* | | | | am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-11 | 0 | -0/+0 |
|\ \ \ \ | |||||
| * \ \ \ | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-10 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-07-10 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
* | | \ \ \ \ | am 0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-09 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-07-09 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
* | | \ \ \ \ \ | Merge "Pass additional arg to acquireBuffer calls." | Andy McFadden | 2013-07-11 | 5 | -7/+7 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Pass additional arg to acquireBuffer calls. | Andy McFadden | 2013-07-08 | 5 | -7/+7 |
* | | | | | | | | am adaa78c9: am a2520db0: camera2/3: set preview callback oneshot flag during... | Zhijun He | 2013-07-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am a2520db0: camera2/3: set preview callback oneshot flag during still capture | Zhijun He | 2013-07-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | camera2/3: set preview callback oneshot flag during still capture | Zhijun He | 2013-07-08 | 1 | -0/+1 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Fix type error in AudioTrack::processAudioBuffer | Glenn Kasten | 2013-07-10 | 1 | -1/+2 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | am 06a4604e: am 4a5c009b: Camera2/3: As a fallback, unilaterally free old rec... | Eino-Ville Talvala | 2013-07-08 | 2 | -14/+119 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers | Eino-Ville Talvala | 2013-07-08 | 2 | -14/+119 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Camera2/3: As a fallback, unilaterally free old recording buffers | Eino-Ville Talvala | 2013-07-08 | 2 | -14/+119 |
* | | | | | | am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-08 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-08 | 0 | -0/+0 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-07-08 | 0 | -0/+0 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
* | | | | | | am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to stage-a... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+12 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+12 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | resolved conflicts for merge of c158971f to stage-aosp-master | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+12 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge "Store rtsp accessunit until PLAY response parsed" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+12 |
| | | |\ \ \ \ \ |