-
-
Notifications
You must be signed in to change notification settings - Fork 6.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[url] skip parsing username:password@ for udp/rtp streams #17222
Conversation
9d021b1
to
75392a9
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please follow the current code guidelines.
75392a9
to
63b0811
Compare
Fixed @Rechi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please follow the current code guidelines.
63b0811
to
db87ec4
Compare
It's really fixed now. |
After some user testing on windows we get an error with what is enabled in the ffmpeg build:
Full log: https://paste.kodi.tv/vewologahu.kodi |
As it’s lacking pthread the error should be windows only. |
@Paxxi would there be any side effects if we build ffmpeg for windows using So with something like |
I don't really know. Based on the given information I would assume pthreads don't work on windows or there wouldn't really be a reason to have a w32-threads option. Maybe it's a simple patch for ffmpeg where it checks for thread support? I would look into that first, if it's more than a bad if check then it might be worth trying with pthreads. |
Good point. Will look into it. May also be solved by a later version of ffmpeg, another option. |
Ok, so ffmpeg requires the URL in a different format if source IPs are used: http://ffmpeg.org/ffmpeg-protocols.html#rtp So May also mean the error above is red herring. |
Also, after some reading there is a marginal difference between w32threads and pthreads, hence why most use w32. We can always try it later on if we eventually need to. |
828e571
to
147efcf
Compare
e99eac9
to
fff54df
Compare
df93269
to
cb68f4c
Compare
474cd9a
to
56f075e
Compare
I seriously doubt that changing ffmpeg to pthreads is an appropriate solution for the issue you are trying to solve. Try to explain why this should require pthreads. Makes no sense at all. Why don't you elaborate on the root cause. Have you asked ffmpeg developers already? Changing ffmpeg to pthreads introduces a high risk of breakage. Taking this risk for something that should be fixed elsewhere is a bad idea. |
UDP streams use pthreads for their circular_buffer logic. The included patch adds missing logic in w32pthreads to allow this (hopefully) to function, but just for UDP. Have not asked ffmpeg devs yet. I have submitted a patch that fixes an RTP bug, but I fear this currently lacks a maintainer. Is the ffmpeg patch in the PR not how you would go about this? |
Your commit messages are misleading. I thought you were disabling w32threads in favour of pthreads for the mingw build. This would have been a major change. What you actually do is making udp use the pthreads compat layer on windows platform. That's a completely different story. Sorry for thy noise. More precise commit messages welcome :) |
:) in hindsight it is a bit ambiguous! |
56f075e
to
e781775
Compare
e781775
to
e5fd836
Compare
All user testing on this has passed so will merge this tomorrow. Due to the patching required I don’t think I will backport this to Leia. |
[url] skip parsing username:password@ for udp/rtp streams
[url] skip parsing username:password@ for udp/rtp streams
[url] skip parsing username:password@ for udp/rtp streams
[url] skip parsing username:password@ for udp/rtp streams
[url] skip parsing username:password@ for udp/rtp streams
[url] skip parsing username:password@ for udp/rtp streams
[url] skip parsing username:password@ for udp/rtp streams
[url] skip parsing username:password@ for udp/rtp streams
Description
Username and password are not valid for UDP/RTP streams. This can cause issues where the URL is in the form rtp://sourceip@multicastip.
Fixes: #17220
Motivation and Context
Fix udp/rtp streams in the format rtp://sourceip@multicastip
How Has This Been Tested?
Requires user testing. I don't have a stream of this type.
Screenshots (if appropriate):
Types of change
Checklist: