summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* Add support of audio offloading for NuPlayer.Wei Jia2014-07-099-46/+636
| | | | Change-Id: Ic83973339fb46a83b48382e6097925f45d200867
* Merge "HLS: do not discard packets when queuing explicit discontinuity"Chong Zhang2014-07-072-3/+10
|\
| * HLS: do not discard packets when queuing explicit discontinuityChong Zhang2014-06-262-3/+10
| | | | | | | | | | | | | | | | | | | | | | in case of explicit discontinuity (#EXT-X-DISCONTINUITY tag in the playlist), do not discard packets that's already queued. (when seeking, the old fetcher will be discarded so this won't affect seeking case.) Bug: 15020526 Change-Id: I5d3fc489df35e3bc44acb1ee7851571cb99cb56b
* | Merge "handle emulation_prevention_three_bytes for AVC"Chong Zhang2014-07-081-2/+2
|\ \
| * | handle emulation_prevention_three_bytes for AVCChong Zhang2014-07-081-2/+2
| |/ | | | | | | | | bug: 15917805 Change-Id: I824fe7eea807f8faba6b149c31890b7a5df87825
* | Support for audio attributes on audio output of media playerJean-Michel Trivi2014-07-012-8/+108
|/ | | | Change-Id: Iae4995c98e64add1ab9e6c8ae6501515032755f5
* am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument ↵Mark Salyzyn2014-06-244-29/+29
|\ | | | | | | | | | | | | warning messages" * commit '76e4e02d6b6c1da140b8cbe48fc58035d2b7d311': libmediaplayerservice: unused argument warning messages
| * am 940c688d: Merge "libmediaplayerservice: unused argument warning messages"Mark Salyzyn2014-06-244-29/+29
| |\ | | | | | | | | | | | | * commit '940c688d76828ffd83929c661e75b5197903d30f': libmediaplayerservice: unused argument warning messages
| | * libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-244-29/+29
| | | | | | | | | | | | Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
* | | Merge "Parse trex and mehd boxes"Marco Nelissen2014-06-231-0/+8
|\ \ \
| * | | Parse trex and mehd boxesMarco Nelissen2014-06-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also get duration from mvhd if available, use that in addition to track durations to determine total length of file, clear track header struct so we don't read uninitialized garbage from it, and take composition time offset into account for proper ordering when B frames are used. b/15669839 Change-Id: Ibf3e35b5c7299bac11d0e78a391545fc325dd2d0
* | | | libmediaplayerservice: 64-bit compile warningsMark Salyzyn2014-06-203-10/+10
|/ / / | | | | | | | | | Change-Id: I333e52dc377becc774f3fa971c230ecb55ea8d7b
* | | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-144-3/+376
|\ \ \
| * | | support for CEA-608 closed captionChong Zhang2014-06-134-3/+376
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 15470448 Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
* | | | Merge "refactor getTrackInfo()"Chong Zhang2014-06-125-30/+97
|\ \ \ \ | |/ / /
| * | | refactor getTrackInfo()Chong Zhang2014-06-135-30/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (this is in preparation for supporting other cc source) - split into two methods: getTrackCount() and getTrackInfo() - move track info parcelling to NuPlayer - parcel in the mime type of the subtitle format Bug: 15470448 Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
* | | | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-121-6/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '2a8270e6944fb3addfcba87f6885aaad196b8b88': Offer a type-safe album art interface.
| * | | am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-121-6/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'c323737dd46d724b4c1ec230b283f26ae2a22b4f': Offer a type-safe album art interface.
| | * | 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
* | | | | am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-111-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ca44dc79b5a163030ab0963f80aa771871de092d': Add libcrypto for users of libstagefright.
| * | | | am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-101-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '8d6d8f546c1d6c55b79b454c720c03a80c738444': Add libcrypto for users of libstagefright.
| | * | | 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.
| * | | \ \ \ am 52a861d2: Merge "warnings be gone."Mark Salyzyn2014-04-114-12/+14
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '52a861d2825544fe2eb90f8e5f6351d02ff95536': warnings be gone.
| | * | | | | 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
* | | | | | Log an error when audio/video encoder failed to createChong Zhang2014-06-111-1/+5
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Change-Id: I493981cddeb9452c533e2917d8c440897d5e6b49 related-to-bug: 15106730
* | | | | check camera permission for video source other than SURFACEChong Zhang2014-06-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15448704 Change-Id: I5f5417037b877a6da3a46700ebb5a80ea59aac36
* | | | | Added paused state to NuPlayerDecoderWei Jia2014-06-052-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents decoder from requesting new buffer until the decoder is resumed, and prevents processing a potential DISCONTINUITY while the player is still flushing. Bug: 13133027 Change-Id: I2f9fa9f00c8583aa6908809cb7c31ddde07cfaf0
* | | | | Fix some NuPlayer issues.Marco Nelissen2014-05-282-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes OnSeekCompleted callback and calling getDuration immediately after prepare(). Change-Id: Ie58c509005cded278a0e50c87240b0a2d920b7d7
* | | | | Fix OGG recognition for 64 bitAndy Hung2014-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4cef86ca05e06f508929d109a52e375169c33bf9
* | | | | 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
generated by cgit v1.1 at 2024-05-31 22:42:26 +0000