Starting to refactor how the dash directory structure will go.

master
Zed A. Shaw 4 weeks ago
parent cc1432889a
commit 1053475e7a
  1. 1
      config/settings.go
  2. 11
      main.go

@ -16,6 +16,7 @@ type CodecOpts struct {
AudioCodec string AudioCodec string
// used internally, shouldn't set int json // used internally, shouldn't set int json
Target string Target string
Source string
} }
type EncodeOpts struct { type EncodeOpts struct {

@ -25,6 +25,10 @@ func VideoOnly(codec config.CodecOpts) bool {
return codec.AudioCodec == "none" return codec.AudioCodec == "none"
} }
func SetDashTarget(codec *config.CodecOpts, path string, encoding config.EncodeOpts) {
SetCodecTarget(codec, path, encoding)
}
func SetCodecTarget(codec *config.CodecOpts, path string, encoding config.EncodeOpts) { func SetCodecTarget(codec *config.CodecOpts, path string, encoding config.EncodeOpts) {
base := filepath.Base(path) base := filepath.Base(path)
target := filepath.Join(encoding.OutDir, base) target := filepath.Join(encoding.OutDir, base)
@ -77,7 +81,6 @@ func Run(encoding config.EncodeOpts, codec config.CodecOpts, pass int, pid int,
"-b:a", fmt.Sprint(codec.AudioBitrate * 1024)) "-b:a", fmt.Sprint(codec.AudioBitrate * 1024))
} }
if encoding.Test > 0 { if encoding.Test > 0 {
encode.InputOptions("-ss", fmt.Sprintf("00:%d", encoding.TestStart)) encode.InputOptions("-ss", fmt.Sprintf("00:%d", encoding.TestStart))
extras = append(extras, "-t", fmt.Sprint(encoding.Test)) extras = append(extras, "-t", fmt.Sprint(encoding.Test))
@ -125,7 +128,11 @@ func RenderFile(encoding config.EncodeOpts, pid int, path string, force bool) {
for i := 0; i < len(encoding.Variants); i++ { for i := 0; i < len(encoding.Variants); i++ {
codec := &encoding.Variants[i] codec := &encoding.Variants[i]
SetCodecTarget(codec, path, encoding) if encoding.Dash {
SetDashTarget(codec, path, encoding)
} else {
SetCodecTarget(codec, path, encoding)
}
_, err := os.Stat(codec.Target) _, err := os.Stat(codec.Target)

Loading…
Cancel
Save