Merge pull request #13 from suntong/fix/12

Fix/12

Author: suntong

config.go

@@ -32,6 +32,7 @@ type Options struct {
 	VSS        bool   // video: same size
 	Cut        mFlags // Cut segment(s) out to keep. Specify in the form of start-[end],\n\tstrictly in the format of hh:mm:ss, and may repeat
 	Lang       string // language selection for audio stream extraction
+	SEL        mFlags // subtitle encoding language (language picked for reencoded video)
 	OptExtra   string // more options that will pass to ffmpeg program
 	A2Opus     bool   // audio encode to opus, using -abr
 	V2X265     bool   // video video encode to x265, using -crf
@@ -109,6 +110,8 @@ func init() {
 		"Cut segment(s) out to keep. Specify in the form of start-[end],\n\tstrictly in the format of hh:mm:ss, and may repeat")
 	flag.StringVar(&Opts.Lang, "lang", "eng",
 		"language selection for audio stream extraction")
+	flag.Var(&Opts.SEL, "sel",
+		"subtitle encoding language (language picked for reencoded video)")
 	flag.StringVar(&Opts.OptExtra, "o", "",
 		"more options that will pass to ffmpeg program")
 	flag.BoolVar(&Opts.A2Opus, "ato-opus", false,
@@ -266,7 +269,7 @@ func init() {
 
 }
 
-const usageSummary = "  -t\ttarget type: webm/x265-opus/x264-mp3/wx/youtube (FFCVT_T)\n  -ves\tvideo encoding method set (FFCVT_VES)\n  -aes\taudio encoding method set (FFCVT_AES)\n  -ses\tsubtitle encoding method set (FFCVT_SES)\n  -vep\tvideo encoding method prepend (FFCVT_VEP)\n  -aep\taudio encoding method prepend (FFCVT_AEP)\n  -sep\tsubtitle encoding method prepend (FFCVT_SEP)\n  -vea\tvideo encoding method append (FFCVT_VEA)\n  -aea\taudio encoding method append (FFCVT_AEA)\n  -abr\taudio bitrate (64k for opus, 256k for mp3) (FFCVT_ABR)\n  -crf\tthe CRF value: 0-51. Higher CRF gives lower quality\n\t (28 for x265, ~ 23 for x264) (FFCVT_CRF)\n\n  -d\tdirectory that hold input files (FFCVT_D)\n  -f\tinput file name (either -d or -f must be specified) (FFCVT_F)\n  -sym\tsymlinks will be processed as well (FFCVT_SYM)\n  -exts\textension list for all the files to be queued (FFCVT_EXTS)\n  -suf\tsuffix to the output file names (FFCVT_SUF)\n  -ext\textension for the output file (FFCVT_EXT)\n  -w\twork directory that hold output files (FFCVT_W)\n\n  -ac\tcopy audio codec (FFCVT_AC)\n  -vc\tcopy video codec (FFCVT_VC)\n  -an\tno audio, output video only (FFCVT_AN)\n  -vn\tno video, output audio only (FFCVT_VN)\n  -vss\tvideo: same size (FFCVT_VSS)\n  -C\tCut segment(s) out to keep. Specify in the form of start-[end],\n\tstrictly in the format of hh:mm:ss, and may repeat (FFCVT_C)\n  -lang\tlanguage selection for audio stream extraction (FFCVT_LANG)\n  -o\tmore options that will pass to ffmpeg program (FFCVT_O)\n  -ato-opus\taudio encode to opus, using -abr (FFCVT_ATO_OPUS)\n  -vto-x265\tvideo video encode to x265, using -crf (FFCVT_VTO_X265)\n\n  -p\tpar2create, create par2 files (in work directory) (FFCVT_P)\n  -nc\tno clobber, do not queue those already been converted (FFCVT_NC)\n  -n\tno exec, dry run (FFCVT_N)\n\n  -force\toverwrite any existing none-empty file (FFCVT_FORCE)\n  -debug\tdebugging level (FFCVT_DEBUG)\n  -ffmpeg\tffmpeg program executable name (FFCVT_FFMPEG)\n  -ffprobe\tffprobe program execution (FFCVT_FFPROBE)\n  -version\tprint version then exit (FFCVT_VERSION)\n\nDetails:\n\n"
+const usageSummary = "  -t\ttarget type: webm/x265-opus/x264-mp3/wx/youtube (FFCVT_T)\n  -ves\tvideo encoding method set (FFCVT_VES)\n  -aes\taudio encoding method set (FFCVT_AES)\n  -ses\tsubtitle encoding method set (FFCVT_SES)\n  -vep\tvideo encoding method prepend (FFCVT_VEP)\n  -aep\taudio encoding method prepend (FFCVT_AEP)\n  -sep\tsubtitle encoding method prepend (FFCVT_SEP)\n  -vea\tvideo encoding method append (FFCVT_VEA)\n  -aea\taudio encoding method append (FFCVT_AEA)\n  -abr\taudio bitrate (64k for opus, 256k for mp3) (FFCVT_ABR)\n  -crf\tthe CRF value: 0-51. Higher CRF gives lower quality\n\t (28 for x265, ~ 23 for x264) (FFCVT_CRF)\n\n  -d\tdirectory that hold input files (FFCVT_D)\n  -f\tinput file name (either -d or -f must be specified) (FFCVT_F)\n  -sym\tsymlinks will be processed as well (FFCVT_SYM)\n  -exts\textension list for all the files to be queued (FFCVT_EXTS)\n  -suf\tsuffix to the output file names (FFCVT_SUF)\n  -ext\textension for the output file (FFCVT_EXT)\n  -w\twork directory that hold output files (FFCVT_W)\n\n  -ac\tcopy audio codec (FFCVT_AC)\n  -vc\tcopy video codec (FFCVT_VC)\n  -an\tno audio, output video only (FFCVT_AN)\n  -vn\tno video, output audio only (FFCVT_VN)\n  -vss\tvideo: same size (FFCVT_VSS)\n  -C\tCut segment(s) out to keep. Specify in the form of start-[end],\n\tstrictly in the format of hh:mm:ss, and may repeat (FFCVT_C)\n  -lang\tlanguage selection for audio stream extraction (FFCVT_LANG)\n  -sel\tsubtitle encoding language (language picked for reencoded video) (FFCVT_SEL)\n  -o\tmore options that will pass to ffmpeg program (FFCVT_O)\n  -ato-opus\taudio encode to opus, using -abr (FFCVT_ATO_OPUS)\n  -vto-x265\tvideo video encode to x265, using -crf (FFCVT_VTO_X265)\n\n  -p\tpar2create, create par2 files (in work directory) (FFCVT_P)\n  -nc\tno clobber, do not queue those already been converted (FFCVT_NC)\n  -n\tno exec, dry run (FFCVT_N)\n\n  -force\toverwrite any existing none-empty file (FFCVT_FORCE)\n  -debug\tdebugging level (FFCVT_DEBUG)\n  -ffmpeg\tffmpeg program executable name (FFCVT_FFMPEG)\n  -ffprobe\tffprobe program execution (FFCVT_FFPROBE)\n  -version\tprint version then exit (FFCVT_VERSION)\n\nDetails:\n\n"
 
 // Usage function shows help on commandline usage
 func Usage() {

ffcvt.go

@@ -278,7 +278,16 @@ func transcodeFile(inputName string) {
 			return
 		}
 		debug(fsinfo, 4)
-		// if there are more than one audio or subtitle stream
+		/*
+
+		   Cases when `-map`s are necessary
+
+		   - more than one audio stream, and we pick eng stream only
+		   - more than one subtitle stream, and
+		     * output all subtitle streams (default, no -sel), or
+		     * pick specific subtitle stream(s) via -sel
+
+		*/
 		allAudioStreams := regexp.MustCompile(`Stream #0:.+: Audio: (.+)`).
 			FindAllStringSubmatch(fsinfo, -1)
 		if len(allAudioStreams) > 1 ||
@@ -290,7 +299,14 @@ func transcodeFile(inputName string) {
 			oldEPUsed = true
 			Opts.VEP += " -map 0:v"
 			Opts.AEP += " -map 0:a:m:language:" + Opts.Lang
-			Opts.SEP += " -map 0:s"
+			//log.Printf("%s: Opts.SEL - %#v", progname, Opts.SEL)
+			if len(Opts.SEL) == 0 {
+				Opts.SEP += " -map 0:s"
+			} else {
+				for _, val := range Opts.SEL {
+					Opts.SEP += " -map 0:s:m:language:" + val
+				}
+			}
 		} else {
 			debug(inputName+" has single audio stream", 2)
 			dealSurroundSound(allAudioStreams[0][1])

ffcvt_cli.sh

@@ -6,4 +6,4 @@ templateFile=$GOPATH/src/github.com/go-easygen/easygen/test/commandlineFlag
   exit 1
 }
 
-easygen $templateFile ffcvt_cli | sed '/\tVES\t\tstring/{ N; N; N; N; N; N; N; N; N; s|^.*$|\tEncoding\t// anonymous field to hold encoding values|; }; /\tExt\t\tstring/d; /flag.MFlagsVar/{s/flag.MFlagsVar/flag.Var/; s/, "",/,/; } ' | gofmt > config.go
+easygen $templateFile ffcvt_cli | tee /tmp/ffcvt_cli.go | sed '/\tVES\t\tstring/{ N; N; N; N; N; N; N; N; N; s|^.*$|\tEncoding\t// anonymous field to hold encoding values|; }; /\tExt\t\tstring/d; /flag.MFlagsVar/{s/flag.MFlagsVar/flag.Var/; s/, "",/,/; } ' | gofmt > config.go

ffcvt_cli.yaml

@@ -192,6 +192,12 @@ Options:
     Value: '"eng"'
     Usage: "language selection for audio stream extraction"
 
+  - Name: SEL
+    Type: mFlags
+    Flag: sel
+    Value: '""'
+    Usage: "subtitle encoding language (language picked for reencoded video)"
+
   - Name: OptExtra
     Type: string
     Flag: o