summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 6bc010e3: am 9e36b5a5: Merge "Add the presentation rotation support" into ...ztenghui2013-03-201-14/+34
|\
| * Merge "Add the presentation rotation support" into jb-mr2-devztenghui2013-03-201-14/+34
| |\
| | * Add the presentation rotation supportztenghui2013-03-151-14/+34
* | | am 81c859d6: am de5cdcae: Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-2010-0/+1186
|\ \ \ | |/ /
| * | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-2010-0/+1186
| |\ \
| | * | Implementing MediaDrm APIsJeff Tinker2013-03-1310-0/+1186
* | | | Turn off debug tags in stagefright modules.Dan Morrill2013-03-196-8/+8
* | | | am 28f1daca: am 96954c00: Merge "Change ANetworkSession implementation to opt...Andreas Huber2013-03-196-49/+135
|\ \ \ \ | |/ / /
| * | | Merge "Change ANetworkSession implementation to optionally attach timestamps"...Andreas Huber2013-03-196-49/+135
| |\ \ \
| | * | | Change ANetworkSession implementation to optionally attach timestampsAndreas Huber2013-03-186-49/+135
* | | | | am ec46fde1: am 106f1628: Merge "Allow for streaming of media files (without ...Andreas Huber2013-03-197-35/+318
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Allow for streaming of media files (without recompression)" into jb-mr...Andreas Huber2013-03-197-35/+318
| |\ \ \ \ | | |/ / /
| | * | | Allow for streaming of media files (without recompression)Andreas Huber2013-03-187-35/+318
* | | | | am f636d132: am b8a1a843: Merge "Fix valgrind error" into jb-mr2-devMarco Nelissen2013-03-191-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix valgrind errorMarco Nelissen2013-03-191-0/+1
| | |_|/ | |/| |
* | | | am 9b3da0d1: am ee6ad3bd: am 59ac7b30: am 66abe3ae: Merge "Fix for crash if n...Andreas Huber2013-03-151-0/+3
|\ \ \ \ | |/ / /
| * | | am 59ac7b30: am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE resp...Andreas Huber2013-03-151-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fix for crash if no content in DESCRIBE responseXuefei Chen2013-03-121-0/+3
* | | | am 858a2c70: am 7d02488e: Merge "Make limitations of MPEG4Writer explicit" in...Tenghui Zhu2013-03-142-6/+49
|\ \ \ \ | |/ / /
| * | | Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-devTenghui Zhu2013-03-142-6/+49
| |\ \ \
| | * | | Make limitations of MPEG4Writer explicitJames Dong2013-03-142-6/+49
* | | | | am 7f8f0a89: am 1cea316d: Merge "Parse SBR extension sample rate" into jb-mr2...Marco Nelissen2013-03-141-9/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Parse SBR extension sample rate" into jb-mr2-devMarco Nelissen2013-03-141-9/+22
| |\ \ \ \
| | * | | | Parse SBR extension sample rateMarco Nelissen2013-03-141-9/+22
* | | | | | am 8dcbadc4: am f15c0d6d: Merge "Adds audio support to DirectRenderer." into ...Andreas Huber2013-03-143-169/+491
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Adds audio support to DirectRenderer." into jb-mr2-devAndreas Huber2013-03-133-169/+491
| |\ \ \ \ \
| | * | | | | Adds audio support to DirectRenderer.Andreas Huber2013-03-133-169/+491
* | | | | | | am 1be720b5: am a32fd0e2: Merge "remove uses of Surface in favor or IGraphicB...Mathias Agopian2013-03-148-14/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2...Mathias Agopian2013-03-138-14/+14
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | remove uses of Surface in favor or IGraphicBufferProducerMathias Agopian2013-03-128-14/+14
| | | |/ / / | | |/| | |
* | | | | | am 80c6ff2e: am 126568c7: Attempt to recover from network stalls by dropping ...Andreas Huber2013-03-1411-5/+101
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Attempt to recover from network stalls by dropping frames on the source side.Andreas Huber2013-03-1311-5/+101
| | |_|_|/ | |/| | |
* | | | | am a848cea9: am c148e7a6: Merge "Squashed commit of the following:" into jb-m...Andreas Huber2013-03-1229-327/+799
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Squashed commit of the following:" into jb-mr2-devAndreas Huber2013-03-1229-327/+799
| |\ \ \ \
| | * | | | Squashed commit of the following:Andreas Huber2013-03-1229-327/+799
| | |/ / /
* | | | | am d9f24f5a: am 2a5177e8: Merge "GraphicBufferSource fixes" into jb-mr2-devAndy McFadden2013-03-123-56/+81
|\ \ \ \ \ | |/ / / /
| * | | | GraphicBufferSource fixesAndy McFadden2013-03-123-56/+81
| |/ / /
* | | | Merge "Propose new interpretation for setPosition and setLoop"Glenn Kasten2013-03-091-0/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Propose new interpretation for setPosition and setLoopGlenn Kasten2013-01-071-0/+45
* | | | Merge "Clean up the native code to match Java update" into jb-mr2-devztenghui2013-03-081-9/+14
|\ \ \ \
| * | | | Clean up the native code to match Java updateztenghui2013-03-081-9/+14
* | | | | Merge "Disable our fancy logic to respect both sink and source's native forma...Andreas Huber2013-03-074-21/+10
|\ \ \ \ \
| * | | | | Disable our fancy logic to respect both sink and source's native formatsAndreas Huber2013-03-074-21/+10
* | | | | | The transport stream HDCP descriptor belongs in the program_info sectionAndreas Huber2013-03-074-30/+70
|/ / / / /
* | | | | Merge "Correct MediaCodec + Surface behavior" into jb-mr2-devAndy McFadden2013-03-065-41/+69
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Correct MediaCodec + Surface behaviorAndy McFadden2013-03-055-41/+69
* | | | | Merge "Add template class SingleStateQueue" into jb-mr2-devGlenn Kasten2013-03-063-0/+140
|\ \ \ \ \
| * | | | | Add template class SingleStateQueueGlenn Kasten2013-03-053-0/+140
* | | | | | Merge "Squashed commit of the following:" into jb-mr2-devAndreas Huber2013-03-0535-3177/+4317
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Squashed commit of the following:Andreas Huber2013-03-0535-3177/+4317
| |/ / / /