summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | OMXCodec: check IMemory::pointer() before using allocationRobert Shih2016-08-161-1/+3
| | | | | | | | | | | | | | | | | | | | Bug: 29421811 Change-Id: I0a73ba12bae4122f1d89fc92e5ea4f6a96cd1ed1
| | * | Fix corruption via buffer overflow in mediaserverRay Essick2016-08-161-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change unbound sprintf() to snprintf() so network-provided values can't overflow the buffers. Applicable to all K/L/M/N branches. Bug: 25747670 Change-Id: Id6a5120c2d08a6fbbd47deffb680ecf82015f4f6
| | * | DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassembleWonsik Kim2016-08-161-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, remove use of variable length array which is non-standard in C++. Bug: 29161888 Change-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506
| | * | SoftMP3: memset safelyRobert Shih2016-08-162-4/+19
| | | | | | | | | | | | | | | | | | | | Bug: 29422022 Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97
| * | | Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-0711-62/+224
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Android 6.0.1 release 66 Change-Id: I1d3eb6b66b7482149fe93647c278065fa46dc518
| | * | DO NOT MERGE - stagefright: fix integer overflow errorWonsik Kim2016-08-011-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 30103394 Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408 (cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
| | * | omx: prevent input port enable/disable for software codecsWonsik Kim2016-07-211-0/+7
| | | | | | | | | | | | | | | | | | | | Bug: 29421804 Change-Id: Iba1011e9af942a6dff7f659af769a51e3f5ba66f
| | * | Fix buildRobert Shih2016-07-211-1/+1
| | | | | | | | | | | | | | | | Change-Id: I48ba34b3df9c9a896d4b18c3f48e41744b7dab54
| | * | Fix buildRobert Shih2016-07-211-1/+1
| | | | | | | | | | | | | | | | Change-Id: I96a9c437eec53a285ac96794cc1ad0c8954b27e0
| | * | Add bound checks to utf16_to_utf8Sergio Giro2016-07-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 29250543 Change-Id: I3518416e89ed901021970958fb6005fd69129f7c (cherry picked from commit 1d3f4278b2666d1a145af2f54782c993aa07d1d9)
| | * | fix buildLajos Molnar2016-07-211-1/+2
| | | | | | | | | | | | | | | | Change-Id: I9bb8c659d3fc97a8e748451d82d0f3448faa242b
| | * | SoftVPX: fix nFilledLen overflowRobert Shih2016-07-212-3/+20
| | | | | | | | | | | | | | | | | | | | Bug: 29421675 Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3
| | * | OMXCodec: check IMemory::pointer() before using allocationRobert Shih2016-07-211-1/+3
| | | | | | | | | | | | | | | | | | | | Bug: 29421811 Change-Id: I0a73ba12bae4122f1d89fc92e5ea4f6a96cd1ed1
| | * | Fix corruption via buffer overflow in mediaserverRay Essick2016-07-211-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change unbound sprintf() to snprintf() so network-provided values can't overflow the buffers. Applicable to all K/L/M/N branches. Bug: 25747670 Change-Id: Id6a5120c2d08a6fbbd47deffb680ecf82015f4f6
| | * | DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassembleWonsik Kim2016-07-211-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, remove use of variable length array which is non-standard in C++. Bug: 29161888 Change-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506
| | * | SoftMP3: memset safelyRobert Shih2016-07-212-4/+19
| | | | | | | | | | | | | | | | | | | | Bug: 29422022 Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97
| | * | Impose a size bound for dynamically allocated tables in stbl.Pawin Vongmasa2016-07-202-26/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Impose a restriction of 200MiB for tables in stsc, stts, ctts and stss boxes. Also change mTimeToSample from Vector to array. Bug: 29367429 Change-Id: I953bea9fe0590268cf27376740f582dc88563d42 Merge conflict resolution of ag/1170200 to mnc-mr2-release
| * | | libstagefright: mtk: Use vendor extensions to check if we should fixup croppingDiogo Ferreira2016-08-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For mediatek video codecs, validate that the current cropped rectangle is valid and use the full frame size otherwise. This fixes a bug where format changes in the same native window would preserve the previous cropping and cause most of the image to be off-screen. Change-Id: If56ca11453f5d2e04a4138b2efe28203f30ba569 Ticket: PORRIDGE-440
| * | | stagefright: Disable thumbnail mode for 8996-class devicesSteve Kondik2016-08-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * The hardware is freezing when used for certain media types. Disable it until the issue is understood. Change-Id: Iaec2420b4f8d3ceacf2c6f72ab14db424092c96b
| * | | mediascanner: Accept .opus file extension.Danny Baumann2016-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently there are a number of people and/or tools that name their opus coded audio in ogg containers *.opus. Reflect that fact. Change-Id: I0617a6d93fe793cdef06ffd4e334001e5f9b054e
| * | | stagefright: Remove the HAL3 limitation from the video reference clock selectionRicardo Cerqueira2016-08-102-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage of boot-time as the timestamp reference isn't necessarily limited to HAL3. A single property check for media.camera.ts.monotonic is enough to cover all cases. Change-Id: Ic56dbcc6ba32c25bccde6dd0bbf07d4c918af43e
| * | | Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-029-31/+128
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ic86e42d5fb8f81fe5c4f58d2e76852829c609760
| | * | DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleakEino-Ville Talvala2016-06-231-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subtract address of a random static object from pointers being routed through app process. Bug: 28466701 Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
| | * | DO NOT MERGE omx: check buffer port before usingWonsik Kim2016-06-232-20/+55
| | | | | | | | | | | | | | | | | | | | Bug: 28816827 Change-Id: I3d5bad4a1ef96dec544b05bb31cc6f7109aae0a5
| | * | SoftHEVC: Exit gracefully in case of decoder errorsHarish Mahendrakar2016-06-231-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exit for error in allocation and unsupported resolutions Bug: 28816956 Change-Id: Ieb830bedeb3a7431d1d21a024927df630f7eda1e
| | * | Don't use sp<>&Marco Nelissen2016-06-233-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | because they may end up pointing to NULL after a NULL check was performed. Bug: 28166152 Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe
| | * | SoftAAC2: fix crash on all-zero adts bufferMarco Nelissen2016-06-231-6/+9
| | | | | | | | | | | | | | | | | | | | Bug: 29153599 Change-Id: I1cb81c054098b86cf24f024f8479909ca7bc85a6
| | * | Fix potential overflowMarco Nelissen2016-06-231-0/+8
| | | | | | | | | | | | | | | | | | | | Bug: 28533562 Change-Id: I798ab24caa4c81f3ba564cad7c9ee019284fb702
| * | | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-0712-19/+208
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Ticket: CYNGNOS-3020 Change-Id: I7e8d69c5f7041b66893ea643c4bc19c3b7bcdda5
| | * | Resolve a merge issue between lmp and lmp-mr1+Dave Weinstein2016-06-141-1/+1
| | |/ | | | | | | | | | | | | | | | Change-Id: I336cb003fb7f50fd7d95c30ca47e45530a7ad503 (cherry picked from commit 33f6da1092834f1e4be199cfa3b6310d66b521c0) (cherry picked from commit bb3a0338b58fafb01ac5b34efc450b80747e71e4)
| | * MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as ↵Wei Jia2016-05-273-14/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | track. GenericSource: return error when no track exists. SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor. Bug: 21657957 Bug: 23705695 Bug: 22802344 Bug: 28799341 Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04 (cherry picked from commit 0386c91b8a910a134e5898ffa924c1b6c7560b13)
| | * limit mediaserver memoryMarco Nelissen2016-05-275-0/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit mediaserver using rlimit, to prevent it from bringing down the system via the low memory killer. Default max is 65% of total RAM, but can be customized via system property. Bug: 28471206 Bug: 28615448 Change-Id: Ic84137435d1ef0a6883e9789a4b4f399e4283f05
| | * Check malloc result to avoid NPDMarco Nelissen2016-05-271-0/+18
| | | | | | | | | | | | | | | Bug: 28471206 Change-Id: Id5d055d76893d6f53a2e524ff5f282d1ddca3345
| | * Fix security vulnerability in libstagefrightJeff Tinker2016-05-271-1/+11
| | | | | | | | | | | | | | | bug: 28175045 Change-Id: Icee6c7eb5b761da4aa3e412fb71825508d74d38f
| | * h264bsdActivateParamSets: Prevent multiplication overflow.Pawin Vongmasa2016-05-271-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | Report MEMORY_ALLOCATION_ERROR if pStorage->picSizeInMbs would exceed UINT32_MAX bytes. Bug: 28532266 Change-Id: Ia6f11efb18818afcdb5fa2a38a14f2a2d8c8447a
| | * Clear unused pointer field when sending across binderMarco Nelissen2016-05-271-0/+1
| | | | | | | | | | | | | | | Bug: 28377502 Change-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98
| | * Check section size when verifying CRCMarco Nelissen2016-05-271-0/+7
| | | | | | | | | | | | | | | Bug: 28333006 Change-Id: Ief7a2da848face78f0edde21e2f2009316076679
| * | OMXCodec: Remove kClientNeedsFrameBuffer for S3DChristopher N. Hesse2016-06-091-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Upstream commit 0bb5ced removed support for this flag. Reference: https://github.com/CyanogenMod/android_frameworks_av/commit/0bb5ced60304da7f61478ffd359e7ba65d72f181 Change-Id: I56c8c0957b556f70b1a52cd6dd8a2bdd8f958381
| * | Fixing ALOGE message in commit ad40e57890f81a3cf436c5f06da66396010bd9e5Jessica Wagantall2016-06-071-1/+1
| | | | | | | | | | | | Change-Id: Icdfe4662ff6b53cff53142706bbd5ade1636fb27
| * | 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-0742-189/+737
| |\ \ | | |/ | | | | | | | | | | | | 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-212-18/+22
| | | | | | | | | | | | 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