frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "For static obtainBuffer(), do not set mUnreleased if acknowledging flu...	Glenn Kasten	2015-10-14	2	-2/+5
\|\
\| *	For static obtainBuffer(), do not set mUnreleased if acknowledging flush.	Andy Hung	2015-10-13	2	-2/+5
* \|	Merge "NuPlayerRenderer: do not send rendering started message when paused" i...	Glenn Kasten	2015-10-14	2	-1/+11
\|\ \
\| * \|	NuPlayerRenderer: do not send rendering started message when paused	Andy Hung	2015-10-13	2	-1/+11
* \| \|	Merge "AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT." into mnc-d...	Glenn Kasten	2015-10-14	1	-1/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT.	Andy Hung	2015-10-13	1	-1/+5
\| \|/
* \|	Merge "Don't send OnCompletion events when looping" into mnc-dr-dev	Marco Nelissen	2015-10-13	1	-1/+2
\|\ \
\| * \|	Don't send OnCompletion events when looping	Marco Nelissen	2015-10-13	1	-1/+2
* \| \|	NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed.	Wei Jia	2015-10-13	1	-0/+6
* \| \|	Merge "NuPlayerDriver: acquire mLock when needed." into mnc-dr-dev	Wei Jia	2015-10-13	1	-1/+1
\|\ \ \
\| * \| \|	NuPlayerDriver: acquire mLock when needed.	Wei Jia	2015-10-13	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge "NuPlayerRenderer: always update MediaClock with max media duration." i...	Wei Jia	2015-10-13	1	-9/+7
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	NuPlayerRenderer: always update MediaClock with max media duration.	Wei Jia	2015-10-13	1	-9/+7
* \| \|	Merge "libstagefright: don't reclaim codec when there's buffer owned by clien...	Ronghua Wu	2015-10-13	2	-2/+45
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	libstagefright: don't reclaim codec when there's buffer owned	Ronghua Wu	2015-10-05	2	-2/+45
* \| \|	am 136ea31a: am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4b...	Andy Hung	2015-10-13	0	-0/+0
\|\ \ \
\| * \ \	am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp...	Andy Hung	2015-10-13	0	-0/+0
\| \|\ \ \
\| \| * \ \	am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev	Andy Hung	2015-10-13	0	-0/+0
\| \| \|\ \ \
\| \| \| * \ \	am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev	Andy Hung	2015-10-13	0	-0/+0
\| \| \| \|\ \ \
\| \| \| \| * \ \	resolved conflicts for 4beea277 to lmp-mr1-dev	Andy Hung	2015-10-13	0	-0/+0
\| \| \| \| \|\ \ \
\| \| \| \| \| * \ \	am e5326d96: Merge "DO NOT MERGE - audio policy: fix commit dea1541f" into lm...	Andy Hung	2015-10-13	2	-18/+18
\| \| \| \| \| \|\ \ \
\| \| \| \| \| \| * \ \	Merge "DO NOT MERGE - audio policy: fix commit dea1541f" into lmp-dev	Andy Hung	2015-10-13	2	-18/+18
\| \| \| \| \| \| \|\ \ \
\| \| \| \| \| \| \| * \| \|	DO NOT MERGE - audio policy: fix commit dea1541f	Eric Laurent	2015-09-16	2	-18/+18
* \| \| \| \| \| \| \| \| \|	am 4c6e77ff: AudioFlinger: Clear record buffers when starting RecordThread	Andy Hung	2015-10-13	2	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	AudioFlinger: Clear record buffers when starting RecordThread	Andy Hung	2015-10-13	2	-2/+7
* \| \| \| \| \| \| \| \| \|	am 5076a51e: am ae827fb4: (-s ours) am 1231bdbe: am 6f235327: am d4ee847f: am...	Andy Hung	2015-10-13	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| / \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	am ae827fb4: (-s ours) am 1231bdbe: am 6f235327: am d4ee847f: am d1c9037a: Me...	Andy Hung	2015-10-13	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	am 1231bdbe: am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - aud...	Andy Hung	2015-10-13	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / /
\| \| \| * \| \| \| \| \|	am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: va...	Andy Hung	2015-10-13	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / /
\| \| \| \| * \| \| \| \|	am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream...	Andy Hung	2015-10-13	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \|/ / / /
\| \| \| \| \| * \| \| \|	am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type receive...	Andy Hung	2015-10-13	0	-0/+0
\| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \|/ / /
\| \| \| \| \| \| * \| \|	Merge "DO NOT MERGE - audio policy: validate stream type received from binder...	Andy Hung	2015-10-13	2	-0/+42
\| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \|/ /
\| \| \| \| \| \| \| * \|	DO NOT MERGE - audio policy: validate stream type received from binder calls.	Eric Laurent	2015-09-16	2	-0/+42
* \| \| \| \| \| \| \| \|	am a0f49d69: am 867f877f: (-s ours) am 7ea1ed87: am 1b6bb62c: am 07d70319: am...	Wei Jia	2015-10-08	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	am 867f877f: (-s ours) am 7ea1ed87: am 1b6bb62c: am 07d70319: am 0b1936be: am...	Wei Jia	2015-10-08	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	am 7ea1ed87: am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am...	Wei Jia	2015-10-08	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / /
\| \| \| * \| \| \| \| \|	am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Me...	Wei Jia	2015-10-08	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / /
\| \| \| \| * \| \| \| \|	am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT M...	Wei Jia	2015-10-08	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \|/ / / /
\| \| \| \| \| * \| \| \|	am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: a...	Wei Jia	2015-10-08	0	-0/+0
\| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \|/ / /
\| \| \| \| \| \| * \| \|	am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only sec...	Wei Jia	2015-10-08	0	-0/+0
\| \| \| \| \| \| \|\ \ \
\| \| \| \| \| \| \| * \ \	am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely c...	Wei Jia	2015-10-08	6	-3/+28
\| \| \| \| \| \| \| \|\ \ \
\| \| \| \| \| \| \| \| * \ \	Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateB...	Wei Jia	2015-10-08	6	-3/+28
\| \| \| \| \| \| \| \| \|\ \ \
\| \| \| \| \| \| \| \| \| * \| \|	DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.	Wei Jia	2015-10-07	6	-3/+28
* \| \| \| \| \| \| \| \| \| \| \|	am d77dc131: am 91aa4a0a: (-s ours) am f106f9e4: am 15e991bd: resolved confli...	Wei Jia	2015-10-08	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	am 91aa4a0a: (-s ours) am f106f9e4: am 15e991bd: resolved conflicts for 0b09d...	Wei Jia	2015-10-08	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev	Wei Jia	2015-10-08	6	-0/+25
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \|	am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev	Wei Jia	2015-10-08	6	-0/+25
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \|	resolved conflicts for 0b09da7a to lmp-mr1-dev	Wei Jia	2015-10-08	6	-0/+25
\| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / /
\| \| \| \| \| * \| \| \| \| \| \|	am 04c02eeb: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely c...	Wei Jia	2015-10-08	6	-3/+28
\| \| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \|/ / / / / /
\| \| \| \| \| \| * \| \| \| \| \|	Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateB...	Wei Jia	2015-10-08	6	-3/+28
\| \| \| \| \| \| \|\ \ \ \ \ \