summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Revert "Revert "soundpool: reuse channel for same sample if available""Andy Hung2015-03-172-34/+53
| | | | | | | | | | | | | | | | | | This reverts commit 18c225d05480e7b80b312ef90d15789b34ce6bbc. Change-Id: If91b4b0fb94df1d910cbaa0a7944001b2baa7be3
* | | am 0d22633e: am 62632e25: Merge "Handle NULL keys and NULL values in ↵Jeff Tinker2015-03-131-4/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MediaDrm JNI HashMap" * commit '0d22633e07a6911403383a22bb3164f53b4f4409': Handle NULL keys and NULL values in MediaDrm JNI HashMap
| * \ \ Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"Jeff Tinker2015-03-131-4/+16
| |\ \ \
| | * | | Handle NULL keys and NULL values in MediaDrm JNI HashMapDaniel Broms2014-11-241-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If getKeyRequest() of MediaDrm was called with a HashMap containing NULL keys or NULL values then the mediaserver crashed. This modification adds NULL checks and throw IllegalArgumentException as expected. Change-Id: Ide82efe0f6bd28c8ac3f9aa048d9794f2ccc8fac
* | | | | Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager."Ronghua Wu2015-03-121-0/+6
|\ \ \ \ \
| * | | | | drm: add EVENT_SESSION_RECLAIMED for resource manager.Ronghua Wu2015-03-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19265536 Change-Id: Ifa15a4c7d3a7c20cb00bd4aefb57d239c0efaafa
* | | | | | Merge "Revert "soundpool: reuse channel for same sample if available""Glenn Kasten2015-03-102-53/+34
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Revert "soundpool: reuse channel for same sample if available"Glenn Kasten2015-03-092-53/+34
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 570576b51b8123ab05b36707ec752cf966292ca5. Bug: 19635137 Change-Id: I8385ac4c151a375c19c3606698081c947b6216e3
* | | | | Merge "Revert "soundpool: update sample rate when reusing audiotrack""Glenn Kasten2015-03-101-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Revert "soundpool: update sample rate when reusing audiotrack"Glenn Kasten2015-03-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a7d57a6f0068b1e2a0f07ca427cfba198b12a9b9. Bug: 19635137 Change-Id: I1f53a432936dd3d51459e7d8cd86421bde399150
* | | | | Merge "Fix SoundPool playback of multichannel files."Andy Hung2015-03-102-5/+7
|\ \ \ \ \
| * | | | | Fix SoundPool playback of multichannel files.Andy Hung2015-03-062-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17188507 Change-Id: Ia4e43c7f8889181b998673b75b1f3bbf8c43f429
* | | | | | Add DEPTH image formats, support in ImageReaderEino-Ville Talvala2015-03-091-34/+32
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add an explicit mapping between public ImageFormat/ PixelFormat enums and internal HAL format/dataspace. - Add DEPTH16 and DEPTH_POINT_CLOUD formats - Wire up mapping layer to ImageReader to support depth formats Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
* | | | | Merge "media: update AMessage to use handler instead of handler-id"Lajos Molnar2015-03-061-1/+1
|\ \ \ \ \
| * | | | | media: update AMessage to use handler instead of handler-idLajos Molnar2015-03-041-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: Ia18746830816bcade510e5137bf8ce6258181ac0
* | | | | Cleanup Bitmap JNI attempt #2John Reck2015-03-051-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original version missed a spot This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
* | | | | Merge "Revert "Cleanup Bitmap JNI""Chad Jones2015-03-051-1/+7
|\ \ \ \ \
| * | | | | Revert "Cleanup Bitmap JNI"Chad Jones2015-03-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7. Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
* | | | | | Merge "Cleanup Bitmap JNI"John Reck2015-03-051-7/+1
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Cleanup Bitmap JNIJohn Reck2015-03-051-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bunch of places where mNativeBitmap was being poked at directly, switch them either to the NDK API or to GraphicsJNI where it made sense Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
* | | | | soundpool: update sample rate when reusing audiotrackDhananjay Kumar2015-03-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User might update playback rate while calling Play on a sample. Update sample rate if reusing existing audio track. Change-Id: I7007c335fa405baf663a322408b92b9df53efdb0 Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | | soundpool: reuse channel for same sample if availableHaynes Mathew George2015-03-042-34/+53
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse channel for same sample if the channel completed current playback and is not reallocated to another sample, i.e. not stolen by other sample. authored-by: Ashish Jain <ashishj@codeaurora.org> Change-Id: Ibe7ee318c7dc11f3c4fd3a2f57d861318b10973b Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | MediaPlayer: add setPlaybackRate JAVA API.Wei Jia2015-03-031-0/+13
| | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I43daced7d9b53bcaca4e6a8d81ca729b32efc79f
* | | | ImageReader: Switch to RAW16 from RAW_SENSOREino-Ville Talvala2015-02-191-3/+3
|/ / / | | | | | | | | | Change-Id: I6362a997b0895686f988896de0463d834354f238
* | | am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: fb14e77 * commit 'fb14e77f45fbad139a0b0c9278bd003964b8f987': Fix memory leak
| * | am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '6da3cc59a0e77e723a8413d2443b0f1bc5821b03': Fix memory leak
| | * | Fix memory leakMarco Nelissen2015-02-101-0/+1
| | | | | | | | | | | | | | | | Change-Id: Id691f9b32f9daeb23a01b17c5418b4d74a294cda
* | | | am 4c49b1fb: am b2d7ca7c: am fd2c1307: Merge "Fix build."Elliott Hughes2015-02-041-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4c49b1fb774d59d3a6e8a6bb5a4549828504c5af': Fix build.
| * | | am b2d7ca7c: am fd2c1307: Merge "Fix build."Elliott Hughes2015-02-041-4/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718': Fix build.
| | * | Fix build.Elliott Hughes2015-02-041-4/+4
| | | | | | | | | | | | | | | | Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f
* | | | Merge "ImageReader: add support for compatible flexYUV buffers" into ↵Lajos Molnar2015-01-291-10/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 8514766 automerge: 2a8dc00 automerge: df876a1 * commit 'df876a110c4b6d55b4a9df57621aa38ff06c6de8': ImageReader: add support for compatible flexYUV buffers
| * | | Merge "ImageReader: add support for compatible flexYUV buffers" into ↵Lajos Molnar2015-01-291-10/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 8514766 automerge: 2a8dc00 * commit '2a8dc00eedeb2b8a9fa3560d8afa4cfd7c17d395': ImageReader: add support for compatible flexYUV buffers
| | * | | ImageReader: add support for compatible flexYUV buffersLajos Molnar2015-01-281-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17906609 Change-Id: Ia21aff632b9a92f4e391b3917a7774af46fd81a0
* | | | | am 3ea395dd: am 4e853598: Merge "Fix printf format"Marco Nelissen2015-01-271-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 2c2415a * commit '2c2415a552b62016886af62419080ca7ac327871': Fix printf format
| * | | | am 3ea395dd: am 4e853598: Merge "Fix printf format"Marco Nelissen2015-01-271-2/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb': Fix printf format
| | * | | Fix printf formatMarco Nelissen2015-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28
* | | | | am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-276-21/+1437
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 6e14c57 * commit '6e14c5705c5acf9d6036060252f257a084cd7578': Make SoundPool use MediaCodec
| * | | | am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-276-21/+1437
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '99985d98c23b32acc0014031d7b88ee4eed21a4b': Make SoundPool use MediaCodec
| | * | | Make SoundPool use MediaCodecMarco Nelissen2015-01-236-21/+1437
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18239054 Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
* | | | | am 2d1e078a: am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial ↵Mike Lockwood2015-01-261-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | implementation of 5 new audio specific properties" into lmp-mr1-dev * commit '2d1e078ac45a646ee55bb9aca022dafd143ff95b': MTP: Fix partial implementation of 5 new audio specific properties
| * | | | am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new ↵Mike Lockwood2015-01-261-0/+5
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | audio specific properties" into lmp-mr1-dev * commit '5ac22aa60f773917981f42e64fbc28615871fd3e': MTP: Fix partial implementation of 5 new audio specific properties
| | * | | MTP: Fix partial implementation of 5 new audio specific propertiesMike Lockwood2015-01-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change Ic5b3fb75309893caae1a4f4b56068a543847f1f7, we added partial support for the MTP properties: MTP_PROPERTY_AUDIO_WAVE_CODE, MTP_PROPERTY_BITRATE_TYPE MTP_PROPERTY_AUDIO_BITRATE MTP_PROPERTY_NUMBER_OF_CHANNELS MTP_PROPERTY_SAMPLE_RATE However we were not returning any values for these properties in the result of the MTP GetObjectPropList command. Strangely, this triggers a nasty bug in Windows 7 that results in data loss. When copying a directory containing several MP3 files from one location on the device to another, Windows will copy only some of the files to the new location, but delete all of the originals. Finishing the implementation of these new object properties for some unknown reason stops this bad behavior in Windows 7. Bug: 19018427 Change-Id: I5fd3b91a89b31827d3100686445cef6795fe0f3f
| | * | | Use NULL instead of 0 when invoking CallStaticVoidMethodHaitao Feng2015-01-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static void CallStaticVoidMethod is variable argument function. if pass 0 to the function like: CallStaticVoidMethod(......, 0), 0 will be treated as INT data type.but in the CallStaticVoidMethod implement 0 will be treated as pointer data type.Pointer in 64bit system occupied 8 bytes, but in 64bit system int occupied 4 bytes. if call function like: CallStaticVoidMethod(......, 0), only low 4 bytes will be assigned 0.Turned out it actually call function like this: CallStaticVoidMethod(......, 0xXXXXXXXX00000000). intent to pass NULL to function but passed non-NULL parameter to the function.this will cause GCDaemon crash. Bug: 18911458 Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f Reviewed-by: Liao, Bruce <bruce.liao@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | | | | am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for ↵Narayan Kamath2015-01-062-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | pointer arguments of CallStaticVoidMethod." * commit '031acc4b3920336e58c56abb99322cbeb9be9e5c': Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
| * | | | am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments ↵Narayan Kamath2015-01-062-2/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | of CallStaticVoidMethod." * commit '3787decd8d41320ec9201405ec4cc893b2c99d78': Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
| | * | | Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."Narayan Kamath2015-01-062-2/+2
| | |\ \ \
| | | * | | Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.Haitao Feng2015-01-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CallStaticVoidMethod is varargs function, and calling it with a literal 0 like CallStaticVoidMethod(..., 0) will treat the argument as a 4 byte int in both 32 and 64 bit processes. This is incorrect for pointer arguments where NULL should be used instead. Reviewed-by: Liao, Bruce <bruce.liao@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com> Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
* | | | | | am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: b7974bd * commit 'b7974bd31d06d439cb75f8a3a0ad032fa689c729': Race-condition in SoundPool during release
| * | | | | am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'dd65a4f735a311fe60c065449e394974807ff297': Race-condition in SoundPool during release
| | * | | | Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| | |\ \ \ \ | | | |/ / / | | |/| | |
generated by cgit v1.1 at 2025-03-25 14:03:56 +0000