summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* audio effects: fix heap overflowEric Laurent2015-06-196-149/+96
| | | | | | | | | | | Check consistency of effect command reply sizes before copying to reply address. Also add null pointer check on reply size. Also remove unused parameter warning. Bug: 21953516. Change-Id: I4cf00c12eaed696af28f3b7613f7e36f47a160c4
* Fix software video decoder buffer size calculationMarco Nelissen2015-06-172-2/+2
| | | | | | | | | | Various software video decoders would specify the buffer size as if it were fully cropped, which then failed a sanity check in SoftwareRenderer. They now return the full buffer size. Bug: 21717327 Bug: 21443020 Change-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5
* Add distortion correction opcodes in DngCreator.Ruben Brunk2015-06-162-1/+133
| | | | | | Bug: 20491394 Change-Id: Ide932d49e620c7dc9a847bb5ddc8715d5f936bd5
* Merge "Revert "stagefright: relax check of OMX buffer header"" into mnc-devRachad Alao2015-06-151-12/+8
|\
| * Revert "stagefright: relax check of OMX buffer header"Rachad Alao2015-06-151-12/+8
| | | | | | | | | | | | | | This reverts commit 652bc0197341337bb07fc4f87f168167fb3f47dc pending the complete investigation of b/21837661 Change-Id: I9c2825fd98ff7e9898c319ee66c0e3a3466c2093
* | don't trigger an integer underflow when decrementing.Nick Kralevich2015-06-134-5/+10
| | | | | | | | | | | | | | | | | | | | When decrementing "i", eventually i will equal zero. When that happens, i-- underflows. This causes a crash when code which uses clang's -fsanitize=unsigned-integer-overflow is run. Avoid trigging an unsigned integer underflow. Change-Id: I61709cb01f56fdb36d631aa95579e8bd09cafd12
* | Merge "stagefright: use media timestamp for default render timestamp" into ↵Lajos Molnar2015-06-132-17/+6
|\ \ | | | | | | | | | mnc-dev
| * | stagefright: use media timestamp for default render timestampLajos Molnar2015-06-122-17/+6
| |/ | | | | | | | | Bug: 21814308 Change-Id: I897bc4878c0b3a758d630e9c117b746ef7e55146
* | Merge "Serialize calls to getFrameAtTime in the mediaserver" into mnc-devMarco Nelissen2015-06-132-0/+4
|\ \
| * | Serialize calls to getFrameAtTime in the mediaserverMarco Nelissen2015-06-122-0/+4
| | | | | | | | | | | | | | | | | | | | | to avoid running out of memory. Bug: 21277449 Change-Id: I7210806a24958f38d86aadab0310fc263e4c0edf
* | | Merge "libstagefright: remove out of date profiling result before doing a ↵Ronghua Wu2015-06-121-0/+2
|\ \ \ | |_|/ |/| | | | | new profiling." into mnc-dev
| * | libstagefright: remove out of date profiling result before doing a new ↵Ronghua Wu2015-06-121-0/+2
| | | | | | | | | | | | | | | | | | | | | profiling. Bug: 21333717 Change-Id: Iaeff615fccf87b3aceed6fa566f82c06a981e030
* | | stagefright: relax check of OMX buffer headerLajos Molnar2015-06-121-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | - move check to after FillBufferDone only. - add support for NULL graphicBuffer - just in case Bug: 21773260 Change-Id: I804574c30ce47fd98bf09f5fe8ad00ae454ed1af
* | | fix build: use proper fmt in StagefrightMetadataRetriever.cpp logLajos Molnar2015-06-121-1/+1
| | | | | | | | | | | | Change-Id: Iadf74ed8c5b3a3bdb799c6e926fb7bea02511071
* | | Merge "Return correct error code from IMediaHttpConnection" into mnc-devMarco Nelissen2015-06-121-1/+1
|\ \ \
| * | | Return correct error code from IMediaHttpConnectionMarco Nelissen2015-06-111-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | It returns a boolean, not a status_t Bug: 21654826 Change-Id: Id364a90598c5cf0bb567b5b25bbc9b7c73412760
* | | Merge "stagefright: post audio EOS in NuPlayerRenderer if getPosition fails" ↵Chong Zhang2015-06-122-0/+35
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | stagefright: post audio EOS in NuPlayerRenderer if getPosition failsChong Zhang2015-06-122-0/+35
| | | | | | | | | | | | | | | | | | | | bug: 20071480 Change-Id: I81f2a1fea0daa694a61be7f4a6d70d6847e9f183
* | | | Merge "stagefright: Decode video thumbnail using MediaCodec" into mnc-devLajos Molnar2015-06-121-108/+197
|\ \ \ \
| * | | | stagefright: Decode video thumbnail using MediaCodecPraveen Chavan2015-06-121-108/+197
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use MediaCodec (in place of OMXCodec) to decode video thumbnail Change-Id: I05beaa3d67edff51aa17f58444fd34afb3933580
* | | | Merge "NuPlayerDriver: add more logging." into mnc-devWei Jia2015-06-121-1/+2
|\ \ \ \
| * | | | NuPlayerDriver: add more logging.Wei Jia2015-06-111-1/+2
| | |/ / | |/| | | | | | | | | | Change-Id: Ib80a42b4e46b4e2bea02d9a002228a058d1fa211
* | | | SoftOpus: Fix output buffer capacity.Vignesh Venkatasubramanian2015-06-111-7/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output buffer size as per opus project's sample decoder [1] is 960*6*channel_count. Whereas in SoftOpus, we use 960*6 (without the channel count multiplier. Fixing it to include maximum number of channels possible as the multiplier. [1] http://git.xiph.org/?p=opus-tools.git;a=blob;f=src/opusdec.c;h=d085f04eacdfd49759ffdb73db805562ba396720;hb=f2a2e88b47f6f24083a37be476f140f677fe7160#l571 BUG=20721050 Change-Id: I323891a1b11491782bc093477b09e7757b885674
* | | Merge "Switch to using shared over local code for initializing ICU" into mnc-devNeil Fuller2015-06-114-70/+3
|\ \ \
| * | | Switch to using shared over local code for initializing ICUNeil Fuller2015-06-114-70/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A static library now exists in external/icu/android_utils. Bug: 21730722 Change-Id: I8302b585d3c87fd1a975301ceca4ceebaccbcac9
* | | | stagefright: fix clang buildWonsik Kim2015-06-111-1/+2
| | | | | | | | | | | | | | | | Change-Id: I4f10e4af6f0b5fb0b90513ad516b36b444d3bd68
* | | | Merge "stagefright: TinyCacheSource to read continuously" into mnc-devWonsik Kim2015-06-111-3/+19
|\ \ \ \
| * | | | stagefright: TinyCacheSource to read continuouslyWonsik Kim2015-06-111-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the seek operation of underlying MediaDataSource implementation is expensive and each read is relatively small (e.g. Live MPEG2 TS stream), current TinyCacheSource implementation requests seek too frequently. Bug: 21764375 Change-Id: Ic620bf027bc4ef48822549c83c5c98109986884a
* | | | | Merge "mpeg2ts: more error tolerance" into mnc-devWonsik Kim2015-06-111-5/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | mpeg2ts: more error toleranceWonsik Kim2015-06-111-5/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be more tolerant with corrupt packet. Instead of reporting EOS, simply discard the damaged packet and continue. Bug: 21764375 Change-Id: Ibfd112db884732a082371c1abbd047077d1bf57e
* | | | NuPlayer: print player stats at the end of playbackPraveen Chavan2015-06-101-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Print stats at the end of playback if the shell property persist.debug.sf.stats is set Change-Id: Ie4250bf86b12af75c16f108ca09ad02b3e44fd29
* | | | NuPlayer: Enhance dumpsys statisticsPraveen Chavan2015-06-109-45/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Account for dropped output-frames (rather than input-frames) in percentage dropped frames. Print mime and component name for each active track Change-Id: I3491d336c696d8ed0fd1503b80afe1df47c787c8
* | | | Merge "Added support for MPEG2 video in MPEG4Extractor" into mnc-devLajos Molnar2015-06-101-1/+13
|\ \ \ \
| * | | | Added support for MPEG2 video in MPEG4ExtractorHarish Mahendrakar2015-05-051-1/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: I70b1c3a07062526fc6d5333f70f4f1d792834e7f
* | | | | Merge "mediaplayer: remove use-awesomeplayer developer option" into mnc-devLajos Molnar2015-06-101-6/+0
|\ \ \ \ \
| * | | | | mediaplayer: remove use-awesomeplayer developer optionLajos Molnar2015-06-101-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17108024 Change-Id: Id6429eb58226fe955f091f661fcb2f21a5f6ce5e
* | | | | | stagefright: fix issues with OMX message passingLajos Molnar2015-06-102-3/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added destructor for MessageList so messages are freed - check if notify has been initialized - do not call onMessages if there are no messages Bug: 21659665 Change-Id: Idb4eaa63dc2f8be8b282be79e6234f83a7669481
* | | | | Merge "NuPlayerRenderer: discard pending kWhatDrainAudioQueue message when ↵Wei Jia2015-06-101-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | AudioSink is opened in callback mode." into mnc-dev
| * | | | | NuPlayerRenderer: discard pending kWhatDrainAudioQueue message when ↵Wei Jia2015-06-101-3/+8
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioSink is opened in callback mode. Bug: 21723010 Change-Id: Iddab8c1cbdf87714aa53315feba064fe101d8f98
* | | | | stagefright: fix legacy support for CameraSourceLajos Molnar2015-06-102-19/+24
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allocate big enough buffers for native metadata source even in CameraSource mode - don't check range when using native metadata mode (and converting it to GrallocSource) as OMX buffer will be smaller than input - log allocated vs. OMX reported sizes in OMXNodeInstance logs Bug: 21708032 Change-Id: I7eeffc5116079e5b368f84980e8e7524260aaccf
* | | | mediaserver : Initialize ICU on startup.Narayan Kamath2015-06-104-1/+72
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | In change 2b29e461c in external/icu, we stopped hardcoding the ICU data path at compile time to avoid two sets of mappings in zygote forked processes. This means we'll have to tell ICU where its data is if the process in question isn't forked from the zygote. bug: 21705078 Change-Id: I829d9fa34fe8209aa8a6d55145ca26fdf0d934e8
* | | Merge "stagefright: add support for output frame rendered callback" into mnc-devLajos Molnar2015-06-108-28/+435
|\ \ \
| * | | stagefright: add support for output frame rendered callbackLajos Molnar2015-06-098-28/+435
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added FRAME_RENDERED event in OMX, used by tunneled video decoders to signal rendered event timing - Track buffers sent for rendering in ACodec and in SoftwareRenderer, and determine when they have rendered - Propagate render times to MediaCodec Bug: 20503131 Change-Id: Idf0a8714d5368b237c2285dd39fa82db847c232f
* | | | Merge "NuPlayerRenderer: change log from ALOGW to ALOGV when audio sink ↵Wei Jia2015-06-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | reports WOULD_BLOCK on writing." into mnc-dev
| * | | | NuPlayerRenderer: change log from ALOGW to ALOGV when audio sink reports ↵Wei Jia2015-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WOULD_BLOCK on writing. Bug: 21726662 Change-Id: I4aa63df7f21e06473594dda30a935e0f1cb745ac
* | | | | Merge "AudioSink: use flags granted by AudioTrack, instead of the requested ↵Wei Jia2015-06-091-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | flags." into mnc-dev
| * | | | | AudioSink: use flags granted by AudioTrack, instead of the requested flags.Wei Jia2015-06-091-2/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not call AudioTrack::setPlaybackRate when DIRECT flag is set. Bug: 17459982 Change-Id: Ib8fb07be72558234519590bcc3bb88c4f6edfa37
* | | | | Merge "Ogg Opus: handle cases where first sample has non 0 time" into mnc-devRobert Shih2015-06-091-1/+38
|\ \ \ \ \
| * | | | | Ogg Opus: handle cases where first sample has non 0 timeRobert Shih2015-06-081-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19286916 Change-Id: I660daae57e7b7e793f55154c74347e9d53627324
* | | | | | Merge "Use only strong references to AudioEffect" into mnc-devEric Laurent2015-06-091-4/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |