frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 9a7d11f0 to master	Glenn Kasten	2013-10-07	1	-0/+3
\|\
\| *	Merge "Cleanup openRecord error handling" into klp-dev	Glenn Kasten	2013-10-07	1	-0/+3
\| \|\
\| \| *	Cleanup openRecord error handling	Glenn Kasten	2013-09-24	1	-0/+3
* \| \|	am 38ea22bb: am b2d71d3a: Merge "Camera API 2, Device 2/3: Implement idle and...	Eino-Ville Talvala	2013-10-04	3	-6/+20
\|\ \ \ \| \|/ /
\| * \|	Merge "Camera API 2, Device 2/3: Implement idle and shutter callbacks" into k...	Eino-Ville Talvala	2013-10-03	3	-6/+20
\| \|\ \
\| \| * \|	Camera API 2, Device 2/3: Implement idle and shutter callbacks	Eino-Ville Talvala	2013-10-02	3	-6/+20
* \| \| \|	am aa50cc78: am 56ce7260: IOMX: Add prepareForAdaptivePlayback method	Lajos Molnar	2013-10-04	1	-0/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	IOMX: Add prepareForAdaptivePlayback method	Lajos Molnar	2013-10-03	1	-0/+4
\| \|/ /
* \| \|	am 6ec564ac: am 353fb9bf: Merge "MediaTimeProvider support fixes" into klp-dev	Lajos Molnar	2013-10-02	1	-0/+1
\|\ \ \ \| \|/ /
\| * \|	Merge "MediaTimeProvider support fixes" into klp-dev	Lajos Molnar	2013-10-01	1	-0/+1
\| \|\ \
\| \| * \|	MediaTimeProvider support fixes	Lajos Molnar	2013-09-30	1	-0/+1
* \| \| \|	am 3424d6e1: am 1adf20ce: Merge "fix volume and effect enable delay on offloa...	Eric Laurent	2013-10-01	1	-0/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	fix volume and effect enable delay on offloaded tracks	Eric Laurent	2013-09-30	1	-0/+3
\| \|/ /
* \| \|	am 2eab94f7: Effects Factory changes for effects offload	jpadmana	2013-09-30	1	-0/+24
\|\ \ \ \| \|/ /
\| * \|	Effects Factory changes for effects offload	jpadmana	2013-09-27	1	-0/+24
* \| \|	am 83f40005: Revert "Effects Factory changes for effects offload"	Eric Laurent	2013-09-30	1	-24/+0
\|\ \ \ \| \|/ /
\| * \|	Revert "Effects Factory changes for effects offload"	Eric Laurent	2013-09-27	1	-24/+0
* \| \|	am 369af71e: am 6914de6d: Merge "Camera: Implement getCameraCharacteristics" ...	Zhijun He	2013-09-25	1	-0/+5
\|\ \ \ \| \|/ /
\| * \|	Camera: Implement getCameraCharacteristics	Zhijun He	2013-09-25	1	-0/+5
* \| \|	am 8ee02943: am 1c7f35d1: Merge "soundpool: allocate shared memory heap by cl...	Eric Laurent	2013-09-24	3	-4/+15
\|\ \ \ \| \|/ /
\| * \|	soundpool: allocate shared memory heap by client	Eric Laurent	2013-09-24	3	-4/+15
\| \|/
* \|	am c7b2f9dc: am 402dfba6: Merge "Add support for level measurements in Visual...	Jean-Michel Trivi	2013-09-24	1	-0/+9
\|\ \ \| \|/
\| *	Add support for level measurements in Visualizer	Jean-Michel Trivi	2013-09-23	1	-0/+9
* \|	am f2c643c8: am 3b3cfcfa: Merge "Fix slow AudioTrack and AudioRecord destruct...	Glenn Kasten	2013-09-20	2	-8/+12
\|\ \ \| \|/
\| *	Fix slow AudioTrack and AudioRecord destruction	Glenn Kasten	2013-09-20	2	-8/+12
* \|	Fully reset SkipCutBuffer state in clear()	Marco Nelissen	2013-09-18	1	-0/+1
* \|	am 11454092: am 18f86140: Merge "Fix underruns when fast track denied due to ...	Glenn Kasten	2013-09-17	1	-2/+0
\|\ \ \| \|/
\| *	Fix underruns when fast track denied due to SRC	Glenn Kasten	2013-09-17	1	-2/+0
* \|	am 1024ffd7: am 7f9551f7: MediaMuxer: Hook up setLocation method	Zhijun He	2013-09-10	1	-0/+10
\|\ \ \| \|/
\| *	MediaMuxer: Hook up setLocation method	Zhijun He	2013-09-09	1	-0/+10
* \|	am c2cfaf78: am a82975e0: Merge "Effects Factory changes for effects offload"...	Eric Laurent	2013-09-06	1	-0/+24
\|\ \ \| \|/
\| *	Effects Factory changes for effects offload	jpadmana	2013-09-06	1	-0/+24
* \|	am c74630bc: am a1991255: Merge "wifi-display: do not use HDCP\'s encryptNati...	Chong Zhang	2013-09-04	1	-0/+11
\|\ \ \| \|/
\| *	Merge "wifi-display: do not use HDCP's encryptNative method if its unsupporte...	Chong Zhang	2013-09-04	1	-0/+11
\| \|\
\| \| *	wifi-display: do not use HDCP's encryptNative method if its unsupported	Chong Zhang	2013-09-03	1	-0/+11
* \| \|	am a4a82c5f: am 6466c9e6: Add ExtendedAudioBufferProvider::framesReleased and...	Glenn Kasten	2013-09-03	2	-0/+11
\|\ \ \ \| \|/ /
\| * \|	Add ExtendedAudioBufferProvider::framesReleased and onTimestamp	Glenn Kasten	2013-09-03	2	-0/+11
* \| \|	am a071bf88: am 894d6be4: Add NBAIO_Source::onTimestamp()	Glenn Kasten	2013-09-03	2	-0/+6
\|\ \ \ \| \|/ /
\| * \|	Add NBAIO_Source::onTimestamp()	Glenn Kasten	2013-09-03	2	-0/+6
* \| \|	am 1a3a8078: am a07a1c2c: Instantiate SingleStateQueue<AudioTimestamp>	Glenn Kasten	2013-09-03	1	-0/+7
\|\ \ \ \| \|/ /
\| * \|	Instantiate SingleStateQueue<AudioTimestamp>	Glenn Kasten	2013-09-03	1	-0/+7
* \| \|	am f81d5fc1: am 943ba3cc: Merge "Add NBAIO_Sink::getTimestamp()" into klp-dev	Glenn Kasten	2013-09-03	3	-0/+11
\|\ \ \ \| \|/ /
\| * \|	Merge "Add NBAIO_Sink::getTimestamp()" into klp-dev	Glenn Kasten	2013-09-03	3	-0/+11
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Add NBAIO_Sink::getTimestamp()	Glenn Kasten	2013-09-03	3	-0/+11
* \| \|	am f946da95: am 4585e8f0: Revert "Enhancement for OnInfo callback on DRM Fram...	Jeff Tinker	2013-09-03	1	-115/+2
\|\ \ \ \| \|/ /
\| * \|	Revert "Enhancement for OnInfo callback on DRM Framework"	Jeff Tinker	2013-09-03	1	-115/+2
\| \|/
* \|	am 908d3c09: am 51ec03c2: Merge "Implement Track::getTimestamp()" into klp-dev	Glenn Kasten	2013-08-29	1	-0/+3
\|\ \ \| \|/
\| *	Implement Track::getTimestamp()	Glenn Kasten	2013-08-29	1	-0/+3
* \|	am f94b2946: am 56b59224: Merge "Add IAudioTrack::getTimestamp()" into klp-dev	Glenn Kasten	2013-08-29	2	-2/+7
\|\ \ \| \|/
\| *	Add IAudioTrack::getTimestamp()	Glenn Kasten	2013-08-29	2	-2/+7