summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Remove MediaPlayerService::decode()Marco Nelissen2015-01-264-264/+0
| | | | | | | and make SoundPool use MediaCodec for decoding files to PCM. Bug: 18239054 Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
* 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
* 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
* 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
* C++11 compatibility.Dan Albert2014-11-201-4/+5
| | | | | | | | | | | | | | * Fix string literal concatenation to not be interpreted as UD literals. * Add constexpr compatibility for non-integral static members. * Use __typeof__ instead of typeof (should become decltype once this actually becomes C++11). * Add an appropriate cast for atomic_uintptr_t, since moving to C++11 means moving from <stdatomic.h> to <atomic>, which has better typechecking (hooray for not macros!). Bug: 18466763 Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
* Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-171-1/+1
| | | | | | | | | | Fix something being declared a struct and forward-declared a class and vice versa. gcc doesn't care, clang complains about the mismatch. Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-devMarco Nelissen2014-10-091-1/+4
|\ | | | | | | | | * commit 'af238382e33a027494a53556e6104b7245e7213f': Fix VideoFrame class layout for 64/32 bit
| * Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-devMarco Nelissen2014-10-091-1/+4
| |\
| | * Fix VideoFrame class layout for 64/32 bitMarco Nelissen2014-10-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This structure is passed between 64 and 32 bit processes via shared memory, so ensure it's the same size, and that the members we care about are in the same place. Bug: 17569156 Change-Id: Id776bc825af1fbf43a6dd3407cca064f6d932902
* | | am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ↵Rachad2014-10-071-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | playback" into lmp-dev * commit '584c14c370f141685b7e8963a13ed91584383ca1': stagefright: do not allocate output buffers for tunneled playback
| * | Merge "stagefright: do not allocate output buffers for tunneled playback" ↵Rachad2014-10-071-0/+2
| |\ \ | | | | | | | | | | | | into lmp-dev
| | * | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allocate native window buffers for tunneled video playback codecs. Bug: 17112525 Change-Id: I262d8030a9df6188938fde5d62ebce8faf7dba1f
* | | | am 57c27c55: am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * commit '57c27c55006f0137a8ad5a87ec62eb89084dcdc6': Add missing #includes
| * | | Add missing #includesBernhard Rosenkraenzer2014-09-274-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some header files in stagefright try to use DISALLOW_EVIL_CONSTRUCTORS (and even DISALLOW_IMPLICIT_CONSTRUCTORS, which isn't defined anywhere in stagefright) without including the proper header. With clang, this results in a build failure - with gcc, it results in DISALLOW_EVIL_CONSTRUCTORS/DISALLOW_IMPLICIT_CONSTRUCTORS not doing what they were intended to do, instead appearing as a method in the DWARF debug sections of files using the headers. Change-Id: Ie4e99affe98ed8fb1bfcf5ec604c19dcd5311c62 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | MediaRecorder: only dequeue available buffers from MediaCodecChong Zhang2014-10-031-1/+1
| |_|/ |/| | | | | | | | | | | Bug: 17514968 Change-Id: If232f92d163deb2440b927315c69e0c4d51ca290
* | | mediarecorder: set level if setting default profileLajos Molnar2014-10-021-2/+8
| | | | | | | | | | | | | | | Bug: 17676461 Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
* | | stagefright: move math templates into AUtils.hLajos Molnar2014-10-011-0/+65
| | | | | | | | | | | | | | | | | | | | | add unit test for math templates Bug: 17676461 Change-Id: Ie964c5fcfcca1ec53b4538f8e577392e8fbb4319
* | | Merge "add AAC audio decoder params for PCM limiter enable" into lmp-devChong Zhang2014-10-011-1/+2
|\ \ \
| * | | add AAC audio decoder params for PCM limiter enableChong Zhang2014-10-011-1/+2
| | | | | | | | | | | | | | | | | | | | Bug: 17470065 Change-Id: Ib67aa1c50e3b6c24c4b12b0f31a996cc6874abd1
* | | | GenericSource: support disconnect before NuCachedSource2 is createdRobert Shih2014-10-011-1/+5
| | | | | | | | | | | | | | | | | | | | Bug: 17672488 Change-Id: I96776c9679fdcfbe9a442c86447c59802b1465ac
* | | | audio: fix stream type for accessibility usageEric Laurent2014-09-252-0/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Make sure that accessibility prompts are heard when a ringtone is active by forcing stream type to AUDIO_STREAM_RING when phone state is AUDIO_MODE_RINGTONE. Bug: 17558149. Change-Id: Ia3bead8052fca5cbf282c267f7b9b06014fef628
* | | Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" ↵Andy Hung2014-09-221-1/+1
|\ \ \ | | | | | | | | | | | | into lmp-dev
| * | | MediaCodec: Fix deallocated pointer reference when calling reset()Andy Hung2014-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name pointer argument in MediaCodec::init() was being implicitly deallocated. Bug: 17499622 Change-Id: If9409f95674e52d1478f969f77693c4d27ff1ff2
* | | | Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." ↵Wei Jia2014-09-223-3/+51
|\ \ \ \ | | | | | | | | | | | | | | | into lmp-dev
| * | | | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-193-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17454455 Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
* | | | | Merge "AudioEffect acquires session" into lmp-devJean-Michel Trivi2014-09-181-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | AudioEffect acquires sessionJean-Michel Trivi2014-09-181-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, users of audio sessions, AudioTrack and AudioRecord, are acquiring and releasing audio sessions according to their life-cycle. AudioEffect instances were not counting as users of an audio session. This caused an effect used on a session to be purged by AudioFlinger::purgeStaleEffects_l() whenever the last user of that session went away. This CL makes AudioEffect acquire and release a session when created and destroyed. Bug 15432115 Change-Id: I922532150009988d43872f9b5928044a830ae0b3
* | | | Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-devLajos Molnar2014-09-171-0/+2
|\ \ \ \
| * | | | NuPlayer: use getTimestamp instead of getPositionLajos Molnar2014-09-171-0/+2
| |/ / / | | | | | | | | | | | | | | | | Bug: 14659809 Bug: 16985287 Change-Id: I59ec72fbd40a9b8d28fe548ddad082c03000c045
* | | | Fix AudioTrack offloaded timestamp handling.Andy Hung2014-09-171-1/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | getTimestamp for offloaded tracks now returns WOULD_BLOCK for situations where the timestamp is unavailable due to the previous track still flushing or the timestamp is stale. It is fixed for normal playback conditions. Bug: 14659809 Bug: 17428188 Change-Id: Ic9ec07ccabc604236979769db5c4ea2dec252660
* | | Clean up AudioTrack position and timestamp handlingGlenn Kasten2014-09-113-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace epoch concept by observing and accumulating server delta positions. The advantage of using server deltas instead of absolute values is that they (1) are not sensitive to 32-bit wraparound, (2) are not sensitive to server behavior for stop(), and (3) prepare for future 64-bit client positions without requiring 64-bit positions on server. Add comments to AudioTrack::getTimestamp() and friends that the timestamp output parameter is undefined on error. Don't allow getTimestamp to return a negative frame position after stop(). Accumulate the client released frames, which may be useful for a future API. Bug: 11815245 Change-Id: I652940fa2db2f34a78c012a3ead0d9204fa29c6e
* | | stagefright: don't use AAtomizer in AMessageLajos Molnar2014-09-101-1/+5
| | | | | | | | | | | | | | | Bug: 15094301 Change-Id: Ib82fb6d8fb6b48402d81f411123b3d924368eb93
* | | Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-101-1/+2
|\ \ \
| * | | CamcorderProfile: Add QUALITY_HIGH_SPEED_2160PZhijun He2014-09-091-1/+2
| | |/ | |/| | | | | | | | | | Bug: 17059255 Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
* | | Merge "Add error code for insufficient output protection" into lmp-devJeff Tinker2014-09-091-15/+17
|\ \ \ | |/ / |/| |
| * | Add error code for insufficient output protectionJeff Tinker2014-08-281-15/+17
| | | | | | | | | | | | | | | bug: 16034599 Change-Id: Ib52c8bdae83ea138cac897bce78ab651c36c1998
* | | Cache audio attributes when player not availableJean-Michel Trivi2014-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache the audio attributes stored in a Parcel in the client-side MediaPlayer object if they are set through setParameter() before the server-side MediaPlayer is available. Apply them when the player is prepared. Bug 17280746 Change-Id: I72f1a7fc4e2b076fae8cbdede77a2f74e98b2a03
* | | Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-devMarco Nelissen2014-09-033-1/+146
|\ \ \
| * | | Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-023-1/+146
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of media scanner. This way the java MediaMetadataRetriever API will give the same result as the media scanner. Also apply some tweaks to the encoding detector to improve handling of ISO-8859-1 tags. Bug: 16302581, 17205395 Change-Id: I1682a7a6a8bf04cffaa455044ba72dd7fd152d49
* | | Merge "Fix more potential deadlocks in ALooperRoster" into lmp-devMarco Nelissen2014-09-031-2/+0
|\ \ \
| * | | Fix more potential deadlocks in ALooperRosterMarco Nelissen2014-08-281-2/+0
| |/ / | | | | | | | | | | | | Bug: 17059501 Change-Id: I242f2859527bed2d6e275c27de94fb19f4dcdc28
* | | Tunneled Video Playback:Rachad2014-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Changed AudioHwSync token to int32_t to match Audio stack api. Bug: 17112525 Change-Id: I673819495c2e7b540e8d7572cc95796bddbf63bb
* | | CameraService: Correct API2 error handlingEino-Ville Talvala2014-08-271-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | - Add more error codes to the binder camera2 callbacks - Translate HAL errors to callback errors - When flushing, report failures for queued requests - Treat stream config failure as nonfatal - Send request errors when buffers aren't available for captures Bug: 15524101 Bug: 14448494 Bug: 11272459 Bug: 17160301 Change-Id: I81aa54e805a9cce1cb8a6a9374549daa7666deb2
* | move cache prefill to GenericSource's message handlerChong Zhang2014-08-211-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | This allows prepareAsync to be terminated by reset promptly. It also makes it easier to do buffer update as GenericSource can access the cache status now. Bug: 16892748 Bug: 17182378 Change-Id: Ia55c04a810fd805041cb2025f6739afa5120b5ed
* | camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-08-181-0/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | As a workaround, duplicate CameraParameters into CameraParameters2 to prevent ABI break for some camera HALs that directly link into CameraParameters. CameraParameters2 implements the real fixes needed in the framework, while CameraParameters is left in to satisfy older camera HALs. Bug: 12609188 Bug: 16654949 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
* | stagefright/media: add support for codec features with text valueLajos Molnar2014-08-141-0/+1
| | | | | | | | | | Bug: 11990470 Change-Id: I7600d999c5f4b6821d825d25fa7e8a2bb5a80c46
* | Merge "MediaCodecList: handle errors gracefully" into lmp-devLajos Molnar2014-08-121-0/+1
|\ \
| * | MediaCodecList: handle errors gracefullyLajos Molnar2014-08-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Handle missing OMX codecs, and codecs that do not load. Fix NULL dereference when initializing codec with no type. Bug: 16907578 Bug: 16905025 Change-Id: I5d103db36ebb029d1aab03222bf6e9324beb1566
* | | MediaCodecList: don't return referencesLajos Molnar2014-08-121-2/+2
|/ / | | | | | | Bug: 16905025 Change-Id: I5b42b294f0cc785b8e4dda0e82c8f8377a46f487
* | Merge "Extend downsampling ratios greater than 2:1" into lmp-devAndy Hung2014-08-111-0/+29
|\ \
generated by cgit v1.1 at 2025-01-11 07:42:01 +0000