summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS not...Andreas Huber2011-11-172-8/+9
|\
| * Make sure not to cancel pending seek/EOS notifications on a cache underrun...Andreas Huber2011-11-162-8/+9
* | am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1Andreas Huber2011-11-111-1/+1
|\ \ | |/
| * Didn't mean to check this in...Andreas Huber2011-11-111-1/+1
* | am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error...Andreas Huber2011-11-111-2/+15
|\ \ | |/
| * Merge "Instead of asserting, signal a runtime error if the session doesn't co...Andreas Huber2011-11-111-2/+15
| |\
| | * Instead of asserting, signal a runtime error if the session doesn't containAndreas Huber2011-11-101-2/+15
| * | Merge "DO NOT MERGE: Instead of asserting, remove active streams if their soc...Andreas Huber2011-11-111-15/+47
| |\ \
| | * | DO NOT MERGE: Instead of asserting, remove active streams if their socketsAndreas Huber2011-11-101-15/+47
| | |/
* | | am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP contr...Andreas Huber2011-11-112-64/+72
|\ \ \ | |/ /
| * | Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1Andreas Huber2011-11-112-64/+72
| |\ \
| | * | Disconnect on socket error on the RTSP control connection.Andreas Huber2011-11-102-64/+72
| | |/
* | | am 510180f1: am 08e42967: Merge "Add support for retrieving location informat...James Dong2011-11-112-0/+36
|\ \ \ | |/ /
| * | Add support for retrieving location information in mp4/3gpp filesJames Dong2011-11-102-0/+36
| |/
* | Merge "Adds handler type 'sbtl' to support subtitles in various containers."James Dong2011-11-101-2/+3
|\ \
| * | Adds handler type 'sbtl' to support subtitles in various containers.Insun Kang2011-11-101-2/+3
* | | am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requ...Andreas Huber2011-11-101-2/+92
|\ \ \ | | |/ | |/|
| * | Merge "Send RTSP control connection keep-alive requests" into ics-mr1Andreas Huber2011-11-101-2/+92
| |\ \
| | * | Send RTSP control connection keep-alive requestsAndreas Huber2011-11-081-2/+92
* | | | am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." in...Andreas Huber2011-11-101-1/+6
|\ \ \ \ | |/ / /
| * | | Merge "Don't believe the PV decoder's lies..." into ics-mr1Andreas Huber2011-11-101-1/+6
| |\ \ \
| | * | | Don't believe the PV decoder's lies...Andreas Huber2011-11-091-1/+6
| | |/ /
* | | | am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to d...Andreas Huber2011-11-102-8/+11
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | There's no point in trying to continue to decode after an error was signalled.Andreas Huber2011-11-092-8/+11
| |/
* | Merge "Instead of asserting, remove active streams if their sockets return fa...Andreas Huber2011-11-091-15/+47
|\ \
| * | Instead of asserting, remove active streams if their sockets return failureAndreas Huber2011-11-091-15/+47
* | | resolved conflicts for merge of 26f70db9 to masterAndreas Huber2011-11-082-11/+0
|\ \ \ | |/ / |/| / | |/
| * Merge "Remove surface legacy APIs and code." into ics-mr1Andreas Huber2011-11-082-11/+0
| |\
| | * Remove surface legacy APIs and code.Andreas Huber2011-10-282-11/+0
* | | am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for...James Dong2011-11-081-0/+6
|\ \ \ | |/ /
| * | Merge "Fix a hang issue where the first frame can be dropped for timelapse vi...James Dong2011-11-071-0/+6
| |\ \ | | |/ | |/|
| | * Fix a hang issue where the first frame can be dropped for timelapse video rec...James Dong2011-10-261-0/+6
* | | Use binary search to discover closest sync sample index, replaceAndreas Huber2011-11-071-24/+25
* | | Properly decode ADTS files with ID3 headers.Andreas Huber2011-11-013-12/+60
* | | Support new HLS byte-range extensionsAndreas Huber2011-10-314-6/+109
* | | am da57c0e8: Merge "Report call status from AudioSource::start() to file writ...James Dong2011-10-272-2/+10
|\ \ \ | |/ /
| * | Merge "Report call status from AudioSource::start() to file writer" into ics-mr1James Dong2011-10-272-2/+10
| |\ \
| | * | Report call status from AudioSource::start() to file writerJames Dong2011-10-262-2/+10
| | |/
* | | am 1388aced: Merge "Fix a reference to a stale pointer in AwesomePlayer." int...Andreas Huber2011-10-271-8/+10
|\ \ \ | |/ /
| * | Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1Andreas Huber2011-10-271-8/+10
| |\ \ | | |/ | |/|
| | * Fix a reference to a stale pointer in AwesomePlayer.Andreas Huber2011-10-261-8/+10
* | | am 5ded5fc5: am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing...Jamie Gennis2011-10-261-0/+160
|\ \ \ | |/ /
| * | am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into i...Jamie Gennis2011-10-261-0/+160
| |\ \ | | |/ | |/|
| | * Stagefright: push blank buffers when tearing downJamie Gennis2011-10-251-0/+160
* | | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-2662-503/+503
|/ /
* | am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-195-1/+39
|\ \ | |/
| * Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-195-1/+39
| |\
| | * Stagefright: idle OMX after ANW errorsJamie Gennis2011-10-195-1/+39
* | | am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetP...James Dong2011-10-181-7/+16
|\ \ \ | |/ /
| * | Bail out after kMaxColorFormatSupported calls to OMX_GetParameter().James Dong2011-10-181-7/+16
| |/