summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Remove manta support in MNC.Ying Wang2015-03-031-4/+0
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 19548232 Change-Id: I5fd341c7cf55792c4b2c9a4928f1ad21308c4469
* | | | | | Merge "Fix NuPlayer::Decoder input buffer loss upon seamless format change"Robert Shih2015-03-041-6/+3
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Fix NuPlayer::Decoder input buffer loss upon seamless format changeRobert Shih2015-02-201-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19462710 Change-Id: I30f2ab76785a524e95b404b8b18ddc862e9c414e
* | | | | Merge "handle mpeg2ts PTS wraparound"Chong Zhang2015-03-031-1/+21
|\ \ \ \ \
| * | | | | handle mpeg2ts PTS wraparoundChong Zhang2015-03-031-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19587682 Change-Id: I805ed6aa330bda3dc0ec8bd3519fb1ffeaa81ca9
* | | | | | mediaplayer: use non-blocking mode for AudioSink::write().Wei Jia2015-03-033-19/+19
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cherry picks https://googleplex-android-review.git.corp.google.com/#/c/643541/ to master. Bug: 19448263 Change-Id: I43dea830212de79c2b080185b6c6b36078f517d2
* | | | | YUVImage.cpp: Fix hidden overflow error in YUV to RGB conversionRachad2015-03-031-6/+6
| |_|_|/ |/| | | | | | | | | | | | | | | Bug: 19573730 Change-Id: I4a233d9dd49fc590df33258b6a288ad058f11f73
* | | | Merge "Change AudioTrack resampling buffers from 3 to 2"Andy Hung2015-02-281-59/+23
|\ \ \ \
| * | | | Change AudioTrack resampling buffers from 3 to 2Andy Hung2015-02-061-59/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move computation of minimum AudioTrack buffer size to server for normal streaming PCM tracks. Use server-side computation to exactly determine requirements for the resampler to avoid triple buffering. This reduces latency for normal audio tracks that require resampling, and makes things consistent with the minimum buffer size. Change-Id: I2f2ca0e599ee20e16559bc5c5dab61ed100da16c
* | | | | Merge "mediaplayer: support dynamic playback rate"Wei Jia2015-02-2512-68/+186
|\ \ \ \ \
| * | | | | mediaplayer: support dynamic playback rateWei Jia2015-02-2412-68/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I856b1507d5fa2cedfb645706d2435683a7d3e050
* | | | | | MPEG4Writer: add software version to mp4 metaChong Zhang2015-02-251-10/+61
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and account for meta data and geo data when estimating moov size bug: 19460202 Change-Id: I094d15f47dda5e41217181cdb3ac519c00330de5
* | | | | MediaRecorder: pass capture fps in floatChong Zhang2015-02-232-10/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: Ic8f2dc02dfd482c4b2065b16e28721fc6e3cf696
* | | | | Merge "MPEG4Writer: add capture fps in meta data"Chong Zhang2015-02-232-5/+119
|\ \ \ \ \
| * | | | | MPEG4Writer: add capture fps in meta dataChong Zhang2015-02-232-5/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: I3a6ea3a5149d124ca9a2487a300dcc2db4405d0f
* | | | | | nuplayer: do not use cached source for wvm contentChong Zhang2015-02-231-23/+32
|/ / / / / | | | | | | | | | | | | | | | | | | | | bug: 18730095 Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
* | | | | am 76b54aa5: am 340cebda: Fix mismatched type tag clang warning.Dan Albert2015-02-201-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '76b54aa5240ee2052aabe7b671965a0836159fdb': Fix mismatched type tag clang warning.
| * | | | | Fix mismatched type tag clang warning.Dan Albert2015-02-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parcel is a struct, not a class. However, Parcel isn't used in this file, so just kill it. Change-Id: I575cae8b3c5dd13dd9b03fccfe7423e1f17f62f5
* | | | | | am 935b4750: am 011734f0: Fix clang build errorBill Yi2015-02-201-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '935b47504411b6ac69f708ba698a72b7282aada1': Fix clang build error
| * | | | | Fix clang build errorBill Yi2015-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I294903dcf3ce3aa6a3b2f50364067e701a33d327
| * | | | | Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEADBill Yi2015-02-19412-4639/+11288
| |\ \ \ \ \
* | \ \ \ \ \ am cf09e292: am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | * commit 'cf09e2926e3f76ac54a6efb6626a7eb256d2aaff': Fixes for GSM decoder
| * | | | | | am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2d9ded1d03653c747ba173f622e19ed6d56f26f4': Fixes for GSM decoder
| | * | | | | am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd607e5a53a6136b745ebacdf41ecdb486ed82ca6': Fixes for GSM decoder
| | | * | | | | Fixes for GSM decoderMarco Nelissen2015-02-192-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use larger buffer size, since otherwise it won't work with MediaExtractor which batches up GSM frames. Support reset and flush. Change-Id: I3a87e3744c088f7a40bbc428187fc44c073c63ec
* | | | | | | | Merge "Refactor AudioPolicyManager"Jean-Michel Trivi2015-02-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor AudioPolicyManagerJean-Michel Trivi2015-02-181-1/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioPolicyManager implementation is now split into the following files: files managerdefault/Gains.* class AudioGain class VolumeCurvePoint class StreamDescriptor files managerdefault/Devices.* class DeviceDescriptor class DeviceVector files managerdefault/Ports.* class AudioPort class AudioPortConfig class AudioPatch files managerdefault/IOProfile.* class IOProfile files managerdefault/HwModule.* class HwModule files managerdefault/AudioInputDescriptor.* class AudioInputDescriptor files managerdefault/AudioOutputDescriptor.* class AudioOutputDescriptor All files for libaudiopolicyservice are moved under service/ All files for libaudiopolicymanager are moved under manager/ Change-Id: I43758be1894e37d34db194b51a19ae24461e066e
* | | | | | | | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-3/+95
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'a7c1df10d39a8056ca755ccd77b06816c6de3225': Add dumpsys info
| * | | | | | | am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-3/+95
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | |_|_|/ / / | |/| | | | | * commit 'a963dacc1b44ec80742c86ce75611eb9cfa936ea': Add dumpsys info
| | * | | | | am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-3/+95
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '64753517e8ee315654441512a1f59b28fe5c1bc1': Add dumpsys info
| | | * | | | Add dumpsys infoMarco Nelissen2015-02-182-3/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print a list of looper-handler pairs and the number of messages they've processed, and optionally break those stats out by message type. Change-Id: I68ce4a7003152d5c9b5cb3f42e6f3949b471aa6e
| * | | | | | am 5f136027: am faefd08b: Revert "DO NOT MERGE: stagefright: add support for ↵Lajos Molnar2015-02-111-3/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel\'s YUV420SP format in SoftwareRenderer" * commit '5f13602782e10b331b962bd94f7d8eb3d73c772e': Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer"
| | * | | | | | Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format ↵Lajos Molnar2015-02-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in SoftwareRenderer" This reverts commit 7a9510dcf637cc1e5c953d77c7bd4409c80a820f. Bug: 19317169 Change-Id: I881ce6b1592b7250f423a561dadd40d379e16104
| * | | | | | | Track change of IInterface::asBinder from instance method to static methodBrian Carlstrom2015-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee262d4223ec3c61dab5ca8d9d7e4a14795da1c3
* | | | | | | | Merge "stagefright: stop reading meta data after MDAT or MOOF"Chong Zhang2015-02-132-17/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | stagefright: stop reading meta data after MDAT or MOOFChong Zhang2015-02-132-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18520722 Change-Id: I213e4bde92a7830543c1815b324164b27d853049
* | | | | | | | | stagefright: add support for limiting framerate in GraphicBufferSourceRonghua Wu2015-02-129-45/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19014096 Change-Id: I6de781e4d140a247dfd8fd8f12c3ddd7baa39ad4
* | | | | | | | | Merge "process all SEI messages for CC extraction"Chong Zhang2015-02-124-28/+69
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | process all SEI messages for CC extractionChong Zhang2015-02-124-28/+69
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19297083 Change-Id: I5b89e35cc2bd5fb2f332872941e7978f15a6f403
* | | | | | | | Track change of IInterface::asBinder from instance method to static methodBrian Carlstrom2015-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 99c678fb5c159f67cd545d928267dcfdff12cdb4) Change-Id: I517fa6b810f01ec5a4fb2bd295f16ed5cacf95ea
* | | | | | | | resolved conflicts for merge of 157defdd to masterLajos Molnar2015-02-104-2/+128
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | Change-Id: I14fd8063fa052f16868b8053a211190092131317
| * | | | | | | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload ↵Lajos Molnar2015-02-104-2/+122
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pause timeout" into lmp-mr1-dev * commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29': nuplayer: acquire wakelock during offload pause timeout
| | * | | | | | Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-devLajos Molnar2015-02-104-2/+122
| | |\ \ \ \ \ \
| | | * | | | | | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-064-2/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hold a wakelock while paused in audio offload mode, until audio teardown event is received, or pause is canceled. Since ARM cores are sleeping, the delayed AMessage will not be received, and the audio output driver will not be closed. This blocks XO shutdown. Bug: 19297092 Change-Id: I3d11fef633e3f2783f4aa31e71285e2fa09d234c
* | | | | | | | | StageFrightRecorder: update setVideoFrameRate sanity checkZhijun He2015-02-092-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow high speed recording fps to be up to 1000fps Change-Id: I975d11b8a9abbd50ce6982fb46f4a4a3a035e475
* | | | | | | | | am 6d5a1afa: am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing ↵Lajos Molnar2015-02-09290-332/+4575
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | headers on h264dec omxdl sources" into lmp-mr1-dev * commit '6d5a1afac2a7bca6b171261ca9b237c3a516e567': stagefright: change licensing headers on h264dec omxdl sources
| * | | | | | | | am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on ↵Lajos Molnar2015-02-07290-332/+4575
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | h264dec omxdl sources" into lmp-mr1-dev * commit '6d5a063de358312e6d133f8937ffb1b795116129': stagefright: change licensing headers on h264dec omxdl sources
| | * | | | | | | Merge "stagefright: change licensing headers on h264dec omxdl sources" into ↵Lajos Molnar2015-02-07290-332/+4575
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | | | | stagefright: change licensing headers on h264dec omxdl sourcesLajos Molnar2015-02-06290-332/+4575
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19030684 Change-Id: I6d4674fad126c26d3b6819fde91277a92dfd8862
* | | | | | | | | am 5421d5b2: am bff77217: am 17e95f40: stagefright: add ↵Lajos Molnar2015-02-091-0/+108
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | media_codecs_google_video_le.xml * commit '5421d5b23d2fcea6ba5573bf3490c65f97c2e730': stagefright: add media_codecs_google_video_le.xml