summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MtpServer: Fix concurrent access to mStoragesTom Marshall2016-06-072-17/+25
| | | | | | | | | | | * getStorage is called both internally with mMutex held and externally without mMutex held. Create getStorageLocked for internal use and make getStorage a wrapper. * hasStorage is only called internally with mMutex held. Make it a private method. Change-Id: I8f73310ad6cca14cd88b8e29f20cc181b3a4fac3
* MTP: Fix crash when no storages are availableTom Marshall2016-06-071-1/+1
| | | | Change-Id: I6d7202ade46a5d781a3db5a1a3bdde17c8e70a60
* Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-0744-194/+797
|\ | | | | | | | | | | Android 6.0.1 release 46 Change-Id: I4fcabf5775aebd2cb8dc0e352d1b1460d3214573
| * SampleTable.cpp: Fixed a regression caused by a fix for bugPawin Vongmasa2016-04-212-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28076789. Detail: Before the original fix (Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9) for 28076789, the code allowed a time-to-sample table size to be 0. The change made in that fix disallowed such situation, which in fact should be allowed. This current patch allows it again while maintaining the security of the previous fix. Bug: 28288202 Bug: 28076789 Change-Id: I1c9a60c7f0cfcbd3d908f24998dde15d5136a295
| * Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-releaseZach Jang2016-04-213-19/+82
| | | | | | | | Change-Id: I079d1db2d30d126f8aed348bd62451acf741037d
| * h264dec: check for overflows when calculating allocation size.Marco Nelissen2016-04-217-14/+30
| | | | | | | | | | Bug: 27855419 Change-Id: Idabedca52913ec31ea5cb6a6109ab94e3fb2badd
| * codecs: check OMX buffer size before use in (avc|hevc|mpeg2)decWonsik Kim2016-04-216-33/+62
| | | | | | | | | | | | Bug: 27833616 Change-Id: Ic4045a3f56f53b08d0b1264b2a91b8f43e91b738 (cherry picked from commit 87fdee0bc9e3ac4d2a88ef0a8e150cfdf08c161d)
| * codecs: check OMX buffer size before use in (gsm|g711)decWonsik Kim2016-04-212-0/+17
| | | | | | | | | | | | Bug: 27793163 Bug: 27793367 Change-Id: Iec3de8a237ee2379d87a8371c13e543878c6652c
| * AudioSource: initialize variablesMarco Nelissen2016-04-211-0/+4
| | | | | | | | | | | | | | to prevent info leak Bug: 27855172 Change-Id: I3d33e0a9cc5cf8a758d7b0794590b09c43a24561
| * Check mp3 output buffer sizeMarco Nelissen2016-04-211-0/+8
| | | | | | | | | | Bug: 27793371 Change-Id: I0fe40a4cfd0a5b488f93d3f3ba6f9495235926ac
| * codecs: check OMX buffer size before use in (h263|h264)decWonsik Kim2016-04-213-7/+31
| | | | | | | | | | Bug: 27833616 Change-Id: I0fd599b3da431425d89236ffdd9df423c11947c0
| * DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)decWonsik Kim2016-04-212-2/+18
| | | | | | | | | | Bug: 27833616 Change-Id: I1ccdd16a00741da072527a6d13e87fd7c7fe8c54
| * Fix OMX_IndexParamConsumerUsageBits size checkMarco Nelissen2016-04-211-3/+4
| | | | | | | | | | Bug: 27207275 Change-Id: I9a7c9fb22a0e84a490ff09c151bd2f88141fdbc0
| * Fix size check for OMX_IndexParamConsumerUsageBitsMarco Nelissen2016-04-213-50/+6
| | | | | | | | | | | | | | | | since it doesn't follow the OMX convention. And remove support for the kClientNeedsFrameBuffer flag. Bug: 27207275 Change-Id: Ia2c119e2456ebf9e2f4e1de5104ef9032a212255
| * Fix initialization of AAC presentation structMarco Nelissen2016-04-211-0/+1
| | | | | | | | | | | | | | Otherwise the new size checks trip on this. Bug: 27207275 Change-Id: I1f8f01097e3a88ff041b69279a6121be842f1766
| * DO NOT MERGE Verify OMX buffer sizes prior to accessMarco Nelissen2016-04-2121-72/+536
| | | | | | | | | | Bug: 27207275 Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
* | audiopolicy: engineconfigurable: Don't include the exampleDiogo Ferreira2016-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | When using the configurable policy engine, the audiopolicy makefile implicitly declares dependencies on the configuration files. However, the example folder already contains the example files which we wan't to override. This patch removes the example from the makefile inclusion path so that we can declare it on a per-device basis without getting errored out by duplicate module names. Change-Id: Ie47ebff6b13606c93630c017252ebaa204203a76
* | stagefright: Correct Exynos4 stride alignmentCaio Schnepper2016-05-231-0/+6
| | | | | | | | | | | | | | | | For the OMX_COLOR_FormatYUV420Planar color format case, Google's VP9 codec is used, in that case the colors were shifting 16 bytes per horizontal line, causing green lines to appear on video playback. Change-Id: I4cf0fd40b79e53882d99f1c3f263c8a98fff1f30
* | stagefright: Fix cts issue with divx testKeith Mok2016-05-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8909 is using soft-ip divx decoder using component name starts with "OMX.ittiam." instead of "OMX.qcom." leading to FFMPEGSoftCodec override with wrong compression format using OMX_VIDEO_CodingDIVX (0x7F000003) defined in OMX_FFMPEG_Extn.h. But qcom omx component actually use QOMX_VIDEO_CodingDivx (0x7FA30C02) which defined in OMX_QCOMExtns.h. Add checking for OMX.ittiam in additional to OMX.qcom solved the problem. FEIJ-700 Change-Id: I4071eb3978974d1072373f0c88ea83653c0c53a9
* | Revert "nuplayer: Fix audio EOS notifiy on AudioSink not ready"Keith Mok2016-05-121-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | This patch is buggy, and causing notifyConsume not called when the buffer is erased, causing audio discontinous cannot resume properly. This patch is not in 8994 CAF also. FEIJ-276 This reverts commit dc5f0eb0bb08885f63a97a111b02e234efc5c413. Change-Id: Idcb5ec9a419a979afe170d3a518ee7696a6fac6c
* | FFMPEGSoftCodec: Initialize the OMX param struct before using itRicardo Cerqueira2016-05-111-0/+1
| | | | | | | | | | | | | | | | Make sure all the items in the port param config are filled out, not just those we expect to use. Ref: CYNGNOS-2797 Change-Id: I9271a83fc6496cfe5ad14e45841cd8a05ffece30
* | Revert "cameraservice: Run HAL3 in Non ZSL mode".Sanjeev Garg2016-05-061-1/+1
| | | | | | | | | | | | | | Reverting the Temp change. This reverts commit f300e17bf3451bf821ccc48c45b243c84ebaff7f. Change-Id: Ib11e38eb8edd7523cb6cdb21caa511152ee62e45
* | soundtrigger: fill in default extras from dspRoman Birg2016-05-041-0/+31
| | | | | | | | | | | | | | | | | | We seem to get an improper offset when getting the value from the DSP (offset 100, data size 1), when this happens, return a new phrase event with valid extras which are initialized to some default values. Change-Id: Ie041f78fec6bdbcd82286b54a7b7fb0c98c740f5 Signed-off-by: Roman Birg <roman@cyngn.com>
* | Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-038-35/+99
|\ \ | |/ | | | | | | | | | | Ticket: CYNGNOS-2373 Android 6.0.1 release 43 (MOB30J) Change-Id: Ie0ab546349bd8a7eed51c839fba28b809e433fd4
| * Fix AMR decoderMarco Nelissen2016-03-251-7/+7
| | | | | | | | | | | | | | | | Previous change caused EOS to be ignored. Bug: 27843673 Related-to-bug: 27662364 Change-Id: Ia148a88abc861a9b393f42bc7cd63d8d3ae349bc
| * SoftAMR: check input buffer size to avoid overflow.Wei Jia2016-03-253-15/+25
| | | | | | | | | | Bug: 27662364 Change-Id: I47380545ea7d85845e141e722b0d84f498d27145
| * SoftAMR: check output buffer size to avoid overflow.Wei Jia2016-03-251-0/+18
| | | | | | | | | | Bug: 27662364 Change-Id: I7b26892c41d6f2e690e77478ab855c2fed1ff6b0
| * codecs: check OMX buffer size before use in VP8 encoder.Wonsik Kim2016-03-251-6/+22
| | | | | | | | | | Bug: 27569635 Change-Id: I469573f40e21dc9f4c200749d4f220e3a2d31761
| * NuPlayerStreamListener: NULL and bounds check before memcpyRobert Shih2016-03-251-1/+10
| | | | | | | | | | Bug: 27533704 Change-Id: I992a7709b92b1cbc3114c97bec48a3fc5b22ba6e
| * Camera3Device: Validate template IDChien-Yu Chen2016-03-251-0/+8
| | | | | | | | | | | | | | | | Validate template ID before creating a default request. Bug: 26866110 Bug: 27568958 Change-Id: Ifda457024f1d5c2b1382f189c1a8d5fda852d30d
| * Add VPX output buffer size checkMarco Nelissen2016-03-252-10/+20
| | | | | | | | | | | | | | and handle dead observers more gracefully Bug: 27597103 Change-Id: Id7acb25d5ef69b197da15ec200a9e4f9e7b03518
* | avextensions: Fix warnings on 64-bit clangSteve Kondik2016-04-303-3/+3
| | | | | | | | Change-Id: Ie4f49819ded3a6a0e308446829a109f57a607e88
* | audiopolicy: Add AudioSessionInfo APISteve Kondik2016-04-2716-20/+465
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This patch introduces a new API which allows applications to query the state of the audio effects system, and receive callbacks with the necessary information to attach effects to any stream. * In the future, this may come as part of the AudioPort system, but since that's an active area of development by Google, we will dodge it for now. * The policy now simply keeps a refcounted list of objects which hold various bits of stream metadata. Callbacks are sent on stream open/close to applications which might be listening for them. Change-Id: I2d554d36e1378f4eb7b276010a3bfe8345c22ecd
* | audiopolicy: Revert all session callback patches.Steve Kondik2016-04-2214-315/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This has been rearchitected in a better way, as this feature turns out to be more difficult than it seems. * Reverting all of this stuff and rolling it into a single commit. This reverts commit c27a16c33c78a36482336a16199b1b8be794cea4. This reverts commit 32ef0556ae58ff6b7c6fe6fb0a17d3ff7f01de31. This reverts commit 489c9fb62f02e1d23d6d6c89b22f7d19c596e65e. This reverts commit a4123803d0a0e9e0c69faa4207d357cc74a65d58. This reverts commit e13b58b988ab642d4ae5ca6d0a89013510714956. This reverts commit 47f8c7303c9e2054f1492b02b6c7472385c52dc9. This reverts commit 0479d7c79a7fd6f112e8dc7e45c009cf6602dbaa. Change-Id: Iaed9f198d806aa414c95960713e8187c98db248b
* | audiopolicy: Fix notification not sent for session releaseSteve Kondik2016-04-222-4/+2
| | | | | | | | Change-Id: Ifba4025532debc50c7931d08a9bcd1593d9b1721
* | Merge tag 'android-6.0.1_r30' into HEADJessica Wagantall2016-04-200-0/+0
|\ \ | |/ | | | | | | Ticket: RM-234 Android 6.0.1 release 30
| * Get service by value instead of referenceMarco Nelissen2016-02-262-3/+3
| | | | | | | | | | | | | | to prevent a cleared service binder from being used. Bug: 26040840 Change-Id: Ifb5483c55b172d3553deb80dbe27f2204b86ecdb
| * Also fix out of bounds access for normal readMarco Nelissen2016-02-261-1/+9
| | | | | | | | | | | | | | Previous fix accidentally only fixed the fragmented read case. Bug: 27208621 Change-Id: Ie16f1920b84c8aba613842659238fcd5925694ad
| * Clear allocation to avoid info leakMarco Nelissen2016-02-261-27/+32
| | | | | | | | | | Bug: 26914474 Change-Id: Ie1a86e86d78058d041149fe599a4996e7f8185cf
| * Fixing safteynet logging bug introduced in ag/862848mspector@google.com2016-02-262-4/+1
| | | | | | | | | | | | We moved the safteynet logging into storeMetaDataInBuffers_l Bug: 26324358 Change-Id: I2171742b53192ebb71d546bcb8970bb3c68f366f
| * 3 uninitialized variables in IOMX.cppmspector@google.com2016-02-261-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | Uninitialized MetadataBufferType pointer in case: SET_INPUT_SURFACE STORE_META_DATA_IN_BUFFERS CREATE_INPUT_SURFACE Fix: initialize them to kMetadataBufferTypeInvalid Bug: 26324358 Change-Id: Ib3bcac9bedc98bc65efa39f67cdbffbd90b374c9
| * Fix info leak vulnerability of IDrmJeff Tinker2016-02-261-1/+1
| | | | | | | | | | bug: 26323455 Change-Id: I25bb30d3666ab38d5150496375ed2f55ecb23ba8
| * IOMX.cpp uninitialized pointer in BnOMX::onTransactmspector@google.com2016-02-261-3/+5
| | | | | | | | | | | | | | | | | | This can lead to local code execution in media server. Fix initializes the pointer and checks the error conditions before returning Bug: 26403627 Change-Id: I7fa90682060148448dba01d6acbe3471d1ddb500
* | audiopolicy: Clean up the messSteve Kondik2016-04-196-208/+27
| | | | | | | | | | | | | | | | | | | | * Since we're not using the policy directly to auto-attach, let's clean it up and remove the unused stuff. * Also fixes notifications for session release. This reverts commit 47f8c7303c9e2054f1492b02b6c7472385c52dc9. Change-Id: Ibe65f427773c6ef012dde4f289d10e4089c094ea
* | audiopolicy: Update legacy policy for session callbacksSteve Kondik2016-04-161-12/+26
| | | | | | | | Change-Id: Id6f24195721a48dc5a0d3a7ff7fbee2bd8614128
* | frameworks/av: Fix video recording breaksKeith Mok2016-04-152-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Id0af9c8aed1a983095275ac03f7f59abc31594cc using boot time for video recording start time as default, but it is specific on devices using qcom camera HAL3 and it breaks all devices using camera HAL1. Fix by changing the default behaviour when property media.camera.ts.monotonic is not set. And newer devices such as 8996 might need to setprop media.camera.ts.monotonic 0 in order to work properly when using camera HAL3. Change-Id: Iee07ed1147713a6397fff43e3bbd4f4ed08b56b7
* | libmedia: Initialize mState/mActive value to avoid possible crashZhou Song2016-04-132-4/+6
| | | | | | | | | | | | | | | | | | | | | | If track creation fails on server side, mState/mActive is left unitialized. After this a crash can happen when track stop() is called because of a reference to a NULL object. Initialize mState/mActive to specific value in initialized list of track constructor. Change-Id: If8c3611e3229c0c1b14b81285e07b9357fec7658 CRs-Fixed: 992608
* | stagefright: Fix CLANG compilation for AMR decoderLeena Winterrowd2016-04-131-1/+1
| | | | | | | | | | | | Fix invalid type in error log's format string. Change-Id: I26aabfcdc1a03c0a7d9cd10fb3b39a660a9be03a
* | nuplayer: Seek to valid position in setVideoSurfaceManikanta Kanamarlapudi2016-04-131-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If flush is called on both A/V tracks and video decoder is not yet created, In offload case the first audio buffer will get flush and audio playback starts from timestamp of second buffer, where as video playback starts from zero leads to AV sync issue in start and cause framedrops. - Call seek to current position to align the Audio and Video tracks. Seek to zero if playback has not yet started. Change-Id: I4f75d0aa908714ad292f348fa8bf7aa5f837f8d7
* | video: Use boot clock for recording start timeSurajit Podder2016-04-135-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | Camera HAL3 uses boot time for buffer timestamp, rather than system monotonic time. This leads to issues as framework uses system monotonic time as reference start time for timestamp adjustment. Add change to use boot time for reference start time. CRs-Fixed: 946735 Change-Id: Id0af9c8aed1a983095275ac03f7f59abc31594cc
generated by cgit v1.1 at 2024-06-26 13:45:34 +0000