summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "mediaplayer: support dynamic playback rate"Wei Jia2015-02-253-0/+4
|\
| * mediaplayer: support dynamic playback rateWei Jia2015-02-243-0/+4
| | | | | | | | | | | | Bug: 19196501 Change-Id: I856b1507d5fa2cedfb645706d2435683a7d3e050
* | MPEG4Writer: add software version to mp4 metaChong Zhang2015-02-251-0/+3
| | | | | | | | | | | | | | | | and account for meta data and geo data when estimating moov size bug: 19460202 Change-Id: I094d15f47dda5e41217181cdb3ac519c00330de5
* | MPEG4Writer: add capture fps in meta dataChong Zhang2015-02-231-0/+9
| | | | | | | | | | | | bug: 19460202 Change-Id: I3a6ea3a5149d124ca9a2487a300dcc2db4405d0f
* | Merge "camera: implement flashlight control"Chien-Yu Chen2015-02-192-0/+31
|\ \ | |/ |/|
| * camera: implement flashlight controlChien-Yu Chen2015-02-122-0/+31
| | | | | | | | | | | | | | | | Implement flashlight API for module v2.4 by calling module APIs and by for hal v2 and v3 by using CameraDeviceBase. Bug: 2682206 Change-Id: Ib8b77f6fd462489d672f27e14fe37801d35b7544
* | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-1/+9
|\ \ | | | | | | | | | | | | * commit 'a7c1df10d39a8056ca755ccd77b06816c6de3225': Add dumpsys info
| * \ am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-1/+9
| |\ \ | | | | | | | | | | | | | | | | * commit 'a963dacc1b44ec80742c86ce75611eb9cfa936ea': Add dumpsys info
| | * | Add dumpsys infoMarco Nelissen2015-02-182-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | stagefright: add support for limiting framerate in GraphicBufferSourceRonghua Wu2015-02-122-0/+2
| |_|/ |/| | | | | | | | | | | Bug: 19014096 Change-Id: I6de781e4d140a247dfd8fd8f12c3ddd7baa39ad4
* | | resolved conflicts for merge of 157defdd to masterLajos Molnar2015-02-101-0/+68
|\ \ \ | |/ / | | | | | | Change-Id: I14fd8063fa052f16868b8053a211190092131317
| * | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload ↵Lajos Molnar2015-02-101-0/+68
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | pause timeout" into lmp-mr1-dev * commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29': nuplayer: acquire wakelock during offload pause timeout
| | * | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-061-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am e5760862: am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for ↵Lajos Molnar2015-02-061-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | native flex-YUV support" into lmp-mr1-dev * commit 'e576086224f6e630159eaeec59ab5146c8533dc7': stagefright: add fallback for native flex-YUV support
| * | | am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native ↵Lajos Molnar2015-02-061-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | flex-YUV support" into lmp-mr1-dev * commit 'bcd22f0f3a4cd5f78e03af23aafadb2d1aec6794': stagefright: add fallback for native flex-YUV support
| | * | stagefright: add fallback for native flex-YUV supportLajos Molnar2015-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use software renderer if codec cannot support flex-YUV on a surface Bug: 17906609 Change-Id: I3d0e3ff5fee7d7b3e2416892968fa18f6139598a
* | | | Add additional info to AudioPort for enum/selection API.Paul McLean2015-02-052-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "device name" member to AudioPort. Moved unique device ID from DevicePort to AudioPort. Straighten out confusion between "name" and "address" Created string constants for Intent "extra" data keys. Combine card/address data into "address" at sender.Add additional info to AudioPort for enum/selection API. Change-Id: I1be308e12b09cd0ead9a3e9fbc9c385462299fb5
* | | | am 3b5d1195: am 7b66f713: am 57f75272: Merge "stagefright: add support for ↵Lajos Molnar2015-02-041-4/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | native flex-YUV formats" into lmp-mr1-dev * commit '3b5d119522bdf9c23be622be395d7a95d465616e': stagefright: add support for native flex-YUV formats
| * | | am 7b66f713: am 57f75272: Merge "stagefright: add support for native ↵Lajos Molnar2015-02-041-4/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | flex-YUV formats" into lmp-mr1-dev * commit '7b66f713fc53ee81453763788c02f3c741d19520': stagefright: add support for native flex-YUV formats
| | * | stagefright: add support for native flex-YUV formatsLajos Molnar2015-02-041-4/+5
| | | | | | | | | | | | | | | | | | | | Bug: 17906609 Change-Id: I14116796eaa94aa8ae62dcc29f67cb7d2c060d34
* | | | am e91c3dd0: am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf ↵Elliott Hughes2015-02-041-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | out of the way." * commit 'e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7': Move AString's StringPrintf out of the way.
| * | | am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-041-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '6a025acb630a3ac4a84715d188aeb48f1946bc3f': Move AString's StringPrintf out of the way.
| | * | Move AString's StringPrintf out of the way.Elliott Hughes2015-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should come back and replace AString with std::string and switch to the "real" StringPrintf family, but this fixes the ODR violation that was preventing us from booting. Bug: 19265750 Change-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35
* | | | am a601b862: am c9e11696: am 36dca156: Merge "Acodec: Send framerate ↵Rachad2015-02-021-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | information to OMX decoder if available" into lmp-mr1-dev * commit 'a601b86287ab5437a7e9aaf6f09bc171803cdc3d': Acodec: Send framerate information to OMX decoder if available
| * | | am c9e11696: am 36dca156: Merge "Acodec: Send framerate information to OMX ↵Rachad2015-02-021-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | decoder if available" into lmp-mr1-dev * commit 'c9e11696c4f80e9803f7e65e29af962f199a574d': Acodec: Send framerate information to OMX decoder if available
| | * | Acodec: Send framerate information to OMX decoder if availableRachad2015-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 19110889 Change-Id: Ia8dbe1b77aaac421ec9415884e1248b9b68168dc
* | | | resolved conflicts for merge of 9391844d to masterMarco Nelissen2015-01-274-264/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I348a71d1b3e3238bc3871a69454edc8247d03111
| * | | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-274-264/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72
| | * | Remove MediaPlayerService::decode()Marco Nelissen2015-01-264-264/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and make SoundPool use MediaCodec for decoding files to PCM. Bug: 18239054 Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
| * | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-133-2/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f': Replace MidiFile player with a Midi extractor
| | * | Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-083-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets rids of a bunch of special midi handling and replaces it with an extractor that works with NuPlayer and MediaMetadataRetriever. Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
* | | | Merge "Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffers"Andy Hung2015-01-151-11/+5
|\ \ \ \
| * | | | Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffersAndy Hung2015-01-141-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously conversion to AUDIO_FORMAT_PCM_16_BIT was required. Client shared memory for static tracks and AudioFlinger track creation and buffer delivery now use native 8 bit PCM data. Change-Id: I485c07a4971fde9a25442bd43fed95019d39abcc
* | | | | Merge "Move roundup from frameworks/av to system/media"Glenn Kasten2015-01-123-33/+2
|\ \ \ \ \
| * | | | | Move roundup from frameworks/av to system/mediaGlenn Kasten2015-01-073-33/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1083ab739e445e5bd3e3082fc1d3a20cc19601d5
* | | | | | am 7e85361e: am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for ↵Rachad2015-01-102-0/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | E-AC3 decoders" into lmp-mr1-dev * commit '7e85361e364bf8f80ab43dd5feb0f584e481019e': ACodec: Added support for E-AC3 decoders
| * | | | | am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" ↵Rachad2015-01-102-0/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '26c73acb73b5af94cb27e5d285d1708d25eb6892': ACodec: Added support for E-AC3 decoders
| | * | | | Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-devRachad2015-01-102-0/+3
| | |\ \ \ \
| | | * | | | ACodec: Added support for E-AC3 decodersRachad2014-12-232-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17883772 Change-Id: I05f674c33522eec0e6ceeece88dd800b1857b3ab
| * | | | | | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-082-3/+48
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | Change-Id: Ic9841f0a66930f57a5ebea527c6a841d7c49cccf
| | * | | | | Use callbacks for Midi I/OMarco Nelissen2015-01-082-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having the Sonivox engine directly open the file and use stdio to read from it, use caller-provided callbacks. Change-Id: Ie55129109060a4a7862fee3177f994401e00b6c1
* | | | | | | am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content ↵Chong Zhang2015-01-081-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | as protected to disable capture" into lmp-mr1-dev * commit '7993d6b343f2723872dac085756743630371454d': mark any copyrighted content as protected to disable capture
| * | | | | am e0344754: am 468977f0: Merge "mark any copyrighted content as protected ↵Chong Zhang2015-01-081-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | to disable capture" into lmp-mr1-dev * commit 'e03447548d1c56fa9875cac7d500f1012a6b5c26': mark any copyrighted content as protected to disable capture
| | * | | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-071-0/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | bug: 18916274 Change-Id: I23f096b51433bf18a10dc5fe6dc6b75c3881c340
* | | | | Event driven wake for AudioTrackThread notification changesAndy Hung2015-01-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used for setMarkerPosition and setPositionUpdatePeriod. Change-Id: I0d94b929438a5cd94b295d7c1884f876fae8b5e7
* | | | | Improve AudioTrack EVENT_LOOP_END and EVENT_BUFFER_END accuracyAndy Hung2015-01-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix timing computation to consider current position. Fix EVENT_LOOP_END count accuracy (some could be dropped before) for non-infinite loop static AudioTracks. Change-Id: I255f692915b55ab6f08ccd6a2365fee3f5d0a4fe
* | | | | Fix loop and position restoration in static AudioTracksAndy Hung2015-01-062-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow restoration of loop and position. Make position and loop synchronously readable. Bug: 17964637 Change-Id: I8cfb5036e665f55fdff5c67d27e1363ce9a8665d
* | | | | Fix loop and position setting in static AudioTracksAndy Hung2015-01-052-41/+47
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Allow independent setting of position and loop. Bug: 17964637 Change-Id: I8b3bd97a244b932728b68da7684044f2636984a5
* | | | am 51281663: am 69897ae4: am 75afcc1f: Merge "Use define for drm property ↵Marco Nelissen2015-01-051-5/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | keys instead of defining as char pointers" * commit '51281663443ea39db9b4c6e2415343e26a6b3fb8': Use define for drm property keys instead of defining as char pointers
| * | | am 69897ae4: am 75afcc1f: Merge "Use define for drm property keys instead of ↵Marco Nelissen2015-01-051-5/+5
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | defining as char pointers" * commit '69897ae4889328807760ea359ee62efffdaca933': Use define for drm property keys instead of defining as char pointers
generated by cgit v1.1 at 2024-06-16 19:33:30 +0000