| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Store rtsp accessunit until PLAY response parsed | Yajun Zeng | 2013-05-13 | 1 | -1/+12 |
| * | | | | | | | | | am 8ebdfa8b: am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | | am 365ed394: Merge "Typo in CameraParameters::set" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | | * | | | | | | Merge "Typo in CameraParameters::set" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Typo in CameraParameters::set | You Kim | 2012-12-14 | 1 | -1/+1 |
| * | | | | | | | | | | am c26ab375: am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC w... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chrom... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | | * | | | | | | | | am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | | * | | | | | | | Merge "libstagefright: Use LOG_BASIC when use chromium http stack" | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | libstagefright: Use LOG_BASIC when use chromium http stack | Xuefeng Deng | 2012-08-17 | 1 | -1/+1 |
| * | | | | | | | | | | | am 046d9c8d: am 06197925: am 267363ee: Merge "Prevent Media Server crash whil... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am 06197925: am 267363ee: Merge "Prevent Media Server crash while the Awesome... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBit... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return t... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | Prevent Media Server crash while the AwesomePlayer getBitrate return true wit... | hovanchen | 2013-07-03 | 1 | -1/+1 |
| * | | | | | | | | | | | | am 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in R... | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource" | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | am ca7f1609: Merge "Prevent double disconnects in RTSPSource" | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | Merge "Prevent double disconnects in RTSPSource" | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | | | | * | | | | | | | Prevent double disconnects in RTSPSource | Fredrik Rosin | 2013-07-01 | 1 | -0/+4 |
| | | | |/ / / / / / / | |||||
| * | | | | | | | | | | Merge "Explicitly compare raw pointers to NULL" | Glenn Kasten | 2013-07-08 | 1 | -18/+20 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Explicitly compare raw pointers to NULL | Glenn Kasten | 2013-07-02 | 1 | -18/+20 |
| | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
 |
index : frameworks_av.git | |
| frameworks/av | git repository hosting |
| summaryrefslogtreecommitdiffstats |