summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Support "suspension" of a video encoder in "surface-input" mode.Andreas Huber2013-07-179-14/+177
* Merge "AudioTrackShared cleanup"Glenn Kasten2013-07-111-31/+32
|\
| * AudioTrackShared cleanupGlenn Kasten2013-07-021-31/+32
* | Merge "Fix AudioTrack::flush()"Glenn Kasten2013-07-111-0/+2
|\ \
| * | Fix AudioTrack::flush()Glenn Kasten2013-07-111-0/+2
* | | Merge "Pass additional arg to acquireBuffer calls."Andy McFadden2013-07-112-3/+3
|\ \ \ | |/ / |/| |
| * | Pass additional arg to acquireBuffer calls.Andy McFadden2013-07-082-3/+3
* | | Fix type error in AudioTrack::processAudioBufferGlenn Kasten2013-07-101-1/+2
* | | am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to stage-a...Jean-Baptiste Queru2013-07-081-1/+12
|\ \ \
| * \ \ am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-masterJean-Baptiste Queru2013-07-081-1/+12
| |\ \ \
| | * \ \ resolved conflicts for merge of c158971f to stage-aosp-masterJean-Baptiste Queru2013-07-081-1/+12
| | |\ \ \
| | | * \ \ Merge "Store rtsp accessunit until PLAY response parsed"Jean-Baptiste Queru2013-07-081-1/+12
| | | |\ \ \
| | | | * | | Store rtsp accessunit until PLAY response parsedYajun Zeng2013-05-131-1/+12
* | | | | | | am c26ab375: am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC w...Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chrom...Jean-Baptiste Queru2013-07-081-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"Jean-Baptiste Queru2013-07-081-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "libstagefright: Use LOG_BASIC when use chromium http stack"Jean-Baptiste Queru2013-07-081-1/+1
| | | |\ \ \ \
| | | | * | | | libstagefright: Use LOG_BASIC when use chromium http stackXuefeng Deng2012-08-171-1/+1
* | | | | | | | am 046d9c8d: am 06197925: am 267363ee: Merge "Prevent Media Server crash whil...Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 06197925: am 267363ee: Merge "Prevent Media Server crash while the Awesome...Jean-Baptiste Queru2013-07-081-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBit...Jean-Baptiste Queru2013-07-081-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return t...Jean-Baptiste Queru2013-07-081-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Prevent Media Server crash while the AwesomePlayer getBitrate return true wit...hovanchen2013-07-031-1/+1
* | | | | | | | | am 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in R...Jean-Baptiste Queru2013-07-081-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Prevent double disconnects in RTSPSourceFredrik Rosin2013-07-011-0/+4
| | | |/ / / /
* | | | | | | Merge "Explicitly compare raw pointers to NULL"Glenn Kasten2013-07-081-18/+20
|\ \ \ \ \ \ \
| * | | | | | | Explicitly compare raw pointers to NULLGlenn Kasten2013-07-021-18/+20
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "mv libcpustats from frameworks/native to frameworks/av"Glenn Kasten2013-07-083-0/+347
|\ \ \ \ \ \ \
| * | | | | | | mv libcpustats from frameworks/native to frameworks/avGlenn Kasten2013-06-183-0/+347
* | | | | | | | am 9a25c012: am eced745a: Merge "Part of fix for TEE resource leaks when app ...Jeff Tinker2013-07-072-1/+19
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into...Jeff Tinker2013-07-072-1/+19
| |\ \ \ \ \ \ \
| | * | | | | | | Part of fix for TEE resource leaks when app crashesJeff Tinker2013-07-032-1/+19
* | | | | | | | | Include what is neededGlenn Kasten2013-07-029-17/+4
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | am 0eefffd8: am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it...Andreas Huber2013-06-281-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
| | | |\ \ \ \ \
| | | | * | | | | Set u.ext_data to null after it has been freedChrister Fletcher2013-06-281-0/+1
* | | | | | | | | am 903871da: am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorr...Glenn Kasten2013-06-281-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorrect format sp...Glenn Kasten2013-06-281-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for t...Glenn Kasten2013-06-281-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fix compilation warning: incorrect format specifier for type 'ssize_t'.Scott Fan2013-06-271-1/+1
| | | |/ / / / /
| | | * | | | | Merge "libstagefright: fix the duration "00:00" for some httplive link"Jean-Baptiste Queru2013-06-251-3/+0
| | | |\ \ \ \ \
| | | | * | | | | libstagefright: fix the duration "00:00" for some httplive linkywan1712012-08-241-3/+0
* | | | | | | | | Public API changes for audio offload support.Richard Fitzgerald2013-06-2711-25/+129
* | | | | | | | | Merge "Adds VP9 decoding support for stagefright."Lajos Molnar2013-06-2510-23/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds VP9 decoding support for stagefright.hkuang2013-06-2410-23/+57
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge "Workaround AudioRecord bug for large buffer sizes"Glenn Kasten2013-06-251-1/+2
|\ \ \ \ \ \ \ \ \