summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge "Fix for testThumbnailForInvalidFilePath and ↵shailendra2011-03-182-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
| | * | | | Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile ↵shailendra2011-03-172-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failed with HMI75B(4124235) Change-Id: Iab523e666c11b7f99aac71c761a4295d32ca026c
* | | | | | am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media ↵James Dong2011-03-176-0/+95
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework files * commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3': Fix missing AOSP copyright headers for a bunch of media framework files
| * | | | | Fix missing AOSP copyright headers for a bunch of media framework filesJames Dong2011-03-176-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 4119349 Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
* | | | | | am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been ↵Mike Lockwood2011-03-171-2/+13
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | started" into honeycomb-mr1 * commit '11473332b4df78610ebb903e255d69ab35e5bf59': MtpServer: Do not attempt to stop MTP if it has not been started
| * | | | | MtpServer: Do not attempt to stop MTP if it has not been startedMike Lockwood2011-03-171-2/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an ANR that occurred if we got a USB disconnected event before the MTP service had started. Bug: 4118033 Change-Id: I6cad4281a5911a9926cae923f34d3a6bf98346c5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which ↵Yu Shan Emily Lau2011-03-162-2/+110
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 * commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39': Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
| * | | | Merge "Suppress the 1 hour video editor export test case which exceed the 5 ↵Yu Shan Emily Lau2011-03-162-2/+110
| |\ \ \ \ | | |/ / / | | | | | | | | | | mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
| | * | | Suppress the 1 hour video editor export test case which exceed the 5 mins ↵Yu Shan Emily Lau2011-03-162-2/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
* | | | | am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report ↵Rajneesh Chowdury2011-03-162-0/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | (Java/Jni)" into honeycomb-mr1 * commit '0edefea88e975613bca9f0227614de91434ade11': Fix for 4087846 Crash reported by monkey report (Java/Jni)
| * | | | Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into ↵Rajneesh Chowdury2011-03-162-0/+24
| |\ \ \ \ | | | | | | | | | | | | | | | | | | honeycomb-mr1
| | * | | | Fix for 4087846 Crash reported by monkey report (Java/Jni)Rajneesh Chowdury2011-03-152-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
* | | | | | am fc591762: Merge "Add the default camera id to mCameraIds for emulator and ↵James Dong2011-03-161-0/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | those devices without media_profiles.xml configuration file." into honeycomb-mr1 * commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd': Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
| * | | | | Add the default camera id to mCameraIds for emulator and those devices ↵James Dong2011-03-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without media_profiles.xml configuration file. bug - 4109530 Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
* | | | | | am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an ↵Andreas Huber2011-03-161-12/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio-only stream and seeking before starting." into honeycomb-mr1 * commit '46956b0691b2a228237d17536fe4ad33a760c0af': DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
| * | | | | DO NOT MERGE: Fix a race condition when playing an audio-only stream and ↵Andreas Huber2011-03-161-12/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | seeking before starting. Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7 related-to-bug: 4039068
* | | | | am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into ↵Shailendra Yadav2011-03-144-2/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1 * commit '3fabad87f6cade6ccf7dc6d716e8b91675982088': Fix for Don't allow adding 64-bit files(4086708)
| * | | | Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1Shailendra Yadav2011-03-144-2/+26
| |\ \ \ \
| | * | | | Fix for Don't allow adding 64-bit files(4086708)Shailendra Yadav2011-03-144-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I880c89b565dd8172fdf077a514d5b3d03eab7d9e
* | | | | | am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"Kenny Root2011-03-141-5/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '206c62ed34dc8a48fd6c907d95456226949f42dd': Remove unnecessary SkImageDecoder_libjpeg.cpp
| * | | | | am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"Kenny Root2011-03-111-5/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d': Remove unnecessary SkImageDecoder_libjpeg.cpp
| | * | | | Remove unnecessary SkImageDecoder_libjpeg.cppChih-Wei Huang2011-03-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files to an unexpected directory. In this case, it's out/target/external/skia/src/images/SkImageDecoder_libjpeg.o It's not in $(PRODUCT_OUT), which is not correct. Worse, it makes the build system be unable to build different architectures (arm and x86) simultaneously, since the output files conflcit. Seems we can just remove SkImageDecoder_libjpeg.cpp since it's already in libskia. Change-Id: I3e7533126ef60fe2fd424fdc777760e73c93489b
| * | | | | am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into ↵James Dong2011-03-112-8/+47
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '68f66b945e7a69549689becd2e656d9056f1e7f5': MP3Extractor and MP3 decoder fixes - DO NOT MERGE
| | * | | | | MP3Extractor and MP3 decoder fixes - DO NOT MERGEJames Dong2011-03-112-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-picked the following patches from HC branch: o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode o When the temp buffer wraps around, the next read position should start from what have been read to avoid reading the same remaining bytes in the buffer again. o Speed up MP3Extractor using cached reads bug - 4083532 Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
* | | | | | | am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into ↵Eric Laurent2011-03-141-26/+22
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1 * commit '3cbfd10bbb869f763880060ebe01dd66da62bbc3': Partial fix for issue 3515250: video chat and SCO
| * | | | | | Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1Eric Laurent2011-03-141-26/+22
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Partial fix for issue 3515250: video chat and SCOEric Laurent2011-03-121-26/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not call directly into AudioSystem in setBluetoothScoOn() but send a message to the AudioService handler instead. As the procedure to switch audio path to BT SCO can last some time we should not block the caller which can run in the UI thread. Change-Id: I6ac4b5a934d69781db3aebe5d0e8137b52a0ada4
* | | | | | | am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" ↵Mike Lockwood2011-03-141-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr1 * commit '3ec9d06f070db3a8899ad235736abd0ffaf6f578': MtpDevice: Handle zero length packets in readResponse()
| * | | | | | MtpDevice: Handle zero length packets in readResponse()Mike Lockwood2011-03-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3509060 Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am dec0b755: Merge "MTP host: Fix problems reading large data packets" into ↵Mike Lockwood2011-03-141-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1 * commit 'dec0b755fff1bf87aafd397ef0dd864f54c587cf': MTP host: Fix problems reading large data packets
| * | | | | | MTP host: Fix problems reading large data packetsMike Lockwood2011-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problem reading large thumbnails via PTP Bug: 4065217 Change-Id: I643672512829c93ab0827091f39103dbb1918071 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1Mike Lockwood2011-03-112-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9fffd9a8bb73e9b225878686862d49b27e98c659': USB: minor cleanup work
| * | | | | | USB: minor cleanup workMike Lockwood2011-03-112-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4067029 Change-Id: Icd8f912ab8732b5f770a217b9b3731092597ce02 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1Mike Lockwood2011-03-118-21/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0eb7b697b7c180660647b5cd0cd7dd067f6b6abb': UsbManager: Hide APIs not needed for USB host or accessory support. Remove MtpClient class from framework and public API UsbDevice: Move IO related methods to new UsbDeviceConnection class
| * | | | | Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1Mike Lockwood2011-03-118-21/+28
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: UsbManager: Hide APIs not needed for USB host or accessory support. Remove MtpClient class from framework and public API UsbDevice: Move IO related methods to new UsbDeviceConnection class
| | * | | | | Remove MtpClient class from framework and public APIMike Lockwood2011-03-117-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After reviewing this class I decided it would be best not to include it in the public API since it adds no functionality that cannot be done using MtpDevice and other APIs directly. So I am moving it to the CameraBrowser sample instead. Also changed CameraBrowser to build against the SDK to ensure all the necessary APIs for PTP support have been made public. Bug: 4067029 Change-Id: I585b06104084953176d018ced08bba0cb4607490 Signed-off-by: Mike Lockwood <lockwood@android.com>
| | * | | | | UsbDevice: Move IO related methods to new UsbDeviceConnection classMike Lockwood2011-03-112-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UsbDevice is now just an immutable parcelable object like UsbInterface and UsbEndpoint. All IO related functionality is now contained in UsbDeviceConnection and UsbRequest. Bug: 4067029 Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1Glenn Kasten2011-03-112-0/+24
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26': Bug 3012968 DRM output control
| * | | | | | Bug 3012968 DRM output controlGlenn Kasten2011-03-102-0/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifies Stagefright to verify that there is a hardware-protected path to video sink for DRM content. Change-Id: I18b8741390e803a05a88c7f180b860a24ba88a10
* | | | | | am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into ↵Rajneesh Chowdury2011-03-102-7/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1 * commit 'a7118e33b494b26bfbd37c895a1c412cd5da56ec': Fix for 4080402 NPE in Transition.setDuration
| * | | | | Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1Rajneesh Chowdury2011-03-102-7/+5
| |\ \ \ \ \
| | * | | | | Fix for 4080402 NPE in Transition.setDurationRajneesh Chowdury2011-03-102-7/+5
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Change-Id: I1e4499e3191beafdaf9bb4b7fd51798bd1eab300
* | | | | | am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1Mike Lockwood2011-03-091-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '564f12ebe409bead467eee04dfd719e97367e520': MTP: Convert date created and modified values from seconds to milliseconds Update USB accessory compatibility library to support new requestPermission API UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
| * | | | | Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1Mike Lockwood2011-03-091-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: MTP: Convert date created and modified values from seconds to milliseconds Update USB accessory compatibility library to support new requestPermission API UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
| | * | | | | MTP: Convert date created and modified values from seconds to millisecondsMike Lockwood2011-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 4026365 Change-Id: Ifd78cca305299ed1cedd6595609d9bf8d520cd8e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '8df2477c4e7e5bf72d6d1216ae5184c53304470e': Support IPv6->IPv4 fallback in HTTP streaming.
| * | | | | | am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'bd0e806a61df9b67890dc3b1390db554e7468b4a': Support IPv6->IPv4 fallback in HTTP streaming.
| | * | | | | Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-081-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4068057 Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
* | | | | | | am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | * commit 'e4a02b61290fa61955c979cfd1afc17a92bba481': Support IPv6 in HTTP streaming.
| * | | | | am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254': Support IPv6 in HTTP streaming.
generated by cgit v1.1 at 2025-08-13 22:53:40 +0000