frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	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 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 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 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
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-dev	Eric Laurent	2014-11-14	1	-2/+0
\| \|\ \ \ \
\| \| * \| \| \|	remove AudioSystem::getOutputSamplingRateForAttr()	Eric Laurent	2014-11-12	1	-2/+0
* \| \| \| \| \|	am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" into...	Lajos Molnar	2014-11-14	2	-0/+66
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "stagefright: add runtime debug support" into lmp-mr1-dev	Lajos Molnar	2014-11-14	2	-0/+66
\| \|\ \ \ \ \
\| \| * \| \| \| \|	stagefright: add runtime debug support	Lajos Molnar	2014-11-12	2	-0/+66
\| \| \|/ / / /
* \| \| \| \| \|	am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode fo...	Chong Zhang	2014-11-14	1	-4/+0
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-dev	Chong Zhang	2014-11-13	1	-4/+0
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Stagefright: use MediaCodec in async mode for recording	Praveen Chavan	2014-11-12	1	-4/+0
* \| \| \| \| \|	am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into ...	Glenn Kasten	2014-11-07	1	-1/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-dev	Glenn Kasten	2014-11-07	1	-1/+4
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Improve AudioTrack recovery from mediaserver death	Glenn Kasten	2014-11-05	1	-1/+4
* \| \| \| \| \| \|	am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailab...	Dan Stoza	2014-11-07	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev	Dan Stoza	2014-11-07	1	-1/+1
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Add a BufferItem parameter to onFrameAvailable	Dan Stoza	2014-11-04	1	-1/+1
\| \| \|/ / / / /
* \| \| \| \| \| \|	am 7e88fac0: Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev au...	Eric Laurent	2014-11-07	1	-2/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	AudioSystem: remove obsolete method.	Eric Laurent	2014-11-06	1	-2/+0
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format c...	Jeff Tinker	2014-11-06	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev	Jeff Tinker	2014-11-06	1	-1/+2
\| \|\ \ \ \ \