summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* am d009aa2b: am 81e0bd44: Add signature|system permission to MediaDrm signer ↵Jeff Tinker2014-04-031-0/+16
|\ | | | | | | | | | | | | APIs * commit 'd009aa2bac4a4c8ca2e0c1203148194e237cc5d0': Add signature|system permission to MediaDrm signer APIs
| * am 81e0bd44: Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-031-0/+16
| |\ | | | | | | | | | | | | * commit '81e0bd44a10e90778ab5b0a3babd4fc52cadedd8': Add signature|system permission to MediaDrm signer APIs
| | * Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-0/+16
| | | | | | | | | | | | | | | Change-Id: If970e5ff8dcab2e67af2f3376dcd14dca82f2394 related-to-bug: 12702350
* | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-012-6/+38
|\ \ \ | |/ / | | | | | | | | | * commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de': Support CAST V2 Authentication in MediaDrm
| * | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-012-6/+38
| |\ \ | | |/ | | | | | | | | | * commit '68d9d71a792deed75d32fe13febc07c9c12c8449': Support CAST V2 Authentication in MediaDrm
| | * Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-292-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861 related-to-bug: 12702350
* | | mediaplayer: add temporary developer settings to use NuPlayer as defaultLajos Molnar2014-03-281-0/+6
| | | | | | | | | | | | | | | Bug: 11784824 Change-Id: Ic98f5fd15ee283d7f581bdc3331d000198ecc9e8
* | | Use LOG_ALWAYS_FATAL instead of LOG_FATALGlenn Kasten2014-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | LOG_FATAL is compiled out in most builds, so the assertion checks were not being performed. Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
* | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+2
|\ \ \ | |/ / | | | | | | Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
| * | 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
| | * | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
| * | | resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aospNarayan Kamath2014-03-073-1/+74
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: Ibcb60d0d3bbc8beb54440951ffe8a14b946ccc85
| | * 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
* | | | NuPlayer: use MediaCodec instead of ACodecLajos Molnar2014-03-104-108/+446
| | | | | | | | | | | | | | | | | | | | Bug: 11785204 Change-Id: I1455bfc683469c7a69e565b179aceacbc5c459f5
* | | | Revert "NuPlayer: Use a software renderer when using software codecs"Lajos Molnar2014-03-104-42/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove software renderer support from NuPlayer because it is included in MediaCodec. Change-Id: I06e001df76df2e18ea8169620ff33aeec57e5ca2
* | | | Fix type of AudioTrack/AudioRecord parameter frameCountGlenn Kasten2014-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It's size_t consistently Change-Id: I29638ef59ac773218025f2403a3508a307b487e0
* | | | Fix includes to no longer pull in Skia includes directories.Derek Sollenberger2014-02-271-1/+0
| | | | | | | | | | | | | | | | | | | | bug:13225538 Change-Id: I4fccc414923f7e62cd46d691c67cb44b9692c225
* | | | initialize encoder at start() time for camera sourceChong Zhang2014-02-262-5/+18
| | | | | | | | | | | | | | | | | | | | Bug: 13156212 Change-Id: I845ef51f662f04c50179dbfb128204922a424e1d
* | | | Merge "NuPlayer side support for seamless format switch."Robert Shih2014-02-243-1/+74
|\ \ \ \
| * | | | NuPlayer side support for seamless format switch.Robert Shih2014-02-243-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid reinstantiating decoder if seamless format switch is supported. Change-Id: I2c2be08d6da90cc835ec747d04a76db2313dfc7c
* | | | | Merge "support for time lapse/slow motion when using SURFACE source"Chong Zhang2014-02-221-3/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | support for time lapse/slow motion when using SURFACE sourceChong Zhang2014-02-141-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13032650 Change-Id: Iecbadf9f29c8c49353416fc467fb3acdde279595
* | | | | Merge "Track pid for each session"Marco Nelissen2014-02-132-5/+10
|\ \ \ \ \
| * | | | | Track pid for each sessionMarco Nelissen2014-02-112-5/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | so they can be properly freed. Change-Id: I6f389035bc29e74e7c367c1c6d0252b180f666b3
* | | | | Remove unused FragmentedMP4Parser and friends. The functionality has beenAndreas Huber2014-02-134-208/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subsumed into MP4Extractor. Change-Id: Ic1b6445660adfb985c604f1ca6f0c86585f8de04
* | | | | fix the build by fixing more warnings.Andreas Huber2014-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ied0ec39eb83b101582702d1e30c21643ccf6353e
* | | | | warnings be gone.Andreas Huber2014-02-115-13/+15
|/ / / / | | | | | | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-113-5/+7
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * | | 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
* | | | am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-101-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '429f2bf7527daf872a1bbdafca8ad28635b84644': frameworks/av: fix errors inside ALOGV
| * | | 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 warnings about unused parametersGlenn Kasten2014-02-071-3/+3
| | | | | | | | | | | | Change-Id: I27dc108e2c1f7ffd414bb7ff3d4c349651da6c26
* | | Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-062-176/+180
|\ \ \
| * | | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-052-176/+180
| | | | | | | | | | | | | | | | | | | | Bug: 12305192 Change-Id: I72d7cb571be5bd348b58ad650f3269d24c15d350
* | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-058-32/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | since we started to use java's HTTPConnection instead of the native implementation. Also remove other remnants of the previous http implementation, such as accounting for the http user's uid. Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
* | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-0422-33/+98
| | | | | | | | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | | am fea77cb3: am fd0daeb3: am 4cc47940: Merge "Fix compile error in ↵Marco Nelissen2014-01-171-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | NuPlayerRenderer debug print" * commit 'fea77cb3c22dcb691f44b939c626ae3070212b73': Fix compile error in NuPlayerRenderer debug print
| * | 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
| |\ \ | | |/
* | | am 7ecfe4ec: am 92630351: Merge "NuPlayer: Use a software renderer when ↵Marco Nelissen2013-12-024-2/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | using software codecs" * commit '7ecfe4ec3f6842377f840513850ad31933bcea30': NuPlayer: Use a software renderer when using software codecs
| * \ \ am 92630351: Merge "NuPlayer: Use a software renderer when using software ↵Marco Nelissen2013-11-284-2/+42
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | codecs" * commit '92630351d265a61faae2dfe006a8bb330283aa7b': NuPlayer: Use a software renderer when using software codecs
| | * 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
* | | | update offloaded audio track sampling rateEric Laurent2013-11-222-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
* | | | am 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for ↵Eric Laurent2013-11-151-1/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | offload" into klp-dev * commit '576e89b523d7705545032edc67d98d9ab1dedbd2': AwesomePlayer: correct stream type for offload
| * | | 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 "Fixed StagefrightRecorder::setupVideoEncoder to use the clipped ↵Robert Shih2013-11-152-28/+12
|\ \ \ \ | | | | | | | | | | | | | | | bitrate value mVideoBitRate; removed unused arguments after refactoring."
generated by cgit v1.1 at 2024-05-05 00:06:13 +0000