fix: some things and rename pkg

Author: Sculas

.circleci/config.yml

@@ -1,2 +1,17 @@
-main.go
-build
+.idea/
+cmake-build-*/
+*.iws
+out/
+.idea_modules/
+atlassian-ide-plugin.xml
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+*.test
+*.out

.gitignore

@@ -1,40 +1,10 @@
-# Golang Transcoding Library
+# Transcoding library in Go
+Fork of Floostack's transcoding library.
 
-<br />
-
-<div align="center">
-  <!-- Build status -->
-  <a href="https://circleci.com/gh/floostack/transcoder">
-    <img src="https://circleci.com/gh/floostack/transcoder.svg?style=svg" alt="Build Status" />
-  </a>
-
-  <!-- Code Quality -->
-  <a href="https://www.codacy.com/manual/floostack/transcoder?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=floostack/transcoder&amp;utm_campaign=Badge_Grade">
-    <img src="https://app.codacy.com/project/badge/Grade/f8ee19ef723b4134bb8bb1f9c439959e" alt="Build Status" />
-  </a>
-
-</div>
-
-<br />
-
-<div align="center">
-  <sub>Created by <a href="https://floostack.com">FlooStack</a>.</sub>
-</div>
-
-## Features
-
-<dl>
-  <dt>Ease use</dt>
-  <dd>Implement your own business logic around easy interfaces</dd>
-
-  <dt>Transcoding progress</dt>
-  <dd>Obtain progress events generated by transcoding application process</dd>
-</dl>
-
-## Download from Github
+## Download from GitHub
 
 ```shell
-go get github.com/floostack/transcoder
+go get github.com/SumeruCCTV/transcoder
 ```
 
 ## Example
@@ -45,20 +15,19 @@ package main
 import (
 	"log"
 
-	ffmpeg "github.com/floostack/transcoder/ffmpeg"
+	ffmpeg "github.com/SumeruCCTV/transcoder/ffmpeg"
 )
 
 func main() {
 
-
 	hwaccel := "cuvid"
 	videoCodec := "h264_cuvid"
 
 	inputOpts := ffmpeg.Options{
-		Hwaccel:      &hwaccel,
-		VideoCodec:   &videoCodec,
+		Hwaccel:    &hwaccel,
+		VideoCodec: &videoCodec,
 	}
-	
+
 	format := "mp4"
 	overwrite := true
 

README.md

@@ -14,8 +14,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/floostack/transcoder"
-	"github.com/floostack/transcoder/utils"
+	"github.com/SumeruCCTV/transcoder"
+	"github.com/SumeruCCTV/transcoder/utils"
 )
 
 // Transcoder ...
@@ -40,11 +40,7 @@ func New(cfg *Config) transcoder.Transcoder {
 
 // Start ...
 func (t *Transcoder) Start() (<-chan transcoder.Progress, error) {
-
 	var stderrIn io.ReadCloser
-
-	out := make(chan transcoder.Progress)
-
 	defer t.closePipes()
 
 	// Validates config
@@ -101,7 +97,7 @@ func (t *Transcoder) Start() (<-chan transcoder.Progress, error) {
 		cmd = exec.CommandContext(*t.commandContext, t.config.FfmpegBinPath, args...)
 	}
 
-	// If progresss enabled, get stderr pipe and start progress process
+	// If progress is enabled, get stderr pipe and start progress process
 	if t.config.ProgressEnabled && !t.config.Verbose {
 		stderrIn, err = cmd.StderrPipe()
 		if err != nil {
@@ -120,19 +116,13 @@ func (t *Transcoder) Start() (<-chan transcoder.Progress, error) {
 	}
 
 	if t.config.ProgressEnabled && !t.config.Verbose {
-		go func() {
-			t.progress(stderrIn, out)
-		}()
-
-		go func() {
-			defer close(out)
-			err = cmd.Wait()
-		}()
-	} else {
-		err = cmd.Wait()
+		out := make(chan transcoder.Progress)
+		defer close(out)
+		go t.progress(stderrIn, out)
+		return out, cmd.Wait()
 	}
 
-	return out, nil
+	return nil, cmd.Wait()
 }
 
 // Input ...
@@ -149,7 +139,7 @@ func (t *Transcoder) Output(arg string) transcoder.Transcoder {
 
 // InputPipe ...
 func (t *Transcoder) InputPipe(w *io.WriteCloser, r *io.ReadCloser) transcoder.Transcoder {
-	if &t.input == nil {
+	if len(t.input) == 0 {
 		t.inputPipeWriter = w
 		t.inputPipeReader = r
 	}
@@ -158,7 +148,7 @@ func (t *Transcoder) InputPipe(w *io.WriteCloser, r *io.ReadCloser) transcoder.T
 
 // OutputPipe ...
 func (t *Transcoder) OutputPipe(w *io.WriteCloser, r *io.ReadCloser) transcoder.Transcoder {
-	if &t.output == nil {
+	if len(t.output) == 0 {
 		t.outputPipeWriter = w
 		t.outputPipeReader = r
 	}
@@ -267,7 +257,6 @@ func (t *Transcoder) GetMetadata() (transcoder.Metadata, error) {
 
 // progress sends through given channel the transcoding status
 func (t *Transcoder) progress(stream io.ReadCloser, out chan transcoder.Progress) {
-
 	defer stream.Close()
 
 	split := func(data []byte, atEOF bool) (advance int, token []byte, spliterror error) {
@@ -296,7 +285,7 @@ func (t *Transcoder) progress(stream io.ReadCloser, out chan transcoder.Progress
 	scanner.Buffer(buf, bufio.MaxScanTokenSize)
 
 	for scanner.Scan() {
-		Progress := new(Progress)
+		progress := new(Progress)
 		line := scanner.Text()
 
 		if strings.Contains(line, "time=") && strings.Contains(line, "bitrate=") {
@@ -338,15 +327,15 @@ func (t *Transcoder) progress(stream io.ReadCloser, out chan transcoder.Progress
 			timesec := utils.DurToSec(currentTime)
 			dursec, _ := strconv.ParseFloat(t.metadata.GetFormat().GetDuration(), 64)
 
-			progress := (timesec * 100) / dursec
-			Progress.Progress = progress
+			currentProgress := (timesec * 100) / dursec
+			progress.Progress = currentProgress
 
-			Progress.CurrentBitrate = currentBitrate
-			Progress.FramesProcessed = framesProcessed
-			Progress.CurrentTime = currentTime
-			Progress.Speed = currentSpeed
+			progress.CurrentBitrate = currentBitrate
+			progress.FramesProcessed = framesProcessed
+			progress.CurrentTime = currentTime
+			progress.Speed = currentSpeed
 
-			out <- *Progress
+			out <- *progress
 		}
 	}
 }

ffmpeg/ffmpeg.go

@@ -1,6 +1,6 @@
 package ffmpeg
 
-import "github.com/floostack/transcoder"
+import "github.com/SumeruCCTV/transcoder"
 
 // Metadata ...
 type Metadata struct {

ffmpeg/metadata.go

@@ -102,7 +102,7 @@ func (opts Options) GetStrArguments() []string {
 					values = append(values, k, fmt.Sprintf("%v", v))
 				}
 			}
-			
+
 			if vi, ok := value.(*int); ok {
 				values = append(values, flag, fmt.Sprintf("%d", *vi))
 			}

ffmpeg/options.go

@@ -1,3 +1,3 @@
-module github.com/floostack/transcoder
+module github.com/SumeruCCTV/transcoder
 
 go 1.13