diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2012-10-01 00:53:24 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2012-10-01 00:53:24 +0200 |
| commit | 46aea5a8182e7147be52251ea86b116b05534f86 (patch) | |
| tree | 7cb1d1d99516fe3aba4216218f1e68f8e609cd7a /src/test.json | |
| parent | cleanup (diff) | |
generate encoder and muxer automatically
Diffstat (limited to 'src/test.json')
| -rw-r--r-- | src/test.json | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/test.json b/src/test.json index 2a389ef..f4aad1c 100644 --- a/src/test.json +++ b/src/test.json @@ -10,14 +10,8 @@ "480p25": { "width": 854, "height": 480, "rate": "25/1" }, "360p25": { "width": 640, "height": 360, "rate": "25/1" } }, - "audiorates": { - "160@44": { "bitrate": 160, "samplerate": 44100 }, - "96@44": { "bitrate": 96, "samplerate": 44100 }, - "160@48": { "bitrate": 160, "samplerate": 48000 }, - "96@48": { "bitrate": 96, "samplerate": 48000 } - }, "formats": { - "flash": { "muxer": "flv", "video": "h264", "audio": "aac" }, + "flash": { "muxer": "flv", "video": "h264", "audio": "aac", "samplerate": 44100 }, "webm": { "muxer": "webm", "video": "vp8", "audio": "vorbis" }, "ogg-audio": { "muxer": "ogg", "audio": "vorbis" } }, @@ -26,6 +20,10 @@ "medium": { "video": "480p25", "audio": 160 }, "low": { "video": "360p25", "audio": 96 } }, + "bitrates": { + "h264": { "720p25": 2048, "480p25": 1024, "360p25": 600 }, + "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 } + }, "machines": { "titan": [ "input", "encoder-vorbis", "encoder-aac", "muxer-flv", "muxer-webm", "muxer-ogg", "streamer0" ], "calypso": [ "encoder-h264" ], @@ -40,17 +38,7 @@ "resolution": "720p25", "samplerate": 48000 }, - "encoder": { - "video": { - "h264": { "720p25": 2048, "480p25": 1024, "360p25": 600 }, - "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 } - }, - "audio": { - "aac": [ "160@44", "96@44" ], - "vorbis": [ "160@48", "96@48" ] - } - }, - "muxer": { + "transcode": { "flash": [ "high", "medium", "low" ], "webm": [ "high", "medium", "low" ], "ogg-audio": [ "high" ] |