summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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
| | * | Use define for drm property keys instead of defining as char pointersMartin Storsjo2014-12-181-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When defined as char pointers, every compilation unit that includes the NdkMediaDrm.h header defines a new copy of the same global variables - leading to linker errors due to multiple definitions if more than one file includes it. By using a define, they don't generate any symbols. The NdkMediaFormat.h header uses extern const char* for a similar set of keys, but that can't be added after the actual platform has shipped. The other alternative would be to declare them as static const char*, which wouldn't generate global symbols, but which could trigger warnings about unused static symbols instead. Change-Id: I14ca81d94309b7f437b3bc144920c48a8b3f0261
* | | | Cleanup annoying whitespace that causes red markersGlenn Kasten2015-01-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I0b1be110b0e0a9606d272c4d023f40ff93522725
* | | | Line length 100Glenn Kasten2014-12-306-8/+15
| | | | | | | | | | | | | | | | Change-Id: I6c8fe626a3825fa9e139319656d682a57b887c97
* | | | Merge "Add done() to SingleStateQueue"Andy Hung2014-12-221-4/+28
|\ \ \ \
| * | | | Add done() to SingleStateQueueAndy Hung2014-12-221-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the SSQ sender to detect whether the SSQ receiver has completed processing of the last queued item. Change-Id: I4b962c9aec5f0d34b28b01e29b5af42e3dc9893a
* | | | | Merge "Remove explicit instantiation of SingleStateQueue"Andy Hung2014-12-221-12/+66
|\ \ \ \ \ | |/ / / /
| * | | | Remove explicit instantiation of SingleStateQueueAndy Hung2014-12-191-12/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring now possible due to changes in the Android atomic include. Change-Id: Ia0094d322d9ad3d8c186307306821376ca8002c4
* | | | | Replace MidiFile player with a Midi extractorMarco Nelissen2014-12-183-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 "Use callbacks for Midi I/O"Marco Nelissen2014-12-162-3/+48
|\ \ \ \ \
| * | | | | Use callbacks for Midi I/OMarco Nelissen2014-12-162-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: I4d775c8458c48c591a15794c4517e006dcf034e1
* | | | | am d7aa535f: am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder ↵Lajos Molnar2014-12-151-0/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | death" into lmp-mr1-dev * commit 'd7aa535fc6ed1f4f0ee68bd3c7c483717d30205e': MediaCodecList: handle binder death
| * | | am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into ↵Lajos Molnar2014-12-151-0/+6
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '06f9952190357426445344090b4e20b8758a118a': MediaCodecList: handle binder death
| | * | MediaCodecList: handle binder deathLajos Molnar2014-12-121-0/+6
| | | | | | | | | | | | | | | | | | | | Bug: 18691591 Change-Id: Icc402d6ea9b0de4ac642c3b403fb64e865481b2e
* | | | am 3e08ca67: resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-111-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3e08ca6709b5a75dc3b779cf3eba8196b08a0245': stagefright: misc fixes to software video encoders (and decoders)
| * | | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-111-0/+6
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37
| | * | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move logic to set encoder parameters to common encoder class (similarly to what was done for decoders) - set compressed buffer size based on frame size and compression ratio, and codec-specific minimum size - set raw buffer size based on frame size and metadata mode - do not set stride and slice height on compressed ports - advertise only QCIF support for google H263 encoder - set large-enough input size for video decoders to support adaptive playback - do not change input buffer size on output port reconfiguration, as no input buffer reallocation takes place - do not return empty buffers with EOS after EOS has been signaled Bug: 18513091 Bug: 18639027 Change-Id: Ib13492ef66adf331aa4572c67d2b283ea020cb41
* | | | am 66b17e9d: Merge commit \'f5a968a0\' into mmGlenn Kasten2014-12-102-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '66b17e9dfe114ae968bfb2f8ad8325527e373c65': audio policy: binder calls for dynamic audio policy mixes
| * | | Merge commit 'f5a968a0' into mmGlenn Kasten2014-12-102-0/+6
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ifd30546c11def40ad483f27c9d7baa4008fcbac3
| | * | audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-092-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add binder calls to register and unregister dynamic mixes to AudioPolicyManager. Bug: 16009464. Change-Id: I4ef38166d0cfc88c984970969380d0cd6eb083ac
* | | | am b279f5ad: am c49d9cda: am 2dda40d6: Merge "audio policy: add support for ↵Eric Laurent2014-12-102-1/+83
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | custom mixes" into lmp-mr1-dev * commit 'b279f5adfa2fd6f22c87b3a7106fbb62a0b9a5d2': audio policy: add support for custom mixes
| * | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ↵Eric Laurent2014-12-102-1/+83
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'c49d9cda49dab8b7dd0376cf56476b3e1895d5c6': audio policy: add support for custom mixes
| | * | audio policy: add support for custom mixesEric Laurent2014-12-092-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for custom mixes in AudioPolicyManager. Two methods are added to register or unregister a list of custom mixes with their attributes and format. getOutputForAttr() and getInputForAttr() first look for a match in registered mixes before defaulting to normal output/input selection Remote submix device connection disconnection now takes address into account to identify the correspnoding custom mix. Bug: 16009464. Change-Id: I3f1c2a485a0fb71b1f984ed0adc9b68aa971e408
* | | | Remove filename based writer constructorsMarco Nelissen2014-12-108-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayerService can't open files (it needs an already opened file descriptor), so these were just wasting space. Change-Id: I323044a6c1814a7bff952ed71b5c7792df2abf03
* | | | am e09bf824: am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output ↵Lajos Molnar2014-12-091-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | format flags on format change" into lmp-mr1-dev * commit 'e09bf82465ff83f4da966b77d551367f7c050154': stagefright: preserve output format flags on format change
| * | | am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags ↵Lajos Molnar2014-12-081-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | on format change" into lmp-mr1-dev * commit '6874ed79fd525cf5d6ec8a953475c14f5a185cb4': stagefright: preserve output format flags on format change
| | * | stagefright: preserve output format flags on format changeLajos Molnar2014-12-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some flags are only set in configure, and get lost when output format changes. Bug: 17383204 Change-Id: I2011bce70920c4ee46fccc378da3b428f3395c11
* | | | am 61280541: am 390ef843: am f20c4356: Merge "AudioRecord: use audio ↵Eric Laurent2014-11-273-13/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | attributes instead of audio source." into lmp-mr1-dev * commit '61280541836947ce0b281b240ffa4c55bbf5bd55': AudioRecord: use audio attributes instead of audio source.
| * | | am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead ↵Eric Laurent2014-11-273-13/+18
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | of audio source." into lmp-mr1-dev * commit '390ef84373b7edd1397381f780ca235326357094': AudioRecord: use audio attributes instead of audio source.
| | * | AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-253-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added AudioRecord constructor with audio attributes. Replaced AudioPolicymanager::getInput() by getInputForAttr(). No new functionality for now. Also: - Fixed warnings in AudioPolicyManager - Allocate audio session ID before calling getOutputForAttr() in AudioTrack. Bug: 16006090. Change-Id: I15df21e4411db688e3096dd801cf579d76d81711
* | | | am 121143d5: am bf14c62e: am 72bf901c: Merge "audio policy: new ↵Eric Laurent2014-11-264-21/+83
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | getOutputForAttr() prototype." into lmp-mr1-dev * commit '121143d5242a790d0bd01fe1b9cec5d28a1ba1d7': audio policy: new getOutputForAttr() prototype.
| * | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() ↵Eric Laurent2014-11-264-21/+83
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | prototype." into lmp-mr1-dev * commit 'bf14c62e7973ed793a3b00c2c67beca4484c1c7a': audio policy: new getOutputForAttr() prototype.
| | * | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-254-21/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update getOutputForAttr() prototype and group all logic dealing with audio attributes to stream type conversion in audio policy manager. getOutputForAttr(): - specifies the audio session (for future use) - returns a status code - receives either stream type (for legacy) or audio attributes - returns an updated streamtype Remove logic dealing with legacy stream types to attributes conversion from AudioTrack. Use correct type for audio sessions in other APIs (startOutput() ...). releaseOutput() specifies the audio session (for future use). Bug: 18067208. Change-Id: I1bfbe9626c04c7955d77f8a70aecfad2cb204817
* | | | am f8c2d166: am a7cf01da: Merge "Fix missing loop count for static tracks." ↵Glenn Kasten2014-11-211-1/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 56df21d * commit '56df21d760d70a106adfbc8417b6ea179d576e24': Fix missing loop count for static tracks.
generated by cgit v1.1 at 2024-05-14 14:01:37 +0000