summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrate valueRobert Shih2013-11-112-28/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mVideoBitRate; removed unused arguments after refactoring. Bug: 11074303 Change-Id: Ieb5dd7dc67e5bc16b6e580ba11b157e4365f3cd6
* | | | | am cc5aeced: am e100b813: Merge "StageFrightRecorder: do not use meta-data ↵Lajos Molnar2013-11-112-7/+27
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | mode for software encoders" into klp-dev * commit 'cc5aeced30609326c7495eca1286163af3933fe1': StageFrightRecorder: do not use meta-data mode for software encoders
| * | | Merge "StageFrightRecorder: do not use meta-data mode for software encoders" ↵Lajos Molnar2013-11-112-7/+27
| |\ \ \ | | | | | | | | | | | | | | | into klp-dev
| | * | | StageFrightRecorder: do not use meta-data mode for software encodersLajos Molnar2013-10-302-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera HAL v1 uses vendor-specific camera-source meta-data mode, but software encoders use generic gralloc-source mode, so they are not compatible. Change-Id: I0d1bab8eada26dcb70c97b1eec83f06d1f331239 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11446505
* | | | | am 92168885: am f8a1169d: Merge "Notify current video size if available" ↵Marco Nelissen2013-11-041-1/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '921688852b72bfa921913b8afe18c0d749c6797d': Notify current video size if available
| * | | | Notify current video size if availableMarco Nelissen2013-11-011-1/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | b/11248101 Change-Id: I0fa3b5592efcf400c86692002267da6825e331ad
| * | | Assign blame for playback wakelocks.Marco Nelissen2013-10-252-8/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a work source for the playback wakelock, so that playback is counted against the requesting app instead of the media server. Cherrypicked from master. b/9464621 Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
* | | Assign blame for playback wakelocks.Marco Nelissen2013-10-252-8/+14
| | | | | | | | | | | | | | | | | | | | | Set a work source for the playback wakelock, so that playback is counted against the requesting app instead of the media server. Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
* | | am 8ee02943: am 1c7f35d1: Merge "soundpool: allocate shared memory heap by ↵Eric Laurent2013-09-242-26/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | client" into klp-dev * commit '8ee02943b61e0a7dd78e5596720261b185a223d5': soundpool: allocate shared memory heap by client
| * | soundpool: allocate shared memory heap by clientEric Laurent2013-09-242-26/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current SoundPool implementation allocates the shared memory heap containing decoded PCM samples in mediaserver process. When mediaserver process crashes, the shared memory heaps allocated by AudioCache cannot be mapped anymore in the new instance of mediaserver. This causes a silent failure to end playback of new sounds because AudioFlinger believes the new AudioTracks are opened in streaming mode and not static mode: it sees a NULL shared memory pointer when the track is created. The fix consists in allocating the memory heap in the client process. Thus the heap is not lost when mediaserver restarts. The global memory usage is the same as this is shared memory. Also added a way to detect that a shared memory is passed when the track is created but cannot be mapped on mediaserver side. Also fix a crash in SoundPool when ALOGV is enabled. Bug: 10894793. Change-Id: Ice6c66ec3b2a409d75dc903a508b6c6fbfb2e8a7
* | | am 83774965: am bc910e5c: Merge "Fix hang" into klp-devMarco Nelissen2013-09-161-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '83774965fefc5d0315ec41641bdd99cf0a657462': Fix hang
| * | Merge "Fix hang" into klp-devMarco Nelissen2013-09-161-1/+1
| |\ \
| | * | Fix hangMarco Nelissen2013-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify that the surface is controlled by the app, to avoid a hang. b/10531761 Change-Id: Idccc2c73aa3d368d8e7fbdc071ce36e2382efea4
* | | | am fcb7a247: am a5652e9c: Merge "Add FLAG_CAN_SEEK_BACKWARD and ↵Chong Zhang2013-09-162-5/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | FLAG_CAN_SEEK_FORWARD see flags" into klp-dev * commit 'fcb7a2472bcb3c7985888acdb9905ba4e21c6bfe': Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags
| * | | Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flagsChong Zhang2013-09-112-5/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Also update seek flag in NuPlayerDriver, otherwise MediaPlayer will get wrong flags. Bug: 10676387 Change-Id: Ice30f27a9a04e37b4718d26228a407fea8d9e4fc
* | | HDCP: use getCaps() to query HDCP capsChong Zhang2013-09-071-5/+1
|/ / | | | | | | | | Bug: 10609422 Change-Id: I8bfbd761b58d5b333db38f5e3cea806abb04443c
* | wifi-display: do not use HDCP's encryptNative method if its unsupportedChong Zhang2013-09-032-0/+15
| | | | | | | | | | Bug: 10609422 Change-Id: I005f1d04a4191b1503b5f3e895a98b8d6560c402
* | fix MediaDrm.isCryptoSchemeSupported(uuid)Jeff Tinker2013-08-281-1/+5
| | | | | | | | | | | | | | | | | | 1. Don't expect plugins to support an empty mimeType in isContentTypeSupported 2. Move the cts test mock drm plugin to the cts tree so it is always used b/10528466 Change-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1
* | Merge "MediaPlayer: add listener for raw track data" into klp-devChong Zhang2013-08-237-7/+181
|\ \
| * | MediaPlayer: add listener for raw track dataChong Zhang2013-08-197-7/+181
| | | | | | | | | | | | | | | | | | Bug: 10326117 Change-Id: I2c0bdf8adc67b11f8dc633423bee66897548f181
* | | Merge "Add ability to test supported content types to MediaDrm" into klp-devJeff Tinker2013-08-222-6/+9
|\ \ \ | |/ / |/| |
| * | Add ability to test supported content types to MediaDrmJeff Tinker2013-08-222-6/+9
| | | | | | | | | | | | | | | bug: 10244066 Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
* | | Add MEDIA_STARTED/PAUSED/STOPPED events to media playersLajos Molnar2013-08-155-0/+50
|/ / | | | | | | | | | | | | | | | | | | | | | | This is needed for the MediaTimeProvider java interface, so it does not continually poll for current media time. Note: NuPlayer and AwesomePlayer do not correctly handle stop (pause instead), so for those we will signal PAUSED. Signed-off-by: Lajos Molnar <lajos@google.com> Change-Id: I3c61e1bda475f131323f475c18a42e3ec66c9ae1 Bug: 10326117
* | libmediaplayerservice: offload playback supportRichard Fitzgerald2013-07-262-84/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main change is to how recycled tracks are used for gapless playback. If we are playing offloaded tracks that can't be recycled we don't open a new offloaded output until we have closed the previous one. This is because offloaded tracks are a limited resource so we don't want to spuriously create unnecessary instances. If the tracks cannot be recycled this means that the formats are incompatible and so the hardware most likely will also be unable to use the existing output channel for the new track. If we already have the maximum number of hardware offload channels open (which could be only one) then creation of the next output would fail if we attempted it while the previous output was still open. Change-Id: I4f5958074e7ffd2e17108157fee86329506730ea Signed-off-by: Eric Laurent <elaurent@google.com>
* | ANetworkSession and ParsedMessage are now part of stagefright foundation.Andreas Huber2013-07-182-5/+13
| | | | | | | | | | | | | | | | Also fixes some bugs in ParseMessage and adds "WebSocket" mode to ANetworkSession, something that's opt-in and should not affect existing clients of the API. Change-Id: I86d5748e0d818231d85d3590d86c2b41d4f8b1f1
* | Merge "Output more detailed error message if loading library fails"leozwang@google.com2013-07-173-1/+9
|\ \
| * | Output more detailed error message if loading library failsleozwang@google.com2013-07-173-1/+9
| | | | | | | | | | | | | | | | | | Bug: 9805979 Change-Id: I77b19d6a65ff9fb72e7428ce79b117628e4c8658
* | | Add commentsGlenn Kasten2013-07-101-1/+1
|/ / | | | | | | Change-Id: Ifbf3a46a4183c8abc0feee1c588953ab10303cc1
* | am 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in ↵Jean-Baptiste Queru2013-07-081-0/+4
|\ \ | |/ | | | | | | | | | | RTSPSource" * commit '9f0e05978e236352fd2a4a7c6dce909755c36ead': Prevent double disconnects in RTSPSource
| * am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| |\ | | | | | | | | | | | | * commit '7266bc80850dc327e9f18c27b81613f959399630': Prevent double disconnects in RTSPSource
| | * am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| | |\ | | | | | | | | | | | | | | | | * commit 'ca7f160921a4a1a5da32ebe8fab1067bd8998a1f': Prevent double disconnects in RTSPSource
| | | * Prevent double disconnects in RTSPSourceFredrik Rosin2013-07-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent a null pointer from occuring by checking that we are not already disconnected before performing a disconnect, in case multiple disconnects have been issued. Change-Id: Ib88800cd246086fd57f77d10748d41b1aefe2084
* | | | am 9a25c012: am eced745a: Merge "Part of fix for TEE resource leaks when app ↵Jeff Tinker2013-07-072-1/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | crashes" into jb-mr2-dev * commit '9a25c012915f2209fff1479b246ae8eba38c3eff': Part of fix for TEE resource leaks when app crashes
| * | | am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" ↵Jeff Tinker2013-07-072-1/+19
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'eced745af7d2d27a8c45e04eb071d4fb30cd3e48': Part of fix for TEE resource leaks when app crashes
| | * | Part of fix for TEE resource leaks when app crashesJeff Tinker2013-07-032-1/+19
| | | | | | | | | | | | | | | | | | | | bug: 9672606 Change-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e
* | | | Include what is neededGlenn Kasten2013-07-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove old includes. Header files only include other header files that they directly need themselves. Change-Id: Ic471386808d9f42ea19ccbd59cb50a5f83a89dd0
* | | | am 903871da: am 83790fcc: am bdf33c98: Merge "Fix compilation warning: ↵Glenn Kasten2013-06-281-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | incorrect format specifier for type \'ssize_t\'." * commit '903871da7a7c71b8718133e60e2f0835837b5f3f': Fix compilation warning: incorrect format specifier for type 'ssize_t'.
| * | | am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for ↵Glenn Kasten2013-06-281-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | type \'ssize_t\'." * commit 'bdf33c98912090176183d3e9b9a9217dbbdca6da': Fix compilation warning: incorrect format specifier for type 'ssize_t'.
| | * | Fix compilation warning: incorrect format specifier for type 'ssize_t'.Scott Fan2013-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: format '%ld' expects argument of type 'long int', but argument 7 has type 'ssize_t {aka int}' [-Wformat] Change-Id: I823835a26320a3abb82f8dff9fbe82e5132e7556 Signed-off-by: Scott Fan <fancp2007@gmail.com>
* | | | Public API changes for audio offload support.Richard Fitzgerald2013-06-272-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: this does _not_ include all private member variables added to classes as part of offload support. Only public/protected functions and stubs functions/variables needed to make the changes buildable. - isOffloadSupported() added to audio policy service A stub implementation is required to build, this always returns false - setParameters() added to IAudioTrack A stub implementation is required to build, this always returns INVALID_OPERATION - CBlk flag for stream end - Change AudioSystem::getRenderPosition() to take an audio_output_t so caller can specify which output to query - Add AudioSystem::isOffloadSupported() This is fully implemented down to the AudioFlinger function AudioPolicyServer::isOffloadSupported() which is just a stub that always returns false. - Add EVENT_STREAM_END to AudioTrack interface. STREAM_END is used to signal when the hardware has actually finished playing all the data it was sent. - Add event type enumeration to media player interface AudioSink callbacks so that the same callback can be used to handle multiple types of event. For offloaded tracks we also have to handle STREAM_END and TEAR_DOWN events - Pass audio_offload_info_t to various functions used for opening outputs, tracks and audio players. This passes additional information about the compressed stream down to the HAL when using offload. For publicly-available APIs this is an optional parameter (for some of the internal and low-level APIs around the HAL interface it is mandatory) - Add getParameters() and setParameters() API to AudioTrack Currently dummy implementations. - Change AudioPlayer contructor so that it takes a set of bitflags defining what options are required. This replaces the original bool which only specified whether to use deep buffering. - Changes to StageFright class definition related to handling tearing-down of an offloaded track when we need to switch back to software decode - Define new StageFright utility functions used for offloaded tracks Currently dummy implementations. - AudioFlinger changes to use extended audio_config_t. Fills in audio_offload_info_t member if this info is passed in when opening an output. - libvideoeditor changes required to add the new event type parameter to AudioSink callback functions - libmediaplayerservice changes required to add the new event type parameter to AudioSink callback functions Change-Id: I3ab41138aa1083d81fe83b886a9b1021ec7320f1 Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Signed-off-by: Eric Laurent <elaurent@google.com>
* | | | Use sp<AudioTrack> instead of raw AudioTrack *Glenn Kasten2013-06-032-25/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change prepares for the new implementation of AudioTrack client, which will require clients to use only sp<AudioTrack>, not raw AudioTrack *. A raw delete will cause a race condition during AudioTrack destruction. AudioTrack was made a RefBase by commit b68a91a70bc8d0d18e7404e14443d4e4020b3635 on 2011/11/15, when it was needed by OpenSL ES (for the callback protector). At that time, the only other client that was also converted from AudioTrack * to sp<AudioTrack> was android.media.AudioTrack JNI in project frameworks/base (file android_media_AudioTrack.cpp). Details: * Use .clear() instead of delete followed by = NULL. * ALOG %p need .get(). * sp<> don't need to be listed in constructor initializer, if initially 0. * Use == 0 for sp<> vs == NULL for raw pointers. * Use if (sp != 0) instead of if (raw). Change-Id: Ic7cad25795d6e862e112abdc227b6d33afdfce17
* | | | am f9bb8358: am b7319a7e: Update HTTP proxy configuration for all media ↵Andreas Huber2013-06-032-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | playback inside stagefright. * commit 'f9bb8358e454be6dc88403171db7e0e182407f17': Update HTTP proxy configuration for all media playback inside stagefright.
| * | | am b7319a7e: Update HTTP proxy configuration for all media playback inside ↵Andreas Huber2013-06-032-0/+9
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | stagefright. * commit 'b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1': Update HTTP proxy configuration for all media playback inside stagefright.
| | * | Update HTTP proxy configuration for all media playback inside stagefright.Andreas Huber2013-05-312-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b related-to-bug: 8873723 (cherry picked from commit 2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
| * | | am dd309b97: Merge "Handle the case where an asynchronous prepare was ↵Andreas Huber2013-04-252-0/+23
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | initiated and then" into jb-mr2-dev * commit 'dd309b97f3e30cb8ab30892b4bf6b5d824853a86': Handle the case where an asynchronous prepare was initiated and then
| | * | Handle the case where an asynchronous prepare was initiated and thenAndreas Huber2013-04-252-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the mediaplayer was reset. Change-Id: Ib241747c5dc002b88a3854569c1f8340b2a8ef41 related-to-bug: 8688986
| * | | am 628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber2013-04-241-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit '628a8c0ed91531468f5c615fea8745f63cc812aa': fix a race condition of MediaPlayerServce::Client::mClient
| | * | Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber2013-04-241-1/+1
| | |\ \
| * | | | Fix a typo that would cause us not to shutdown/flush the decoders inAndreas Huber2013-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some cases. related-to-bug: 8630032 Change-Id: I8e94b53b34e137e827e9630c65f3252ea91e4ebd
| * | | | Guard against mLooper == NULL.Andreas Huber2013-04-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01aa0e47b55d0dffe34525edf9f055a5cb4dc70f related-to-bug: 8620223
generated by cgit v1.1 at 2024-05-29 14:50:01 +0000