Adding format=mp4 parameter to convert gif files into mp4 (reduces file size) #30
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package ffmpeg | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "io" | ||
| "io/ioutil" | ||
| "os" | ||
| "os/exec" | ||
| "path" | ||
| "path/filepath" | ||
| ) | ||
|
|
||
| // Convert wraps the ffmpeg command and can be used to convert media files. | ||
| // ffmpeg -i src -y dst | ||
| func Convert(src string, dst string) (err error) { | ||
| if src, err = filepath.Abs(src); err != nil { | ||
| return | ||
| } | ||
|
|
||
| if dst, err = filepath.Abs(dst); err != nil { | ||
| return | ||
| } | ||
|
|
||
| if _, err = os.Stat(src); err != nil { | ||
| return fmt.Errorf("Failed to open file %s: %q", src, err) | ||
| } | ||
|
|
||
| if _, err = os.Stat(path.Dir(dst)); err != nil { | ||
| return fmt.Errorf("No such directory %s: %q", path.Dir(src), err) | ||
| } | ||
|
|
||
| cmd := exec.Command("ffmpeg", "-i", src, "-y", dst) | ||
|
|
||
| var stderr io.ReadCloser | ||
| if stderr, err = cmd.StderrPipe(); err != nil { | ||
| return | ||
| } | ||
|
|
||
| if err = cmd.Run(); err != nil { | ||
| return | ||
| } | ||
|
|
||
| errmsg, _ := ioutil.ReadAll(stderr) | ||
| errstr := string(errmsg) | ||
| if errstr != "" { | ||
| return errors.New(errstr) | ||
| } | ||
|
|
||
| return nil | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package ffmpeg | ||
|
|
||
| import ( | ||
| "os" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestGIFToVideo(t *testing.T) { | ||
| os.Remove("../testdata/issue-8.mp4") | ||
| err := Convert("../testdata/issue-8.gif", "../testdata/issue-8.mp4") | ||
| assert.NoError(t, err) | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,12 +5,16 @@ import ( | |
| "encoding/hex" | ||
| "errors" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
| "path" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/goware/go-metrics" | ||
| "github.com/goware/lg" | ||
| "github.com/pressly/imgry" | ||
| "github.com/pressly/imgry/ffmpeg" | ||
| "github.com/pressly/imgry/imagick" | ||
| ) | ||
|
|
||
|
|
@@ -33,7 +37,8 @@ type Image struct { | |
| Sizing *imgry.Sizing `json:"-" redis:"-"` | ||
| Data []byte `json:"-" redis:"-"` | ||
|
|
||
| img imgry.Image | ||
| conversionFormat string | ||
| } | ||
|
|
||
| // Hrmm.. how will we generate a Uid if we just have a blob and no srcurl..? | ||
|
|
@@ -127,7 +132,11 @@ func (im *Image) SizeIt(sizing *imgry.Sizing) error { | |
| return fmt.Errorf("Error occurred when sizing an image: %s", err) | ||
| } | ||
|
|
||
| im.conversionFormat = sizing.Format | ||
|
|
||
| if err = im.sync(); err != nil { | ||
| return fmt.Errorf("Error occurred when syncing the image: %s", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
@@ -189,9 +198,55 @@ func (im *Image) Release() { | |
| } | ||
| } | ||
|
|
||
| func (im *Image) sync() error { | ||
| im.Width = im.img.Width() | ||
| im.Height = im.img.Height() | ||
|
|
||
| if im.Format == "mp4" && len(im.Data) != 0 { | ||
|
There was a problem hiding this comment. If the format is already mp4, stop here. |
||
| // No need to convert again. | ||
| return nil | ||
| } | ||
|
|
||
| im.Format = im.img.Format() | ||
| im.Data = im.img.Data() | ||
|
|
||
| if im.conversionFormat == "mp4" && im.Format == "gif" { | ||
|
There was a problem hiding this comment. Handling the special case from There was a problem hiding this comment. btw, here is a function where we call out to exiftool and pass data to it via stdin -- https://gist.github.com/pkieltyka/5f565ee8510c4091f381 perhaps this will help you figure out how to pipe gif data to ffmpeg There was a problem hiding this comment. libmagic > exiftool https://github.com/rakyll/magicmime There was a problem hiding this comment. I was thinking of doing something like that, but the problem is that However it throws: I've found other people with similar problems but without an answer, like https://ffmpeg.org/pipermail/ffmpeg-user/2012-March/005677.html There was a problem hiding this comment. ah. well.. lets just write to disk like you’re doing On Wednesday, December 16, 2015 at 10:28 AM, José Carlos wrote:
|
||
| // I still can't find how to pipe images to ffmpeg's stdin, so for now we | ||
| // need to output them to disk. | ||
| outputGIF := tmpFile(im.Key + ".gif") // Better if mounted on tmpfs. | ||
| outputMP4 := tmpFile(im.Key + ".mp4") | ||
|
|
||
| if err := ioutil.WriteFile(outputGIF, im.img.Data(), 0664); err != nil { | ||
| return err | ||
| } | ||
| defer os.RemoveAll(path.Dir(outputGIF)) | ||
|
|
||
| if err := ffmpeg.Convert(outputGIF, outputMP4); err != nil { | ||
| return err | ||
| } | ||
| defer os.RemoveAll(path.Dir(outputMP4)) | ||
|
|
||
| buf, err := ioutil.ReadFile(outputMP4) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // I'm going to take over the data buffer. | ||
| im.Data = buf | ||
| im.Format = "mp4" | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func tmpFile(name string) string { | ||
| for { | ||
| dirname, _ := ioutil.TempDir("", "tmp-") | ||
| file := dirname + "/" + name | ||
| _, err := os.Stat(file) | ||
| if !os.IsExist(err) { | ||
| return file | ||
| } | ||
| } | ||
| panic("reached") | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The ADD command was downloading the sources each time
docker buildwas called. This RUN operation does the same and it's cached by its docker layer, no need to download it each time.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very interesting catch!