From c6379117b697302791b8239e7f0231ddb13f7cf8 Mon Sep 17 00:00:00 2001 From: Philip Ye Date: Tue, 5 Jul 2022 17:03:41 +0800 Subject: [PATCH 1/5] add more options for audio --- ffmpeg/metadata.go | 10 ++++++++++ metadata.go | 2 ++ 2 files changed, 12 insertions(+) diff --git a/ffmpeg/metadata.go b/ffmpeg/metadata.go index 4e81910..389682a 100644 --- a/ffmpeg/metadata.go +++ b/ffmpeg/metadata.go @@ -53,6 +53,8 @@ type Streams struct { Duration string `json:"duration"` Disposition Disposition `json:"disposition"` BitRate string `json:"bit_rate"` + SampleRate string `json:"sample_rate"` + BitsPerSample string `json:"bits_per_sample"` } // Tags ... @@ -287,6 +289,14 @@ func (s Streams) GetBitRate() string { return s.BitRate } +func (s Streams) GetSampleRate() string { + return s.SampleRate +} + +func (s Streams) GetBitsPerSample() string { + return s.BitsPerSample +} + //GetDefault ... func (d Disposition) GetDefault() int { return d.Default diff --git a/metadata.go b/metadata.go index d03241d..09d212a 100644 --- a/metadata.go +++ b/metadata.go @@ -51,6 +51,8 @@ type Streams interface { GetDuration() string GetDisposition() Disposition GetBitRate() string + GetSampleRate() string + GetBitsPerSample() string } // Tags ... From f331fbc9ce77ea09945521378583ea876bfeaf68 Mon Sep 17 00:00:00 2001 From: Philip Ye Date: Wed, 6 Jul 2022 10:04:15 +0800 Subject: [PATCH 2/5] fix: SA comment issue --- ffmpeg/metadata.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ffmpeg/metadata.go b/ffmpeg/metadata.go index 389682a..0d8c844 100644 --- a/ffmpeg/metadata.go +++ b/ffmpeg/metadata.go @@ -289,10 +289,12 @@ func (s Streams) GetBitRate() string { return s.BitRate } +//GetSampleRate ... func (s Streams) GetSampleRate() string { return s.SampleRate } +//GetBitsPerSample ... func (s Streams) GetBitsPerSample() string { return s.BitsPerSample } From d2075cd210dc838c418fa3c0b0724253c69158fb Mon Sep 17 00:00:00 2001 From: Philip Ye Date: Wed, 6 Jul 2022 11:26:50 +0800 Subject: [PATCH 3/5] add NbFrames --- ffmpeg/metadata.go | 6 ++++++ metadata.go | 1 + 2 files changed, 7 insertions(+) diff --git a/ffmpeg/metadata.go b/ffmpeg/metadata.go index 0d8c844..c982b2b 100644 --- a/ffmpeg/metadata.go +++ b/ffmpeg/metadata.go @@ -48,6 +48,7 @@ type Streams struct { DivxPacked string `json:"divx_packed"` RFrameRrate string `json:"r_frame_rate"` AvgFrameRate string `json:"avg_frame_rate"` + NbFrames string `json:"nb_frames"` TimeBase string `json:"time_base"` DurationTs int `json:"duration_ts"` Duration string `json:"duration"` @@ -264,6 +265,11 @@ func (s Streams) GetAvgFrameRate() string { return s.AvgFrameRate } +//GetNbFrames ... +func (s Streams) GetNbFrames() string { + return s.NbFrames +} + //GetTimeBase ... func (s Streams) GetTimeBase() string { return s.TimeBase diff --git a/metadata.go b/metadata.go index 09d212a..680e375 100644 --- a/metadata.go +++ b/metadata.go @@ -46,6 +46,7 @@ type Streams interface { GetDivxPacked() string GetRFrameRrate() string GetAvgFrameRate() string + GetNbFrames() string GetTimeBase() string GetDurationTs() int GetDuration() string From 792804fb23d1ebccb358e1bc926a3d357d8fcb4a Mon Sep 17 00:00:00 2001 From: Philip Ye Date: Thu, 21 Jul 2022 18:07:42 +0800 Subject: [PATCH 4/5] dev: move github/floostack/transcoder to git.code --- README.md | 4 ++-- ffmpeg/ffmpeg.go | 4 ++-- ffmpeg/metadata.go | 2 +- go.mod | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 967d5b9..39702a9 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ## Download from Github ```shell -go get github.com/floostack/transcoder +go get git.code.oa.com/yt-media-ai-videounderstanding/gh-floostack-transcoder ``` ## Example @@ -45,7 +45,7 @@ package main import ( "log" - ffmpeg "github.com/floostack/transcoder/ffmpeg" + ffmpeg "git.code.oa.com/yt-media-ai-videounderstanding/gh-floostack-transcoder/ffmpeg" ) func main() { diff --git a/ffmpeg/ffmpeg.go b/ffmpeg/ffmpeg.go index 6328104..623a3b3 100644 --- a/ffmpeg/ffmpeg.go +++ b/ffmpeg/ffmpeg.go @@ -14,8 +14,8 @@ import ( "strconv" "strings" - "github.com/floostack/transcoder" - "github.com/floostack/transcoder/utils" + "git.code.oa.com/yt-media-ai-videounderstanding/gh-floostack-transcoder" + "git.code.oa.com/yt-media-ai-videounderstanding/gh-floostack-transcoder/utils" ) // Transcoder ... diff --git a/ffmpeg/metadata.go b/ffmpeg/metadata.go index c982b2b..5345ce3 100644 --- a/ffmpeg/metadata.go +++ b/ffmpeg/metadata.go @@ -1,6 +1,6 @@ package ffmpeg -import "github.com/floostack/transcoder" +import transcoder "git.code.oa.com/yt-media-ai-videounderstanding/gh-floostack-transcoder" // Metadata ... type Metadata struct { diff --git a/go.mod b/go.mod index 4c9ade4..787b4ee 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module github.com/floostack/transcoder +module git.code.oa.com/yt-media-ai-videounderstanding/gh-floostack-transcoder go 1.13 From ed919f6c16fd4e1774e28788ed5bb23e8a55ff6c Mon Sep 17 00:00:00 2001 From: Philip Ye Date: Thu, 21 Jul 2022 18:28:51 +0800 Subject: [PATCH 5/5] fix: correct BitsPerSample unmarshal issue --- ffmpeg/metadata.go | 4 ++-- metadata.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ffmpeg/metadata.go b/ffmpeg/metadata.go index 5345ce3..1c6344a 100644 --- a/ffmpeg/metadata.go +++ b/ffmpeg/metadata.go @@ -55,7 +55,7 @@ type Streams struct { Disposition Disposition `json:"disposition"` BitRate string `json:"bit_rate"` SampleRate string `json:"sample_rate"` - BitsPerSample string `json:"bits_per_sample"` + BitsPerSample int `json:"bits_per_sample"` } // Tags ... @@ -301,7 +301,7 @@ func (s Streams) GetSampleRate() string { } //GetBitsPerSample ... -func (s Streams) GetBitsPerSample() string { +func (s Streams) GetBitsPerSample() int { return s.BitsPerSample } diff --git a/metadata.go b/metadata.go index 680e375..f0bb1cc 100644 --- a/metadata.go +++ b/metadata.go @@ -53,7 +53,7 @@ type Streams interface { GetDisposition() Disposition GetBitRate() string GetSampleRate() string - GetBitsPerSample() string + GetBitsPerSample() int } // Tags ...