summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | Fix buildMarco Nelissen2014-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bad automerge Change-Id: I000a9d3ac2915b3e39d2d34bd52062ac47e9f0fe
* | | | | | | am 4bf85e84: am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge ↵Marco Nelissen2014-03-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "libexif is now libjhead" into klp-dev * commit '4bf85e84e95cd39f5bded8abc8d1e0bf9c28e3ce': libexif is now libjhead
| * | | | | | am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into ↵Marco Nelissen2014-03-071-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'e1af0bd8588ca2de7084853017928729a793b769': libexif is now libjhead
| | * | | | | 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 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController ↵Eric Laurent2014-03-061-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronization mode" into klp-dev * commit '3260f254459fab42fb23389088da0eb73e0e0969': Fix RemoteController synchronization mode
| | * | | | | | 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
* | | | | | | fix MediaCodec release deadlock and resource leakChong Zhang2014-03-032-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12910147 Change-Id: I5f2c02b6ad5bfcd88797c6aa79dcaa23d030eacf
* | | | | | | Merge "Fix includes so that they no longer rely on the global Skia includes ↵Derek Sollenberger2014-02-284-5/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | directories."
| * | | | | | | Fix includes so that they no longer rely on the global Skia includes ↵Derek Sollenberger2014-02-274-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directories. bug:13225538 Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
* | | | | | | | Cleanup unnecessary includes for libskia.Derek Sollenberger2014-02-271-5/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libskia target exports all of its public includes directories so redefining them here is redundant. Also this cleans up and makes it obvious where the framework is making using of private Skia headers. Change-Id: Ie7ecc9ddd3df780bed6b9af54ba58ca58274e043
* | | | | | | Merge "Move Session apis to android.media.session"RoboErik2014-02-2610-15/+24
|\ \ \ \ \ \ \
| * | | | | | | Move Session apis to android.media.sessionRoboErik2014-02-2510-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to make it easier to distinguish the new apis from the old ones. Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
* | | | | | | | Merge "Tabs -> spaces in frameworks/base."John Spurlock2014-02-251-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Tabs -> spaces in frameworks/base.John Spurlock2014-02-251-6/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
* | | | | | | | Merge "support time lapse/slow motion on SURFACE source"Chong Zhang2014-02-242-6/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | support time lapse/slow motion on SURFACE sourceChong Zhang2014-02-142-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - pass time between capture as us, in high fps case ms could be inaccurate - add test cases in MediaRecorderTest for time lapse/slow motion Bug: 13032650 Change-Id: I34ecc3b39e0519753f74ae42afcaeeddfff1666a
* | | | | | | | | Add method to get redirected UriMarco Nelissen2014-02-212-7/+19
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32c35e1cae89ee1106e8eabff0a4673af8cf57cd
* | | | | | | | Another javadoc fixRoboErik2014-02-191-2/+2
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Change-Id: I7a569a1583f87153f68d492a7500ffceac2ed3ae
* | | | | | | Fix build (bad javadoc reference)RoboErik2014-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifddab9f61fda81858ab429bbd2ec9d0821577c23
* | | | | | | Merge "Initial round of MediaSession APIs"RoboErik2014-02-2012-35/+1002
|\ \ \ \ \ \ \
| * | | | | | | Initial round of MediaSession APIsRoboErik2014-02-1912-35/+1002
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is far from complete but puts the basic components in place for an app to interact with media sessions. Change-Id: Icfe313f90ad76ae56badbe42b0e43fc5f68db36f
| * | | | | | | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-132-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7825334929b098b36e1144872200e75ba6d24b13. Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
| * | | | | | | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-122-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv() thus minimizing build dependencies. Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
* | | | | | | Fix regressionMarco Nelissen2014-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't crash if an item is inserted without a slash in its path. b/13076381 Change-Id: I5cde2adaa038201e0692af3c8ca92540ce75f083
* | | | | | | Update createInputSurface() docAndy McFadden2014-02-141-0/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Surface returned by MediaCodec#createInputSurface() is configured for HW_VIDEO_ENCODER by the consumer. Accessing the Surface through Surface#lockCanvas() sets SW_READ_OFTEN | SW_WRITE_OFTEN, and some devices choke on the combination. Bug 11418094 Change-Id: Ic182802386146d19b1bdecdb894c5130c563a3ed
* | | | | | am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '43c9516a29563131e04ee797562130e2c4f9d54e': Fix in MediaMuxer's JNI code
| * | | | | am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc': Fix in MediaMuxer's JNI code
generated by cgit v1.1 at 2025-01-23 23:30:01 +0000