summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requi...Lajos Molnar2014-03-071-6/+9
|\
| * Merge "avcenc: Only do startcode escaping if the next byte requires it"Lajos Molnar2014-02-111-6/+9
| |\
| | * avcenc: Only do startcode escaping if the next byte requires itMartin Storsjo2014-02-111-6/+9
* | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-0718-57/+63
|\ \ \ | |/ /
| * | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1118-57/+63
| |/
* | am 7142d10a: Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-03-071-0/+11
|\ \ | |/
| * Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
| |\
| | * avcenc: Update video port parameters in the base classMartin Storsjo2013-11-211-0/+11
* | | am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-03-073-0/+7
|\ \ \ | |/ /
| * | Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
| |\ \
| | * | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2013-11-253-0/+7
* | | | am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as ...Lajos Molnar2014-03-071-0/+3
|\ \ \ \ | |/ / /
| * | | Merge "SoftVPXEncoder: Set the frame size on the output port as well"Lajos Molnar2014-02-101-0/+3
| |\ \ \
| | * | | SoftVPXEncoder: Set the frame size on the output port as wellMartin Storsjo2013-11-251-0/+3
| | |/ /
* | | | am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-03-071-1/+1
|\ \ \ \ | |/ / /
| * | | M3UParser: Fix typo in 8883a38a308Martin Storsjo2014-02-101-1/+1
* | | | am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last s...Marco Nelissen2014-03-071-12/+22
|\ \ \ \ | |/ / /
| * | | Merge "M3UParser: Skip query strings when looking for the last slash in a URL"Marco Nelissen2014-02-101-12/+22
| |\ \ \
| | * | | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-02-051-12/+22
* | | | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-03-073-4/+3
|\ \ \ \ \ | |/ / / /
| * | | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-063-4/+3
| |/ / /
* | | | am 5db1e3a6: Merge "correct one logic error in decide whether should render o...Lajos Molnar2014-03-072-2/+2
|\ \ \ \ | |/ / /
| * | | correct one logic error in decide whether should render or notJianzheng Zhou2014-02-032-2/+2
* | | | am 3b7ddf83: set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
|\ \ \ \
| * | | | set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
| * | | | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2014-03-052-6/+9
| * | | | update offloaded audio track sampling rateEric Laurent2014-03-051-2/+13
* | | | | am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
* | | | | am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
|\ \ \ \ \ | |/ / / /
| * | | | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-165-9/+89
* | | | | am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
| |\ \ \ \
| | * | | | Avoid jumps to faulty position after seeksRoger1 Jonsson2013-12-181-1/+4
* | | | | | am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
| |\ \ \ \ \
| | * | | | | HLS: Fixed rounding error with decimal segment durationOscar Rydhé2013-12-191-1/+1
| | |/ / / /
* | | | | | am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-202-0/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | stagefright: do not offload LD-AAC decodingEric Laurent2013-12-212-0/+14
* | | | | | am 1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."Eric Laurent2013-12-201-17/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2013-12-191-17/+23
| |/ / / /
* | | | | am 274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQu...Eric Laurent2013-12-172-6/+9
|\ \ \ \ \ | |/ / / /
| * | | | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-172-6/+9
* | | | | am 9060d498: Merge "update offloaded audio track sampling rate"Eric Laurent2013-12-171-2/+13
|\ \ \ \ \ | |/ / / /
| * | | | update offloaded audio track sampling rateEric Laurent2013-12-171-2/+13
| * | | | Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEADThe Android Open Source Project2013-12-0516-99/+254
| |\ \ \ \
* | \ \ \ \ am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"Marco Nelissen2013-11-261-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix SIGABRT when playing mp4 fileMarco Nelissen2013-11-251-0/+6
* | | | | | am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"Marco Nelissen2013-11-251-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed data offset at parsing IPMP DescriptorsIchitaro Kohara2013-11-251-1/+2
| | |_|/ / | |/| | |