From e1975ea045992fc1c126a9729c1956409641b9aa Mon Sep 17 00:00:00 2001 From: RuffaloVM Date: Wed, 2 Feb 2022 07:02:59 +0900 Subject: [PATCH 1/2] CONTRIBUTING.md : add comma on words --- CONTRIBUTING.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c5e991c6e..b109e65ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,22 +14,22 @@ In order to contribute new or updated documentation, you must first create a Git **NOTE:** Issues and Pull Requests older than 60 days will [automatically be marked as stale](https://github.com/actions/stale) and then closed 7 days later if there still hasn't been any further activity. -Before starting writing your contribution to the documentation you should take a look at the [style guide](https://github.com/raspberrypi/style-guide/blob/master/style-guide.md). +Before starting writing your contribution to the documentation, you should take a look at the [style guide](https://github.com/raspberrypi/style-guide/blob/master/style-guide.md). ## Type of Content -We welcome contributions from the community, ranging from correcting small typos all the way through to adding entire new sections to the documentation. However going forward we're going to be fairly targetted about what sort of content we add to the documentation. We are looking to keep the repository, and the documentation, focussed on Raspberry Pi-specific things, rather than having generic Linux or computing content. +We welcome contributions from the community, ranging from correcting small typos all the way through to adding entire new sections to the documentation. However, going forward we're going to be fairly targetted about what sort of content we add to the documentation. We are looking to keep the repository, and the documentation, focussed on Raspberry Pi-specific things, rather than having generic Linux or computing content. We are therefore deprecating the more generic documentation around using the Linux operating system, ahead of removing these sections entirely at some point in the future as part of a larger update to the documentation site. This move is happening as we feel these sort of more general topics are, ten years on from when the documentation was initially written, now much better covered elsewhere on the web. As such, we're not accepting PRs against these sections unless they're correcting errors. -**NOTE:** We are willing to consider toolchain-related contributions, but changes to the toolchain may have knock-on effects in other places so it is possible that apparently benign pull requests that make toolchain changes could be refused for fairly opaque reasons. +**NOTE:** We are willing to consider toolchain-related contributions, but changes to the toolchain may have knock-on effects in other places, so it is possible that apparently benign pull requests that make toolchain changes could be refused for fairly opaque reasons. ## Third-Party Services -In general we will not accept content that is specific to an individual third-party service or product. We will also not embed, or add links, to YouTube videos showing tutorials on how to configure your Raspberry Pi. +In general, we will not accept content that is specific to an individual third-party service or product. We will also not embed, or add links, to YouTube videos showing tutorials on how to configure your Raspberry Pi. ## Licensing -The documentation is under a [Creative Commons Attribution-Sharealike](https://creativecommons.org/licenses/by-sa/4.0/) (CC BY-SA 4.0) licence. By contributing content to this repository you are agreeing to place your contributions under this licence. +The documentation is under a [Creative Commons Attribution-Sharealike](https://creativecommons.org/licenses/by-sa/4.0/) (CC BY-SA 4.0) licence. By contributing content to this repository, you are agreeing to place your contributions under this licence. From c0f7300fd57759d3c2d422f909949f9fb160db22 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 3 Feb 2022 10:34:46 +0000 Subject: [PATCH 2/2] camera: Update libcamera-apps network streaming command line examples Add ffplay command line examples for all network streaming options. Add a note to recommend using ffplay over vlc as the latter seems problematic with H.264 streams. Signed-off-by: Naushir Patuck --- .../asciidoc/accessories/camera/libcamera_vid.adoc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/documentation/asciidoc/accessories/camera/libcamera_vid.adoc b/documentation/asciidoc/accessories/camera/libcamera_vid.adoc index aa9c37c3b..637a8d9f4 100644 --- a/documentation/asciidoc/accessories/camera/libcamera_vid.adoc +++ b/documentation/asciidoc/accessories/camera/libcamera_vid.adoc @@ -50,6 +50,10 @@ where `` is the IP address of the client, or multicast address (if appr ---- vlc udp://@: :demux=h264 ---- +or alternatively +---- +ffplay udp://: -fflags nobuffer -flags low_delay -framedrop +---- with the same `` value. ===== TCP @@ -84,5 +88,11 @@ and this can be played with ---- vlc rtsp://:8554/stream1 ---- +or alternatively +---- +ffplay rtsp://:8554/stream1 -vf "setpts=N/30" -fflags nobuffer -flags low_delay -framedrop +---- In all cases, the preview window on the server (the Raspberry Pi) can be suppressed with the `-n` (`--nopreview`) option. Note also the use of the `--inline` option which forces the stream header information to be included with every I (intra) frame. This is important so that a client can correctly understand the stream if it missed the very beginning. + +NOTE: Recent versions of VLC seem to have problems with playback of H.264 streams. We recommend using `ffplay` for playback using the above commands until these issues have been resolved.