summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-4/+0
|\ | | | | | | | | | | | | Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:26:45 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| * DO NOT MERGE: Remove the use of JHEAD in ExifInterfaceSungsoo Lim2016-07-211-4/+0
| | | | | | | | | | Bug: 29270469 Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f
* | Merge tag 'android-6.0.1_r13' into HEADJessica Wagantall2016-02-012-16/+29
|\ \ | |/ | | | | | | | | | | Android 6.0.1 release 13 Ticket: CYNGNOS-1522 Change-Id: Ie3e371fbd0ad24e99bba8512080b5238eeacb95e
| * DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-102-16/+29
| | | | | | | | | | | | | | | | | | Sample decoding still occurs in SoundPoolThread without holding the SoundPool lock. Bug: 25781119 Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8 (cherry picked from commit 0275a982abecee683f16c827d405eafe51fb67ae)
* | Udpate instrumentation codeWilliam Clark2015-11-301-1/+0
| | | | | | | | | | | | Added changes to support new features in QSSP Change-Id: I92c0a4eb3cb5363fbf08185f25644a3202c38788
* | MediaRecorder: Add pause interfaceSteve Kondik2015-11-073-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add pause in java level - add pause in jni level CRs-Fixed: 587051 Add 2 APIs (suspend/resume) in MediaPlayer - API:suspend() will just pause the player and release all the decoders to replace release() which will release the whole player - API:resume() will just init the decoders again, then start() will be called to start to play the streaming Change-Id: Ia0c38bd827f21261b2bd87c04778e86362003344
* | Stop thread before deleting object referenceOscar Rydhé2015-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If setPeriodicCapture is called Visualizer will start a thread and do periodic callbacks. When native_finalize is called the reference to the class is deleted. If a callback happens after this the reference is no longer valid and when used from the callback method the vm crashes. With this patch the thread will be terminated before deleting the reference. Please note that this change depends on the commit in platform/frameworks/av with the same Change-Id. Change-Id: I30f331437ddad05f8d52c244cdbecb1859a0abd2
* | Screenshots info is not updated when device is plugged in MTP modeMaunik Shah2015-11-011-0/+13
| | | | | | | | | | | | | | | | | | | | When device is connected as MTP mode and user opens folder /sdcard/Pictures/Screenshots/ in windows system and captures new screenshot, image information is always shown as 0 KB Issue: https://code.google.com/p/android/issues/detail?id=56204 Change-Id: I46f3d72d275e164e40e305a3b5aafe685e6905f2
* | Fix in effectCallback to avoid sending callbacks to dead objectsLucas Gomez Jimenez2015-10-271-0/+9
| | | | | | | | | | | | | | This issue can be easily reproduced by killing an application that is playing audio using one or more audio effects. Change-Id: I5f90c65c58d9f2df0737eeed2fbbb0c43aaa0f81
* | EncoderCapabilities: Adding HFR entry in EncoderCapabilities and JNIVikas Reddy Pachika2015-10-231-3/+10
| | | | | | | | | | | | | | | | --Adding HFR entries like max HFR mode, max HFR width & max HFR height in the EncoderCapabilities.java and android_media_MediaProfiles.cpp Change-Id: I544a17e32ddd7ddccb0c48cf07b3199d2c485e09 CRs-Fixed: 589983
* | SEEMP: Add more framework instrumentationWilliam Clark2015-10-061-0/+2
| | | | | | | | | | | | | | | | | | Instrument framework files to log events of interest. Conflicts: core/java/android/accounts/AccountManager.java Change-Id: Ia45651e6352586f910039b51cac2356f65f80010
* | frameworks/base : Handling usecases for ext mediaplayerManikanta Sivapala2015-10-061-8/+21
| | | | | | | | | | | | | | | | Handling usecases while creating ext mediaplayer like extmediaplayer listner creation fails but QCMediaplayer creation succeeds or vice versa. Change-Id: Ic5242161bf30bd2688bd6aba6d6115ab0768e963
* | video: Add support for MediaRecorder pause interfaceSurajit Podder2015-10-062-2/+5
| | | | | | | | | | | | | | | | * Add pause() API to java MediaRecorder * Add change in jni to instantiate extended native MediaRecorder which supports pause/resume Change-Id: I168e187dc33ce32cd3a846123a3e55fa8ac600a0
* | MediaRecorder: video: add H265 encoderLubin Yin2015-10-061-1/+3
| | | | | | | | | | | | Add support to set HEVC video encoder (H265). Change-Id: Ic514799beeae42aa9a71476e25cfebb3b5867758
* | frameworks/base: Changes related to DASHManikanta Sivapala2015-10-061-4/+151
| | | | | | | | | | | | | | Creating Extended MediaPlayerListener and Native MediaPlayer for DASH. Change-Id: Ief49777e94b818851052715d6dbd9e51982da85a
* | CamcorderProfiles: add VGA and 4K-DCI profiles.Praveen Chavan2015-10-061-1/+3
|/ | | | Change-Id: I1067da3769635365048529fe315e6971c2d51696
* MediaSync: fix flush handling and deadlockLajos Molnar2015-07-162-0/+18
| | | | | | | | | | | - clear pending video frames - flush audio track - reset clock - restart audio track after flush - don't hold lock during callback Bug: 22234976 Change-Id: I681df950b67d7f9f77a9c5783279f1c8c91be856
* Merge "ImageWriter: Exception when Surface is abandoned" into mnc-devChien-Yu Chen2015-07-071-6/+38
|\
| * ImageWriter: Exception when Surface is abandonedChien-Yu Chen2015-07-061-6/+38
| | | | | | | | | | | | | | | | | | | | | | Throw IllegalStateException when queueing or dequeueing an image if the input surface is already abandoned by the consumer. Also fix a crash when planes are not initialized when closing ImageWriter. Bug: 22279111 Change-Id: I8301920d64a53c45b29e947e52ff323733abbf16
* | Report specific exception type on decrypt with invalid sessionJeff Tinker2015-07-061-0/+9
|/ | | | | bug: 22235465 Change-Id: Ic1e1a86529d4f2246b9768799aacde5cd1070d04
* Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-devChien-Yu Chen2015-06-191-1/+4
|\
| * ImageReader: Fix format workarounds for legacy devicesChien-Yu Chen2015-06-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Legacy shim overrides HAL_PIXEL_FORMAT_BLOB to HAL_PIXEL_FORMAT_RGBA_8888. Make ImageReader aware of the workaround when returning the format. Remove the workaround in legacy shim that overrides YUV_420_888 to YV12 because allocating YUV_420_888 buffers with SW access is supported on Flo. Bug: 21707937 Change-Id: I84a8610c82ae986a0064873f611e4f257baf1774
* | Merge "audio effect JNI: fix global ref leak." into mnc-devEric Laurent2015-06-192-0/+4
|\ \
| * | audio effect JNI: fix global ref leak.Eric Laurent2015-06-192-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Remove one more global ref leak in AudioEffect and Visualizer JNI. Bug: 21629892. Change-Id: Id77fc2d10f3dc9d3154d6a1cf0f8cc0f83683584
* | | Merge "Improve robustness of MediaDrm after mediaserver crash" into mnc-devJeff Tinker2015-06-191-0/+4
|\ \ \
| * | | Improve robustness of MediaDrm after mediaserver crashJeff Tinker2015-06-171-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | If DEAD_OBJECT is returned from binder calls due to mediaserver crash, throw new MediaDrmResetException. This allows the app to detect the condition and handle it properly. bug: 20614102 Change-Id: Id08b08fb612672fd94383f0470f5fa3f267b944f
* | | Merge "ImageWriter: Remove exception for closing twice" into mnc-devChien-Yu Chen2015-06-181-2/+1
|\ \ \ | |/ / |/| |
| * | ImageWriter: Remove exception for closing twiceChien-Yu Chen2015-06-181-2/+1
| |/ | | | | | | | | | | | | because close() will be called again when GC kicks in. Bug: 20945169 Change-Id: If3c5a13be241977ccf4692d5301c423b7ff38918
* | Merge "Add more specific consumer names for common buffer queue endpoints." ↵Eino-Ville Talvala2015-06-111-0/+11
|\ \ | |/ |/| | | into mnc-dev
| * Add more specific consumer names for common buffer queue endpoints.Eino-Ville Talvala2015-06-091-0/+11
| | | | | | | | Change-Id: I744bdcba6e60e5efd8865f725b09a9f791d76160
* | Merge "Fix format string mismatch. Clang build fix." into mnc-devDan Albert2015-06-111-1/+2
|\ \
| * | Fix format string mismatch. Clang build fix.Dan Albert2015-06-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The gralloc usage flags are an enum, which is backed by an implementation defined type. Both gcc and clang are making this a long long. All the values are hard coded to fit within 8 hex characters though, so just make the cast. Change-Id: I4a9778a24c2cbf7fb663371d208e30c4921e170d
* | | SoundPool monitors AppOps for OP_PLAY_AUDIOJean-Michel Trivi2015-06-101-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | Fix performance regression in SoundPool by not checking SoundPool can play audio everytime it's about to play. Instead check for permission in constructor and register a listener for changes on OP_PLAY_AUDIO. Bug 20018833 Change-Id: I4e7a633d23b98653a149681d18a387cd560efe4d
* | Merge "media: hook up OnFrameRenderedListener events to framework events" ↵Lajos Molnar2015-06-102-1/+64
|\ \ | | | | | | | | | into mnc-dev
| * | media: hook up OnFrameRenderedListener events to framework eventsLajos Molnar2015-06-082-1/+64
| |/ | | | | | | | | Bug: 20503131 Change-Id: Ife6d4862d14daf5b9659307af57417bd3532e8fe
* | Use only strong references to AudioEffectEric Laurent2015-06-082-124/+139
|/ | | | | | | | | Modify AudioEffect and Visualizer JNI to use strong references to native AudioEffect object. Bug: 21629892. Change-Id: I4c2dea0b2e16d807d6dc5d6b09e02e4652d48873
* Merge "Fix bug in MediaCrypto.setMediaDrmSession" into mnc-devJeff Tinker2015-06-031-10/+12
|\
| * Fix bug in MediaCrypto.setMediaDrmSessionJeff Tinker2015-06-011-10/+12
| | | | | | | | | | | | | | MediaCryptoException was being thrown unexpectedly bug: 21565802 Change-Id: I44768cac1e85a01c8d775b8432d11711ae978b0d
* | Merge "MediaPlayer: trigger onError instead of exception on stale native ↵Robert Shih2015-06-011-1/+1
|\ \ | | | | | | | | | notifications" into mnc-dev
| * | MediaPlayer: trigger onError instead of exception on stale native notificationsRobert Shih2015-06-011-1/+1
| |/ | | | | | | | | | | | | | | This change also reverted commit 2c838fbd87ad5685c0008b419ea02421159b9b70, "MediaPlayer: add mPreparing to weed out unwanted prepared messages". Bug: 21266735 Change-Id: I392342519420bee2fde1fe1915c51d24101ca27d
* | Merge "Deprecations are warnings not errors" into mnc-devGlenn Kasten2015-05-282-2/+2
|\ \
| * | Deprecations are warnings not errorsGlenn Kasten2015-05-282-2/+2
| |/ | | | | | | Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
* | Merge "Add comments to indicate code review was done for bugs" into mnc-devGlenn Kasten2015-05-281-0/+1
|\ \ | |/ |/|
| * Add comments to indicate code review was done for bugsGlenn Kasten2015-05-181-0/+1
| | | | | | | | | | | | Bug: 20818955 Bug: 20890069 Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
* | MediaPlayer: add mPreparing to weed out unwanted prepared messagesRobert Shih2015-05-211-1/+1
|/ | | | | Bug: 21266735 Change-Id: Ie4fe76533c9b7f505c57ba63df7992f2490942cc
* Merge "Fix SoundPool.unload() return value" into mnc-devAndy Hung2015-05-161-1/+1
|\
| * Fix SoundPool.unload() return valueAndy Hung2015-05-151-1/+1
| | | | | | | | | | Bug: 21209627 Change-Id: Ifd5c5f349894744c192cad10c5c875882566ec53
* | Merge "MediaDrm API Updates per api council review" into mnc-devJeff Tinker2015-05-151-11/+11
|\ \
| * | MediaDrm API Updates per api council reviewJeff Tinker2015-05-151-11/+11
| | | | | | | | | | | | | | | | | | bug: 21044671 Change-Id: Ifb34e7b8cb53f7bd5737c0869fc6c1f731ba1c9c
* | | Merge "ImageReader: Image getFormat should return the Image buffer format" ↵Zhijun He2015-05-141-2/+16
|\ \ \ | | | | | | | | | | | | into mnc-dev
generated by cgit v1.1 at 2024-05-18 23:11:19 +0000