summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | android_media_MediaMuxer_native_setup should return jlong. It was incorrectly returning jint. Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-062-114/+0
|\ \ \
| * | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-052-114/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | since we started to use java's HTTPConnection instead of the native implementation. Change-Id: I32b08480593a859e0368dbbcf8da8f25c9e08ca9
* | | | Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source"Chong Zhang2014-02-063-23/+250
|\ \ \ \
| * | | | MediaRecorderTest: add tests for getSurface() and SURFACE sourceChong Zhang2014-01-163-23/+250
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12305192 Change-Id: I2f63799219273dc84732ba3b7a9dceb84a1f27a7
* | | | | Merge "android_media_MediaMuxer_setLocation: amended signature."Robert Shih2014-02-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI signature. Bug: 12890910 Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292
* | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made ↵Andreas Huber2014-02-0515-21/+703
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | available to media code"
| * | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-0415-21/+703
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | to media code Change-Id: I7f6cdcfd2a28846d36d89dd5180ef20a22b03af8
* | | | | Cache media/nomedia pathsMarco Nelissen2014-02-041-16/+50
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking all the parents of every path for presence of a .nomedia file every time a new entry is inserted, build a cache of paths and use that when possible. Change-Id: I5b912fd54473db8f96d3511cbc2715e0b69dd16b
* | | | am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it ↵Zhijun He2014-01-311-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | fails to acquire graphics buffer" * commit '4f840dd16db41a2d4442667193d57260f84af04a': Release locked buffer when it fails to acquire graphics buffer
| * | | am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to ↵Zhijun He2014-01-311-0/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | acquire graphics buffer" * commit '5901ddeb525ed7691c382e8d17f47055d7d1e5db': Release locked buffer when it fails to acquire graphics buffer
| | * | Merge "Release locked buffer when it fails to acquire graphics buffer"Zhijun He2014-01-301-0/+1
| | |\ \
| | | * | Release locked buffer when it fails to acquire graphics bufferlina.x.pi2014-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JNI buffer in ImageReader_imageSetup is not released when it fails to acquire graphics buffer. After all JNI buffers are exhausted, ACQUIRE_MAX_IMAGES will be returned and leads to error. The JNI buffer should be released when it fails to acquire graphics buffer. Change-Id: I3319a58ac44e36c8593b404672a685c4b589a735
| * | | | 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>
* | | | Merge "Fix invocation of notification callback in case the callback is modified"Andreas Huber2014-01-281-3/+4
|\ \ \ \
| * | | | Fix invocation of notification callback in case the callback is modifiedAndreas Huber2014-01-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from a separate thread. Change-Id: I741c1f2f9c796ec977a742a69cedcca10c5218ad
* | | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible 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. 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> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, 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) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
* | | | API that allows usage of MediaCodec APIs without polling.Andreas Huber2014-01-273-13/+199
| | | | | | | | | | | | | | | | | | | | Change-Id: Iebccdd3aec74a2cfa9ad0bf16c0c6006a3b72999 related-to-bug: 11990118
* | | | Revert "AArch64: Make graphics classes 64-bit compatible"Narayan Kamath2014-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976. Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
* | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible 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. 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> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, 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) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
* | | | Merge "Check that the exif bits are actually there"Marco Nelissen2014-01-221-2/+2
|\ \ \ \
| * | | | Check that the exif bits are actually thereMarco Nelissen2014-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/12663599 Change-Id: If2af0ab20f29ab3264a8c6c8c4abf0ebeff6616c
* | | | | Merge "Add "throws IOException" to MediaCodec factory methods"Andy Hung2014-01-211-6/+27
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add "throws IOException" to MediaCodec factory methodsAndy Hung2014-01-161-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.media.MediaCodec (createByCodecName|createDecoderByType|createEncoderByType) now explicitly throws IOException. Requires changes to existing code for declaration compatibility. Bug: 11364276 Change-Id: I105ecb7c4bd49bf803111253cd23bab161c988f9 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | Resolved conflicts for merge of 28c6ec02 to masterNarayan Kamath2014-01-1624-153/+157
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: Idf1cabf2694dfa13d928df944d346f5e051b6948
| * | | | 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>
generated by cgit v1.1 at 2025-02-13 13:46:31 +0000