Support per-stream proxies in HLS streams (attempt 5) #9421

jhol · 2016-03-22T03:53:31Z

This branch supercedes #9412, #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:

[Plugin]
  -> CListItem
      -> CFileItem
          -> CDVDInputStream/CDVDInputStreamFFmpeg
              -> CPlayListM3U::GetBestBandwidthStream
                  -> CFile::Open
                      -> IFile/CCurlFile
                          -> libcurl
                              [HTTP Request playlist M3U8 file]

          -> CDVDInputStream
              -> CDVDDemuxFFmpeg
                  -> libffmpeg
                      [HTTP Request media chunks]

To enable per-stream proxy configuration, the five config values (proxy protocol, host, port, user-name and password) must follow the same path-ways.

The proxy configurations are carried by five new CFileItem properties: proxy.type, proxy.host, proxy.port, proxy.user and proxy.password.
Accessor methods (GetProxyType etc.) have been added to CDVDInputStreamFFmpeg, which expose these property values.
CPlayListM3U::GetBestBandwidthStream has been moved to CDVDInputStreamFFmpeg, so that it can gain access to the proxy information from CDVDInputStreamFFmpeg.
Use of the CFile::Open factory mechanism has been removed from this method. Instead CCurlFile is created directly, so that the proxy values can be applied to the object.
CDVDDemuxFFmpeg has access to CDVDInputStreamFFmpeg, and adds the http_proxy string to the options dictionary if one has been specified.

garbear · 2016-03-22T05:14:54Z

Please force-push instead of opening new pull requests. When you rewrite history and force-push to a branch of the same name, github will automatically update the PR. Note that any comments directly attached to old commits will be hidden (but still viewable)

xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp

-    if (selected.compare(m_item.GetPath()) != 0)
+    const CURL playlist_url = m_item.GetURL();
+    const CURL selected = PLAYLIST::CPlayListM3U::GetBestBandwidthStream(playlist_url, bandwidth);
+    if (selected.Get().compare(playlist_url.Get()) != 0)


garbear · 2016-03-22T06:36:44Z

I went through the code and it looks like you're on the right track. Good job.

xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp

+  {
+    const std::string type_str = GetProxyType();
+    CCurlFile::ProxyType type = CCurlFile::PROXY_HTTP;
+    if (type_str == "http")


FernetMenta · 2016-03-22T06:45:43Z

I agree with @garbear and only have this single comment. Then it is good to go 👍

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.

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.

jhol · 2016-03-22T13:58:59Z

@garbear @FernetMenta - now updated

FernetMenta · 2016-03-22T16:05:13Z

@jhol thank you very much!
jenkins build this please

FernetMenta · 2016-03-22T17:37:43Z

@jhol congrats and thanks again

Support per-stream proxies in HLS streams (attempt 5)

xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp

+
+  // Select the standard port
+  const std::string value = GetProxyType();
+  if (value == "socks4" && value == "socks4a" &&


kyl416 · 2020-07-29T00:16:04Z

Is there any documentation or examples on how to use these proxy properties in a strm file? I tried "CFileItem.proxy.host" and it didn't work.

EDIT: I got it working with "proxy.host", the problem though for m3u8 it seems to only affect the playlist while http URLs that redirect to https don't use the proxy. And I couldn't get it to work with socks5.

jhol mentioned this pull request Mar 22, 2016

Support per-stream proxies in HLS streams (attempt 4) #9412

Closed

garbear reviewed Mar 22, 2016
View reviewed changes

FernetMenta reviewed Mar 22, 2016
View reviewed changes

xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp

{

const std::string type_str = GetProxyType();

CCurlFile::ProxyType type = CCurlFile::PROXY_HTTP;

if (type_str == "http")

This comment was marked as spam.

Sign in to view

FernetMenta added Type: Improvement non-breaking change which improves existing functionality v17 Krypton Component: Video labels Mar 22, 2016

FernetMenta added this to the Krypton 17.0-alpha1 milestone Mar 22, 2016

jhol added 8 commits March 22, 2016 07:56

CPlayListM3U: Convert GetBestBandwidthStream to CURL

ad392a0

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.

CCurlFile: Use a reference to CSettings to tidy proxy reading

51e914f

CCurlFile: Tidied proxy methods

5cfb488

CDVDInputStreamFFmpeg: Added proxy accessor methods

60b2197

CDVDInputStreamFFmpeg: Moved in CPlayListM3U::GetBestBandwidthStream

ba079dc

CDVDInputStreamFFmpeg: Added proxy support to GetM3UBestBandwidthStream

f7e9304

CDVDDemuxFFmpeg: Make GetFFmpegOptionsFromURL handle m_pInput

47a3bdb

jhol force-pushed the replace-proxy8 branch from 84f2f09 to ce7b199 Compare March 22, 2016 13:58

FernetMenta added a commit that referenced this pull request Mar 22, 2016

Merge pull request #9421 from jhol/replace-proxy8

61d6149

Support per-stream proxies in HLS streams (attempt 5)

FernetMenta merged commit 61d6149 into xbmc:master Mar 22, 2016

FernetMenta reviewed Mar 24, 2016
View reviewed changes

xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp

// Select the standard port

const std::string value = GetProxyType();

if (value == "socks4" && value == "socks4a" &&

This comment was marked as spam.

Sign in to view

basrieter mentioned this pull request Sep 1, 2016

VideoPlayer: fix security issues with http options exposed to ffmpeg #9330

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support per-stream proxies in HLS streams (attempt 5) #9421

Support per-stream proxies in HLS streams (attempt 5) #9421

jhol commented Mar 22, 2016

garbear commented Mar 22, 2016

This comment was marked as spam.

garbear commented Mar 22, 2016

This comment was marked as spam.

FernetMenta commented Mar 22, 2016

jhol commented Mar 22, 2016

FernetMenta commented Mar 22, 2016

FernetMenta commented Mar 22, 2016

This comment was marked as spam.

kyl416 commented Jul 29, 2020 •

edited

Support per-stream proxies in HLS streams (attempt 5) #9421

Support per-stream proxies in HLS streams (attempt 5) #9421

Conversation

jhol commented Mar 22, 2016

garbear commented Mar 22, 2016

This comment was marked as spam.

garbear commented Mar 22, 2016

This comment was marked as spam.

FernetMenta commented Mar 22, 2016

jhol commented Mar 22, 2016

FernetMenta commented Mar 22, 2016

FernetMenta commented Mar 22, 2016

This comment was marked as spam.

kyl416 commented Jul 29, 2020 • edited

kyl416 commented Jul 29, 2020 •

edited