Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 5d7b2778: resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp | Glenn Kasten | 2012-11-27 | 0 | -0/+0 |
|\ | |||||
| * | resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp | Glenn Kasten | 2012-11-27 | 10 | -4870/+1341 |
| |\ | |||||
| | * | Merge "New VHQ resampler" into jb-mr1.1-dev | Glenn Kasten | 2012-11-27 | 11 | -4818/+1427 |
| | |\ | |||||
| | | * | New VHQ resampler | Glenn Kasten | 2012-11-27 | 11 | -4818/+1427 |
* | | | | am b8fa1240: am aa9e3e01: Camera: Play shutter sound iff enableShutterSound(t... | Igor Murashkin | 2012-11-27 | 3 | -9/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | am aa9e3e01: Camera: Play shutter sound iff enableShutterSound(true) && Shutt... | Igor Murashkin | 2012-11-27 | 3 | -9/+14 |
| |\ \ \ | | |/ / | |||||
| | * | | Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !null | Igor Murashkin | 2012-11-26 | 3 | -9/+14 |
| | |/ | |||||
* | | | am 8b5985d9: am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse" | Andreas Huber | 2012-11-27 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse" | Andreas Huber | 2012-11-27 | 1 | -0/+4 |
| |\ \ | |||||
| | * \ | Merge "Crash in android::MyHandler::parsePlayResponse" | Andreas Huber | 2012-11-27 | 1 | -0/+4 |
| | |\ \ | |||||
| | | * | | Crash in android::MyHandler::parsePlayResponse | Patric Frederiksen | 2012-11-27 | 1 | -0/+4 |
* | | | | | am 9abbd0fb: am 3eb46d17: Merge "Fix of uninitialized mIsDrm variable." | Andreas Huber | 2012-11-27 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 3eb46d17: Merge "Fix of uninitialized mIsDrm variable." | Andreas Huber | 2012-11-27 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Fix of uninitialized mIsDrm variable." | Andreas Huber | 2012-11-27 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Fix of uninitialized mIsDrm variable. | Henrik B Andersson | 2012-11-27 | 1 | -1/+1 |
| | | |/ / | |||||
* | | | | | am 5bc5bf39: am 79fd6853: Merge "MediaCodec: Add a method for getting the com... | Andreas Huber | 2012-11-26 | 2 | -4/+44 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 79fd6853: Merge "MediaCodec: Add a method for getting the component name" | Andreas Huber | 2012-11-26 | 2 | -4/+44 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "MediaCodec: Add a method for getting the component name" | Andreas Huber | 2012-11-26 | 2 | -4/+44 |
| | |\ \ \ | |||||
| | | * | | | MediaCodec: Add a method for getting the component name | Martin Storsjo | 2012-11-19 | 2 | -4/+44 |
| | | |/ / | |||||
* | | | | | am 21006fa5: (-s ours) am 5865ddf7: Merge "AudioTrack::dump null mCblk check ... | Marco Nelissen | 2012-11-26 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 5865ddf7: Merge "AudioTrack::dump null mCblk check test" | Marco Nelissen | 2012-11-26 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "AudioTrack::dump null mCblk check test" | Marco Nelissen | 2012-11-26 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | AudioTrack::dump null mCblk check test | Zbigniew Mazur | 2012-11-23 | 1 | -1/+1 |
| | | |/ / | |||||
* | | | | | am b96c4b4c: am 2da6e4ae: Merge "Avoid memory leaks when handling metadata st... | Marco Nelissen | 2012-11-20 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 2da6e4ae: Merge "Avoid memory leaks when handling metadata strings" | Marco Nelissen | 2012-11-20 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Avoid memory leaks when handling metadata strings" | Marco Nelissen | 2012-11-20 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Avoid memory leaks when handling metadata strings | David Williams | 2012-11-20 | 1 | -1/+1 |
| | |/ / / | |||||
* | | | | | Merge "AudioFlinger files reorganization" | Eric Laurent | 2012-11-20 | 11 | -9336/+9647 |
|\ \ \ \ \ | |||||
| * | | | | | AudioFlinger files reorganization | Eric Laurent | 2012-11-19 | 11 | -9336/+9647 |
* | | | | | | am 14dda623: am 7013209c: Merge "Handle large AVCC chunks" | Andreas Huber | 2012-11-20 | 1 | -6/+4 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | am 7013209c: Merge "Handle large AVCC chunks" | Andreas Huber | 2012-11-20 | 1 | -6/+4 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge "Handle large AVCC chunks" | Andreas Huber | 2012-11-20 | 1 | -6/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | Handle large AVCC chunks | Jan Olof Svensson | 2012-11-19 | 1 | -6/+4 |
| | | | |/ / | | | |/| | | |||||
* | | | | | | am 343f9c81: am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits... | Marco Nelissen | 2012-11-20 | 1 | -5/+7 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits" | Marco Nelissen | 2012-11-20 | 1 | -5/+7 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "Changed parsing of trkn and disk from 8 bits to 16 bits" | Marco Nelissen | 2012-11-20 | 1 | -5/+7 |
| | |\ \ \ \ | |||||
| | | * | | | | Changed parsing of trkn and disk from 8 bits to 16 bits | Andreas Lillvik | 2012-11-19 | 1 | -5/+7 |
| | | |/ / / | |||||
* | | | | | | fix a typo in SINC resampler that prevented tracks to be mixed | Mathias Agopian | 2012-11-19 | 1 | -2/+2 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge "Clean up channel count and channel mask" | Glenn Kasten | 2012-11-19 | 6 | -37/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Clean up channel count and channel mask | Glenn Kasten | 2012-11-19 | 6 | -37/+27 |
* | | | | | | delete -> free | Marco Nelissen | 2012-11-19 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge ""if" statements use curly braces per media style" | Glenn Kasten | 2012-11-16 | 3 | -48/+140 |
|\ \ \ \ \ | |||||
| * | | | | | "if" statements use curly braces per media style | Glenn Kasten | 2012-11-16 | 3 | -48/+140 |
* | | | | | | Merge "Fix time vs. bytes units bug in getRenderPosition" | Glenn Kasten | 2012-11-16 | 3 | -24/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix time vs. bytes units bug in getRenderPosition | Glenn Kasten | 2012-11-16 | 3 | -24/+21 |
* | | | | | | | Merge "Don't use control block frame count after create" | Glenn Kasten | 2012-11-16 | 6 | -80/+100 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Don't use control block frame count after create | Glenn Kasten | 2012-11-16 | 6 | -80/+100 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge "Don't explicitly log tid" | Glenn Kasten | 2012-11-16 | 3 | -18/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Don't explicitly log tid | Glenn Kasten | 2012-11-16 | 3 | -18/+18 |
| |/ / / / / / | |||||
* | | | | | | | am abae71d3: am d983364b: Static AudioTrack plays twice initially | Glenn Kasten | 2012-11-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | |