summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* opus: Support for > 2 channelsVignesh Venkatasubramanian2015-01-262-3/+31
| | | | | | | | This CL adds support for Opus streams that have more than 2 channels. It also fixes a bug where codec delay and seek preroll are not transferred during metadata to message conversion. Change-Id: Ia9748d4f7024368b2aa3c5cbd27f8016c859ea00
* am 4beddcf5: am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if ↵Chong Zhang2015-01-161-2/+8
|\ | | | | | | | | | | | | it\'s not available" into lmp-mr1-dev * commit '4beddcf5130bd24847c1e87696f864df41d42cae': do not use paused postition if it's not available
| * am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ↵Chong Zhang2015-01-161-2/+8
| |\ | | | | | | | | | | | | | | | | | | available" into lmp-mr1-dev * commit '9e308de9214e55dd0d102484ea44b117ec050540': do not use paused postition if it's not available
| | * Merge "do not use paused postition if it's not available" into lmp-mr1-devChong Zhang2015-01-161-2/+8
| | |\
| | | * do not use paused postition if it's not availableChong Zhang2015-01-151-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | bug: 18896133 bug: 18996505 Change-Id: I1e24fabe3fe8f2275b1ccc0df100cb2c4ba2264b
| | * | MidiFile: report correct state during transient period when start() is ↵Wei Jia2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called first time. Bug: 18905421 Bug: 18994222 Change-Id: Iee47043e60740fab9e62aa28db4cbcec4f339c22
| * | | am e680491e: am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'e680491ef752256d0d0d39fc77cd7495e580adea': Fix id3 parser crash
| | * \ \ am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '1efe46deb86b8ca246e2486ec16d88efd9e1e657': Fix id3 parser crash
| | | * | | Fix id3 parser crashMarco Nelissen2015-01-151-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18872896 Change-Id: I953f58f35a76590701234d5707e060499acfc069
| * | | | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1316-940/+441
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f': Replace MidiFile player with a Midi extractor
| | * | | | am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1316-940/+441
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '724b9ea51db0c191cc3184319719a38b5a1f6502': Replace MidiFile player with a Midi extractor
| | | * | | Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1316-940/+441
| | | |\ \ \
| | | | * | | Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-0816-940/+441
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | am a2d2c48a: Merge "Don\'t signal an error at the end of a short file"Marco Nelissen2015-01-091-19/+11
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a2d2c48a7ca3331ee77421d776e9849651b488c1': Don't signal an error at the end of a short file
| | | * | | | Merge "Don't signal an error at the end of a short file"Marco Nelissen2015-01-091-19/+11
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Don't signal an error at the end of a short fileMarco Nelissen2014-12-231-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just signaling EOS is sufficient Bug: 17933838 Change-Id: I04a1af57378115731febe7cacb35af5e55d5db83
* | | | | | | Merge "Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffers"Andy Hung2015-01-151-46/+15
|\ \ \ \ \ \ \
| * | | | | | | Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffersAndy Hung2015-01-141-46/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Fix id3 parser crashMarco Nelissen2015-01-151-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18872896 Change-Id: I953f58f35a76590701234d5707e060499acfc069
* | | | | | | | Merge "Fix cumulative error in setPositionNotificationPeriod"Andy Hung2015-01-141-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix cumulative error in setPositionNotificationPeriodAndy Hung2015-01-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time for AudioTrackThread sleep due to periodic notification needs to be computed from actual position. External reported AOSP issue 65807. Change-Id: Ic46b64588e6c5803afcd8252cde8837eb3fbf6ff
* | | | | | | | Merge "Move roundup from frameworks/av to system/media"Glenn Kasten2015-01-125-37/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Move roundup from frameworks/av to system/mediaGlenn Kasten2015-01-075-37/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1083ab739e445e5bd3e3082fc1d3a20cc19601d5
* | | | | | | | | am 7e85361e: am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for ↵Rachad2015-01-102-0/+68
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+68
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+68
| | |\ \ \ \ \ \ \
| | | * | | | | | | ACodec: Added support for E-AC3 decodersRachad2014-12-232-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17883772 Change-Id: I05f674c33522eec0e6ceeece88dd800b1857b3ab
* | | | | | | | | | am e6453027: am d8ba6ef1: am 38a97bd7: stagefright: keep alignment ↵Lajos Molnar2015-01-101-21/+14
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restrictions for SoftVideoDecoder * commit 'e6453027baf4c79e95b31aa602b18621e3118423': stagefright: keep alignment restrictions for SoftVideoDecoder
| * | | | | | | | | am d8ba6ef1: am 38a97bd7: stagefright: keep alignment restrictions for ↵Lajos Molnar2015-01-101-21/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftVideoDecoder * commit 'd8ba6ef11cb89672ee121ec7f4ee527446aa5dbf': stagefright: keep alignment restrictions for SoftVideoDecoder
| | * | | | | | | | stagefright: keep alignment restrictions for SoftVideoDecoderLajos Molnar2015-01-091-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse updatePortDefinitions for setParam(PortDefinition). Allow increasing input buffer size even if size changes. Bug: 18528130 Change-Id: I62b66d8f1135504dd16ac576046bfc5b5b8cda59
* | | | | | | | | | am 9a9c9be1: am d18196a1: am c8c68c88: Merge "Use aligned width and height ↵Ronghua Wu2015-01-081-3/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to compute size." into lmp-mr1-dev * commit '9a9c9be1f8c1664253d11f8913a30998a2950521': Use aligned width and height to compute size.
| * | | | | | | | | am d18196a1: am c8c68c88: Merge "Use aligned width and height to compute ↵Ronghua Wu2015-01-081-3/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size." into lmp-mr1-dev * commit 'd18196a140ea8eee971508ca4a9fcc5f060fe94b': Use aligned width and height to compute size.
| | * | | | | | | | Merge "Use aligned width and height to compute size." into lmp-mr1-devRonghua Wu2015-01-081-3/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Use aligned width and height to compute size.Ronghua Wu2015-01-071-3/+6
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18528130 Change-Id: I4d2304d8c8919c1cde60676848cfe2e4f2061a87
| * | | | | | | | | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-087-61/+97
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | Change-Id: Ic9841f0a66930f57a5ebea527c6a841d7c49cccf
| | * | | | | | | | am c52af00b: Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-087-61/+99
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c52af00beda4477d0fd00c3071e6ffd9c465430b': Use callbacks for Midi I/O
| | | * | | | | | | Use callbacks for Midi I/OMarco Nelissen2015-01-087-61/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-084-1/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-084-1/+18
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to disable capture" into lmp-mr1-dev * commit 'e03447548d1c56fa9875cac7d500f1012a6b5c26': mark any copyrighted content as protected to disable capture
| | * | | | | | | | Merge "mark any copyrighted content as protected to disable capture" into ↵Chong Zhang2015-01-084-1/+18
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | | | | | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-074-1/+18
| | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18916274 Change-Id: I23f096b51433bf18a10dc5fe6dc6b75c3881c340
* | | | | | | | | | Merge "Event driven wake for AudioTrackThread notification changes"Andy Hung2015-01-072-3/+38
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Event driven wake for AudioTrackThread notification changesAndy Hung2015-01-062-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used for setMarkerPosition and setPositionUpdatePeriod. Change-Id: I0d94b929438a5cd94b295d7c1884f876fae8b5e7
* | | | | | | | | | Merge "Improve AudioTrack EVENT_LOOP_END and EVENT_BUFFER_END accuracy"Andy Hung2015-01-071-11/+40
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Improve AudioTrack EVENT_LOOP_END and EVENT_BUFFER_END accuracyAndy Hung2015-01-061-11/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge "Fix loop and position restoration in static AudioTracks"Andy Hung2015-01-072-46/+74
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix loop and position restoration in static AudioTracksAndy Hung2015-01-062-46/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow restoration of loop and position. Make position and loop synchronously readable. Bug: 17964637 Change-Id: I8cfb5036e665f55fdff5c67d27e1363ce9a8665d
* | | | | | | | | | Merge "Fix loop and position setting in static AudioTracks"Andy Hung2015-01-072-61/+140
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fix loop and position setting in static AudioTracksAndy Hung2015-01-052-61/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow independent setting of position and loop. Bug: 17964637 Change-Id: I8b3bd97a244b932728b68da7684044f2636984a5
* | | | | | | | | am 644afb88: am 9fc2f470: am 8140a2b7: stagefright: report crop rectangle as ↵Lajos Molnar2015-01-071-5/+7
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codec resolution if exists * commit '644afb88421ac0e71d526f9b6726404a90c7cccd': stagefright: report crop rectangle as codec resolution if exists
generated by cgit v1.1 at 2024-09-22 01:42:53 +0000