summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* stagefright: Fix CLANG compilation for AMR decoderLeena Winterrowd2016-04-131-1/+1
| | | | | | Fix invalid type in error log's format string. Change-Id: I26aabfcdc1a03c0a7d9cd10fb3b39a660a9be03a
* video: Use boot clock for recording start timeSurajit Podder2016-04-133-2/+28
| | | | | | | | | | | | | 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
* frameworks/av: Fix LOG_NDEBUG compilation issuesLeena Winterrowd2016-04-131-0/+2
| | | | | | Fix compilation issues that appear when enabling LOG_NDEBUG. Change-Id: I87e9e5ac66157759dd6f521fab0dd346089a011a
* libstagefright: handle error when B-frame is sent to MPEG4Writerxiaoqiny2016-04-132-3/+19
| | | | | | | | | 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-132-2/+3
| | | | | | Defer MPEG4 muxer creation to AVFactory. Change-Id: If0918be77ab7f8d82c78203f371df789e3cc29b8
* omx: softcodecs: Support HAL_PIXEL_FORMAT_RGBX_8888Diogo Ferreira2016-04-111-0/+3
| | | | | | | | | | Adds support for the HAL_PIXEL_FORMAT_RGBX_8888 format used by mediatek's hardware. Fixes several CTS tests where interaction between hardware and software encoders and decoders is tested. Change-Id: Ie3267c7d34706c49ad415ebc04ad05f2f2ef3506
* Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-052-1/+10
|\ | | | | | | | | Ticket: CYNGNOS-2213 Android 6.0.1 release 24
| * Also fix out of bounds access for normal readMarco Nelissen2016-03-011-1/+9
| | | | | | | | | | | | | | Previous fix accidentally only fixed the fragmented read case. Bug: 27208621 Change-Id: Ie16f1920b84c8aba613842659238fcd5925694ad
| * Fixing safteynet logging bug introduced in ag/862848mspector@google.com2016-03-011-0/+1
| | | | | | | | | | | | We moved the safteynet logging into storeMetaDataInBuffers_l Bug: 26324358 Change-Id: I2171742b53192ebb71d546bcb8970bb3c68f366f
| * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 am: e463301aa4 am: 0dd00d9b19 * commit '0dd00d9b1986cd2cc4f45bdb96266dee01f20d72': Fix out-of-bounds write
| | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 am: e463301aa4 * commit 'e463301aa44f0ea0ae1a2399bf8800d94cf6ce3e': Fix out-of-bounds write
| | | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 * commit 'a39f9818759155a2651995d6844f9821d83e3f0d': Fix out-of-bounds write
| | | | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 * commit '0945199000aaa5a628705de69f17d28a5c04cc36': Fix out-of-bounds write
| | | | | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 am: 2304c606eb * commit '2304c606eb2eb9e6f21fcca0e6dcd4ac8156779a': Fix out-of-bounds write
| | | | | | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7eMarco Nelissen2016-01-121-1/+9
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a8ac8f617b * commit 'a8ac8f617b2df8f07935d3e1e47189dee2381b88': Fix out-of-bounds write
| | | | | | | * Fix out-of-bounds write am: 5403587a74Marco Nelissen2016-01-121-1/+9
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fb2eb86102 * commit 'fb2eb8610208d3ad2ea69f57a151ffe436c6c6e6': Fix out-of-bounds write
| | | | | | | | * Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5403587a74 * commit '5403587a74aee2fb57076528c3927851531c8afb': Fix out-of-bounds write
| | | | | | | | | * Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26365349 Change-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b
| | | | | | | | * | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-032-1/+18
| | | | | | | | |\ \ | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 * commit '6afc659b00c3f4a83b9f5f3c744b7119b33340b4': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | | * DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-032-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809 (cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
| | | | | | | * | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-032-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809 (cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
| | | | | * | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-102-0/+18
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 * commit '1856f1fe348e25c7080c9c8cbd75da21409c179c': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | * | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-102-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809 (cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba) (cherry picked from commit 0462975291796e414891e04bcec9da993914e458)
| | | | | * | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" ↵Jon Larimer2015-10-211-1/+3
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 am: 699e9b0749 am: 8e4f53159c * commit '8e4f53159c64996e1617ec589977c290fa233010': stagefright: MPEG4Extractor: allow 'hdlr' box before first track
| | | | | | * | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" ↵Jon Larimer2015-10-211-1/+3
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 * commit 'b44e95da772bb26fa9fc4cdc04cf51b7d42344ae': stagefright: MPEG4Extractor: allow 'hdlr' box before first track
| | | | | | | * | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" ↵Jon Larimer2015-10-201-1/+3
| | | | | | | |\ \ \ | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev am: b1a13d01dc am: 781cd4f37d * commit '781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e': stagefright: MPEG4Extractor: allow 'hdlr' box before first track
| | | | | | | | * | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" ↵Jon Larimer2015-10-201-1/+3
| | | | | | | | |\ \ | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev am: b1a13d01dc * commit 'b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa': stagefright: MPEG4Extractor: allow 'hdlr' box before first track
| | | | | | | | | * Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" ↵Jon Larimer2015-10-201-1/+3
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev
| | | | | | | | | | * stagefright: MPEG4Extractor: allow 'hdlr' box before first trackLajos Molnar2015-10-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21725583 Change-Id: I799c1967759c7e49fb50281a1708188450caac77 (cherry picked from commit cf75af8f76265fb2909028f5dc68c7029dbe5f49)
| | | | | | | | * | | am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely ↵Wei Jia2015-10-084-3/+16
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call allocateBuffer." into klp-dev * commit '3b4a72acf039c58c33807b6d6fcdd5e09eafb1df': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
| | | | | | | | | * | Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call ↵Wei Jia2015-10-084-3/+16
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocateBuffer." into klp-dev
| | | | | | | | | | * | DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-074-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24310423 Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3 (cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)
| | | | | * | | | | | | am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-084-0/+13
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
| | | | | | * | | | | | resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-084-0/+13
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib6a1aa4cee00e0449da30ae158d71403d6236487
| | | | | | | * | | | | Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call ↵Wei Jia2015-10-084-3/+16
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocateBuffer." into lmp-dev
| | | | | | | | * | | | | DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-074-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24310423 Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3 (cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)
| | | | | * | | | | | | | am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am ↵Wei Jia2015-10-061-2/+19
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. * commit 'd4df7559c32d95707d2c04cbf8612db37d682ef6': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
| | | | | | * | | | | | | am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible ↵Wei Jia2015-10-061-2/+19
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integer overflow for extendedHeaderSize and paddingSize. * commit '8b713f11afc2cd5bf4252022c84bb480a8dd492b': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
| | | | | | | * | | | | | am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for ↵Wei Jia2015-10-061-2/+19
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / | | | | | | | |/| / / / / | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extendedHeaderSize and paddingSize. * commit 'fc0e2a87c17b1f326b5e3302e8f534c143fd5784': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
| | | | | | | | * | | | am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and ↵Wei Jia2015-10-061-2/+19
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | paddingSize. * commit '7ed8d1eff9b292b3c65a875b13a549e29654534b': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
| | | | | | | | | * | | ID3: check possible integer overflow for extendedHeaderSize and paddingSize.Wei Jia2015-10-061-2/+19
| | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24623447 Change-Id: Ifbc74454d6e28ad7136efe35ab638a07e46398b1 (cherry picked from commit b3694ff5a5bcecd4b6cedca156f6effb55bbf4ca)
| | | | * | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-12-032-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809 (cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
| * | | | | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-12-032-0/+18
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 am: a022f6e7b7 * commit 'a022f6e7b7f3ef86095199ef02903051c9a6a08c': libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | * | | | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-12-032-0/+18
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 * commit '87f8cbb223ee516803dbb99699320c2484cbf3ba': libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | * | | | | | | | libstagefright: check requested memory size before allocation for ↵Wei Jia2015-11-202-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809
| * | | | | | | | | | DO NOT MERGE Revert "AwesomePlayer: Separate cache buffer watermarks for ↵Chris Elliott2015-12-021-27/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offload audio" This reverts commit ddbebb92f831784dc143d2cd8492ce690e238744.
| * | | | | | | | | | DO NOT MERGE Revert "AwesomePlayer: Stop posting buffering events once at EOS"Chris Elliott2015-12-021-2/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 701cac1716d5ddb867a5444ea152d26741f3b397.
| * | | | | | | | | AwesomePlayer: Separate cache buffer watermarks for offload audioSridhar Vashist2015-11-231-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Using normal playback cache watermarks for offload playback leads to cache underruns & buffering pauses resulting in choppy audio. - Add new properties to define cache hi/low watermarks for offload audio. - Calculate cache buffer levels only based on size for offload audio. Change-Id: Idb8c1be351678d57490939187079f452a65aebc3 Signed-off-by: Sridhar Vashist <svashist@motorola.com>
| * | | | | | | | | AwesomePlayer: Stop posting buffering events once at EOSSridhar Vashist2015-11-231-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop posting buffering events once at end of stream to avoid perpetually holding the 'TimedEventQueue' wakelock in libstagefright. Change-Id: I3b8012886f2c27e830ce215b14090c35825635cd Signed-off-by: Sridhar Vashist <svashist@motorola.com>
| * | | | | | | | ALooper::awaitResponse gets reply and returns immediately if the looper is ↵Ronghua Wu2015-10-261-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stopped. Bug: 25088488 Change-Id: Id33d5d75f1173db52d00f4ff71d4c2c4f27f72f5
generated by cgit v1.1 at 2024-06-27 09:48:36 +0000