Merge branch 'master' into multipleOptionsAndOutputs

Author: xfrr

ffmpeg/ffmpeg.go

@@ -23,7 +23,7 @@ type Transcoder struct {
 	input            string
 	output           []string
 	options          [][]string
-	metadata         *Metadata
+	metadata         transcoder.Metadata
 	inputPipeReader  *io.ReadCloser
 	outputPipeReader *io.ReadCloser
 	inputPipeWriter  *io.WriteCloser
@@ -50,7 +50,7 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,
 	}
 
 	// Get file metadata
-	_, err := t.getMetadata()
+	_, err := t.GetMetadata()
 	if err != nil {
 		return nil, err
 	}
@@ -191,7 +191,8 @@ func (t *Transcoder) validate() error {
 	return nil
 }
 
-func (t *Transcoder) getMetadata() (metadata *Metadata, err error) {
+// GetMetadata Returns metadata for the specified input file
+func (t *Transcoder) GetMetadata() ( transcoder.Metadata, error) {
 
 	if t.config.FfprobeBinPath != "" {
 		var outb, errb bytes.Buffer
@@ -213,6 +214,8 @@ func (t *Transcoder) getMetadata() (metadata *Metadata, err error) {
 			return nil, fmt.Errorf("error executing (%s) with args (%s) | error: %s | message: %s %s", t.config.FfprobeBinPath, args, err, outb.String(), errb.String())
 		}
 
+		var metadata Metadata
+
 		if err = json.Unmarshal([]byte(outb.String()), &metadata); err != nil {
 			return nil, err
 		}
@@ -296,7 +299,7 @@ func (t *Transcoder) progress(stream io.ReadCloser, out chan transcoder.Progress
 			}
 
 			timesec := utils.DurToSec(currentTime)
-			dursec, _ := strconv.ParseFloat(t.metadata.Format.Duration, 64)
+			dursec, _ := strconv.ParseFloat(t.metadata.GetFormat().GetDuration(), 64)
 
 			progress := (timesec * 100) / dursec
 			Progress.Progress = progress

ffmpeg/metadata.go

@@ -0,0 +1,338 @@
+package ffmpeg
+
+import "github.com/Borloxos/transcoder"
+
+// Metadata ...
+type Metadata struct {
+	Format  Format    `json:"format"`
+	Streams []Streams `json:"streams"`
+}
+
+// Format ...
+type Format struct {
+	Filename       string
+	NbStreams      int    `json:"nb_streams"`
+	NbPrograms     int    `json:"nb_programs"`
+	FormatName     string `json:"format_name"`
+	FormatLongName string `json:"format_long_name"`
+	Duration       string `json:"duration"`
+	Size           string `json:"size"`
+	BitRate        string `json:"bit_rate"`
+	ProbeScore     int    `json:"probe_score"`
+	Tags           Tags   `json:"tags"`
+}
+
+// Streams ...
+type Streams struct {
+	Index              int
+	ID                 string      `json:"id"`
+	CodecName          string      `json:"codec_name"`
+	CodecLongName      string      `json:"codec_long_name"`
+	Profile            string      `json:"profile"`
+	CodecType          string      `json:"codec_type"`
+	CodecTimeBase      string      `json:"codec_time_base"`
+	CodecTagString     string      `json:"codec_tag_string"`
+	CodecTag           string      `json:"codec_tag"`
+	Width              int         `json:"width"`
+	Height             int         `json:"height"`
+	CodedWidth         int         `json:"coded_width"`
+	CodedHeight        int         `json:"coded_height"`
+	HasBFrames         int         `json:"has_b_frames"`
+	SampleAspectRatio  string      `json:"sample_aspect_ratio"`
+	DisplayAspectRatio string      `json:"display_aspect_ratio"`
+	PixFmt             string      `json:"pix_fmt"`
+	Level              int         `json:"level"`
+	ChromaLocation     string      `json:"chroma_location"`
+	Refs               int         `json:"refs"`
+	QuarterSample      string      `json:"quarter_sample"`
+	DivxPacked         string      `json:"divx_packed"`
+	RFrameRrate        string      `json:"r_frame_rate"`
+	AvgFrameRate       string      `json:"avg_frame_rate"`
+	TimeBase           string      `json:"time_base"`
+	DurationTs         int         `json:"duration_ts"`
+	Duration           string      `json:"duration"`
+	Disposition        Disposition `json:"disposition"`
+	BitRate            string      `json:"bit_rate"`
+}
+
+// Tags ...
+type Tags struct {
+	Encoder string `json:"ENCODER"`
+}
+
+// Disposition ...
+type Disposition struct {
+	Default         int `json:"default"`
+	Dub             int `json:"dub"`
+	Original        int `json:"original"`
+	Comment         int `json:"comment"`
+	Lyrics          int `json:"lyrics"`
+	Karaoke         int `json:"karaoke"`
+	Forced          int `json:"forced"`
+	HearingImpaired int `json:"hearing_impaired"`
+	VisualImpaired  int `json:"visual_impaired"`
+	CleanEffects    int `json:"clean_effects"`
+}
+
+// GetFormat ...
+func (m Metadata) GetFormat() transcoder.Format {
+	return m.Format
+}
+
+// GetStreams ...
+func (m Metadata) GetStreams() (streams []transcoder.Streams) {
+	for _, element := range m.Streams {
+		streams = append(streams, element)
+	}
+	return streams
+}
+
+// GetFilename ...
+func (f Format) GetFilename() string {
+	return f.Filename
+}
+
+// GetNbStreams ...
+func (f Format) GetNbStreams() int {
+	return f.NbStreams
+}
+
+// GetNbPrograms ...
+func (f Format) GetNbPrograms() int {
+	return f.NbPrograms
+}
+
+// GetFormatName ...
+func (f Format) GetFormatName() string {
+	return f.FormatName
+}
+
+// GetFormatLongName ...
+func (f Format) GetFormatLongName() string {
+	return f.FormatLongName
+}
+
+// GetDuration ...
+func (f Format) GetDuration() string {
+	return f.Duration
+}
+
+// GetSize ...
+func (f Format) GetSize() string {
+	return f.Size
+}
+
+// GetBitRate ...
+func (f Format) GetBitRate() string {
+	return f.BitRate
+}
+
+// GetProbeScore ...
+func (f Format) GetProbeScore() int {
+	return f.ProbeScore
+}
+
+// GetTags ...
+func (f Format) GetTags() transcoder.Tags {
+	return f.Tags
+}
+
+// GetEncoder ...
+func (t Tags) GetEncoder() string {
+	return t.Encoder
+}
+
+//GetIndex ...
+func (s Streams) GetIndex() int {
+	return s.Index
+}
+
+//GetID ...
+func (s Streams) GetID() string {
+	return s.ID
+}
+
+//GetCodecName ...
+func (s Streams) GetCodecName() string {
+	return s.CodecName
+}
+
+//GetCodecLongName ...
+func (s Streams) GetCodecLongName() string {
+	return s.CodecLongName
+}
+
+//GetProfile ...
+func (s Streams) GetProfile() string {
+	return s.Profile
+}
+
+//GetCodecType ...
+func (s Streams) GetCodecType() string {
+	return s.CodecType
+}
+
+//GetCodecTimeBase ...
+func (s Streams) GetCodecTimeBase() string {
+	return s.CodecTimeBase
+}
+
+//GetCodecTagString ...
+func (s Streams) GetCodecTagString() string {
+	return s.CodecTagString
+}
+
+//GetCodecTag ...
+func (s Streams) GetCodecTag() string {
+	return s.CodecTag
+}
+
+//GetWidth ...
+func (s Streams) GetWidth() int {
+	return s.Width
+}
+
+//GetHeight ...
+func (s Streams) GetHeight() int {
+	return s.Height
+}
+
+//GetCodedWidth ...
+func (s Streams) GetCodedWidth() int {
+	return s.CodedWidth
+}
+
+//GetCodedHeight ...
+func (s Streams) GetCodedHeight() int {
+	return s.CodedHeight
+}
+
+//GetHasBFrames ...
+func (s Streams) GetHasBFrames() int {
+	return s.HasBFrames
+}
+
+//GetSampleAspectRatio ...
+func (s Streams) GetSampleAspectRatio() string {
+	return s.SampleAspectRatio
+}
+
+//GetDisplayAspectRatio ...
+func (s Streams) GetDisplayAspectRatio() string {
+	return s.DisplayAspectRatio
+}
+
+//GetPixFmt ...
+func (s Streams) GetPixFmt() string {
+	return s.PixFmt
+}
+
+//GetLevel ...
+func (s Streams) GetLevel() int {
+	return s.Level
+}
+
+//GetChromaLocation ...
+func (s Streams) GetChromaLocation() string {
+	return s.ChromaLocation
+}
+
+//GetRefs ...
+func (s Streams) GetRefs() int {
+	return s.Refs
+}
+
+//GetQuarterSample ...
+func (s Streams) GetQuarterSample() string {
+	return s.QuarterSample
+}
+
+//GetDivxPacked ...
+func (s Streams) GetDivxPacked() string {
+	return s.DivxPacked
+}
+
+//GetRFrameRrate ...
+func (s Streams) GetRFrameRrate() string {
+	return s.RFrameRrate
+}
+
+//GetAvgFrameRate ...
+func (s Streams) GetAvgFrameRate() string {
+	return s.AvgFrameRate
+}
+
+//GetTimeBase ...
+func (s Streams) GetTimeBase() string {
+	return s.TimeBase
+}
+
+//GetDurationTs ...
+func (s Streams) GetDurationTs() int {
+	return s.DurationTs
+}
+
+//GetDuration ...
+func (s Streams) GetDuration() string {
+	return s.Duration
+}
+
+//GetDisposition ...
+func (s Streams) GetDisposition() transcoder.Disposition {
+	return s.Disposition
+}
+
+//GetBitRate ...
+func (s Streams) GetBitRate() string {
+	return s.BitRate
+}
+
+//GetDefault ...
+func (d Disposition) GetDefault() int {
+	return d.Default
+}
+
+//GetDub ...
+func (d Disposition) GetDub() int {
+	return d.Dub
+}
+
+//GetOriginal ...
+func (d Disposition) GetOriginal() int {
+	return d.Original
+}
+
+//GetComment ...
+func (d Disposition) GetComment() int {
+	return d.Comment
+}
+
+//GetLyrics ...
+func (d Disposition) GetLyrics() int {
+	return d.Lyrics
+}
+
+//GetKaraoke ...
+func (d Disposition) GetKaraoke() int {
+	return d.Karaoke
+}
+
+//GetForced ...
+func (d Disposition) GetForced() int {
+	return d.Forced
+}
+
+//GetHearingImpaired ...
+func (d Disposition) GetHearingImpaired() int {
+	return d.HearingImpaired
+}
+
+//GetVisualImpaired ...
+func (d Disposition) GetVisualImpaired() int {
+	return d.VisualImpaired
+}
+
+//GetCleanEffects ...
+func (d Disposition) GetCleanEffects() int {
+	return d.CleanEffects
+}