summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Avoid duplicated code calculating the stts sample duration"James Dong2011-06-101-22/+21
|\
| * Avoid duplicated code calculating the stts sample durationJames Dong2011-06-101-22/+21
* | am 15e9d474: am 88748e6d: am d86302df: Quiet the log.Dianne Hackborn2011-06-101-1/+1
|\ \ | |/ |/|
| * am 88748e6d: am d86302df: Quiet the log.Dianne Hackborn2011-06-101-1/+1
| |\
| | * am d86302df: Quiet the log.Dianne Hackborn2011-06-091-1/+1
| | |\
| | | * Quiet the log.Dianne Hackborn2011-06-091-1/+1
| * | | am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 s...James Dong2011-06-092-12/+0
| |\ \ \ | | |/ /
| | * | am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do n...James Dong2011-06-092-12/+0
| | |\ \ | | | |/
| | | * Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" i...James Dong2011-06-092-12/+0
| | | |\
| | | | * Revert "Add avg bandwidth estimate every 2 seconds - do not merge."James Dong2011-05-192-12/+0
| * | | | am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line br...Conley Owens2011-06-09185-30089/+30089
| |\ \ \ \
| | * \ \ \ am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix ...Conley Owens2011-06-09185-30089/+30089
| | |\ \ \ \
| | | * \ \ \ Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
| | | |\ \ \ \
| | | | * | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
* | | | | | | | Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index...James Dong2011-06-101-9/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_In...James Dong2011-06-081-9/+10
* | | | | | | | | Merge "Correctly handle crop rect event in SoftAVC.cpp"James Dong2011-06-102-8/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correctly handle crop rect event in SoftAVC.cppJames Dong2011-06-092-8/+11
* | | | | | | | | | Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populat...Andreas Huber2011-06-105-44/+251
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make dumpsys(media.player) more useful by having AwesomePlayer populate it.Andreas Huber2011-06-085-44/+251
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Make sure we don't read from invalid fdsMarco Nelissen2011-06-091-0/+3
| | * | | | | | | | am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor...Andreas Huber2011-06-021-17/+79
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | / / / / | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abo...Andreas Huber2011-06-011-17/+79
| | * | | | | | | am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately wh...Andreas Huber2011-04-183-12/+26
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to ...Andreas Huber2011-04-143-12/+26
| | * | | | | | | am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value,...James Dong2011-04-041-2/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | When read() from AudioRecord returns 0 or negative value, report an error to ...James Dong2011-03-301-2/+3
| | * | | | | | | am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into g...James Dong2011-03-112-8/+47
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | MP3Extractor and MP3 decoder fixes - DO NOT MERGEJames Dong2011-03-112-8/+47
* | | | | | | | | Fix an issue in MPEG4Writer where the write of outstanding chunks in the last...James Dong2011-06-091-0/+1
* | | | | | | | | Merge "Add timestamp and data pointer checks in CameraSource"James Dong2011-06-091-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Add timestamp and data pointer checks in CameraSourceJames Dong2011-06-031-5/+5
* | | | | | | | | This device-specific workaround is no longer necessary.Andreas Huber2011-06-082-11/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge "Fix the comment for the location box @xyz"James Dong2011-06-061-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the comment for the location box @xyzJames Dong2011-06-031-2/+2
* | | | | | | | | Merge "Remove dead code related to gettid"Glenn Kasten2011-06-066-80/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove dead code related to gettidGlenn Kasten2011-06-036-80/+9
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h"James Dong2011-06-033-8/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.hJames Dong2011-06-033-8/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Initial-checkin for ON2 Software AVC/H264 decoder"James Dong2011-06-03403-0/+112275
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Initial-checkin for ON2 Software AVC/H264 decoderJames Dong2011-06-02403-0/+112275
| |/ / / / / / /
* | | | | | | | Merge "Don't advertise the (old-style) software decoders unless they're actua...Andreas Huber2011-06-021-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Don't advertise the (old-style) software decoders unless they're actually pre...Andreas Huber2011-06-021-0/+2
* | | | | | | | Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based"James Dong2011-06-025-9/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Do not call getEstimatedBandwidth if the streaming is not HTTP-basedJames Dong2011-06-025-9/+21
* | | | | | | | Remove unnecessary level of priority indirectionGlenn Kasten2011-06-012-4/+4
|/ / / / / / /
* | | | | | | Revert "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-014-5/+5