frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of cf79c7a5 to master	Ying Wang	2014-05-08	2	-11/+0
\|\
* \	Merge "Add client side support for more AUDIO_FORMAT_PCM_*"	Glenn Kasten	2014-05-08	1	-7/+19
\|\ \
\| * \|	Add client side support for more AUDIO_FORMAT_PCM_*	Glenn Kasten	2014-05-07	1	-7/+19
* \| \|	Make AMediaCodec_create* APIs more like their Java counterparts	Marco Nelissen	2014-05-08	1	-6/+7
* \| \|	Merge "Expand AMediaFormat"	Marco Nelissen	2014-05-07	1	-10/+44
\|\ \ \
\| * \| \|	Expand AMediaFormat	Marco Nelissen	2014-05-07	1	-10/+44
* \| \| \|	Merge "Add NDK version of MediaMuxer"	Marco Nelissen	2014-05-07	5	-4/+104
\|\ \ \ \ \| \|/ / /
\| * \| \|	Add NDK version of MediaMuxer	Marco Nelissen	2014-05-07	5	-4/+104
\| \|/ /
* \| \|	Merge "Fix a couple of fast capture typo bugs"	Glenn Kasten	2014-05-07	1	-2/+2
\|\ \ \
\| * \| \|	Fix a couple of fast capture typo bugs	Glenn Kasten	2014-05-07	1	-2/+2
\| \|/ /
* \| \|	Merge "Remove legacy omx_message variables"	Andy Hung	2014-05-07	3	-50/+12
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove legacy omx_message variables	Andy Hung	2014-05-06	3	-50/+12
* \| \|	MediaFormat owns its strings	Marco Nelissen	2014-05-06	1	-2/+15
\|/ /
* \|	Don't build libmediandk for PDK	Marco Nelissen	2014-05-05	1	-1/+5
* \|	WIP: MediaCodec and friends NDK APIs, plain C version	Marco Nelissen	2014-05-05	5	-0/+709
* \|	Merge "Fix bug for direct track with PCM != 16-bit"	Glenn Kasten	2014-05-02	1	-1/+2
\|\ \
\| * \|	Fix bug for direct track with PCM != 16-bit	Glenn Kasten	2014-05-02	1	-1/+2
* \| \|	am 63249d6e: am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queu...	Lajos Molnar	2014-05-02	1	-7/+10
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"	Lajos Molnar	2014-05-02	1	-7/+10
\| \|\ \
\| \| * \	am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"	Lajos Molnar	2014-05-02	1	-7/+10
\| \| \|\ \
\| \| \| * \	Merge "AwesomePlayer: use PTS for queueBuffer"	Lajos Molnar	2014-05-02	1	-7/+10
\| \| \| \|\ \
\| \| \| \| * \|	AwesomePlayer: use PTS for queueBuffer	Lajos Molnar	2014-05-01	1	-7/+10
* \| \| \| \| \|	am 113f2122: am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"	Lajos Molnar	2014-05-02	2	-4/+25
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"	Lajos Molnar	2014-05-02	2	-4/+25
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am b52675e9: Merge "Smooth out AwesomePlayer"	Lajos Molnar	2014-05-02	2	-4/+25
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "Smooth out AwesomePlayer"	Lajos Molnar	2014-05-02	2	-4/+25
\| \| \| \|\ \ \ \| \| \| \| \|/ /
\| \| \| \| * \|	Smooth out AwesomePlayer	Lajos Molnar	2014-05-01	2	-4/+25
* \| \| \| \| \|	am 9e0922ba: am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduli...	Lajos Molnar	2014-05-02	1	-3/+7
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video e...	Lajos Molnar	2014-05-02	1	-3/+7
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"	Lajos Molnar	2014-05-02	1	-3/+7
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "AwesomePlayer: improve scheduling of video event to hit PTS"	Lajos Molnar	2014-05-02	1	-3/+7
\| \| \| \|\ \ \ \| \| \| \| \|/ /
\| \| \| \| * \|	AwesomePlayer: improve scheduling of video event to hit PTS	Lajos Molnar	2014-05-01	1	-3/+7
* \| \| \| \| \|	am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator...	Lajos Molnar	2014-05-02	2	-0/+178
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| / \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and Wind...	Lajos Molnar	2014-05-02	2	-0/+178
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFit...	Lajos Molnar	2014-05-02	2	-0/+178
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"	Lajos Molnar	2014-05-02	2	-0/+178
\| \| \| \|\ \ \| \| \| \| \|/
\| \| \| \| *	stagefright: add ClockEstimator API and WindowedLinearFitEstimator	Lajos Molnar	2014-05-01	2	-0/+178
* \| \| \| \|	resolved conflicts for merge of 47c888a9 to master	Glenn Kasten	2014-05-02	7	-39/+39
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bit...	Glenn Kasten	2014-05-02	7	-35/+35
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 86438382: Merge "When passing a size_t via binder, use 64-bits uncondition...	Glenn Kasten	2014-05-02	7	-35/+35
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "When passing a size_t via binder, use 64-bits unconditionally"	Glenn Kasten	2014-05-02	7	-35/+35
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| \| *	When passing a size_t via binder, use 64-bits unconditionally	Glenn Kasten	2014-02-13	7	-35/+35
* \| \| \| \|	Merge "Use AUDIO_INTERLEAVE_* constants"	Glenn Kasten	2014-05-01	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Use AUDIO_INTERLEAVE_* constants	Glenn Kasten	2014-04-30	1	-1/+1
* \| \| \| \| \|	am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include"	Glenn Kasten	2014-05-01	1	-0/+1
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	am 3d9164da: am 236f8ddd: Merge "Add missing include"	Glenn Kasten	2014-05-01	1	-0/+1
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	am 236f8ddd: Merge "Add missing include"	Glenn Kasten	2014-05-01	1	-0/+1
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| \| * \| \|	Merge "Add missing include"	Glenn Kasten	2014-05-01	1	-0/+1
\| \| \| \|\ \ \
\| \| \| \| * \| \|	Add missing include	Igor Chernyshev	2014-04-02	1	-0/+1
* \| \| \| \| \| \|	am ee46bd37: am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop s...	Lajos Molnar	2014-05-01	1	-0/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / /