Skip to content

stream.ffmpegmux: always clean up named pipes #3992

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Sep 4, 2021
Merged

stream.ffmpegmux: always clean up named pipes #3992

merged 1 commit into from
Sep 4, 2021

Conversation

bastimeyer
Copy link
Member

Fixes #3991

No tests for this change, because the test for FFMPEGMuxer.open currently doesn't touch the pipe_threads, and I don't want to mess with this.

The fix is simple, just break out of the while loop instead of returning, so that the pipe.close() call always gets made.

$ streamlink -l debug 'https://www.youtube.com/watch?v=xcJtL7QggTI' best
[cli][debug] OS:         Linux-5.13.13-1-git-x86_64-with-glibc2.33
[cli][debug] Python:     3.9.6
[cli][debug] Streamlink: 2.3.0+49.g830c5ec
[cli][debug] Requests(2.26.0), Socks(1.7.1), Websocket(1.1.0)
[cli][debug] Arguments:
[cli][debug]  url=https://www.youtube.com/watch?v=xcJtL7QggTI
[cli][debug]  stream=['best']
[cli][debug]  --loglevel=debug
[cli][debug]  --player=mpv
[cli][info] Found matching plugin youtube for URL https://www.youtube.com/watch?v=xcJtL7QggTI
[plugins.youtube][debug] Using video ID: xcJtL7QggTI
[plugins.youtube][debug] MuxedStream: v 137 a 251 = 1080p
[plugins.youtube][debug] MuxedStream: v 135 a 251 = 480p
[plugins.youtube][debug] MuxedStream: v 133 a 251 = 240p
[plugins.youtube][debug] MuxedStream: v 160 a 251 = 144p
[cli][info] Available streams: audio_mp4a, audio_opus, 144p (worst), 240p, 360p, 480p, 720p, 1080p (best)
[cli][info] Opening stream: 1080p (muxed-stream)
[stream.ffmpegmux][debug] Opening http substream
[stream.ffmpegmux][debug] Opening http substream
[utils.named_pipe][info] Creating pipe streamlinkpipe-70962-1-1164
[utils.named_pipe][info] Creating pipe streamlinkpipe-70962-2-4705
[stream.ffmpegmux][debug] ffmpeg command: ffmpeg -nostats -y -i /tmp/streamlinkpipe-70962-1-1164 -i /tmp/streamlinkpipe-70962-2-4705 -c:v copy -c:a copy -map 0 -map 1 -f matroska pipe:1
[stream.ffmpegmux][debug] Starting copy to pipe: /tmp/streamlinkpipe-70962-1-1164
[stream.ffmpegmux][debug] Starting copy to pipe: /tmp/streamlinkpipe-70962-2-4705
[cli][debug] Pre-buffering 8192 bytes
[cli][info] Starting player: mpv
[cli.output][debug] Opening subprocess: mpv --force-media-title=https://www.youtube.com/watch?v=xcJtL7QggTI -
[cli][debug] Writing stream to output
[cli][info] Player closed
[stream.ffmpegmux][debug] Closing ffmpeg thread
[stream.ffmpegmux][error] Pipe copy aborted: /tmp/streamlinkpipe-70962-1-1164
[stream.ffmpegmux][error] Pipe copy aborted: /tmp/streamlinkpipe-70962-2-4705
[stream.ffmpegmux][debug] Pipe copy complete: /tmp/streamlinkpipe-70962-1-1164
[stream.ffmpegmux][debug] Pipe copy complete: /tmp/streamlinkpipe-70962-2-4705
[stream.ffmpegmux][debug] Closed all the substreams
[cli][info] Stream ended
[cli][info] Closing currently open stream...

$ ls /tmp/streamlinkpipe-*
fish: No matches for wildcard “/tmp/streamlinkpipe-*”. See `help expand`.
 ls /tmp/streamlinkpipe-*
    ^

@bastimeyer
Copy link
Member Author

This of course doesn't fix the issue that the stream doesn't end gracefully without errors, but at least it doesn't leave named pipes behind, polluting the system.

@gravyboat gravyboat merged commit b3494be into streamlink:master Sep 4, 2021
@bastimeyer bastimeyer deleted the stream/ffmpegmux/fix-named-pipe-cleanup branch September 4, 2021 20:05
Billy2011 added a commit to Billy2011/streamlink-27 that referenced this pull request Sep 5, 2021
@Billy2011
[PATCH] stream.ffmpegmux: always clean up named pipes (streamlink#3992)
cbb06a3
Billy2011 added a commit to Billy2011/streamlink-27 that referenced this pull request Sep 7, 2021
@Billy2011
[PATCH] stream.ffmpegmux: always clean up named pipes (streamlink#3992)
00b36fd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug stream: ffmpegmux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

stream.ffmpegmux: named pipes don't get cleaned up
2 participants
@bastimeyer @gravyboat