summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add the presentation rotation support" into jb-mr2-devztenghui2013-03-201-14/+34
|\
| * Add the presentation rotation supportztenghui2013-03-151-14/+34
* | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-2010-0/+1186
|\ \
| * | Implementing MediaDrm APIsJeff Tinker2013-03-1310-0/+1186
* | | 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
* | | | 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
* | | | Fix valgrind errorMarco Nelissen2013-03-191-0/+1
| |_|/ |/| |
* | | 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
* | | 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
* | | | 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
* | | | | 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
| | |/ / / | |/| | |
* | | | | Attempt to recover from network stalls by dropping frames on the source side.Andreas Huber2013-03-1310-4/+100
| |_|_|/ |/| | |
* | | | Merge "Squashed commit of the following:" into jb-mr2-devAndreas Huber2013-03-1217-17/+127
|\ \ \ \
| * | | | Squashed commit of the following:Andreas Huber2013-03-1217-17/+127
| |/ / /
* | | | GraphicBufferSource fixesAndy McFadden2013-03-123-56/+81
|/ / /
* | | 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-073-13/+10
|\ \ \ \
| * | | | Disable our fancy logic to respect both sink and source's native formatsAndreas Huber2013-03-073-13/+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-0522-2859/+1579
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Squashed commit of the following:Andreas Huber2013-03-0522-2859/+1579
| |/ / /
* | | | Merge "Implement Surface input to MediaCodec." into jb-mr2-devAndy McFadden2013-03-0511-20/+1083
|\ \ \ \ | |/ / / |/| | |
| * | | Implement Surface input to MediaCodec.Andy McFadden2013-03-0411-20/+1083
| |/ /
* | | Miscellaneous cleanupGlenn Kasten2013-03-041-3/+3
|/ /
* | am c0048178: Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
|\ \ | |/
| * Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
| |\
| | * Avoid invalid memory access when using extractMetadata()Sangkyu Lee2013-02-281-1/+16
* | | am ceb83b8d: Merge "SoftAMR: Signal the right frame format"Andreas Huber2013-02-271-1/+1
|\ \ \ | |/ /
| * | Merge "SoftAMR: Signal the right frame format"Andreas Huber2013-02-271-1/+1
| |\ \
| | * | SoftAMR: Signal the right frame formatMartin Storsjo2013-02-171-1/+1
* | | | am ccf51ec4: Merge "SoftVorbis: Set the right encoding in the port definition"Andreas Huber2013-02-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "SoftVorbis: Set the right encoding in the port definition"Andreas Huber2013-02-271-1/+1
| |\ \ \
| | * | | SoftVorbis: Set the right encoding in the port definitionMartin Storsjo2013-01-311-1/+1
| | | |/ | | |/|
* | | | Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamer...Igor Murashkin2013-02-271-1/+1
|\ \ \ \
| * \ \ \ am ceb388d6: CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-268-13/+91
| |\ \ \ \
| * | | | | Handles duplicated NAL start code to fix crash on HLS streams.Insun Kang2013-02-251-1/+1
* | | | | | am 801726ef: Merge "MPEG4Writer: Write a zero-length compressor string"Andreas Huber2013-02-271-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge "MPEG4Writer: Write a zero-length compressor string"Andreas Huber2013-02-271-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | MPEG4Writer: Write a zero-length compressor stringMartin Storsjo2013-01-311-1/+2
| | | |/ | | |/|