frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 3c780188 to master	Glenn Kasten	2014-03-14	3	-0/+4
\|\
\| *	am 089affb6: Merge "mediaserver and associated services are 32-bit only"	Glenn Kasten	2014-03-14	3	-0/+4
\| \|\
\| \| *	mediaserver and associated services are 32-bit only	Glenn Kasten	2014-03-12	3	-0/+4
\| \| *	audioflinger: Fix for a deadlock in track creation	Haynes Mathew George	2014-03-06	2	-2/+5
\| * \|	am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ...	Zhijun He	2014-03-11	1	-0/+16
\| \|\ \
\| \| * \	am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...	Zhijun He	2014-03-11	1	-0/+16
\| \| \|\ \
\| \| \| * \|	DO NOT MERGE: Camera: delete preview callback when preview size is changed	Zhijun He	2014-03-10	1	-0/+16
\| * \| \| \|	am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into kl...	Eino-Ville Talvala	2014-03-07	3	-55/+66
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev	Eino-Ville Talvala	2014-03-07	3	-55/+66
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev	Eino-Ville Talvala	2014-03-07	3	-55/+66
\| \| \| \|\ \
\| \| \| \| * \|	DO NOT MERGE: Camera: fix focusArea wrong indexing issue	Zhijun He	2014-03-05	1	-14/+14
\| \| \| \| * \|	DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.	Ruben Brunk	2014-03-05	1	-6/+8
\| \| \| \| * \|	DO NOT MERGE: camera2/3: Add protection for still capture path	Zhijun He	2014-03-05	1	-35/+44
\| \| \| * \| \|	Increase kFastTrackMultiplier from 1 to 2	Glenn Kasten	2014-03-05	1	-7/+7
\| \| * \| \| \|	am 281dd4e1: audioflinger: fix static track end detection	Eric Laurent	2014-03-05	1	-9/+2
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	audioflinger: fix static track end detection	Eric Laurent	2014-03-05	1	-9/+2
\| \| \| * \| \|	AudioMixer: Remove tracks from enabledTracks after reseting outTemp	Gaurav Kumar	2014-03-05	1	-4/+7
\| * \| \| \| \|	am eb16bb5d: am 7028a2c8: am 7e92abea: audioflinger: fix offload write buffer...	Eric Laurent	2014-03-05	1	-2/+2
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 7e92abea: audioflinger: fix offload write buffer offset	Eric Laurent	2014-03-05	1	-2/+2
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	audioflinger: fix offload write buffer offset	Eric Laurent	2014-03-05	1	-2/+2
\| \| \| \|/ /
\| \| \| * \|	audioflinger: check for condition before waiting	Haynes Mathew George	2014-03-04	1	-1/+6
\| * \| \| \|	am 632c3790: am 7c206e5b: am e0cd1051: audioflinger: update track ready condi...	Haynes Mathew George	2014-03-05	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am e0cd1051: audioflinger: update track ready condition	Haynes Mathew George	2014-03-05	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	audioflinger: update track ready condition	Haynes Mathew George	2014-03-04	1	-1/+1
\| * \| \| \|	am 4f9e38c6: am 21e81bca: am e010f65e: audioflinger: Fix for a deadlock in tr...	Haynes Mathew George	2014-03-05	2	-2/+6
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| / \| \| \|_\|/ \| \|/\| \|
\| \| * \|	am e010f65e: audioflinger: Fix for a deadlock in track creation	Haynes Mathew George	2014-03-05	2	-2/+6
\| \| \|\ \ \| \| \| \|/
\| \| \| *	audioflinger: Fix for a deadlock in track creation	Haynes Mathew George	2014-03-04	2	-2/+6
* \| \| \|	Merge "Fix Offload playback in AudioFlinger"	Andy Hung	2014-03-14	1	-2/+3
\|\ \ \ \
\| * \| \| \|	Fix Offload playback in AudioFlinger	Andy Hung	2014-03-13	1	-2/+3
* \| \| \| \|	Merge "Revert "Revert "Convert AudioFlinger mSinkBuffer to flexible format"""	Andy Hung	2014-03-14	2	-22/+41
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Revert "Revert "Convert AudioFlinger mSinkBuffer to flexible format""	Andy Hung	2014-03-13	2	-22/+41
* \| \| \| \|	Merge "camera3: Pass vendor tags through binder."	Ruben Brunk	2014-03-13	5	-49/+111
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	camera3: Pass vendor tags through binder.	Ruben Brunk	2014-03-13	5	-49/+111
* \| \| \| \|	Revert "Convert AudioFlinger mSinkBuffer to flexible format"	Eric Laurent	2014-03-13	2	-41/+22
* \| \| \| \|	Convert AudioFlinger mSinkBuffer to flexible format	Andy Hung	2014-03-10	2	-22/+41
* \| \| \| \|	Add mEffectBuffer to AudioFlinger	Andy Hung	2014-03-10	2	-21/+110
* \| \| \| \|	NBAIO::Format_from_SR_C requires audio_format_t parameter	Glenn Kasten	2014-03-07	1	-1/+1
* \| \| \| \|	Merge "Use larger capture pipe since we support resampling by 6:1"	Glenn Kasten	2014-03-06	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Use larger capture pipe since we support resampling by 6:1	Glenn Kasten	2014-02-28	1	-3/+3
* \| \| \| \| \|	Rename mSinkFormat to mMixerFormat for AudioMixer::track_t	Andy Hung	2014-03-01	3	-16/+16
* \| \| \| \| \|	Merge "Use float_from_q19_12 conversion in AudioMixer"	Andy Hung	2014-03-01	1	-3/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Use float_from_q19_12 conversion in AudioMixer	Andy Hung	2014-02-28	1	-3/+4
* \| \| \| \| \|	Merge "Add MixerBuffer for accumulation of float audio"	Andy Hung	2014-02-28	2	-10/+113
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Add MixerBuffer for accumulation of float audio	Andy Hung	2014-02-27	2	-10/+113
* \| \| \| \| \|	Merge "Rename mixBufferSize to mSinkBufferSize in AudioFlinger"	Andy Hung	2014-02-28	2	-11/+11
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Rename mixBufferSize to mSinkBufferSize in AudioFlinger	Andy Hung	2014-02-27	2	-11/+11
* \| \| \| \| \|	Merge "Rename constants for MixBufferSize to SinkBufferSize"	Andy Hung	2014-02-28	1	-9/+9
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Rename constants for MixBufferSize to SinkBufferSize	Andy Hung	2014-02-27	1	-9/+9
* \| \| \| \| \|	Merge "Rename mMixBuffer to mSinkBuffer in AudioFlinger"	Andy Hung	2014-02-28	2	-27/+28
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Rename mMixBuffer to mSinkBuffer in AudioFlinger	Andy Hung	2014-02-27	2	-27/+28