Commit Graph

450 Commits

Author SHA1 Message Date
mpromonet
6fdae72c09 fix -S in docker default command 2019-01-26 11:20:48 +00:00
Michel Promonet
64bec47c79 reduce docker size for x86 2019-01-25 20:49:34 +00:00
Michel Promonet
5d0469b11f reduce docker size for x86 2019-01-25 20:39:09 +00:00
Michel Promonet
c1d23dcfab try to build docker for rpi 2019-01-25 20:31:34 +00:00
Michel Promonet
c9c121306a try to build docker for rpi 2019-01-25 20:28:46 +00:00
Michel Promonet
2cb3762ab5 add make in dockerfile 2019-01-20 18:44:06 +00:00
Michel Promonet
b35df2aaf5 use copy instead of add for docker 2019-01-20 17:45:45 +00:00
Michel Promonet
3511bbfbad build docker image from debian 2019-01-17 22:16:17 +00:00
Michel Promonet
ff18c12a64
Update Dockerfile 2019-01-17 13:30:09 +01:00
Michel Promonet
eec483bf81
Update MemoryBufferSink.h 2018-12-24 17:44:45 +01:00
Michel Promonet
bf67b88aea
Merge pull request #120 from neheb/n
Add a few missing headers
2018-12-24 17:44:13 +01:00
Rosen Penev
9977cc5a4b Add a few missing headers
Helps to compile with alternative c++ libraries.
2018-12-16 08:26:43 -08:00
Michel Promonet
2e3bfd90f7 install pkg-config in docker build 2018-12-16 13:42:10 +01:00
Michel Promonet
f0e1ebabba add include of string 2018-12-16 01:22:12 +01:00
Michel Promonet
5ea82aea28
Update README.md 2018-12-13 00:22:13 +01:00
Michel Promonet
30c5f88403
search live555 only in cmake root 2018-12-13 00:07:37 +01:00
Michel Promonet
be6dc4592e
fix build 2018-12-11 08:34:14 +01:00
Michel Promonet
6e569797c0
replace std::stoi with atoi 2018-12-11 08:25:35 +01:00
Michel Promonet
7dbe1195b2 fix docker build 2018-12-09 22:08:52 +01:00
Michel Promonet
a5ad056084 add gitlab ci 2018-12-09 22:01:22 +01:00
Michel Promonet
b0072384c7
Update .travis.yml 2018-12-09 19:50:21 +01:00
mpromonet
c6beba8b42 reduce number of buffer for HLS 2018-12-08 23:43:42 +00:00
mpromonet
1b81da88ba fix live555 build 2018-12-08 23:06:12 +00:00
mpromonet
f2ff5f4ee1 fix service name 2018-12-08 22:19:16 +00:00
mpromonet
a52ac5c37b add pkg-config to circleci build 2018-12-08 22:07:32 +00:00
mpromonet
ef64a350ba remove obsolete -T option 2018-12-08 21:29:07 +00:00
mpromonet
7cd878c6db extract memory buffer from HLS mediasubsession 2018-12-08 21:24:59 +00:00
mpromonet
fbdc2bc710 extract sendfile 2018-12-08 20:34:23 +00:00
mpromonet
df5215a75f for #117: allow to stream over http without muxing unicast/multicast stream 2018-12-08 19:58:11 +00:00
mpromonet
252d613c9d fix path of installed hls 2018-12-08 15:14:30 +00:00
mpromonet
65560567c3 for #118: update service template to fix path to get index.html 2018-12-08 14:44:43 +00:00
mpromonet
95b0976fde fix JPEG quantization size 2018-10-18 20:10:55 +00:00
Michel Promonet
b48c160520
Update MJPEGVideoSource.cpp 2018-10-10 01:14:33 +02:00
Michel Promonet
31f91beb4a
Update MJPEGVideoSource.cpp 2018-10-10 00:09:11 +02:00
mpromonet
3ecbb974c6 fix raw depth 2018-09-22 21:26:45 +00:00
mpromonet
7fef21b762 use cmake option to set c++11 2018-09-22 18:56:46 +00:00
Michel Promonet
c960a44846 try to support video/RAW 2018-09-07 23:31:32 +02:00
Michel Promonet
5936006374 for #106 update install path 2018-09-01 00:24:46 +02:00
Michel Promonet
d87bd7c584
Update README.md 2018-07-12 00:29:27 +02:00
Michel Promonet
7ead7613fe fox #100: try to add audio/PCMA & audio/PCMU 2018-05-26 17:40:53 +02:00
Michel Promonet
35218bac5d
Update README.md 2018-05-09 12:27:03 +02:00
Michel Promonet
af948dfdd6
Merge pull request #95 from walterav1984/patch-1
Update README.md default alsa capture is S16_LE
2018-04-13 20:56:11 +02:00
Walter Sonius
0c1bb70761
Update README.md default alsa capture is S16_LE
Although the default RTP payload stream is S16_BE the "v4l2rtspserver" defaults to S16_LE while not specifying any format shown with the following use cases in this post.  See specifically `./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmicb #noise, default is LE>BE!!!`.

