update

admpub · admpub · commit 24e6bb57d9fb · 2021-07-05T21:12:01.000+08:00
diff --git a/ffmpeg/ffmpeg.go b/ffmpeg/ffmpeg.go
@@ -23,7 +23,7 @@ type Transcoder struct {
 	config           *Config
 	input            string
 	output           []string
-	options          [][]string
+	options          []transcoder.Options
 	metadata         transcoder.Metadata
 	inputPipeReader  io.ReadCloser
 	outputPipeReader io.ReadCloser
@@ -68,16 +68,20 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,
 		// Just append the 1 output file we've got
 		args = append(args, t.output[0])
 	} else {
+		arguments := make([][]string, len(t.options))
+		for i, o := range t.options {
+			arguments[i] = o.GetStrArguments()
+		}
 		for index, out := range t.output {
 			// Get executable flags
 			// If we are at the last output file but still have several options, append them all at once
 			if index == outputLength-1 && outputLength < optionsLength {
 				for i := index; i < len(t.options); i++ {
-					args = append(args, t.options[i]...)
+					args = append(args, arguments[i]...)
 				}
 				// Otherwise just append the current options
 			} else {
-				args = append(args, t.options[index]...)
+				args = append(args, arguments[index]...)
 			}
 
 			// Append output flag
@@ -163,13 +167,13 @@ func (t *Transcoder) OutputPipe(w io.WriteCloser, r io.ReadCloser) transcoder.Tr
 
 // WithOptions Sets the options object
 func (t *Transcoder) WithOptions(opts transcoder.Options) transcoder.Transcoder {
-	t.options = [][]string{opts.GetStrArguments()}
+	t.options = []transcoder.Options{opts}
 	return t
 }
 
 // WithAdditionalOptions Appends an additional options object
 func (t *Transcoder) WithAdditionalOptions(opts transcoder.Options) transcoder.Transcoder {
-	t.options = append(t.options, opts.GetStrArguments())
+	t.options = append(t.options, opts)
 	return t
 }
 
diff --git a/ffmpeg/options.go b/ffmpeg/options.go
@@ -77,34 +77,39 @@ func (opts Options) GetStrArguments() []string {
 
 	for i := 0; i < f.NumField(); i++ {
 		flag := f.Field(i).Tag.Get("flag")
-		value := v.Field(i).Interface()
+		rv := v.Field(i)
+		value := rv.Interface()
 
-		if !v.Field(i).IsNil() {
+		if !rv.IsNil() {
 
 			if _, ok := value.(*bool); ok {
 				values = append(values, flag)
+				continue
 			}
 
 			if vs, ok := value.(*string); ok {
 				values = append(values, flag, *vs)
+				continue
 			}
 
 			if va, ok := value.([]string); ok {
-
 				for i := 0; i < len(va); i++ {
 					item := va[i]
 					values = append(values, flag, item)
 				}
+				continue
 			}
 
 			if vm, ok := value.(map[string]interface{}); ok {
 				for k, v := range vm {
 					values = append(values, k, fmt.Sprintf("%v", v))
 				}
+				continue
 			}
-			
+
 			if vi, ok := value.(*int); ok {
 				values = append(values, flag, fmt.Sprintf("%d", *vi))
+				continue
 			}
 
 		}

Original file line number	Diff line number	Diff line change
`@@ -77,34 +77,39 @@ func (opts Options) GetStrArguments() []string {`
`77`	`77`
`78`	`78`	`for i := 0; i < f.NumField(); i++ {`
`79`	`79`	`flag := f.Field(i).Tag.Get("flag")`
`80`		`- value := v.Field(i).Interface()`
	`80`	`+ rv := v.Field(i)`
	`81`	`+ value := rv.Interface()`
`81`	`82`
`82`		`- if !v.Field(i).IsNil() {`
	`83`	`+ if !rv.IsNil() {`
`83`	`84`
`84`	`85`	`if _, ok := value.(*bool); ok {`
`85`	`86`	`values = append(values, flag)`
	`87`	`+ continue`
`86`	`88`	`}`
`87`	`89`
`88`	`90`	`if vs, ok := value.(*string); ok {`
`89`	`91`	`values = append(values, flag, *vs)`
	`92`	`+ continue`
`90`	`93`	`}`
`91`	`94`
`92`	`95`	`if va, ok := value.([]string); ok {`
`93`		`-`
`94`	`96`	`for i := 0; i < len(va); i++ {`
`95`	`97`	`item := va[i]`
`96`	`98`	`values = append(values, flag, item)`
`97`	`99`	`}`
	`100`	`+ continue`
`98`	`101`	`}`
`99`	`102`
`100`	`103`	`if vm, ok := value.(map[string]interface{}); ok {`
`101`	`104`	`for k, v := range vm {`
`102`	`105`	`values = append(values, k, fmt.Sprintf("%v", v))`
`103`	`106`	`}`
	`107`	`+ continue`
`104`	`108`	`}`
`105`		`-`
	`109`	`+`
`106`	`110`	`if vi, ok := value.(*int); ok {`
`107`	`111`	`values = append(values, flag, fmt.Sprintf("%d", *vi))`
	`112`	`+ continue`
`108`	`113`	`}`
`109`	`114`
`110`	`115`	`}`