summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-244-29/+29
| | | | Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
* Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-111-6/+4
|\
| * Offer a type-safe album art interface.Elliott Hughes2014-06-111-6/+4
| | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-101-0/+1
|/ | | | | | | | | | libstagefright_rtsp uses some MD5 functions that used to be in bionic, but it was removed recently. As an initial fix, I statically linked in libcrypto_static to the libstagefright_rtsp library. However, I think it's better to modify the single user of this library to link against the shared libcrypto library. Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
* Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-293-1/+74
|\
| * am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-141-0/+2
| |\ | | | | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only
| * \ am 49ea1337: Merge changes ↵Lajos Molnar2014-03-073-1/+74
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev * commit '49ea13379fb15ddb73183ebafa3a377342ef932f': LiveSession: Use the actual, possibly redirected url as base in the M3U M3UParser: Skip query strings when looking for the last slash in a URL ChromiumHTTPDataSource: Keep track of the redirected URL Initial HLS seamless switch implementation. NuPlayer side support for seamless format switch. LiveSession refactor PlaylistFetcher: Add support for block-by-block decryption. LiveSession: Add support for block-by-block fetchFile.
| | * | NuPlayer side support for seamless format switch.Robert Shih2014-03-063-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid reinstantiating decoder if seamless format switch is supported. Bug: 11854054 Change-Id: I2c2be08d6da90cc835ec747d04a76db2313dfc7c
| | * | update offloaded audio track sampling rateEric Laurent2014-03-052-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioPlayer must read the sampling rate from offloaded audio sinks whenever a new time position is computed as the decoder can update the sampling rate on the fly. Bug: 12823955. Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
* | | | warnings be gone.Andreas Huber2014-04-114-12/+14
| |_|/ |/| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
* | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+2
|/ / | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
* | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-113-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | frameworks/av: fix errors inside ALOGVColin Cross2014-02-061-1/+1
| | | | | | | | | | | | Fix errors exposed by adding compile-time checking to disabled ALOGVs. Change-Id: I9602a4a485dffa3caad732c2a19ec0e41a0ac65b
* | Fix compile error in NuPlayerRenderer debug printOscar Rydhé2014-01-031-1/+3
| | | | | | | | | | | | | | | | When activating verbose log prints in NuPlayerRenderer the build fails because a variable have changed but the log print hasn't been updated. Change-Id: I3089b087d296c37dfe6379d7e75d5892912fef96
* | update offloaded audio track sampling rateEric Laurent2013-12-172-0/+16
| | | | | | | | | | | | | | | | AudioPlayer must read the sampling rate from offloaded audio sinks whenever a new time position is computed as the decoder can update the sampling rate on the fly. Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
* | Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEADThe Android Open Source Project2013-12-055-17/+58
|\ \ | |/
| * AwesomePlayer: correct stream type for offloadEric Laurent2013-11-141-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | canOffloadStream() function in stagefright utils forces the stream type to AUDIO_STREAM_MUSIC when querying the audio policy manager if a particular track is offloadable or not. This causes MP3 ringtones to be offloaded which is not a validated use case. The fix consists in using the actual stream type read from the AudioSink. Bug: 11410937. Change-Id: I44b8e033a8e785a79cdc291b142f80b5580bdc4d
| * 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
| * | 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
* | Merge "NuPlayer: Use a software renderer when using software codecs"Marco Nelissen2013-11-284-2/+42
|\ \ | |/ |/|
| * NuPlayer: Use a software renderer when using software codecsMartin Storsjo2013-09-254-2/+42
| | | | | | | | | | | | | | | | | | | | This mimics what is done in AwesomePlayer and MediaCodec - ideally this logic perhaps should be moved into ACodec to avoid having to replicate it in every caller. This makes HLS and RTSP playback work in the emulator. Change-Id: I18027dc3e469889baaae3e1c4afb559de7d0f7d3
* | 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
* | 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
* | | 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
* | 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>
generated by cgit v1.1 at 2024-04-28 06:55:37 +0000