summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Begin refactor of MediaFocusControlJean-Michel Trivi2014-03-252-386/+440
| | | | | | | | | | | | Extract class that handles each entry in the remote control stack and move it to another file, MediaController.java. Rename RemoteControlStackEntry to MediaController as each instance will not just encapsulate information about the corresponding (if any) RemoteControlClient. This is just a CL for the renaming and extraction into a new file of existing code. Obvious required changes are labelled "FIXME". Change-Id: Ifbdac1d70e4d279ab175eef03e9d792d44873c51
* Merge "AudioTrack write from ByteBuffer updates position"Jean-Michel Trivi2014-03-211-17/+15
|\
| * AudioTrack write from ByteBuffer updates positionJean-Michel Trivi2014-03-211-17/+15
| | | | | | | | | | | | | | | | | | Remove offset parameter. Update buffer position when data is successfully written. Bug 7919023 Change-Id: I1701532ef0a91e2ccecfc38b24de29bc4f64d035
* | MediaHTTPConnection: fix JNI signatureColin Cross2014-03-201-1/+1
| | | | | | | | | | | | mNativeContext was changed to a long, fix the GetFieldID signature Change-Id: Ib19605d2c534a2aea7d75ab105349710905d716f
* | MediaHTTPConnection: use jlong to store native pointerColin Cross2014-03-192-4/+4
| | | | | | | | Change-Id: Ic4f391a8e658498e63c26ea2af4c7413ed387360
* | Merge "Add stream-level suppression to vibrate/audio services."John Spurlock2014-03-196-15/+157
|\ \
| * | Add stream-level suppression to vibrate/audio services.John Spurlock2014-03-196-15/+157
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new audio restriction layer to app-ops. Restrictions add additional constraints to audio operations at a stream-level. Restrictions do not affect the persistable state, and are purely additive: that is, they can only impose additional contstraints, not enable something that has already been disabled. Restrictions also support a whitelisted set of exempt package names. - Add new audio stream-level checks to app-ops. - Implement a provisional OP_PLAY_AUDIO suppression to three java entry points MediaPlayer, AudioTrack, & SoundPool. - Enhance vibrator api to take stream information as an optional hint - the constants correspond to AudioManager stream types. OP_VIBRATE now supports the stream-level restriction check. - Simplify Vibrator subclasses by adding default implementations for two .vibrate calls. - Migrate NoMan's zen-mode control to use the new app-ops stream-level restriction mechanism. Change-Id: Ifae8952647202f728cf1c73e881452660c704678
* | am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor ↵Glenn Kasten2014-03-191-1/+0
|\ \ | |/ |/| | | | | | | | | shouldn\'t depend on audioflinger." * commit 'a0e300efae92d8155151e345034620054cff8955': mediaeditor shouldn't depend on audioflinger.
| * am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
| |\ | | | | | | | | | | | | * commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc': mediaeditor shouldn't depend on audioflinger.
| | * mediaeditor shouldn't depend on audioflinger.Narayan Kamath2014-03-191-1/+0
| | | | | | | | | | | | Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90
| * | am e128ca43: am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow ↵Lajos Molnar2014-03-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | issue in MediaTimeProvider" into klp-dev * commit 'e128ca437a668e4050f6b81187d5a9c507c5725e': MediaPlayer: fix int overflow issue in MediaTimeProvider
| | * \ 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
| * | | | am f8d8777d: Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-171-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f8d8777dddf91c741981b4f795f2fb2b1d81c1b6': Update framework to use M33 Skia. DO NOT MERGE
| | * | | 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 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '203a6ddb0c098821ff36511e2a98211a90a69954': Verify certificates
| | * | | 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 57080be9: am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE ↵Zhihai Xu2014-03-141-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev * commit '57080be98e6c8d33781c619b79731264ab909baf': DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
| | * | | | 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 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif ↵Marco Nelissen2014-03-072-34/+46
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of libjhead" into klp-dev * commit '344251969929dcb37a33a3e3910121458f7dc38f': Make MtpDatabase use libexif instead of libjhead
| | * | | | 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
* | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-171-11/+13
|\ \ \ \ \
| * | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: Ic661d515a94fd5fad39f2d07f0cdf25337fae67c
* | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-171-3/+5
|\ \ \ \ \ \
| * | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-3/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: I2a7cea5806869bcd6aeaeee7dee97d80f819c9aa
* | | | | | MTP: Add support for some audio specific object propertiesMike Lockwood2014-03-132-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stops Windows 7 from putting up the "Your device might not be able to play or view this file" dialog when copying MP3 files to the device. Bug: 3195286 Change-Id: Ic5b3fb75309893caae1a4f4b56068a543847f1f7
* | | | | | Merge "Adds a TransportController and TransportPerformer to session"RoboErik2014-03-1215-209/+2380
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adds a TransportController and TransportPerformer to sessionRoboErik2014-03-1215-209/+2380
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes transport controls a primitive interface on sessions with a way to create the performer, register callbacks, and send commands and updates between controllers and performers. This still needs some cleanup but has been tested with OneMedia. Change-Id: I373d35f7ccc383b8421bd14044457467d80425f3
* | | | | | Merge "MTP: Add support for battery level device property"Mike Lockwood2014-03-124-58/+147
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | MTP: Add support for battery level device propertyMike Lockwood2014-03-124-58/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7342482 Change-Id: I810e55fe9695e2206816f57334ad14f65e9c641d
* | | | | | Merge "AudioTrack write method with data in ByteBuffer"Jean-Michel Trivi2014-03-111-2/+103
|\ \ \ \ \ \
| * | | | | | AudioTrack write method with data in ByteBufferJean-Michel Trivi2014-03-111-2/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New write method with data in ByteBuffer. Allows blocking and non-blocking write. If the ByteBuffer is not direct, the implementation uses the existing implementation with a byte array. Bug 7919023 Change-Id: I6935e3e05783d7d7672614b194941a87abbb50cf
* | | | | | | MediaPlayer: fix int overflow issue in MediaTimeProviderLajos Molnar2014-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13394783 Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
* | | | | | | Merge "MediaMuxer: added WebM filetype; open output file RW."Robert Shih2014-03-101-10/+11
|\ \ \ \ \ \ \
| * | | | | | | MediaMuxer: added WebM filetype; open output file RW.Robert Shih2014-01-291-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files with RW access can be memory mapped. Change-Id: Ic5df057e6661b062e834845a19b606c8d01a0608
* | | | | | | | am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume ↵Narayan Kamath2014-03-071-3/+3
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that size_t is 32-bit" * commit 'f7a6fe95b0b439d3c6288b0b9da152b4c70c2265': Don't assume that size_t is 32-bit
| * | | | | | | am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"Narayan Kamath2014-03-071-3/+3
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | * commit '51ec4ec51f88d854b182547405e37f3ae74c35bd': Don't assume that size_t is 32-bit
| | * | | | | | Merge "Don't assume that size_t is 32-bit"Narayan Kamath2014-03-071-3/+3
| | |\ \ \ \ \ \
| | | * | | | | | Don't assume that size_t is 32-bitAshok Bhat2014-03-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crypto data was being copied to java jint array in chunks of size_t. This will not work on LP64 as size_t will be 64-bit. This patch changes copy to use int32_t chunks instead of size_t. Change-Id: I75d910a1182ad2f58f432cd172127f048b4c393b Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | | am f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t ↵Narayan Kamath2014-03-071-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | for variables that store uint32_t value" * commit 'f2c11c142975f1571a0e8606a3b274afcb987b83': Don't use size_t for variables that store uint32_t value
| * | | | | | | am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store ↵Narayan Kamath2014-03-071-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uint32_t value" * commit '6ac6263dcc55a4a93647cc1307c901a01c06d89c': Don't use size_t for variables that store uint32_t value
| | * | | | | | Don't use size_t for variables that store uint32_t valueAshok Bhat2014-03-061-3/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The local variables width, height, displayWidth and displayHeight are set to the corresponding members of VideoFrame class. As the members of VideoFrame are uint32_t, the local variables have been changed to uint32_t. As these local variables are passed to a java method, the change of size_t to uint32_t ensures that the size of the actual parameter (i.e uint32_t) is now same as the size of the formal parameter (i.e. jint) for all platforms. Change-Id: Icd14de0142bfd4e6ba52a3e6aff3d80b323a0de4 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| * | | | | | am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load ↵Marco Nelissen2014-03-071-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failure" into klp-dev * commit 'b2c45abc1d6f791f254c2cf6affcfc4f564d9cd2': ExifInterface: fix class load failure
| | * | | | | 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
generated by cgit v1.1 at 2025-11-26 17:10:08 +0000