47734c9509ecb472c2844cae46e2d916b9358321 |
|
02-May-2016 |
Chih-Hung Hsieh <chh@google.com> |
resolve merge conflicts of 98a9b2a to nyc-dev-plus-aosp Change-Id: Iae0a5cb698807d74ba28878d7ce1f69b6ba5219a
|
090ef604f81447eab4aa0a5b45d6307482573560 |
|
27-Apr-2016 |
Chih-Hung Hsieh <chh@google.com> |
Fix google-explicit-constructor warnings. Bug: 28341362 Change-Id: I625fbab25f16282c2ea929cd16283d9d146fa17b
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
69d3d8a9540b0da787ea0beccad2517f057dd54d |
|
07-Mar-2016 |
Marco Nelissen <marcone@google.com> |
Expand mediaextractor dumpsys Bug: 22775369 Change-Id: I3366a52ba7a00d1685a2211465f2f18f143d0efc
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
316c3d929ffb004b0150d515e82aede02208ce97 |
|
08-Sep-2015 |
Wonsik Kim <wonsik@google.com> |
NuCachedSource2: fix possible erroneous early free Because the constructor of NuCachedSource2 sent a message to AHandlerReflector object, AHandlerReflector::onMessageReceived could have executed just before the object gets wrapped in a strong pointer, resulting in erroneous early free. Fix the issue by using static Create function to ensure the message is sent after the object is wrapped in a sp. Bug: 23882800 Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
2c878cfdf36b896abb99e62a37188cc92cd4fe6e |
|
19-May-2015 |
Chong Zhang <chz@google.com> |
stagefright: don't use stale pointer after disconnecting NuCachedSource2 bug: 20858729 Change-Id: I7d680accb43a4aa08620acd96659b97e80d1a5e8
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
ee4e1b1a63758941460ae79a064249d3a5189443 |
|
17-Apr-2015 |
Lajos Molnar <lajos@google.com> |
stagefright: warnings be gone, some are now errors, use clang Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
1d15ab58bf8239069ef343de6cb21aabf3ef7d78 |
|
05-Mar-2015 |
Lajos Molnar <lajos@google.com> |
media: switch to new AMessage handling Bug: 19607784 Change-Id: I94cddcb81f671422ad4982a23dc4acfe57a9f1aa
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
efbb61950db36a5eb789be83f077246172507c67 |
|
31-Jan-2015 |
Chong Zhang <chz@google.com> |
NuPlayer: pause playback when buffering is low also fix buffering percentage report (should be the buffered position) bug: 18730095 Change-Id: I11e7ca4ba9e772a1ae76861ca1ff1725b62f65ae
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
4f17dadd3cfd9940893ea042ca8883c6aa6ada07 |
|
30-Sep-2014 |
Robert Shih <robertshih@google.com> |
NuCachedSource2: fix disconnect process - clear mAsyncResult - return early from reads if mDisconnecting is set Bug: 17696761 Change-Id: I98bfc3f5f06594915bd58faf71fbcded482664d2
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
9f3d1cffe3bbec35c1fb7fc7e206428728ac234e |
|
24-Sep-2014 |
Chong Zhang <chz@google.com> |
NuCachedSource2: more fixes for source read hang - Do not try to read from HTTP source if already disconnecting - Let NuCachedSource2::readAt() return immediately when disconnecting Bug: 17613805 Change-Id: Ibca4d3a4288ae9a9e2f5658a4240ace54efeb220
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
48296b792a8d68358de74141fa80bd5bd84d0307 |
|
14-Sep-2014 |
Chong Zhang <chz@google.com> |
Disconnect HTTP-based data source upon reset Bug: 17425250 Change-Id: Ieb4c93fd9848489f9dbf35a36474376924fd8eb9
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
a5750e0dad9e90f2195ce36f2c4457fa04b2b83e |
|
19-Jun-2014 |
Mark Salyzyn <salyzyn@google.com> |
libstagefright: 64-bit compile warnings Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
1b24cf32e02a1372e57b3a2a432bc0adfe496e6d |
|
16-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d * commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
|
db43b34c3428e480f8c4c66e7e88f4001f37f91e |
|
04-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
media: 64 bit compile issues - change internal sized types to use stdint.h - printf & scanf formats - size_t or unsigned int for iterators Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
d411b4ca2945cd8974a3a78199fce94646950128 |
|
11-Apr-2014 |
Andreas Huber <andih@google.com> |
warnings be gone. (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
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
84333e0475bc911adc16417f4ca327c975cf6c36 |
|
08-Feb-2014 |
Andreas Huber <andih@google.com> |
warnings be gone. Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
1b86fe063badb5f28c467ade39be0f4008688947 |
|
29-Jan-2014 |
Andreas Huber <andih@google.com> |
FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
a7607a7f97b3136d5e61c0bca63760bf9fc05b19 |
|
28-Aug-2012 |
Andreas Huber <andih@google.com> |
Fix retries when server doesn't support range requests. Change-Id: I2d137f3e799b87af36a279473c0077d860c14477 related-to-bug: 7021436
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
a53d87c7b1428fe02f535c31dafd64cb1362fde9 |
|
20-Apr-2012 |
Andreas Huber <andih@google.com> |
Add the ability to query the amount of cached data to NuMediaExtractor. Change-Id: I0966270a2bd36698330beaa03f47d02fc6a40c44 related-to-bug: 6364341
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
40a4e1440869b2e3981f261b0d301cd16c0cf0aa |
|
18-Jan-2012 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Make sure seek triggers a reconnect if needed. Previously, if we had disconnected at the high watermark, the read immediately following a seek would fail, and would not be retried, resulting in an error. Change-Id: I45a53563fe17d6b54893815abc7750a7dfb0a124
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
9d2f386dd2885eaffa11fd494ae258bb09fe6397 |
|
10-Jan-2012 |
James Dong <jdong@google.com> |
Separate sniffing from session initialization This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened o The change is backward compatibile in that no update is required for existing drm plug-ins if they do not plan to provide separate sniffer/extractor related-to-bug: 5725548 Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47 |
|
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
df64d15042bbd5e0e4933ac49bf3c177dd94752c |
|
04-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
3856b090cd04ba5dd4a59a12430ed724d5995909 |
|
20-Oct-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
95c4d6034dc356f70c6293ea53d4858415b2d020 |
|
18-Oct-2011 |
Andreas Huber <andih@google.com> |
Don't hold onto the lock while reconnecting to the server to avoid stalling the readers. Change-Id: I73b646587c8a654a73ff7d800c0f17bd78001855
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
49c59815369616b0fd5451ccabd377e8fe1dc3fa |
|
07-Oct-2011 |
Andreas Huber <andih@google.com> |
YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater through the use of pseudo http headers specified in the setDataSource call. x-cache-config: -1/-1/0 x-disconnect-at-highwatermark: 1 turns off keep-alives and disconnects every time the cache is full (will attempt to reconnect once it run below lowwater mark) related-to-bug: 5433309 Change-Id: Id2f942fc956e0e156834cfcd6bb08dae6a29fae1
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
0b8cd8b0cf1489f8f7c0b2c4d7ea8fea70ca93a1 |
|
07-Oct-2011 |
Andreas Huber <andih@google.com> |
Specifying -1 for both low and highwater marks would not actually do the right thing before this change. Also make it more consistent in that specifying -1 for the keepalive settings specifies the default. Change-Id: I086f530fbf42abce66d1c8e61157215cb474e044
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
a045cb0e77097120e86e367e1cab5494ce2a5d5e |
|
05-Oct-2011 |
Andreas Huber <andih@google.com> |
Allow a system property "media.stagefright.cache-params" to override cache/prefetcher default parameters. To override specify a property adb shell setprop media.stagefright.cache-params "4096/20480/15" to set the low water threshold to 4096 KB, the high water threshold to 20 MB and the keepalive interval to 15 secs. if high and/or lowwater mark are negative, the default values are used for the respective value. if keep-alive interval is 0, keep-alives are disabled. Change-Id: I89a4a06836e4a2f473d7a92b567ab07818c2f87d
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
0683eba6b35c396c21f10e926709f2f8fc05f090 |
|
18-Jul-2011 |
Andreas Huber <andih@google.com> |
Retry datasource fetches a few times before giving up (NuCachedSource2). Change-Id: I147fc18ef55bc89d2e2fee69b7869c45abbfdd6b related-to-bug: 3405354
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
b33d2ac90cfce0fe6db8c3e979e7ae2bbfc28163 |
|
02-Jun-2011 |
James Dong <jdong@google.com> |
Do not call getEstimatedBandwidth if the streaming is not HTTP-based Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
5b1b8a93a07326f1cbc627f09e02988375189e0a |
|
26-May-2011 |
James Dong <jdong@google.com> |
Send estimated bandwidth value as informational event when cache fetcher pauses o Application can make informed decision about the available network bandwidth when cache fetcher pauses. o Application can also adjust how frequently the bandwidth is estimated within a range from one second to one minute. Change-Id: I90068001343e79da1886de03c565537787e1580b
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
67802977b6f0aa8d6f14f85dadcf32a3cadb9c07 |
|
04-May-2011 |
Andreas Huber <andih@google.com> |
Fix potential memory corruption in NuCachedSource2. Change-Id: Ia6bd2d4966287228a3ac1b067ee1f1ccad965dbb related-to-bug: 4354845
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
7bf8413f91fc072452f315a91618aeef2574d420 |
|
19-Apr-2011 |
Andreas Huber <andih@google.com> |
Make sure a read restarts the prefetcher if necessary. Change-Id: I87cac0e61e4dce7987ddf29c32f51e1672d1bbed related-to-bug: 4286618
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
6511c9755c3a3360ba869772600c7aae048a7ffc |
|
30-Mar-2011 |
Andreas Huber <andih@google.com> |
Stagefright DataSources now expose the underlying content mime type. Use that mime type to determine if we should do upfront buffering at the start of playback and don't for audio streams to ensure playback starts fairly instantly. Change-Id: If21e36d1b024f0e5c723911bceadaa2e0307ab42 related-to-bug: 4090916
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
9d00f0375f8b1af9fe06637e4fa575c7c062df39 |
|
22-Mar-2011 |
Andreas Huber <andih@google.com> |
am 6834f061: am 970d7dd9: am e2c32e9f: If nothing is to be copied, return right away. * commit '6834f0617aea626dfc0f306c9fa3610f32cee1f7': If nothing is to be copied, return right away.
|
310962976d575c0a97ec7a768e9cca0b2361daea |
|
21-Mar-2011 |
Andreas Huber <andih@google.com> |
If nothing is to be copied, return right away. This avoids a potential out-of-bounds problem in the code below. Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c related-to-bug: 4139974
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
b5ce361d19e69fe156f7188c9ee0f4734b259874 |
|
25-Feb-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 3477330 This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead. Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
889b340ec736a9d3e3e690256d305cc8740f0c4b |
|
07-Feb-2011 |
Gloria Wang <gwang@google.com> |
- Do not use global DrmManagerClient - Release the DrmManagerClient and DecryptHandle in DataSource Fix for bug 3429811 Change-Id: I549f72b75225751877eb0e630ce8098f8ec6316f
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
ac05c317cd818701535c5d72ce90da98c4bae75b |
|
20-Jan-2011 |
Andreas Huber <andih@google.com> |
Prefill the cache before trying to instantiate the media extractor. The latter is an operation that otherwise could block on the datasource for a significant amount of time. During that time we'd be unable to abort the preparation phase without this prefill. Change-Id: Ia42496d88a11314386ea8797d665bf4e94871e30 related-to-bug: 3362836
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
1bd233ce7e1aa7730bc18d46ffd57791391738cd |
|
18-Jan-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Don't report 100% buffered when the stream ends prematurely. Change-Id: Ia4e80d02f28104427a3309e3d5b155faa5702757
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
6ee94582e3ce7bdd9625345e7564e3176a51a2f3 |
|
15-Jan-2011 |
James Dong <jdong@google.com> |
Fixed thrashing in the cached buffer during 720p YT video streaming bug - 3340194 Change-Id: Ic59bb18ab1731d7dd7cae7cc8aeb393900bce7f6
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
145e68fc778275963189b02a1adcbe27cce4d769 |
|
12-Jan-2011 |
Andreas Huber <andih@google.com> |
Increase cache size and low-watermark threshold, also MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages to the JAVA client informing it how much (if at all) the video lags behind audio (arg2 is the media delay in ms). Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1 related-to-bug: 3335220
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
a44153c1a57202fb538659eb50706e60454d6273 |
|
04-Dec-2010 |
Andreas Huber <andih@google.com> |
Squashed commit of the following: commit 9254c845d7c82976fd4b8be406ce4b17eeb0e119 Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 15:26:12 2010 -0800 Remove obsolete code from the cached data source. Change-Id: I794b986ac8977cbc834dff189221a636ba564e36 commit 2ee33711064c58c53ba65ed9e63dd4b01ec2380e Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 15:23:13 2010 -0800 LiveSource is dead, long live LiveSession. Change-Id: Ibcd0731ecf9c94f0b3e5db3d53d012d9da2a1c66 commit 9eabb2c3cd8571ab859bdeae0aa7f655c414d8fa Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 12:49:31 2010 -0800 Respect explicitly signalled discontinuities. Change-Id: I3c0c16a2de7a99742d25db7d1b2ff0258de52271 commit 7f7f7b6b906b6ece6e4d43af7fd5f494e805c5e5 Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 11:45:57 2010 -0800 Better protection against syncword emulation in AAC ADTS content. Change-Id: I867e80a4556dd46d24ab3e781177c248a5221719 commit fe765766582efcc350aed01135ea603576adccf6 Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 09:15:59 2010 -0800 New implementation of http live driving code. Change-Id: I31ddf3d6a0d5929b121be704a2b9c3d6775f7737 Change-Id: Id8d1829c8fcb173756965013f848c1d426ef1048
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
7fe4ed1207fa587c65231f9a32374ae4b618d6c0 |
|
19-Nov-2010 |
Andreas Huber <andih@google.com> |
Fix an artifact of going from off_t to off64_t Change-Id: I999fb60a290f9b2db5b73bf926392c8f4e1b7829
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
c7fc37a3dab9bd1f96713649f351b5990e6316ff |
|
16-Nov-2010 |
James Dong <jdong@google.com> |
64-bit file size/offset support for media framework Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
771b85d9245a24273497792a2515d88d31c99e1e |
|
10-Nov-2010 |
Gloria Wang <gwang@google.com> |
Add getUri() for streaming Change-Id: I56e15e67cc5f4d0f41c9e2985404a4d89d757e7e
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
34ef0f32c8fc0186236a27e07405328cc1f7c56d |
|
12-Nov-2010 |
Andreas Huber <andih@google.com> |
Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun. Change-Id: Id5f4b7a0387137380dcd39995390a8e0d084b4b3 Conflicts: media/libstagefright/AwesomePlayer.cpp
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
b371426ce4cf2fa6d8c3d1903b61322feb165d35 |
|
01-Nov-2010 |
Gloria Wang <gwang@google.com> |
Add support for WV DRM Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
bff07d0b22a5ee2d9f044f6cb5e4be1532017ab0 |
|
12-Oct-2010 |
Andreas Huber <andih@google.com> |
HTTP Live content that are tagged as complete are now seekable. Change-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde related-to-bug: 2368598
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
6e4c5c499999c04c2477b987f9e64f3ff2bf1a06 |
|
21-Sep-2010 |
Andreas Huber <andih@google.com> |
Remove stagefright foundation's incompatible logging interface and update callsites. Change-Id: I45fba7d60530ea0f233ac3695a97306b6dc1795c
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
a814c1fdc2acf0ed2ee3b175110f6039be7c4873 |
|
28-Aug-2010 |
Andreas Huber <andih@google.com> |
ALoopers can now be named (useful to distinguish threads). Change-Id: Ieabaddb2e3a9e3a7a5bc36e55cd0721b60dbd50e
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
a5273ebd1746368662a597643d6701a5046d5c7b |
|
22-Jun-2010 |
Andreas Huber <andih@google.com> |
Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not. Change-Id: I7d022ac494e1cecdd7f656806b7ed45979c02840
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
d17875a226491e3de60fa32d764a4cc92de7f949 |
|
11-Jun-2010 |
Andreas Huber <andih@google.com> |
Must hold lock here... Change-Id: I179a5582c9246f78c988f85e2f969f32d547ac89
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
6f5aae1bcba130d5b8092a19fca3627aa565df56 |
|
11-Jun-2010 |
Andreas Huber <andih@google.com> |
Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream. Change-Id: I963ad7074b830d553b67c8925efd5369d0b7a5b9
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|
5994b4798b01f3dd340577c9ea9657f09093a770 |
|
10-Jun-2010 |
Andreas Huber <andih@google.com> |
Initial check-in of new caching/prefetching data source implementation. Change-Id: I97a6e3f03c69c9b1219f1f06bd109c0102f2c504
/frameworks/av/media/libstagefright/NuCachedSource2.cpp
|