summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-023-1/+10
|\ | | | | | | | | | | 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-232-0/+9
| | | | | | | | | | | | | | | | Subtract address of a random static object from pointers being routed through app process. Bug: 28466701 Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
| * Don't use sp<>&Marco Nelissen2016-06-231-1/+1
| | | | | | | | | | | | | | because they may end up pointing to NULL after a NULL check was performed. Bug: 28166152 Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe
* | Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-072-5/+60
|\ \ | |/ | | | | | | | | Android 6.0.1 release 46 Change-Id: I4fcabf5775aebd2cb8dc0e352d1b1460d3214573
| * Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-releaseZach Jang2016-04-211-1/+60
| | | | | | | | Change-Id: I079d1db2d30d126f8aed348bd62451acf741037d
| * Fix size check for OMX_IndexParamConsumerUsageBitsMarco Nelissen2016-04-211-4/+0
| | | | | | | | | | | | | | | | since it doesn't follow the OMX convention. And remove support for the kClientNeedsFrameBuffer flag. Bug: 27207275 Change-Id: Ia2c119e2456ebf9e2f4e1de5104ef9032a212255
| * Get service by value instead of referenceMarco Nelissen2016-02-261-1/+1
| | | | | | | | | | | | | | to prevent a cleared service binder from being used. Bug: 26040840 Change-Id: Ifb5483c55b172d3553deb80dbe27f2204b86ecdb
* | audiopolicy: Add AudioSessionInfo APISteve Kondik2016-04-275-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-224-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | video: Use boot clock for recording start timeSurajit Podder2016-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | libstagefright: handle error when B-frame is sent to MPEG4Writerxiaoqiny2016-04-133-0/+6
| | | | | | | | | | | | | | | | | | Without this patch, writing B-frame to MediaMuxer will be blocked and cannot return a result. This may cause an endless progress bar shown in gallery when triming or muting some videos. Change-Id: Ib9f902a57da470c0357ec68aab00a35fbb26fb77 CRs-Fixed: 521005
* | libstagefright: Allow for MPEG4Writer extensionDeva Ramasubramanian2016-04-131-1/+8
| | | | | | | | | | | | Defer MPEG4 muxer creation to AVFactory. Change-Id: If0918be77ab7f8d82c78203f371df789e3cc29b8
* | audiopolicy: Be a little smarter with auto-attachSteve Kondik2016-04-072-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * The edge cases, ZOMG! * Instead of relying on effects to be automatically attached, let's just always notify userspace and send a bit more information. This lets the application decide if effects should be attached rather than relying on a hard-coded configuration file. * Perform the setup in getOutputForAttr, but do it on the command thread so we don't block the client. OPO-593 Change-Id: I3900b349f2e895d51fa3a3dcc2de0c4bdf6dbc08
* | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-051-1/+1
|\ \ | | | | | | | | | | | | Ticket: CYNGNOS-2213 Android 6.0.1 release 24
| * | Get service by value instead of referenceMarco Nelissen2016-03-011-1/+1
| |/ | | | | | | | | | | | | to prevent a cleared service binder from being used. Bug: 26040840 Change-Id: Ifb5483c55b172d3553deb80dbe27f2204b86ecdb
* | video: Add metadata support for DataSourceSurajit Podder2016-03-081-2/+6
| | | | | | | | | | | | | | Add meta() API to query and update DataSource metadata. Change-Id: Ibc99fbb6b9bdd6ca6a9d0b25883ba5907946a81d
* | video: Add support to push blank buffers on surface switchSurajit Podder2016-03-081-0/+1
| | | | | | | | | | | | | | | | Add support to push blank buffers only on surface switch. Setting "push-blank-buffers-on-switch" key with value 1 will enable this feature. Change-Id: I4a0fc48fe24c09a6b8d0e2e0fc4dc2e96d3178bf
* | audiopolicy: Add notification when default effects are updatedSteve Kondik2016-03-084-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * In M, we now have the ability to define a default set of audio effect on a per-stream basis. This allows us to get around the problem of apps not sending the control intents so we can implement smart global effects for specific media types. * We still need a session id in order to get a handle and configure them from an app like AudioFX, so we'll need to add some plumbing in order to send an event to interested applications. * This patch implements the native side of this. The Java layer will call down thru AudioSystem and register a callback which will be invoked by the audio policy when default effects are updated on a stream. This callback will receive both the stream type as well as the session id. * Attaching this listener requires that the caller hold the MODIFY_AUDIO_ROUTING permission. Change-Id: I142b15f2585ffca6a953c3e828e2a7c07b24f56c
* | libmedia: Add support for LHR tonesKarthik Reddy Katta2016-01-231-0/+2
| | | | | | | | | | | | | | Add tones to the ToneGenerator that are to be used for Local Hold Recall. Change-Id: I92cc1d63a3f6d38fc224774909b5b27d58be969c
* | stagefright: Add deferred release optionSteve Kondik2016-01-051-0/+4
| | | | | | | | | | | | * Fill in stub methods to improve video encoding performance. Change-Id: I2bbf192e022043d161429c6cabf4a7d740802d20
* | stagefright: Forward-port HFR and HSR supportSteve Kondik2016-01-051-0/+3
| | | | | | | | | | | | * CAF commit bd42a7ac3a60c0d8a079b4567484c9b006bac8ad upstream Change-Id: I457ccab603647f3139ea2199a544f64ac3d1a214
* | nuplayer: Enable PCM offload for any sourceSteve Kondik2015-12-291-1/+1
| | | | | | | | | | | | | | | | | | * Use the raw PCM format to perform the early open of the audio sink. This ensures that the renderer will do the same. * Fill in stubs for timestamp and position calculation. This fixes underruns and other issues. Change-Id: I8d761e523194cc12f387b4b2aa1594536e56da01
* | nuplayer: Pass along the sniffed metadata from GenericSourceSteve Kondik2015-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When the extended sniffer detects a file type that only it can handle, it will set a flag in the metadata. In some cases, an extractor exists in Android already for the filetype however it may be known to fail or we may want different behavior. * This flag is checked in MediaExtractor, but GenericSource does a little dance in order to stack DataSources for DRM and was throwing out this metadata (it's not really used by AOSP), so the desired behavior was not seen for some cases. * Add a new optional argument when creating the MediaExtractor to pass in the metadata from the original sniff so that the extended extractor is used where necessary for streaming formats. * This fixes FLAC offload with Tidal. Change-Id: I7d6b875346ce63b60cd3c37572b779665bfe217c
* | stagefright: Add more hardware codec support for our extractorSteve Kondik2015-12-281-0/+1
| | | | | | | | | | | | | | * Additional cases for timestamp reordering (smooth out AVI playback) * Enable hardware thumbnailer Change-Id: If828181850a5627dc1f91b118974905d22ab24e9
* | stagefright: Deal with output format of other AAC decodersSteve Kondik2015-12-211-1/+1
| | | | | | | | | | | | | | * Pass the bits-per-sample value when setting up the raw PCM output in case FFMPEG is decoding as it will produce floats. Change-Id: If5a8cc43a1c41e522324e77871823c9084f92169
* | Move overflow checks into SkipCutBufferMarco Nelissen2015-12-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Previously SkipCutBuffer would check its input parameters to ensure they were sane, however since bogus values might be the result of overflows, and overflow protection was recently turned on for libstagefright, the compiler's overflow checks were performed before SkipCutBuffer's, resulting in abort rather than just ignoring the bogus values. Moving the multiplication by framesize into SkipCutBuffer fixes this. Change-Id: I1ad6744bb045a5212701bbf6ee44eecb5f318210
* | stagefright: Finish support for HEVC muxingSteve Kondik2015-12-131-0/+3
| | | | | | | | | | | | * Forward-port CAF L-MR1 code to fill in stubs. Change-Id: I6c07e803ad4fe3ef5286f61667b5ca11380db984
* | StagefrightRecorder: Add support for WAVE recordingMichael Bestas2015-12-121-0/+108
| | | | | | | | | | | | * Forward port the cm-12.1 code Change-Id: I77373a236108507b8fa76cc8d3016de36aade301
* | libstagefright: Fix for testExceptionManikanta Kanamarlapudi2015-12-091-0/+2
| | | | | | | | | | | | | | | | Handled decoder configure call for encoder component and vice-versa in fallback logic CRs-Fixed: 891538 Change-Id: Ibb0d2da829a0e0f907ad8265836bac0466de1b4d
* | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-072-1/+8
|\ \ | |/ | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/av into cm-13.0 Android 6.0.1 release 3 Change-Id: I2f2a1fe1b58c828e8341556996211562d6e195ab
| * am 32ba6ec7: am 0378676b: am 92990810: am b1231923: am e550d213: am ↵Lajos Molnar2015-10-191-0/+4
| |\ | | | | | | | | | | | | | | | | | | f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev * commit '32ba6ec761fc62f7da217281ac5bb598ffed2db8': stagefright: check bounds for MediaCodecList.getCodecInfo
| | * am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge ↵Lajos Molnar2015-10-191-0/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev * commit '0378676b3f12158537a01916e69f6ab51817605f': stagefright: check bounds for MediaCodecList.getCodecInfo
| | | * am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: ↵Lajos Molnar2015-10-191-0/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check bounds for MediaCodecList.getCodecInfo" into lmp-dev * commit '92990810407a2e1101f5db156c1e264887886c82': stagefright: check bounds for MediaCodecList.getCodecInfo
| | | | * am e550d213: am f70b69a8: Merge "stagefright: check bounds for ↵Lajos Molnar2015-10-191-0/+4
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodecList.getCodecInfo" into lmp-dev * commit 'e550d21360287c752fd79a67f1962244ee272be1': stagefright: check bounds for MediaCodecList.getCodecInfo
| | | | | * stagefright: check bounds for MediaCodecList.getCodecInfoLajos Molnar2015-10-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24445127 Change-Id: I1c6cb9e2518b852d48d5d0d625b54409bd4e13ec
| | | * | | am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-081-0/+6
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit 'f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
| | | | * | resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-081-0/+6
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | Change-Id: Ib6a1aa4cee00e0449da30ae158d71403d6236487
| | | | | * DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24310423 Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3 (cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)
| | | * | | am 8910f92a: am 2ea335b1: am fecbc5da: am 5b4a5cce: Merge "do not dequeue ↵Jon Larimer2015-08-201-0/+1
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev * commit '8910f92aea5791f245da2c69a8c2ad3fb92bb310': do not dequeue from native window after we hit fatal error -- DO NOT MERGE
| | | | * | am fecbc5da: am 5b4a5cce: Merge "do not dequeue from native window after we ↵Jon Larimer2015-08-181-0/+1
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hit fatal error -- DO NOT MERGE" into lmp-dev * commit 'fecbc5da64a992f91f74ef6c67a7e247b0da7777': do not dequeue from native window after we hit fatal error -- DO NOT MERGE
| | | | | * do not dequeue from native window after we hit fatal error -- DO NOT MERGEChong Zhang2015-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 22845824 Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141 (cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)
| * | | | | Merge "libstagefright: don't reclaim codec when there's buffer owned by ↵Ronghua Wu2015-10-131-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | client. Notify the client and try to reclaim again in 0.5s." into mnc-dr-dev
| | * | | | | libstagefright: don't reclaim codec when there's buffer ownedRonghua Wu2015-10-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by client. Notify the client and try to reclaim again in 0.5s. Bug: 23703241 Bug: 23949540 Change-Id: I1afe50c71635645668bfb73ffa0d801765b5ae3c
* | | | | | | libstagefright: squash exynos4 supportSimon Shields2015-12-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit e41cc838b6212f8711c550522e8cefc95f003a67 Author: rINanDO <drjisakh@gmail.com> Date: Mon Aug 10 13:56:56 2015 +0200 stagefright: Exynos4 MPEG4 decoder should set native color format. Change-Id: I41bee77d48fc0b35691b94585de10269579ae789 commit a50263c53a1ecd0f75688f7042dd5e5d9badbc39 Author: Caio Schnepper <caioschnepper@gmail.com> Date: Wed Jun 10 22:26:07 2015 -0300 libstagefright: back off exynos4_enhancements HWC_HWOVERLAY usage The open source hwc doesn't support the GRALLOC_USAGE_HW_FIMC1 | GRALLOC_USAGE_HWC_HWOVERLAY combination. Removing HWC_HWOVERLAY allows FIMC1 to do decode/color conversion. Change-Id: Ibdfa9e5dd170e99e0d994540979e88e519931641 commit 63286a333bde1aa047de4e2fde8da1b59e42a16d Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org> Date: Sun Nov 3 02:45:19 2013 +0000 exynos4: libstragefright: add support for samsung colorformat/omx/mfc Source: http://git.insignal.co.kr/samsung/exynos/android/platform/frameworks/av/commit/?h=exynos-jb&id=1614612f7ca2a00473d202dbedcb135fadc608ad Conflicts: media/libstagefright/ACodec.cpp media/libstagefright/OMXCodec.cpp cherry pick from 906eba9f Change-Id: I1c174f8e9fa9bd3ed16a0399f070b6680f6a331c Change-Id: I47f5b09b37ea5376a45c80c9dd91a7fbd0c3361a
* | | | | | | video: Add QHD & 2K profile for recorderXavier Varricatt2015-12-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QHD & 2K profile for recorder Change-Id: Ib74ca47fc330d02069a3ec010c6ce8431c50f0fe
* | | | | | | stagefright: Fix build breaksKeith Mok2015-12-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build breaks on non QCOM_HARDWARE device Change-Id: I4671fa21cc7836172d356a83381dc80ee6b18f03
* | | | | | | stagefright: More HW codec support w/ FFMPEGExtractorSteve Kondik2015-12-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Support QC DiVX codec Change-Id: I5591b4544a8f92a7cc309b45a8de009f572217b7
* | | | | | | Handle error result from DrmManagerClient correctlyPatrik Lindgren2015-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readAtDRM() must handle the case when DrmManagerClient::pread() returns an error (-1) correctly. This is a degrade in Android L. Change-Id: Id7ff124d178e26931dddac5ac73697cfe6da501c
* | | | | | | libstagefright: Handle MPEG4 DP playbackLeena Winterrowd2015-11-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the HW decoder doesn't support MPEG4 DP clips, detect DP format clips in the parser and report a new MIME: video/mpeg4-esdp. This MIME is only registered to the SW decoder which supports DP clips. Merges the following change from kitkat: libstagefright: Fix DP Parsing issue with mpeg4 SP,ASP (Change-Id: I69c719011e1a0d2a0b0ae5a9b504b7cce443866b) CRs-Fixed: 722066 Change-Id: I7bc3a7a9f4a6d37e046ed9c8008cb27fb3bc665d
* | | | | | | Merge branch 'LA.BF64.1.2.2_rb4.8' of ↵Steve Kondik2015-11-291-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git://codeaurora.org/platform/frameworks/av into cm-13.0
generated by cgit v1.1 at 2024-12-22 22:33:58 +0000