summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Handle undefined NAL type for h264 streaming"Andreas Huber2013-08-081-0/+7
|\
| * Handle undefined NAL type for h264 streamingPatrik2 Carlsson2013-07-271-0/+7
* | rtsp handle response line ended with '\n'Yajun Zeng2013-07-311-0/+3
|/
* 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 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 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 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
| | |/ / /
* | | | | 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
* | | | | | 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 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
* | | | | | | am 209bbbcf: Apply EQ and bass boost first in effect chainJean-Michel Trivi2013-06-201-2/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Apply EQ and bass boost first in effect chainJean-Michel Trivi2013-06-201-2/+2
* | | | | | | am 82fc2ca6: am d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix typo.Masaki Muranaka2013-06-061-1/+1
| | | | |_|_|/ | | | |/| | |
| | * | | | | Noise will be heard if audio sample rate not matched with audio trackMing Zhou2013-06-071-1/+1
| | |/ / / /
| | * | | | Merge "Fix overflow of rand in ARTPConnection"Andreas Huber2013-04-241-1/+2
| | |\ \ \ \
| | | * | | | Fix overflow of rand in ARTPConnectionYajun Zeng2013-04-241-1/+2
| | * | | | | Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber2013-04-241-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fixed the wrong timestamps issue about camera recordingJun Tian2013-04-221-1/+1
| | * | | | | Fix for crash if no content in DESCRIBE responseXuefei Chen2013-03-121-0/+3
| | * | | | | 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
| | * | | | | | Merge "SoftAMR: Signal the right frame format"Andreas Huber2013-02-271-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | SoftAMR: Signal the right frame formatMartin Storsjo2013-02-171-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 "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
| | | |/ / / / /
| | * | | | | | am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."James Dong2012-12-211-3/+10
| | |\ \ \ \ \ \ | | | |/ / / / /