summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-294-0/+5
|\ | | | | | | | | * commit '166776fbbeb74e28a736681a5edd355013b976ad': Add missing includes.
| * Merge "Add missing includes."Elliott Hughes2015-01-294-0/+5
| |\
| | * Add missing includes.Elliott Hughes2015-01-284-0/+5
| | | | | | | | | | | | Change-Id: Ib697ce44243e7cb07aee60944238e0854d82e9de
* | | am aeccbffd: Merge "Avoid mixing declarations and statements in C89 source ↵Andreas Gampe2015-01-281-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | files" * commit 'aeccbffde62b717c96a5285448a4943b366bd586': Avoid mixing declarations and statements in C89 source files
| * | Merge "Avoid mixing declarations and statements in C89 source files"Andreas Gampe2015-01-281-2/+1
| |\ \ | | |/ | |/|
| | * Avoid mixing declarations and statements in C89 source filesMartin Storsjo2014-12-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to adding the UNUSED macro, this file built just fine in C89 mode. Move the macro call to after the local variable declarations, to avoid mixing declarations and statements (which isn't allowed in C89 mode). Change-Id: I09299a07103d47298a0086f7c639d2be696b19ce
* | | am 47deb15e: Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-2714-1920/+13
|\ \ \ | |/ / | | | | | | | | | * commit '47deb15e99cbf60e558027e074b7415c95637943': Remove MediaPlayerService::decode()
| * | Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-2714-1920/+13
| |\ \
| | * | Remove MediaPlayerService::decode()Marco Nelissen2015-01-2614-1920/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and make SoundPool use MediaCodec for decoding files to PCM. Bug: 18239054 Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
* | | | am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-269-16/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cbb803a57f8bbfbdcc3e9857d16a38a47106a26c': Remove superfluous OpenSSL include paths.
| * | | Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-269-16/+7
| |\ \ \ | | |/ / | |/| |
| | * | Remove superfluous OpenSSL include paths.Adam Langley2015-01-229-16/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e
* | | am 1ed13b3b: (-s ours) Merge "DO NOT MERGE - audio policy: fix output device ↵Eric Laurent2015-01-200-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | command after clearing audio patch" * commit '1ed13b3b443735e7f7b5002954f31741b0b1c572': DO NOT MERGE - audio policy: fix output device command after clearing audio patch
| * | Merge "DO NOT MERGE - audio policy: fix output device command after clearing ↵Eric Laurent2015-01-201-4/+8
| |\ \ | | | | | | | | | | | | audio patch"
| | * | DO NOT MERGE - audio policy: fix output device command after clearing audio ↵Eric Laurent2015-01-201-4/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | patch Make sure that a valid audio patch is created again on an output stream following the disconnection and reconnection of the same output device. Bug: 18144611. Change-Id: I72387ad8e93f8fb2571da2a6c58a6e167ac7fc4d
* | | am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
|\ \ \ | |/ / | | | | | | | | | * commit '1efe46deb86b8ca246e2486ec16d88efd9e1e657': Fix id3 parser crash
| * | Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| |\ \
| | * | Fix id3 parser crashMarco Nelissen2015-01-151-2/+9
| |/ / | | | | | | | | | | | | Bug: 18872896 Change-Id: I953f58f35a76590701234d5707e060499acfc069
* | | am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1319-942/+446
|\ \ \ | |/ / | | | | | | | | | * commit '724b9ea51db0c191cc3184319719a38b5a1f6502': Replace MidiFile player with a Midi extractor
| * | Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1319-942/+446
| |\ \
| | * | Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-0819-942/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am c52af00b: Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-089-64/+147
|\ \ \ | |/ / | | | | | | | | | * commit 'c52af00beda4477d0fd00c3071e6ffd9c465430b': Use callbacks for Midi I/O
| * | Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-089-64/+147
| |\ \
| | * | Use callbacks for Midi I/OMarco Nelissen2015-01-089-64/+147
| |/ / | | | | | | | | | | | | | | | | | | 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 43637c2e: Merge "fix memory leak in PatchPanel"Eric Laurent2015-01-051-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit '43637c2e0313ed9fea4e4aceb14c166349327aea': fix memory leak in PatchPanel
| * | Merge "fix memory leak in PatchPanel"Eric Laurent2015-01-051-0/+2
| |\ \
| | * | fix memory leak in PatchPanelsoon1.choi2015-01-051-0/+2
| | |/ | | | | | | | | | | | | | | | | | | Before the audio patch is created, audio patch with same handle is removed from vector for patches. At this time, Patch allocated in the heap is not freed. This causes memory leaks in the mediaserver. Change-Id: Id0d28c36a7e7fbf473753bf4ead7518f28c1b998
* | | am 75afcc1f: Merge "Use define for drm property keys instead of defining as ↵Marco Nelissen2015-01-051-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | char pointers" * commit '75afcc1fa311448cdc1cbb9a9637c066627b7947': Use define for drm property keys instead of defining as char pointers
| * | Merge "Use define for drm property keys instead of defining as char pointers"Marco Nelissen2015-01-051-5/+5
| |\ \
| | * | 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
* | | | am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-052-5/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5c97c4e1b0a45e52f463eeef37cd672372644613': Remove hardcoded ICU & OpenSSL include paths.
| * | | Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-052-5/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Remove hardcoded ICU & OpenSSL include paths.Narayan Kamath2015-01-052-5/+0
| |/ / | | | | | | | | | | | | | | | | | | They're exported using LOCAL_EXPORT_C_INCLUDE_DIRS. bug: 18581021 Change-Id: I9593422b9eddb8203bee88d60e31a03b4a5f976b
* | | am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-222-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'bd08223c450a7a2e8e8d79e6be148ed1ac64caa3': Fix double close.
| * | Merge "Fix double close."Marco Nelissen2014-12-222-1/+1
| |\ \
| | * | Fix double close.Bao Haojun2014-05-172-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch will fix the double close issue in SoundPool::doLoad(): status = MediaPlayer::decode(mFd, mOffset, mLength, &sampleRate, &numChannels, &format, mHeap, &mSize); ALOGV("close(%d)", mFd); ::close(mFd); mFd = -1; In MediaPlayerService::decode() which is called directly by MediaPlayer::decode(), the fd will be closed, and after it return, the mFd will be closed again. When the system is idle, the second close will fail with EBADFD, but if the system is busy, the mFd will be reused with another open/socket/pipe system call, and the second close will cause errors. Change-Id: If709515392cd490fea569658202524c51f8df785 Signed-off-by: Bao Haojun <baohaojun@gmail.com> Signed-off-by: Wang Liang <wangliang@smartisan.cn>
* | | | am 1ec00eab: (-s ours) Merge "DO NOT MERGE - NuPlayer: open audio sink in ↵Eric Laurent2014-12-180-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | offload mode when resuming from timeout teardown." * commit '1ec00eab663c3eb74ad50fc5fc9f6b257f89a524': DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from timeout teardown.
| * | | Merge "DO NOT MERGE - NuPlayer: open audio sink in offload mode when ↵Eric Laurent2014-12-183-5/+36
| |\ \ \ | | | | | | | | | | | | | | | resuming from timeout teardown."
| | * | | DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from ↵Ronghua Wu2014-12-183-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout teardown. Also always recheck if a new stream can do offload. Bug: 18154425 Change-Id: I121877834bd963eeeba91a2b951fd30d5dc36a8b
* | | | | am d179bd67: (-s ours) Merge "DO NOT MERGE - NuPlayer: invalid anchor time ↵Eric Laurent2014-12-180-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | when render is flushed." * commit 'd179bd6779bf0ff5614c5c58de36f989b4b58d04': DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.
| * | | | Merge "DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed."Eric Laurent2014-12-182-0/+8
| |\ \ \ \ | | |/ / /
| | * | | DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-12-182-0/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Also rememeber the pause time in NuPlayerDriver. Bug: 18436336 Change-Id: If09f680a0d0f9137bd55c5f94201eb3aa783278a
* | | | am 6f3b732b: Merge "Fix wrong int argument of FOURCC."Chih-Hung Hsieh2014-12-171-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6f3b732b6f95e9b96172164cba13382ce64864ba': Fix wrong int argument of FOURCC.
| * | | Merge "Fix wrong int argument of FOURCC."Chih-Hung Hsieh2014-12-171-4/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Fix wrong int argument of FOURCC.Chih-Hung Hsieh2014-12-161-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang compiler reports error for aosp_x86-eng target: .../MPEG4Extractor.cpp:1538:14: error: case value is not a constant expression case FOURCC('\xA9', 'x', 'y', 'z'): ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ..../MPEG4Extractor.cpp:1538:14: note: left shift of negative value -87 Change-Id: I3ef1aa710cd1ce84ca46cdfbe37876bb9a1140bd
* | | am 09a1f34f: (-s ours) Merge "DO NOT MERGE - audio policy: fix inifinite ↵Eric Laurent2014-12-160-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | loop in clearAudioPatches()" * commit '09a1f34f2f45fe01b7dc6a15b15259ba61e47b5b': DO NOT MERGE - audio policy: fix inifinite loop in clearAudioPatches()
| * | Merge "DO NOT MERGE - audio policy: fix inifinite loop in clearAudioPatches()"Eric Laurent2014-12-161-5/+2
| |\ \
generated by cgit v1.1 at 2025-01-11 06:36:31 +0000