summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-05-301-1/+1
| | | | | | | | | | Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI signature. Bug: 15337287 Bug: 12890910 Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292 (cherry picked from commit 3cb78498d3f664f541ba7d28f4543cf8c12733f1)
* Merge "Allow DRM plugins to be destroyed when released" into klp-modular-devJeff Tinker2014-04-212-2/+10
|\
| * Allow DRM plugins to be destroyed when releasedJeff Tinker2014-04-112-2/+10
| | | | | | | | | | bug: 13411994 Change-Id: I5b4ac137ebfbaa61bc37f8344ab6ff3a7f6c0099
* | am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
|\ \ | | | | | | | | | | | | * commit 'ca1f8f6d14a144dde64112cd471df5e9539ad521': MTP: Fix getThumbnail
| * | MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The thumbnail size was not being passed to the MTP stack so getThumbnail was returning zero length data. Bug: 13747419 Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
* | | Check that mRemotePlayer is not null before useSimon Wilson2014-04-171-3/+3
| |/ |/| | | | | | | Bug: 14138829 Change-Id: Ie7ddb54ef3b82b9566ac41d4f0ff335976d3c907
* | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-023-42/+37
| | | | | | | | | | | | | | | | Also addresses style issues noted in post-submit review from https://googleplex-android-review.git.corp.google.com/#/c/439054/ Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5 related-to-bug: 12702350
* | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-0111-26/+490
| | | | | | | | | | | | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a related-to-bug: 12702350
* | am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in ↵Lajos Molnar2014-03-191-1/+1
|\ \ | |/ | | | | | | | | | | MediaTimeProvider" into klp-dev * commit '0dc084865313a416246915c72b29c13cc3f404d4': MediaPlayer: fix int overflow issue in MediaTimeProvider
| * MediaPlayer: fix int overflow issue in MediaTimeProviderLajos Molnar2014-03-191-1/+1
| | | | | | | | | | Bug: 13394783 Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
* | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (These CLs are already in master.) Bug: 13246311 This cherry-picks 7 CLs: ----------------------------------------------------------------------- Remove calls to deprecated SkBitmap::setIsOpaque() setIsOpaque() has been removed from ToT Skia. Update setters for mIsPremultiplied and hasAlpha to take the other into consideration. cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a ----------------------------------------------------------------------- Merge AssetStream with AssetStreamAdaptor. Add enums to the constructor for AssetStreamAdaptor to choose the different behaviors used by the (former) two different classes. The old clients of AssetStream now get the following features of AssetStreamAdaptor - Debugging statements on error. - The stream is an SkStreamRewindable. - getLength() returns the correct value, and the old way of getting the length (read(NULL, 0)) is no longer implemented, since it is no longer used. - isAtEnd() returns the correct value. ToT Skia makes it pure virtual, so some implementation is necessary. cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56 ----------------------------------------------------------------------- Deprecate Android-specific SkPaint functions. The following functions were problematic: const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*); const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*); const void* findImage(const SkGlyph&, const SkMatrix*); Replacing them with calls through SkGlyphCache solved a nasty crash bug, so they have all been deprecated. Bug: 11968757 cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08 ----------------------------------------------------------------------- pass SkGlyphCache into updateGlyphCache() Doing so prevents us from double-locking the glyph cache, thereby effectively locking ourselves out of reusing work that we'd just done. Bug: 11968757 cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89 ----------------------------------------------------------------------- Updates to the Skia API needed to merge the WebView m33 version of Skia. cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3 Bugfix for screenshots (recent apps) due to incorrect rowBytes computation bug: 12915192 cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714 ----------------------------------------------------------------------- Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap. cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5 ----------------------------------------------------------------------- Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33 Conflicts: core/jni/android/graphics/Bitmap.cpp core/jni/android/graphics/Graphics.cpp core/jni/android/graphics/Typeface.cpp graphics/java/android/graphics/Bitmap.java
* | am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
|\ \ | |/ | | | | | | * commit '105c47924f7af9319ec9242b952b4bf074585229': Verify certificates
| * Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| |\
| | * Verify certificatesMarco Nelissen2014-03-132-0/+46
| | | | | | | | | | | | | | | | | | b/13418320 Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
* | | am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is ↵Zhihai Xu2014-03-141-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | passed wrong unit parameter from AudioManager" into klp-dev * commit 'bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7': DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
| * | DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from ↵Zhihai Xu2014-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioManager setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager. It cause maximize volume in Bluetooth speaker/device. The volume expected by Bluetooth Avrcp should be from 0 to 15. But the current volume parameter passed to Bluetooth Avrcp is from 0 to 150. It is scaled by 10 times than the correct volume. index = rescaleIndex(index * 10, streamType, streamTypeAlias); Should divide the volume by 10 before pass to Bluetooth Avrcp. bug:12495379 Change-Id: I4160588e92ee384e21a75d63036d8bd6ccb30621
| * | Fix a JNI local reference leak in JNIMediaPlayerListener::notify.Elliott Hughes2014-03-071-0/+1
| | | | | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=62137 b/12603577 Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
* | | am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of ↵Marco Nelissen2014-03-072-34/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | libjhead" into klp-dev * commit 'ac87587875f1dfade5e06a82ccc009d0f0170569': Make MtpDatabase use libexif instead of libjhead
| * | Make MtpDatabase use libexif instead of libjheadMarco Nelissen2014-03-072-34/+46
| |/ | | | | | | | | | | b/12203995 Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
* | am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ↵Marco Nelissen2014-03-071-1/+1
|\ \ | |/ | | | | | | | | | | klp-dev * commit '233e7e9f64be5e85196dd959824bce9a69b2fd99': ExifInterface: fix class load failure
| * ExifInterface: fix class load failureZhijun He2014-03-061-1/+1
| | | | | | | | | | | | | | libexif_jni was renamed as libjhead_jni b/12203995 Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
* | am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
|\ \ | |/ | | | | | | * commit '4f36104f06755dc2c95b3d7c8bac5312d7572199': libexif is now libjhead
| * libexif is now libjheadMarco Nelissen2014-03-061-2/+2
| | | | | | | | | | b/12203995 Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
| * Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-devLeon Scroggins III2014-03-061-2/+2
| |\
| | * Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (These CLs are already in master.) Bug: 13246311 This cherry-picks 7 CLs: ----------------------------------------------------------------------- Remove calls to deprecated SkBitmap::setIsOpaque() setIsOpaque() has been removed from ToT Skia. Update setters for mIsPremultiplied and hasAlpha to take the other into consideration. cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a ----------------------------------------------------------------------- Merge AssetStream with AssetStreamAdaptor. Add enums to the constructor for AssetStreamAdaptor to choose the different behaviors used by the (former) two different classes. The old clients of AssetStream now get the following features of AssetStreamAdaptor - Debugging statements on error. - The stream is an SkStreamRewindable. - getLength() returns the correct value, and the old way of getting the length (read(NULL, 0)) is no longer implemented, since it is no longer used. - isAtEnd() returns the correct value. ToT Skia makes it pure virtual, so some implementation is necessary. cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56 ----------------------------------------------------------------------- Deprecate Android-specific SkPaint functions. The following functions were problematic: const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*); const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*); const void* findImage(const SkGlyph&, const SkMatrix*); Replacing them with calls through SkGlyphCache solved a nasty crash bug, so they have all been deprecated. Bug: 11968757 cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08 ----------------------------------------------------------------------- pass SkGlyphCache into updateGlyphCache() Doing so prevents us from double-locking the glyph cache, thereby effectively locking ourselves out of reusing work that we'd just done. Bug: 11968757 cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89 ----------------------------------------------------------------------- Updates to the Skia API needed to merge the WebView m33 version of Skia. cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3 Bugfix for screenshots (recent apps) due to incorrect rowBytes computation bug: 12915192 cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714 ----------------------------------------------------------------------- Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap. cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5 ----------------------------------------------------------------------- Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33
* | | am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" ↵Eric Laurent2014-03-061-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | into klp-dev * commit 'eac19754ca0822e4c1c50c436affbf5cbf7e08d3': Fix RemoteController synchronization mode
| * | Fix RemoteController synchronization modeJean-Michel Trivi2014-03-061-1/+1
| |/ | | | | | | | | | | | | | | | | Fix erroneous argument check in RemoteController syncrhonization mode setter.. Bug 12189375 Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10
* | am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit ↵Narayan Kamath2014-01-281-2/+2
|\ \ | | | | | | | | | | | | | | | | | | compatible" * commit 'aa9ba887371e875ffbde49f43fa12bb5f123425b': AArch64: Make graphics classes 64-bit compatible
| * | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media ↵Narayan Kamath2014-01-1624-153/+157
|\ \ \ | |/ / | | | | | | | | | | | | | | | classes" * commit 'bc0468e67626937300e9afd182656469463d96a1': AArch64: Use long for pointers in media classes
| * | AArch64: Use long for pointers in media classesAshok Bhat2014-01-1524-153/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in media classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
|\ \ \ | |/ / | | | | | | | | | * commit 'a9045d24a73faa6aa1e8ad204a1e14a53711a824': Add NULL check in updateProxyConfig
| * | Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
| |\ \
| | * | Add NULL check in updateProxyConfigOscar Rydhé2013-12-191-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the exclusionList was null in updateProxyConfig the VM would crash when converting it to a UTF8 string. Avoid this by adding a null check. Change-Id: I0d8106fd54385bd9ae9c652a6c67d459a119cf2b
* | | | am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-101-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '739ae9b3b77458b4c77f799cba56dc68d65ab424': Fix a JNI local reference leak in MediaDrm
| * | | Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-111-0/+1
| |\ \ \
| | * | | Fix a JNI local reference leak in MediaDrmPatrik2 Carlsson2013-12-191-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | A reference leak was found in the subtitle usecase that also applies to android_media_MediaDrm.cpp (Code taken from the similar fix in android_media_MediaPlayer.cpp) Change-Id: Icc4b25e4adc9a600ff4ac99a7a8478bb55a6e348
* | | | am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"Narayan Kamath2014-01-076-27/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '79ceb53ae5b867a954476e3f6499f89664fbc669': AArch64: Use long for pointers in MTP classes
| * | | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-076-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in MTP classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I67805547251722e7b77611d47d0bb632a64d3e6d Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in ↵Narayan Kamath2014-01-073-37/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | VideoEditor classes" * commit '08467c5727c04c1fef40ff1e361628944275ef28': AArch64: Use long for pointers in VideoEditor classes
| * | | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-073-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in VideoEditor classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Ifff3a28f2ab6774ee89d31770ad63451c8726431 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio ↵Narayan Kamath2014-01-074-57/+65
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | effect classes" * commit 'c0c92f206eddb6fb319bd11929c1703daf17248f': AArch64: Use long for pointers in audio effect classes
| * | | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-074-57/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in AudioEffect and Visualizer classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Ief49bbe5baef663e268c7f6d70ac33a4df45621c Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in ↵Narayan Kamath2014-01-072-20/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | AmrInputStream" * commit '80cff94478a39914012df816179ea57c53040903': AArch64: Use long for pointers in AmrInputStream
| * | | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-072-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in AmrInputStream class, as native pointers can be 64-bit. Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."Narayan Kamath2013-12-191-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '2d2d594308693af79bf5c44f0dcc30f29d2dc31a': MediaDrm#mNativeContext is a long, not int.
| * | | Merge "MediaDrm#mNativeContext is a long, not int."Narayan Kamath2013-12-191-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | MediaDrm#mNativeContext is a long, not int.Narayan Kamath2013-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Therefore, we must use SetLongField and not SetIntField. Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
* | | | am be8fbb8f: Merge "Remove unused field from MediaMuxer"Narayan Kamath2013-12-182-9/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'be8fbb8fb63fddac2310dfbafa2594ed165b16b1': Remove unused field from MediaMuxer
| * | | Remove unused field from MediaMuxerNarayan Kamath2013-12-182-9/+0
| |/ / | | | | | | | | | Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
generated by cgit v1.1 at 2025-02-02 18:58:03 +0000