Skip to content

Commit 1fafd18

Browse files
author
Sungjin Han
committed
Merge branch 'release/0.0.1'
2 parents f7c8e5a + 366fd32 commit 1fafd18

File tree

2 files changed

+53
-19
lines changed

2 files changed

+53
-19
lines changed

README.md

+35-19
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,62 @@
1-
# rpi-mjpg-streamer #
1+
# rpi-mjpg-streamer
22

33
Instructions and helper scripts for running mjpg-streamer on Raspberry Pi.
44

55

6-
## A. Setup mjpg-streamer ##
6+
## A. Setup mjpg-streamer
77

8-
#### enable raspberry pi camera in raspi-config ####
8+
### Enable Raspberry Pi Camera module from raspi-config
99

1010
```
1111
$ sudo raspi-config
1212
```
1313

14-
#### install necessary packages for mjpg-streamer ####
14+
### Install necessary packages for mjpg-streamer
1515

1616
```
1717
$ sudo apt-get update
18-
1918
$ sudo apt-get install libv4l-dev libjpeg8-dev subversion imagemagick v4l-utils
2019
```
2120

22-
#### build mjpg-streamer ####
21+
### Build mjpg-streamer
2322

2423
```
2524
$ svn co https://svn.code.sf.net/p/mjpg-streamer/code/mjpg-streamer/ mjpg-streamer
26-
2725
$ cd mjpg-streamer
28-
2926
$ sudo ln -s /usr/include/linux/videodev2.h /usr/include/linux/videodev.h
30-
3127
$ make USE_LIBV4L2=true clean all
3228
```
3329

34-
#### (for Raspberry Pi Camera boards) setup video4linux ####
30+
### Setup video4linux for Raspberry Pi Camera module
3531

3632
```
3733
$ sudo modprobe bcm2835-v4l2
38-
3934
$ sudo vi /etc/modules
4035
41-
# add following line
36+
# add following line:
4237
bcm2835-v4l2
4338
4439
$ sudo vi /boot/config.txt
4540
46-
# add following line for disabling RPi camera's LED
41+
# add following line if you want to disable RPi camera's LED:
4742
disable_camera_led=1
4843
```
4944

50-
#### Add yourself to the video group ####
45+
### Add yourself to the video group
5146

5247
```
5348
$ sudo usermod -a -G video $USER
5449
```
5550

56-
## B. Run mjpg-streamer ##
51+
## B. Run mjpg-streamer
5752

58-
#### Clone this repository ####
53+
### 1. Clone this repository
5954

6055
```
6156
$ git clone https://github.com/meinside/rpi-mjpg-streamer.git
6257
```
6358

64-
#### Run mjpg-streamer from the shell directly ####
59+
### 2-a. Run mjpg-streamer from the shell directly
6560

6661
```
6762
# copy & edit run-mjpg-streamer.sh to your environment or needs
@@ -72,10 +67,30 @@ $ vi somewhere/run-mjpg-streamer.sh
7267
$ somewhere/run-mjpg-streamer.sh
7368
```
7469

75-
#### Run mjpg-streamer as a service ####
70+
### 2-b. Or run mjpg-streamer as a service
71+
72+
#### systemd
73+
74+
```
75+
# copy & edit systemd/mjpg-streamer.service file,
76+
$ sudo cp rpi-mjpg-streamer/systemd/mjpg-streamer.service.sample /lib/systemd/system/mjpg-streamer.service
77+
$ sudo vi /lib/systemd/system/mjpg-streamer.service
78+
79+
# then register as a service
80+
$ sudo systemctl enable mjpg-streamer.service
81+
82+
# or remove it
83+
$ sudo systemctl disable mjpg-streamer.service
84+
85+
# and start/stop it
86+
$ sudo systemctl start mjpg-streamer.service
87+
$ sudo systemctl stop mjpg-streamer.service
88+
```
89+
90+
#### init.d
7691

7792
```
78-
# copy & edit init/mjpg-streamer to your environment or needs
93+
# copy & edit init/mjpg-streamer file,
7994
$ sudo cp rpi-mjpg-streamer/init/mjpg-streamer.sample /etc/init.d/mjpg-streamer
8095
$ sudo chmod +x /etc/init.d/mjpg-streamer
8196
$ sudo vi /etc/init.d/mjpg-streamer
@@ -98,3 +113,4 @@ Connect through the web browser:
98113
![Connected](https://cloud.githubusercontent.com/assets/185988/2740477/3501d5b0-c6d3-11e3-85de-de3ceb302325.png)
99114

100115
Most modern browsers(including mobile browsers like Safari and Chrome) will show the live stream immediately.
116+

systemd/mjpg-streamer.service.sample

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[Unit]
2+
Description=Streams video with Raspberry Pi Camera
3+
After=syslog.target
4+
After=network.target
5+
6+
[Service]
7+
Type=simple
8+
User=some_user
9+
Group=some_user
10+
WorkingDirectory=/path/to/script/directory
11+
ExecStart=/path/to/script/directory/run-mjpg-streamer.sh
12+
Restart=always
13+
RestartSec=5
14+
Environment=
15+
16+
[Install]
17+
WantedBy=multi-user.target
18+

0 commit comments

Comments
 (0)