frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of a127c07c to master	Kenny Root	2010-10-14	2	-0/+8
\|\
\| *	am 312644cd: Merge "Support for writing to MPEG2 transport stream files." int...	Andreas Huber	2010-10-13	2	-0/+8
\| \|\
\| \| *	Merge "Support for writing to MPEG2 transport stream files." into gingerbread	Andreas Huber	2010-10-13	2	-0/+8
\| \| \|\
\| \| \| *	Support for writing to MPEG2 transport stream files.	Andreas Huber	2010-10-12	2	-0/+8
* \| \| \|	am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as complet...	Andreas Huber	2010-10-14	1	-0/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 165c6579: Merge "HTTP Live content that are tagged as complete are now see...	Andreas Huber	2010-10-13	1	-0/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	HTTP Live content that are tagged as complete are now seekable.	Andreas Huber	2010-10-12	1	-0/+1
\| \| \|/
* \| \|	am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for ...	Andreas Huber	2010-10-10	2	-3/+5
\|\ \ \ \| \|/ /
\| * \|	am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek ...	Andreas Huber	2010-10-08	2	-3/+5
\| \|\ \ \| \| \|/
\| \| *	Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very exp...	Andreas Huber	2010-10-08	2	-3/+5
\| \| \|\
\| \| \| *	Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ...	Andreas Huber	2010-10-08	2	-3/+5
* \| \| \|	am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" in...	Eric Laurent	2010-10-10	1	-0/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread	Eric Laurent	2010-10-08	1	-0/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Added getter for session Id to AudioSink	Eric Laurent	2010-10-07	1	-0/+1
\| \| \|/
* \| \|	am 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp	Gloria Wang	2010-10-10	4	-24/+55
\|\ \ \ \| \|/ /
\| * \|	resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp	Gloria Wang	2010-10-07	4	-24/+55
\| \|\ \
\| \| * \|	Update of DRM framework.	Takeshi Aimi	2010-10-04	4	-24/+55
* \| \| \|	am bb708373: am 949f7d90: Merge "Work to support switching transport streams ...	Andreas Huber	2010-10-10	2	-2/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 949f7d90: Merge "Work to support switching transport streams mid-stream an...	Andreas Huber	2010-10-07	2	-2/+4
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Work to support switching transport streams mid-stream and signalling discont...	Andreas Huber	2010-10-07	2	-2/+4
* \| \| \|	am 45bd1159: am 02654f01: Merge "On this particular device the hardware video...	Andreas Huber	2010-10-10	2	-1/+5
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 02654f01: Merge "On this particular device the hardware video decoder spit...	Andreas Huber	2010-10-07	2	-1/+5
\| \|\ \ \ \| \| \|/ /
\| \| * \|	On this particular device the hardware video decoder spits out buffers that d...	Andreas Huber	2010-10-07	2	-1/+5
* \| \| \|	0-memcpy video recording framework	James Dong	2010-10-09	1	-1/+1
* \| \| \|	Move Camera specific logic out from StagefrightRecorder to CameraSource	James Dong	2010-10-08	2	-17/+93
* \| \| \|	am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead...	Andreas Huber	2010-10-07	1	-3/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrac...	Andreas Huber	2010-10-05	1	-3/+3
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after sub...	Andreas Huber	2010-10-05	1	-3/+3
* \| \| \|	Merge "0-memcpy video recording framework"	James Dong	2010-10-07	1	-0/+53
\|\ \ \ \
\| * \| \| \|	0-memcpy video recording framework	James Dong	2010-10-07	1	-0/+53
* \| \| \| \|	am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling buf...	Mathias Agopian	2010-10-06	1	-4/+6
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANati...	Mathias Agopian	2010-10-04	1	-4/+6
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	fix [2835280] Add support for cancelling buffers to ANativeWindow	Mathias Agopian	2010-10-04	1	-4/+6
* \| \| \| \|	am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space...	James Dong	2010-10-06	1	-0/+1
\|\ \ \ \ \ \| \|/ / / / \| \| \| / / \| \|_\|/ / \|/\| \| \|
\| * \| \|	am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file ...	James Dong	2010-10-04	1	-0/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Fixed an issue where the reserved free space in the file writer was larger th...	James Dong	2010-10-04	1	-0/+1
* \| \| \|	Video size retrieval/configuration support in camera hal	James Dong	2010-10-03	1	-0/+31
* \| \| \|	am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery t...	Eric Laurent	2010-09-30	1	-2/+5
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gin...	Eric Laurent	2010-09-30	1	-2/+5
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Issue 3032913: improve AudioTrack recovery time	Eric Laurent	2010-09-30	1	-2/+5
* \| \| \|	am d6c30e8c: am be045061: Merge "Instead of constantly polling the AudioPlaye...	Andreas Huber	2010-09-28	1	-1/+5
\|\ \ \ \ \| \|/ / /
\| * \| \|	am be045061: Merge "Instead of constantly polling the AudioPlayer to see if i...	Andreas Huber	2010-09-28	1	-1/+5
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS...	Andreas Huber	2010-09-28	1	-1/+5
\| \| \|\ \
\| \| \| * \|	Instead of constantly polling the AudioPlayer to see if it reached EOS or fin...	Andreas Huber	2010-09-28	1	-1/+5
* \| \| \| \|	am c889bbfa: am 4769f579: Merge "Vorbis files may have more samples encoded t...	Andreas Huber	2010-09-28	1	-0/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 4769f579: Merge "Vorbis files may have more samples encoded that should be...	Andreas Huber	2010-09-28	1	-0/+2
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Vorbis files may have more samples encoded that should be used, i.e. w...	Andreas Huber	2010-09-28	1	-0/+2
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Vorbis files may have more samples encoded that should be used, i.e. we have ...	Andreas Huber	2010-09-28	1	-0/+2
* \| \| \| \|	am 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into ging...	Andreas Huber	2010-09-28	1	-0/+72
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread	Andreas Huber	2010-09-28	1	-0/+72
\| \|\ \ \ \ \| \| \|/ / /