-
Notifications
You must be signed in to change notification settings - Fork 178
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
Add local ffmpeg and MediaMTX builds to Docker #3353
Conversation
9bbcd73
to
6e253ee
Compare
This is needed in order to support Opus (enhanced RTMP)
6e253ee
to
1e33cd7
Compare
&& mv /opt/mediamtx/mediamtx /usr/local/bin/mediamtx \ | ||
&& mv /opt/mediamtx/mediamtx.yml /etc/mediamtx/mediamtx.yml \ | ||
&& rm -rf /opt/mediamtx/ | ||
# Copy artifacts from the builder stage |
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.
since this is temporary, should we put the removed snippet as comments instead of deleting completely?
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.
and update the MEDIAMTX_VERSION
with v1.11.2-livepeer-1
as we track that version field for alerts in deployments/version mismatches.
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.
I'm ok with still deleting, we have the git history to go back to. not really a big fan of commented out code
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.
Re-introduced the MEDIAMTX_VERSION env var in d6d05ed
since this is temporary, should we put the removed snippet as comments instead of deleting completely?
I am not sure exactly how temporary it would be ... depends on how soon our changes get upstreamed, and whether there is anything else we need to change and maintain for ourselves. Could be a while. Like Max said, we have the git history to fall back to.
@@ -30,6 +30,11 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 \ | |||
&& chmod +x /usr/bin/grpc_health_probe \ | |||
&& ldconfig /usr/local/lib | |||
|
|||
RUN FFMPEG_SHA=b76053d8bf322b197a9d07bd27bbdad14fd5bc15 git clone --depth 1 https://git.ffmpeg.org/ffmpeg.git /ffmpeg \ |
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.
I thought we already had local ffmpeg for rtmp input and output 😕
https://github.com/livepeer/go-livepeer/blob/master/media/rtmp2segment.go#L59
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.
Oh I see now, you've removed the apt install
and are compiling it instead
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.
Yes - the system ffmpeg is quite old (version 4-something) and we need the bleeding edge, since ffmpeg's support for Opus in RTMP was merged just a couple weeks ago
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3353 +/- ##
===================================================
- Coverage 32.25409% 32.25330% -0.00079%
===================================================
Files 147 147
Lines 40584 40585 +1
===================================================
Hits 13090 13090
- Misses 26723 26724 +1
Partials 771 771
Continue to review full report in Codecov by Sentry.
|
Updates for a6e7aef Updated MediaMTX to latest + bumped Livepeer git tag to fix this issue: bluenviron/mediamtx#4212 Also had to lowercase the connection type since MediaMTX changed these strings recently: bluenviron/mediamtx#4076 Lowercasing keeps us compatible across versions. cc @mjh1 |
This is needed in order to support Opus (enhanced RTMP) for audio pass through.
The MediaMTX changes have been submitted upstream; hopefully they will get merged soon and we can go back to using off the shelf releases.