summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | ImageReader: Image getFormat should return the Image buffer formatZhijun He2015-05-061-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also return buffer size correctly. Bug: 19527410 Change-Id: I9a912afc61d577571c1b2a7f6df21da40838e925
* | | | Merge "MediaDataSource: address API council comments" into mnc-devChong Zhang2015-05-142-5/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | MediaDataSource: address API council commentsChong Zhang2015-05-142-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - throw IOExecption on fatal errors - add offset argument to readAt - and fix a crash in MediaExtractor bug: 21045118 bug: 21163225 Change-Id: I3c0ff42e539868b9374a4f1f3a9852143f68ba68
* | | | AudioTrack in SoundPool uses audio_attributes_t parameterJean-Michel Trivi2015-05-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Bug 20731155 Change-Id: I62ce9d5c5a88aaf534cfd1861378215f9253248d
* | | | Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into ↵Chong Zhang2015-05-133-13/+13
|\ \ \ \ | |_|_|/ |/| | | | | | | mnc-dev
| * | | MediaCodec: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-133-13/+13
| |/ / | | | | | | | | | | | | bug: 21045402 Change-Id: I510a3a694367b8e5a21f4a4fa2a338031fed8991
* | | Merge "MediaSync: address API review." into mnc-devWei Jia2015-05-087-160/+160
|\ \ \
| * | | MediaSync: address API review.Wei Jia2015-05-087-160/+160
| | |/ | |/| | | | | | | | | | | | | | | | | | | Rename *Settings to *Params; Remove size parameter from MediaSync.queueAudio(); Bug: 20887706 Change-Id: I4c572da92ada51458031a482b96b3f624224e608
* | | media: merge CodecException's getErrorCode and getReason.Ronghua Wu2015-05-081-12/+27
| |/ |/| | | | | | | | | | | And unhide getErrorCode. Bug: 20950388 Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
* | Fix clang warnings on unused variable, mismatched tag, print format.Chih-Hung Hsieh2015-05-071-1/+1
|/ | | | | BUG: 20890093 Change-Id: I91588f481d80b69823bc9d104b8bd09167ee5373
* MediaSync: clean up configureAudioTrack and configureSurface.Wei Jia2015-05-042-17/+17
| | | | | | Bug: 19666434 Change-Id: I8b112843d430c0730a879abc9aa25f143bdcf09d
* Merge "media: hook up MediaCodec.setSurface" into mnc-devLajos Molnar2015-05-022-0/+53
|\
| * media: hook up MediaCodec.setSurfaceLajos Molnar2015-05-012-0/+53
| | | | | | | | | | Bug: 11990461 Change-Id: Id2dc952594c21c6be68e4ffd039c7f74006a2374
* | MediaRecorder: implement persistent input surface APIsChong Zhang2015-05-021-0/+22
| | | | | | | | | | | | | | Bug: 19127604 Bug: 19489395 Change-Id: Ic8e151b97ea6b85fc65f724d3e68e1cb6b500866
* | MediaCodec: implement persistent input surface APIsChong Zhang2015-05-012-1/+165
|/ | | | | | | Bug: 19127604 Bug: 19489395 Change-Id: If0d723c9ecd6fe81d9df210bd2fd026b8603ea4a
* media: Hook up MediaPlayer and MediaSync to new settingsLajos Molnar2015-04-305-91/+265
| | | | | Bug: 19666434 Change-Id: Ib815a80a991d4be9ce179514ac517c54f98234fd
* Merge "Change how Java Bitmaps are accessed in a few places" into mnc-devJohn Reck2015-04-301-4/+5
|\
| * Change how Java Bitmaps are accessed in a few placesJohn Reck2015-04-301-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Stop assuming that a Java Bitmap has a SkBitmap* that has some externally managed lifecycle, and instead switch a bunch of users to accessing the bitmap by providing their own SkBitmap* on which to set the (ref counted!) SkPixelRef* instead Attempt #2 to land this, original issue was in getSkBitmap and should be fixed Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
* | Merge "media: set codec exception reason." into mnc-devRonghua Wu2015-04-301-2/+2
|\ \
| * | media: set codec exception reason.Ronghua Wu2015-04-281-2/+2
| |/ | | | | | | | | Bug: 19620911 Change-Id: I13c007bc82b367680e9a15dc6caed6ef8a81d0a6
* | Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-devAndy Hung2015-04-301-4/+5
|\ \
| * | Check for null codec from AMediaCodec_createDecoderByTypeAndy Hung2015-04-291-4/+5
| |/ | | | | | | | | | | | | NULL codec can now occur if codec cannot be created. Bug: 20566134 Change-Id: I08d54e733a01d0614313673dc49a6f5e702633ac
* | Respect the record audio app op - frameworkSvet Ganov2015-04-283-8/+24
|/ | | | Change-Id: I5696d2ef22738ccffaf8bd7a0ee68cbc3dea3bf1
* ImageWriter: Change detach to sp<GraphicBuffer>Dan Stoza2015-04-271-1/+1
| | | | | | | | Changes the call to IGBP::detachNextBuffer to return an sp<GraphicBuffer> instead of an ANativeWindowBuffer*. Bug: 20092217 Change-Id: I59d6acef7120de5040c6710aeecfa1633ec7f736
* Merge "ImageWriter: fix and cleanup the closed Image Handling"Zhijun He2015-04-241-1/+1
|\
| * ImageWriter: fix and cleanup the closed Image HandlingZhijun He2015-04-241-1/+1
| | | | | | | | | | | | | | | | | | Attempting to access an Image after it is closed will result in an ISE. Also fixed some minor doc issues. Bug: 19872785 Change-Id: I91f037b2b2f243fcbd905d5a646b505bc9c10638
* | MediaSync: fix message delay based on play time for pending audio frames.Wei Jia2015-04-232-0/+25
| | | | | | | | | | Bug: 19666434 Change-Id: Ia9ad3858d4ddccf8aa476f2506785f1d76f90b32
* | media: add SyncSettings to MediaSync and MediaPlayerLajos Molnar2015-04-225-2/+272
| | | | | | | | | | Bug: 18249558 Change-Id: I76d7e20d0e0c2d1d24bf60ade6386986573476f0
* | media: use PlaybackSettings in MediaSync and MediaPlayerLajos Molnar2015-04-222-4/+175
|/ | | | | Bug: 19666434 Change-Id: Ic5e517534a26f4e3b0294205e0b93f95338bf072
* GraphicsJNI Canvas cleanupJohn Reck2015-04-221-1/+2
| | | | Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
* Merge "Revert "Change how Java Bitmaps are accessed in a few places""John Reck2015-04-201-5/+4
|\
| * Revert "Change how Java Bitmaps are accessed in a few places"John Reck2015-04-201-5/+4
| | | | | | | | | | | | | | | | Bug: 20207616 This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0. Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
* | Revert "A bunch more cleanups"John Reck2015-04-171-2/+1
| | | | | | | | | | | | This reverts commit c294d128d03bc9a9982b273a82516c04583438cc. Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
* | Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-167-72/+265
|\ \
| * | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-157-72/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps to implement MediaDataSource, which is modeled on stagefright's DataSource, to supply media data to the framework. This was already implemented for MediaExtractor, but it was renamed from DataSource. MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new overload: #setDataSource(android.media.MediaDataSource) Only NuPlayer supports this new data source. The change introduces: * IDataSource: The binder interface for DataSource. * JMediaDataSource: The native counterpart to the java interface. It implements IDataSource. * CallbackDataSource: A stagefright DataSource that wraps an IDataSource. Change-Id: I6d9c1167b4a7384c469b1e928f31791a7ebed716
* | | Merge "MediaSync: pass the error code of setPlaybackRate from native code to ↵Wei Jia2015-04-162-6/+18
|\ \ \ | | | | | | | | | | | | JAVA."
| * | | MediaSync: pass the error code of setPlaybackRate from native code to JAVA.Wei Jia2015-04-152-6/+18
| | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I9c892b1e487b3bcdce49ff067e42995194cf6585
* | | | media: add reason to CodecException ctor.Ronghua Wu2015-04-151-2/+19
| | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I3e9d1824c438253e9a7c303478f3cb75d0bb5c75
generated by cgit v1.1 at 2025-03-29 19:09:22 +0000