This can be a bug in code or mistake in documentation you may choose what/where to fix :-).

Reproducable steps:
Add the following code to your `~/.asoundrc` that's in your `/home/pi` folder, `/etc/asound.conf` is not used in my example!
```
pcm.virtmica {
    type file
    format "raw"
    file "/dev/null"
    infile "/home/pi/music16le.raw"
    slave.pcm "default"
}
pcm.virtmicb {
    type file
    format "raw"
    file "/dev/null"
    infile "/home/pi/music16be.raw"
    slave.pcm "default"
}
pcm.virtmicc {
    type file
    format "raw"
    file "/dev/null"
    infile "/home/pi/music32le.raw"
    slave.pcm "default"
}
pcm.virtmicd {
    type file
    format "raw"
    file "/dev/null"
    infile "/home/pi/music32be.raw"
    slave.pcm "default"
}
```
Create some raw pcm music sources with `ffmpeg`, which I use a minute(s) long mp3 music file for (16bit 44100Hz stereo) in my example. Use filenames that resemble code above and use long enough samples as in minutes not seconds, since as soon as the v4l2rtspserver is started the music file starts playing and will not loop!

```
sudo apt-get install ffmpeg
ffmpeg -i music.mp3 -f s16le -acodec pcm_s16le /home/pi/music16le.raw
ffmpeg -i music.mp3 -f s16be -acodec pcm_s16be /home/pi/music16be.raw
ffmpeg -i music.mp3 -f s32le -acodec pcm_s32le /home/pi/music32le.raw
ffmpeg -i music.mp3 -f s32be -acodec pcm_s32be /home/pi/music32be.raw
```
Test `v4l2rtspserver` (before commit 41589c8) with the virtual alsa devices and sample files you just made:
```
./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmica #you hear music
./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmica -a S16_LE #you hear music
./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmica -a S16_BE #noise

./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmicb #noise, default is LE>BE!!!
./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmicb -a S16_LE #noise
./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmicb -a S16_BE #you hear music

./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmicc #slow/offpitch music :-)
./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmicc -a S32_LE #recognizable interupted music with gaps
./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmicc -a S32_BE #noise with gaps

./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmicd #noise
./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmicd -a S32_LE #noise with gaps
./v4l2rtspserver -F 25 -W 1280 -H 720 -P 8555 /dev/video0,virtmicd -a S32_BE #recognizable interupted music with gaps

```
2018-04-10 12:49:25 +02:00
Michel Promonet
6b4753c473 compile x86 with alsa 2018-04-06 20:23:47 +02:00
Michel Promonet
5bd57a9ca6 fix compilation with HAVE_ALSA 2018-04-06 20:20:08 +02:00
Michel Promonet
41589c8220 try to set audio payload according to audio capture format 2018-04-04 23:45:27 +02:00
Michel Promonet
14519538a9
Update README.md 2018-04-04 08:39:54 +02:00
Michel Promonet
6b440f64dc
Update README.md 2018-04-02 18:59:08 +02:00
Michel Promonet
932c83dc00 add an option -G to configure width x height x fps 2018-03-25 19:29:21 +02:00
Michel Promonet
1d40bf223a
add docker info in readme 2018-03-25 19:05:03 +02:00