| Commit message (Expand) | Author | Age | Files | Lines |
* | am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native flex-YU... | Lajos Molnar | 2015-02-06 | 1 | -1/+1 |
|\ |
|
| * | stagefright: add fallback for native flex-YUV support | Lajos Molnar | 2015-02-04 | 1 | -1/+1 |
* | | am 7b66f713: am 57f75272: Merge "stagefright: add support for native flex-YUV... | Lajos Molnar | 2015-02-04 | 1 | -4/+5 |
|\ \
| |/ |
|
| * | stagefright: add support for native flex-YUV formats | Lajos Molnar | 2015-02-04 | 1 | -4/+5 |
* | | am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way." | Elliott Hughes | 2015-02-04 | 1 | -1/+1 |
|\ \ |
|
| * | | Move AString's StringPrintf out of the way. | Elliott Hughes | 2015-02-04 | 1 | -1/+1 |
* | | | am c9e11696: am 36dca156: Merge "Acodec: Send framerate information to OMX de... | Rachad | 2015-02-02 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | Acodec: Send framerate information to OMX decoder if available | Rachad | 2015-01-29 | 1 | -1/+1 |
* | | | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp | Marco Nelissen | 2015-01-27 | 4 | -264/+0 |
|\ \ \
| | |/
| |/| |
|
| * | | Remove MediaPlayerService::decode() | Marco Nelissen | 2015-01-26 | 4 | -264/+0 |
* | | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor" | Marco Nelissen | 2015-01-13 | 3 | -2/+5 |
|\ \ \
| |/ / |
|
| * | | Replace MidiFile player with a Midi extractor | Marco Nelissen | 2015-01-08 | 3 | -2/+5 |
* | | | am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" in... | Rachad | 2015-01-10 | 2 | -0/+3 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-dev | Rachad | 2015-01-10 | 2 | -0/+3 |
| |\ \ |
|
| | * | | ACodec: Added support for E-AC3 decoders | Rachad | 2014-12-23 | 2 | -0/+3 |
* | | | | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aosp | Marco Nelissen | 2015-01-08 | 2 | -3/+48 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Use callbacks for Midi I/O | Marco Nelissen | 2015-01-08 | 2 | -3/+48 |
* | | | | am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to... | Chong Zhang | 2015-01-08 | 1 | -0/+1 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | mark any copyrighted content as protected to disable capture | Chong Zhang | 2015-01-07 | 1 | -0/+1 |
| | |/
| |/| |
|
* | | | am 69897ae4: am 75afcc1f: Merge "Use define for drm property keys instead of ... | Marco Nelissen | 2015-01-05 | 1 | -5/+5 |
|\ \ \
| | |/
| |/| |
|
| * | | Use define for drm property keys instead of defining as char pointers | Martin Storsjo | 2014-12-18 | 1 | -5/+5 |
* | | | am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into lm... | Lajos Molnar | 2014-12-15 | 1 | -0/+6 |
|\ \ \
| | |/
| |/| |
|
| * | | MediaCodecList: handle binder death | Lajos Molnar | 2014-12-12 | 1 | -0/+6 |
* | | | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp | Lajos Molnar | 2014-12-11 | 1 | -0/+6 |
|\ \ \
| |/ / |
|
| * | | stagefright: misc fixes to software video encoders (and decoders) | Lajos Molnar | 2014-12-10 | 1 | -0/+6 |
* | | | Merge commit 'f5a968a0' into mm | Glenn Kasten | 2014-12-10 | 2 | -0/+6 |
|\ \ \
| |/ / |
|
| * | | audio policy: binder calls for dynamic audio policy mixes | Eric Laurent | 2014-12-09 | 2 | -0/+6 |
* | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ... | Eric Laurent | 2014-12-10 | 2 | -1/+83 |
|\ \ \
| |/ / |
|
| * | | audio policy: add support for custom mixes | Eric Laurent | 2014-12-09 | 2 | -1/+83 |
* | | | am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on... | Lajos Molnar | 2014-12-08 | 1 | -0/+1 |
|\ \ \
| |/ / |
|
| * | | stagefright: preserve output format flags on format change | Lajos Molnar | 2014-12-05 | 1 | -0/+1 |
* | | | am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead of... | Eric Laurent | 2014-11-27 | 3 | -13/+18 |
|\ \ \
| |/ / |
|
| * | | AudioRecord: use audio attributes instead of audio source. | Eric Laurent | 2014-11-25 | 3 | -13/+18 |
* | | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy... | Eric Laurent | 2014-11-26 | 4 | -21/+83 |
|\ \ \
| |/ / |
|
| * | | audio policy: new getOutputForAttr() prototype. | Eric Laurent | 2014-11-25 | 4 | -21/+83 |
* | | | am f8c2d166: am a7cf01da: Merge "Fix missing loop count for static tracks." i... | Glenn Kasten | 2014-11-21 | 1 | -1/+8 |
|\ \ \
| |/ / |
|
| * | | Merge "Fix missing loop count for static tracks." into lmp-mr1-dev | Glenn Kasten | 2014-11-20 | 1 | -1/+8 |
| |\ \ |
|
| | * | | Fix missing loop count for static tracks. | Andy Hung | 2014-11-18 | 1 | -1/+8 |
* | | | | am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr... | Eric Laurent | 2014-11-21 | 1 | -2/+2 |
|\ \ \ \
| |/ / / |
|
| * | | | AudioSystem: fix cross deadlock | Eric Laurent | 2014-11-20 | 1 | -2/+2 |
* | | | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility." | Dan Albert | 2014-11-20 | 1 | -4/+5 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | C++11 compatibility. | Dan Albert | 2014-11-20 | 1 | -4/+5 |
* | | | | am 4fd641be: am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" int... | Eric Laurent | 2014-11-19 | 1 | -4/+5 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | AudioSystem: Add mutex for output cache | Eric Laurent | 2014-11-19 | 1 | -4/+5 |
* | | | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches" | Chih-hung Hsieh | 2014-11-17 | 1 | -1/+1 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Fix struct vs. class mismatches | Bernhard Rosenkränzer | 2014-11-17 | 1 | -1/+1 |
| * | | | am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev | Marco Nelissen | 2014-10-09 | 1 | -1/+4 |
| |\ \ \ |
|
| * \ \ \ | am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ... | Rachad | 2014-10-07 | 1 | -0/+2 |
| |\ \ \ \ |
|
| * \ \ \ \ | am 57c27c55: am dc28fa7e: Merge "Add missing #includes" | Dan Albert | 2014-10-04 | 4 | -2/+7 |
| |\ \ \ \ \ |
|
* | \ \ \ \ \ | am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ... | Eric Laurent | 2014-11-14 | 1 | -2/+0 |
|\ \ \ \ \ \ \
| | |_|_|_|/ /
| |/| | | | | |
|