Support per-stream proxies in HLS streams (attempt 4) #9412
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This conversion also has the side-effect of stripping the proxy configuration.
Formatting the CURL as a string, then parsing it back to a CURL is redundant, and has the effect of stripping any additional CURL object metadata.
Nothing attempts to override this method, and having it be overridable serves no clear purpose.
|
@FernetMenta Any better this time? There is no |
Now that the ProxyType enum has been moved to Proxy.h, there is a risk that any changes to that structure could be made without updating the proxyType2CUrlProxyType lookup table, possibly creating a buffer overrun case. Doing the conversion with a switch-case mitigates against this.
Since v3.0, FFmpeg has supported the http_proxy option for the HTTP protocol. Previously, CDVDDemuxFFmpeg would pass Kodi httpproxy CURL protocol option through as a HTTP header, which the server would (hopefully) ignore. With this change, if Kodi is built with an older version of FFmpeg, FFmpeg will simply ignore the option - which is an improvement over sending spurious HTTP headers.
| @@ -166,10 +166,8 @@ bool CFileCache::Open(const CURL& url) | |||
|
|
|||
| CLog::Log(LOGDEBUG,"CFileCache::Open - opening <%s> using cache", url.GetFileName().c_str()); | |||
|
|
|||
| m_sourcePath = url.Get(); | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
see comments. we are getting closer. |
| @@ -42,26 +48,23 @@ CDVDInputStreamFFmpeg::~CDVDInputStreamFFmpeg() | |||
|
|
|||
| bool CDVDInputStreamFFmpeg::IsEOF() | |||
| { | |||
| if(m_aborted) | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Superceded by #9421 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This branch supercedes #9398, #9240 and #8680, providing another attempt to add the ability for plugins to provide per-stream proxy configuration, including support for proxies with HLS.
The flow of URL information from plugins to HTTP requests for HLS streams is as follows:
To enable per-stream proxy configuration, the five config values (proxy protocol, host, port, user-name and password) must follow the same path-ways.
CFileItemproperties:proxy.type,proxy.host,proxy.port,proxy.userandproxy.password.GetProxyTypeetc.) have been added toCDVDInputStream, which expose these property values.enum CCurlFile::ProxyTypehas been moved to a common header so that it can be used in code beyondCCurlFileCPlayListM3U::GetBestBandwidthStreamhas been moved toCDVDInputStreamFFmpeg, so that it can gain access to the proxy information fromCDVDInputStream.CFile::Openfactory mechanism has been removed from this method. InsteadCCurlFileis created directly, so that the proxy values can be applied to the object.CDVDDemuxFFmpeghas access toCDVDInputStream, and adds thehttp_proxystring to the options dictionary if one has been specified.