summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"Andreas Huber2011-03-218-14/+50
|\
| * Support passing headers to MediaMetadataRetriever's setDataSource APIAndreas Huber2011-03-218-14/+50
* | Scale the thumbnail if display dimension is different from the actual buffer ...James Dong2011-03-201-1/+9
|/
* Merge "Squashed commit of the following:"Andreas Huber2011-03-182-195/+145
|\
| * Squashed commit of the following:Andreas Huber2011-03-182-195/+145
* | Merge "Better organize media recorder error and information event and types"James Dong2011-03-182-21/+21
|\ \
| * | Better organize media recorder error and information event and typesJames Dong2011-03-182-21/+21
| |/
* | Merge "Fix issue 4111672: AudioTrack control block flags"Eric Laurent2011-03-182-9/+26
|\ \
| * | Fix issue 4111672: AudioTrack control block flagsEric Laurent2011-03-182-9/+26
* | | Merge "Handle display dimension scaling event due to SAR embedded in AVC videos"James Dong2011-03-182-3/+49
|\ \ \
| * | | Handle display dimension scaling event due to SAR embedded in AVC videosJames Dong2011-03-182-3/+49
| | |/ | |/|
* | | Signal a runtime error if the AVCDecoder encounters an invalid frame.Andreas Huber2011-03-181-1/+2
|/ /
* | am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for...James Dong2011-03-176-0/+95
|\ \ | |/ |/|
| * am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framewor...James Dong2011-03-176-0/+95
| |\
| | * Fix missing AOSP copyright headers for a bunch of media framework filesJames Dong2011-03-176-0/+95
* | | Merge "Don't send the seek-complete notification twice."Andreas Huber2011-03-161-2/+1
|\ \ \
| * | | Don't send the seek-complete notification twice.Andreas Huber2011-03-161-2/+1
* | | | resolved conflicts for merge of 1cbf8493 to masterJames Dong2011-03-161-2/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am fc591762: Merge "Add the default camera id to mCameraIds for emulator and ...James Dong2011-03-161-0/+5
| |\ \ | | |/
| | * Add the default camera id to mCameraIds for emulator and those devices withou...James Dong2011-03-161-0/+5
| * | am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-...Andreas Huber2011-03-161-12/+5
| |\ \ | | |/
| | * DO NOT MERGE: Fix a race condition when playing an audio-only stream and seek...Andreas Huber2011-03-161-12/+5
* | | Fix a race condition when playing an audio-only stream and seeking before sta...Andreas Huber2011-03-161-12/+5
* | | Fix an issue where the timestamp provided by WAVExtractor does not start with 0James Dong2011-03-151-2/+1
* | | Add memory leak tracking/debugging code to drm serverJames Dong2011-03-143-136/+172
* | | Merge "frameworks/base: remove LOCAL_PRELINK_MODULE"Iliyan Malchev2011-03-148-10/+10
|\ \ \
| * | | frameworks/base: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-148-10/+10
* | | | Merge "libstagefright: Add error handling in AMRNB deooder"James Dong2011-03-141-2/+12
|\ \ \ \ | |/ / / |/| | |
| * | | libstagefright: Add error handling in AMRNB deooderSidipotu Ashok2011-03-141-2/+12
* | | | am 2d24213f: am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in rea...Mike Lockwood2011-03-141-0/+4
|\ \ \ \ | | |/ / | |/| |
| * | | am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" ...Mike Lockwood2011-03-141-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | MtpDevice: Handle zero length packets in readResponse()Mike Lockwood2011-03-141-0/+4
* | | | Merge "Fix PV AAC decoder crash due to out-of-boundary array access."James Dong2011-03-141-7/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix PV AAC decoder crash due to out-of-boundary array access.James Dong2011-03-141-7/+25
* | | | am 0bea34fc: am dec0b755: Merge "MTP host: Fix problems reading large data pa...Mike Lockwood2011-03-141-3/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am dec0b755: Merge "MTP host: Fix problems reading large data packets" into h...Mike Lockwood2011-03-141-3/+3
| |\ \ | | |/
| | * MTP host: Fix problems reading large data packetsMike Lockwood2011-03-121-3/+3
* | | If MP3 decoder output frame size were 0, media server would crash.James Dong2011-03-111-1/+9
* | | Only use ChromiumHTTPDataSource if webkit was built with chromium support.Andreas Huber2011-03-112-6/+53
* | | am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeyco...Glenn Kasten2011-03-112-0/+24
|\ \ \ | |/ /
| * | am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1Glenn Kasten2011-03-112-0/+24
| |\ \ | | |/
| | * Bug 3012968 DRM output controlGlenn Kasten2011-03-102-0/+24
* | | Fix for bug 3477330Gloria Wang2011-03-1011-28/+29
* | | Merge "Support http authentication ala http://foo:bar@host.org in stagefright."Andreas Huber2011-03-091-1/+2
|\ \ \
| * | | Support http authentication ala http://foo:bar@host.org in stagefright.Andreas Huber2011-03-091-1/+2
* | | | am d1e09e08: am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP st...Lorenzo Colitti2011-03-091-14/+24
|\ \ \ \ | | |/ / | |/| |
| * | | am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
| |\ \ \
| | * \ \ am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
| | |\ \ \
| | | * | | Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-081-14/+24
* | | | | | am d6aaec0c: am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |