1
0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-12-04 14:46:31 -05:00
Commit Graph

38 Commits

Author SHA1 Message Date
Moritz Grimm
83d1d17be1 Remove half-baked support for "passthrough encoders"
The correct way is to just not configure an encoder for a stream, which
is what the documentation already states. Encoder sections now require
a program name to be set or the configuration will not load.

Fixes a segfault in ezstream.c, as reported by Tom McCallum via Github.
2020-01-15 23:04:40 +01:00
Moritz Grimm
b7d1269944 Add example that calls meta.sh 2018-01-22 17:35:11 +01:00
Moritz Grimm
6e92298a98 Tweak to hit a few more code paths 2018-01-22 17:34:31 +01:00
Moritz Grimm
0b260b3c08 Make media inputs ("intakes") a list of things, too 2017-11-23 18:34:57 +01:00
Moritz Grimm
ed9e84f387 Change config format to (eventually) support concurrent streams to many servers
Everything ties together in stream configurations, of which there can be many
now.

For the time being, every stream configuration but the "default" is ignored.

Every stream/server/encoder/decoder configuration now has the name "default"
by default, so that configuring names is only needed to resolve ambiguities.

Decoder configurations are now also constrained in this manner for consistency,
meaning they are no longer uniquely identified by a number of file extensions
but also a name.
2017-11-18 01:54:14 +01:00
Moritz Grimm
1790ca5508 Explicitly exit 0 on success 2017-09-20 00:17:20 +02:00
Moritz Grimm
58f615486a Add missing "album" example 2017-09-15 19:17:13 +02:00
Moritz Grimm
f87a5ae9ec Mention "stdin" magic filename 2017-09-15 18:59:59 +02:00
Moritz Grimm
00c18db8c8 Make oggenc example work with decoder examples again 2017-09-15 18:57:40 +02:00
Moritz Grimm
9cb809d5fb Change example to match distributed meta.sh file 2017-09-15 18:52:47 +02:00
Moritz Grimm
8dc044fee9 Be consistent about using $() instead of `` 2017-07-07 16:44:58 +02:00
Moritz Grimm
8e0d5d6678 Add STDIN streaming configuration example 2017-03-30 14:54:41 +02:00
Moritz Grimm
8e9533c5e3 Allow external control of meta.sh output for increased usefulness 2017-01-02 02:08:26 +01:00
Moritz Grimm
a337c74ea4 Update TLS configuration to match libshout requirements 2016-03-04 18:20:17 +01:00
Moritz Grimm
57749b4d73 Merge branch 'develop' into feature/https_support 2016-02-29 15:24:55 +01:00
Moritz Grimm
87275ca223 Properly set up traps
Also don't attempt to delete the temporary file twice.
2015-06-08 23:57:17 +02:00
Moritz Grimm
ccaa2fddc3 Remove broken check 2015-06-08 23:52:14 +02:00
Moritz Grimm
2016cb5012 Revert "Comment out/remove HTTPS-related documentation and examples"
This reverts commit 2ccc72c963.
2015-05-23 09:53:03 +02:00
Moritz Grimm
2ccc72c963 Comment out/remove HTTPS-related documentation and examples
... to be reverted when HTTPS is officially supported with the corresponding
libshout release.
2015-05-22 22:42:50 +02:00
Moritz Grimm
d71886a0e6 Add a video streaming example 2015-05-22 00:27:52 +02:00
Moritz Grimm
f7a700efe9 Replace examples with fewer, more concise ones 2015-05-21 23:32:55 +02:00
Moritz Grimm
2bc4cedbb0 Make oggdec output correctly signed RAW audio
Newer oggdec seems to have inverted the -e setting, as compared to the
old examples from a few years ago.
2015-05-21 23:30:51 +02:00
Moritz Grimm
fb9c44f7fa Update new example so that it can theoretically work 2015-05-21 18:50:22 +02:00
Moritz Grimm
43e48648fa Refactor configuration (work in progress)
* Move -m and -n command line options into the config file
* Restructure configuration file:
  - Group into "server", "stream", "media", "metadata", "decoders", and
    "encoders"
  - Untangle decoder and encoder:
    o Decoders match on file extensions and convert to a canonical "internal"
      format
    o Encoders create one of the supported stream formats, potentially using
      different parameters (like bitrate)
  - Consistently specify stream format
  - Enable reencoding by selecting an encoder
* Architecturally separate configuration file storage from parsing
  - Allows for different configuration back-ends in the future, like
    YAML, SQL, REST API, ...
* Support roll-back in case of error on (re)load
* Anticipate HTTPS support
2015-05-06 00:38:00 +02:00
Moritz Grimm
739a08b5b9 Untangle compatibility code
* update to latest strlc*(3) and strtonum(3) functions
* isolate local_basename()
2015-02-27 22:42:51 +01:00
Moritz Grimm
8819f0f9f9 Require automake 1.10 everywhere 2015-02-23 13:51:47 +01:00
Moritz Grimm
6211bc8506 Fix a shell command injection vulnerability in metadata
This has been reported by Alexandre Rebert in February 2013(!).
The time to fix is terrible; luckily, the affected user base is likely to be
very small.
2015-01-07 22:49:09 +01:00
moritz
549af56184 Add new <metadata_refreshinterval/> feature
Add new <metadata_refreshinterval/> feature and configuration option. Based on
a patch by Matthew Adams (thanks!), with minor changes and documentation
additions by me.

(cherry picked from commit 4176545211)
2015-01-01 23:41:31 +01:00
moritz
82b59b717d ezstream-file_template.xml should also contain <stream_once/>.
(cherry picked from commit cfe1900c8c)
2015-01-01 23:38:44 +01:00
moritz
85406d9399 Add an example template configuration for ezstream-file.sh(1).
git-svn-id: https://svn.xiph.org/trunk/ezstream@16535 0101bb08-14d6-0310-b084-bc0e0c8e3800
2009-08-30 20:34:03 +00:00
moritz
c5da3377ac Listen to my own documentation: the end-of-playlist case is indicated by an
empty line. But ...


git-svn-id: https://svn.xiph.org/trunk/ezstream@16525 0101bb08-14d6-0310-b084-bc0e0c8e3800
2009-08-29 09:12:53 +00:00
moritz
ca4060f94c Add a more fancy playlist script.
git-svn-id: https://svn.xiph.org/trunk/ezstream@16523 0101bb08-14d6-0310-b084-bc0e0c8e3800
2009-08-28 15:55:13 +00:00
moritz
c6a686560e Akos Veres suggested that ezstream should be able to set the login username,
and I concur.


git-svn-id: https://svn.xiph.org/trunk/ezstream@16319 0101bb08-14d6-0310-b084-bc0e0c8e3800
2009-07-22 20:19:38 +00:00
moritz
c0b2b86332 Remove -x argument to lame. This makes the examples work for me by default
again, with a more recent lame version.


git-svn-id: https://svn.xiph.org/trunk/ezstream@15875 0101bb08-14d6-0310-b084-bc0e0c8e3800
2009-03-28 13:38:30 +00:00
moritz
9acbffc2dd Overhaul the ezstream build system, using my own library of autoconf macros.
There are a few benefits to this, but the main reason is consistency and me
completely understanding what's going on. Regressions are not expected, but
wouldn't surprise either ... this needs lots of testing.


git-svn-id: https://svn.xiph.org/trunk/ezstream@15776 0101bb08-14d6-0310-b084-bc0e0c8e3800
2009-03-16 00:08:31 +00:00
moritz
22884e3fbb * Add new configuration example for streaming from standard input.
* Rename reencoding examples to shorter and less redundant filenames.


git-svn-id: https://svn.xiph.org/trunk/ezstream@14094 0101bb08-14d6-0310-b084-bc0e0c8e3800
2007-11-04 13:40:58 +00:00
moritz
0b31a1b57f Improve the reencoding examples; more usable defaults and add more options
to create a more well-defined stream of raw samples.


git-svn-id: https://svn.xiph.org/trunk/ezstream@14093 0101bb08-14d6-0310-b084-bc0e0c8e3800
2007-11-04 13:09:08 +00:00
moritz
5125437d3f Move conf/ to examples/. Add ezstream_metadata.xml and two minimalistic example
scripts.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12710 0101bb08-14d6-0310-b084-bc0e0c8e3800
2007-03-10 20:13:56 +00:00