Skip to content
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

feat: refactor, remove hardcoded youtube rtmp url #508

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

roanta2
Copy link

@roanta2 roanta2 commented Apr 24, 2023

Refactoring on livestream part to not treat youtube as a special case. So now you need to provide the entire rtmp url ( stream url + key).

@jitsi-jenkins
Copy link

Hi, thanks for your contribution!
If you haven't already done so, could you please make sure you sign our CLA (https://jitsi.org/icla for individuals and https://jitsi.org/ccla for corporations)? We would unfortunately be unable to merge your patch unless we have that piece :(.

@roanta2 roanta2 requested a review from saghul April 24, 2023 15:13
@codecov
Copy link

codecov bot commented Apr 24, 2023

Codecov Report

Merging #508 (24a0dcc) into master (c23529a) will increase coverage by 0.11%.
The diff coverage is 5.55%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #508      +/-   ##
============================================
+ Coverage     48.05%   48.17%   +0.11%     
  Complexity      174      174              
============================================
  Files            73       73              
  Lines          2110     2105       -5     
  Branches        202      199       -3     
============================================
  Hits           1014     1014              
+ Misses         1026     1021       -5     
  Partials         70       70              
Impacted Files Coverage Δ
...rc/main/kotlin/org/jitsi/jibri/api/xmpp/XmppApi.kt 51.72% <0.00%> (+3.07%) ⬆️
.../jitsi/jibri/service/impl/StreamingJibriService.kt 0.00% <0.00%> (ø)
...rc/main/kotlin/org/jitsi/jibri/api/http/HttpApi.kt 40.00% <25.00%> (ø)

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c23529a...24a0dcc. Read the comment docs.

@bbaldino
Copy link
Member

Others probably have a better memory of this than I do, but there's actually existing code that I believe is trying to support exactly this. If you look at this chunk you removed in your PR:

                val rtmpUrl = if (startIq.streamId.isRtmpUrl()) {
                    startIq.streamId
                } else {
                    "$YOUTUBE_URL/${startIq.streamId}"
                }

That's allowing for the value passed as the streamId to be an entire RTMP url.

@roanta2
Copy link
Author

roanta2 commented Apr 25, 2023

Others probably have a better memory of this than I do, but there's actually existing code that I believe is trying to support exactly this. If you look at this chunk you removed in your PR:

                val rtmpUrl = if (startIq.streamId.isRtmpUrl()) {
                    startIq.streamId
                } else {
                    "$YOUTUBE_URL/${startIq.streamId}"
                }

That's allowing for the value passed as the streamId to be an entire RTMP url.

Yep, so I moved this part in StreamingJibriService.kt without the else branch. My first comment is kind of misleading so I didn't add the functionality for the streamId to be the entire RTMP url, as it was already there, I just removed the custom youtube stuff.

@saghul
Copy link
Member

saghul commented Apr 25, 2023

@roanta2 We'll need to modify Jitsi Meet too to use the full rtmp URL format.

@saghul
Copy link
Member

saghul commented Apr 25, 2023

LGTM at a glance, but we need to wait to have Jitsi Meet ready before we can apply this. Can you start working on that @roanta2 ?

@roanta2
Copy link
Author

roanta2 commented Apr 25, 2023

@saghul Thanks. I'm mostly backend but it seems like a minor change in Jisti Meet, so I'll give it a try.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants