summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/chromium_http
Commit message (Collapse)AuthorAgeFilesLines
* Move chromium_http/support.cpp off androidGetTid.Elliott Hughes2014-08-181-1/+1
| | | | | Bug: 17048545 Change-Id: I9bb86908177d8c5350124b4f8bee448595eb32a4
* am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am ↵Marco Nelissen2014-03-201-0/+1
|\ | | | | | | | | | | | | 72499628: am 25bab830: Fix build * commit '5be9c1daf956c35d37585d21fff5d6b99f506560': Fix build
| * am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am ↵Marco Nelissen2014-03-201-0/+1
| |\ | | | | | | | | | | | | | | | | | | 25bab830: Fix build * commit '01eed3c0fb951e349d68f4bce818bef22e7925b1': Fix build
| | * am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | |\ | | | | | | | | | | | | | | | | * commit '7a107b857e658ba11c0c1fd2325ac91a2c0569a2': Fix build
| | | * am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '25bab830af062dcaef6f75220066b221fd30957e': Fix build
| | | | * Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of jb-mr1, need to explicitly include library dependencies. The original change in jb, which the automerger dutyfully merged, did not need this. Change-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7
* | | | | am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am ↵Marco Nelissen2014-03-201-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates * commit '6f65db14e310b513c8943b236a6e61cf27cef4c7': Verify certificates
| * | | | am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am ↵Marco Nelissen2014-03-201-2/+102
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates * commit '0e0891f8b49f31e6a28b563f86aae537e66bb6e0': Verify certificates
| | * | | am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am ↵Marco Nelissen2014-03-201-2/+102
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | 3bc4f7ea: am 0c271b75: Verify certificates * commit '6cdc90b5e41374dd665df3ae7283ef0c1f532678': Verify certificates
| | | * | am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * commit 'd434944b00cf83a38019047e0d7db155a15d77f4': Verify certificates
| | | | * am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed': Verify certificates
| | | | | * Verify certificatesMarco Nelissen2014-03-191-2/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/13418320 Cherrypicked from 8a57d24c733b08da846b54d1adf029e606b5a5f3 https://googleplex-android-review.git.corp.google.com/#/c/433309/ Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
* | | | | | Verify certificatesMarco Nelissen2014-03-132-1/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/13418320 Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
* | | | | | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2014-03-062-0/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the code actually match an existing comment in DrmInitialization, which claimed that mURI was the redirected URL and not the original one. Bug: 13174301 Change-Id: I0a5cc65f520f1482ff91320ae78af84a8a681ee3
* | | | | am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * commit '8eef093c213094c7efb655ef4d9e31439646bd7f': libstagefright: Use LOG_BASIC when use chromium http stack
| * | | | Merge "libstagefright: Use LOG_BASIC when use chromium http stack"Jean-Baptiste Queru2013-07-081-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | libstagefright: Use LOG_BASIC when use chromium http stackXuefeng Deng2012-08-171-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using chromium http stack, the LogLevel is LOG_ALL, and in chromium_net, LOG_ALL will HexEncode all received data. thus playing a 10Mbps 1080P video stream will generate 20Mbps Hex Buffer for event logging. This is a heavy operation for logging. Change-Id: I28e8173e1aa806dd23014378d530d30187360060 Author: Xuefeng Deng <xuefeng.deng@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 35737
| * | | Add support for HLS playlists of type 'event'.Andreas Huber2012-11-271-1/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 6870049 Squashed commit of the following: commit eee2f3ba6bb7335f4e285632726db85645669929 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 15:02:01 2012 -0800 Make everything a lot less verbose by default. Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3 commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 14:34:46 2012 -0800 HLS now properly signals media time changes at discontinuities including the start of playback (which may not necessarily be at time 0 if the playlist is of type 'event' and hasn't completed yet). Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e commit 1555589832b1878a144a976a643e1af4d61f877c Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 14:32:28 2012 -0800 As part of a time discontinuity, clients of IStreamListener can now signal the corresponding media time after the discontinuity, i.e. the first PTS timestamp following the discontinuity will be considered equivalent to the specified media time and media buffers timestamped accordingly. Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92 commit 5c24c605c073a11c426d025b1e7478fc1ad8365a Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 13:00:56 2012 -0800 NuPlayer sources now expose flags() and can announce that duration may change (increase) dynamically, in which case duration will be polled at 1 second intervals and communicated to the upper layers. Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea commit ecb71de8e281e61971a2cd73e7161a97540bc357 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 12:57:47 2012 -0800 Stop caching duration in MediaPlayer, duration could increase dynamically. Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791 commit 544aec5823e6d7a3e97e15b6b23546616bcd343e Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 08:46:28 2012 -0800 An attempt to add support for "event" style HLS playlists. Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60 Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
* | | Update HTTP proxy configuration for all media playback inside stagefright.Andreas Huber2013-05-314-2/+62
| | | | | | | | | | | | | | | | | | Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b related-to-bug: 8873723 (cherry picked from commit 2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
* | | Add liblogYing Wang2013-04-091-0/+1
| | | | | | | | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* | | Identify network servers and clients with a OS version related stringAndreas Huber2013-03-261-14/+2
| | | | | | | | | | | | | | | | | | and put the logic to create that string in one location instead of many... Change-Id: I1f729f2e7376cd3b45eea0e48f7bd10084b41b39
* | | Add support for HLS playlists of type 'event'.Andreas Huber2012-11-271-1/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 6870049 Squashed commit of the following: commit eee2f3ba6bb7335f4e285632726db85645669929 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 15:02:01 2012 -0800 Make everything a lot less verbose by default. Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3 commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 14:34:46 2012 -0800 HLS now properly signals media time changes at discontinuities including the start of playback (which may not necessarily be at time 0 if the playlist is of type 'event' and hasn't completed yet). Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e commit 1555589832b1878a144a976a643e1af4d61f877c Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 14:32:28 2012 -0800 As part of a time discontinuity, clients of IStreamListener can now signal the corresponding media time after the discontinuity, i.e. the first PTS timestamp following the discontinuity will be considered equivalent to the specified media time and media buffers timestamped accordingly. Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92 commit 5c24c605c073a11c426d025b1e7478fc1ad8365a Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 13:00:56 2012 -0800 NuPlayer sources now expose flags() and can announce that duration may change (increase) dynamically, in which case duration will be polled at 1 second intervals and communicated to the upper layers. Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea commit ecb71de8e281e61971a2cd73e7161a97540bc357 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 12:57:47 2012 -0800 Stop caching duration in MediaPlayer, duration could increase dynamically. Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791 commit 544aec5823e6d7a3e97e15b6b23546616bcd343e Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 08:46:28 2012 -0800 An attempt to add support for "event" style HLS playlists. Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60 Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
* | Don't log streaming url.James Dong2012-08-171-5/+1
| | | | | | | | | | | | o related-to-bug: 6994761 Change-Id: I79d5549a70b3bde67ddf496cfc6283ac92b1f569
* | libstagefright: dynamically load libstagefright_chromium_httpColin Cross2012-06-152-3/+47
|/ | | | | | | dlopen libstagefright_chromium_http to allow it to be on the platform side of the pdk without getting overwritten during a pdk fusion build. Change-Id: I391e81d98beab165c3313bc8a71bb370ebb8584d
* Properly handle the case where a pending connection process is disconnectedAndreas Huber2012-05-012-1/+13
| | | | | | | just at the time when the connection is established. Change-Id: Icbae5a61edfd6a1336e4b8d3ee513337363c09ea related-to-bug: 6154825
* AV Android make files changesJames Dong2012-03-281-1/+1
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* stagefright: compile without chromium for pdk buildsColin Cross2012-03-261-0/+2
| | | | Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
* Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.James Dong2012-03-241-1/+0
| | | | | | o related-to-bug: 6214141 Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
* Switched to use the header files in /frameworks/nativeJames Dong2012-03-121-1/+1
| | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* Separate sniffing from session initializationJames Dong2012-01-121-2/+2
| | | | | | | | | | | | 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
* Allow data uris to be data sourcesNarayan Kamath2011-12-062-2/+71
| | | | | bug:5571010 Change-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58
* Various improvements to nuplayer playbackAndreas Huber2011-09-161-0/+22
| | | | | | | | | | | | | | | | | | | | - Drastically cut down the number of times we supply the AudioSink with data by estimating the time until the sink would run out of data and then scheduling a refill in advance of that. - Use a dedicated looper for video decoders since they are currently taking too long to return from OMX_FillThisBuffer (bug 5325201) - Revise thread priorities for the OMX dispatcher and software codecs, instead of running them at ANDROID_PRIORITY_AUDIO, they now only run at ANDROID_PRIORITY_FOREGROUND - Since threads created by pthread_create inherit all of the parent threads attributes including thread priority, briefly reset thread priority to ANDROID_PRIORITY_FOREGROUND before instantiating OMX components and then restore it. Change-Id: If9332a3a20dad5485333d68c11de0d2d5d3fffc3
* Network traffic accounting for chromium stack support in mediaserver.Ashish Sharma2011-08-053-0/+51
| | | | | | | - Atribute network activity to uid calling the mediaplayer - Enables logging of chromium network stack in logcat Change-Id: I2d28c8392248a056b3cee305dd4d4475ebba4337
* Close the DRM session in the destructor of ChromiumHTTPDataSource.Gloria Wang2011-08-041-4/+2
| | | | | | Fix for bug 5015079. Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
* Restart HLS streaming from the bottom of the playlist if we miss the boat on theAndreas Huber2011-08-041-5/+5
| | | | | | | | | | next segment. This can happen if for whatever reason we playback video slower than it is served. Also removed some unnecessary verbosity from ChromiumHTTPDataSource. Change-Id: I6e870879310c9efe4d50d7dc0883c08405442d79 related-to-bug: 5120425
* Merge "Fix for bug 5049763 HLS: Cookies set in main playlist request aren't ↵Kristian Monsen2011-07-271-0/+3
|\ | | | | | | being passed to subsequent HTTP requests"
| * Fix for bug 5049763 HLS: Cookies set in main playlist request aren't being ↵Kristian Monsen2011-07-221-0/+3
| | | | | | | | | | | | | | | | | | | | passed to subsequent HTTP requests Cookies should be store between requests in memory with this. Tell me if you want to store the cookies on disk as well. Change-Id: I9afe5796a3d395afcf54d669c86cf7da432f8d9a
* | Retry datasource fetches a few times before giving up (NuCachedSource2).Andreas Huber2011-07-221-3/+31
|/ | | | | Change-Id: I147fc18ef55bc89d2e2fee69b7869c45abbfdd6b related-to-bug: 3405354
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-2/+0
| | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* Merge changes I7e8401a4,I412ddf36Kristian Monsen2011-07-011-17/+17
|\ | | | | | | | | | | * changes: Merge Chromium at r11.0.696.0: New autofill strings Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
| * Merge Chromium at r11.0.696.0: Using setter instead of direct variable accessKristian Monsen2011-06-291-17/+17
| | | | | | | | | | | | | | Members in UrlRequestContext was made private in upstream CL: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165 Change-Id: I412ddf36b0818e59b9b3ae428407d562facd4785
* | Instantiate a NetworkChangeNotifier to have chromium transparently handle ↵Andreas Huber2011-06-291-0/+3
|/ | | | | | | | interface changes. Change-Id: If48d2934ce29d68b9c31a1d120fe8f134f277a33
* Merge "Merge chromium to r11.0.672.0: Compile fix"Kristian Monsen2011-06-142-4/+4
|\
| * Merge chromium to r11.0.672.0: Compile fixKristian Monsen2011-06-072-4/+4
| | | | | | | | | | | | | | Cause by upstream CL: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924 Change-Id: Iada1639b7a38cee963644437e8e3f4f5708d6136
* | Do not call getEstimatedBandwidth if the streaming is not HTTP-basedJames Dong2011-06-021-1/+1
| | | | | | | | Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
* | Send estimated bandwidth value as informational event when cache fetcher pausesJames Dong2011-05-311-34/+1
|/ | | | | | | | | | 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
* Merge chromium to 10.0.634.0: Compile fixKristian Monsen2011-05-251-1/+1
| | | | | | | base/thread.h moved to base/threading/thread.h: http://codereview.chromium.org/6028009 Change-Id: I4a7dd04055ed931f6bc2c6b63255f3832d0c78bd
* Merge Chromium at 10.0.621.0: Fixes for libstagefreightKristian Monsen2011-05-132-21/+23
| | | | | | | URLRequest is now a member of the net namespace. HttpCache constructor has a new argument, which is a CertVerifier() Change-Id: I21d524938868b2e37993838f4fbb8447b02c3606
* Stagefright DataSources now expose the underlying content mime type.Andreas Huber2011-03-302-2/+15
| | | | | | | | 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
* Fix for bug 3477330Gloria Wang2011-03-101-3/+3
| | | | | | | This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead. Change-Id: Icbd59858385e8256125a615a3c82656b25319d44