CEF/imagorvideoextended
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refactor(ffmpeg): use r_frame_rate for FPS (#41)

Browse source 
* refactor(ffmepg): use r_frame_rate for FPS

* reset golden

* fix

* test: update golden files
This commit is contained in:
Adrian Shum 2022-10-22 11:32:09 +08:00 • committed by GitHub
parent fe92e79efc
commit 654251e693
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 60 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -49,18 +49,13 @@ http://localhost:8000/unsafe/300x0/7x7/filters:max_frames(70):fill(yellow)/http:
### Metadata ### Metadata
imagorvideo provides metadata endpoint that extracts video metadata, dimension and duration data. By default, it only process the header without extracting the frame data for better processing speed. imagorvideo provides metadata endpoint that extracts video metadata, including dimension, duration and FPS data. The endpoint only processes the header without extracting the frame data.
To use the metadata endpoint, add `/meta` right after the URL signature hash before the image operations: To use the metadata endpoint, add `/meta` right after the URL signature hash before the image operations:
``` ```
http://localhost:8000/unsafe/meta/https://test-videos.co.uk/vids/bigbuckbunny/mp4/h264/1080/Big_Buck_Bunny_1080_10s_30MB.mp4 http://localhost:8000/unsafe/meta/https://test-videos.co.uk/vids/bigbuckbunny/mp4/h264/1080/Big_Buck_Bunny_1080_10s_30MB.mp4
``` ```
Appending the `max_frames()` or `frame(n)` filter however, would activate frame processing. This results more processing time but would also allows retrieving frame related info such as frames per second `fps`:
```
http://localhost:8000/unsafe/meta/filters:max_frames()/https://test-videos.co.uk/vids/bigbuckbunny/mp4/h264/1080/Big_Buck_Bunny_1080_10s_30MB.mp4
```
```jsonc ```jsonc
{ {
@ -72,13 +67,12 @@ http://localhost:8000/unsafe/meta/filters:max_frames()/https://test-videos.co.uk
"height": 1080, "height": 1080,
"title": "Big Buck Bunny, Sunflower version", "title": "Big Buck Bunny, Sunflower version",
"artist": "Blender Foundation 2008, Janus Bager Kristensen 2013", "artist": "Blender Foundation 2008, Janus Bager Kristensen 2013",
"fps": 30, // available only if frame processing activated "fps": 30,
"has_video": true, "has_video": true,
"has_audio": false "has_audio": false
} }
``` ```
### Configuration ### Configuration
Configuration options specific to imagorvideo. Please see [imagor configuration](https://github.com/cshum/imagor#configuration) for all existing options available. Configuration options specific to imagorvideo. Please see [imagor configuration](https://github.com/cshum/imagor#configuration) for all existing options available.

6
ffmpeg/ffmpeg.go
View file

@ -133,8 +133,8 @@ func (av *AVContext) Close() {
func (av *AVContext) Metadata() *Metadata { func (av *AVContext) Metadata() *Metadata {
var fps float64 var fps float64
if av.availableDuration > 0 { if av.stream != nil {
fps = float64(av.availableIndex) * float64(time.Second) / float64(av.availableDuration) fps = float64(av.stream.r_frame_rate.num) / float64(av.stream.r_frame_rate.den)
} }
return &Metadata{ return &Metadata{
Orientation: av.orientation, Orientation: av.orientation,
@ -143,7 +143,7 @@ func (av *AVContext) Metadata() *Metadata {
Height: av.height, Height: av.height,
Title: av.title, Title: av.title,
Artist: av.artist, Artist: av.artist,
FPS: math.Round(fps*10) / 10, FPS: fps,
HasVideo: av.hasVideo, HasVideo: av.hasVideo,
HasAudio: av.hasAudio, HasAudio: av.hasAudio,
} }

19
processor.go
View file

@ -114,6 +114,15 @@ func (p *Processor) Process(ctx context.Context, in *imagor.Blob, params imagorp
return return
} }
defer av.Close() defer av.Close()
meta := av.Metadata()
if params.Meta {
out = imagor.NewBlobFromJsonMarshal(Metadata{
Format: strings.TrimPrefix(mime.Extension(), "."),
ContentType: mime.String(),
Metadata: meta,
})
return
}
bands := 3 bands := 3
for _, filter := range params.Filters { for _, filter := range params.Filters {
switch filter.Name { switch filter.Name {
@ -148,15 +157,7 @@ func (p *Processor) Process(ctx context.Context, in *imagor.Blob, params imagorp
} }
} }
} }
meta := av.Metadata()
if params.Meta {
out = imagor.NewBlobFromJsonMarshal(Metadata{
Format: strings.TrimPrefix(mime.Extension(), "."),
ContentType: mime.String(),
Metadata: meta,
})
return
}
switch meta.Orientation { switch meta.Orientation {
case 3: case 3:
filters = append(filters, imagorpath.Filter{Name: "orient", Args: "180"}) filters = append(filters, imagorpath.Filter{Name: "orient", Args: "180"})

2
testdata/golden/meta/alpha-webm.webm-9999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":12040,"width":720,"height":576,"fps":9.8,"has_video":true,"has_audio":false} {"orientation":1,"duration":12040,"width":720,"height":576,"fps":25,"has_video":true,"has_audio":false}

2
testdata/golden/meta/alpha-webm.webm.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":12040,"width":720,"height":576,"has_video":true,"has_audio":false} {"orientation":1,"duration":12040,"width":720,"height":576,"fps":25,"has_video":true,"has_audio":false}

2
testdata/golden/meta/everybody-betray-me.mkv-10.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":7407,"width":640,"height":480,"fps":30,"has_video":true,"has_audio":true} {"orientation":1,"duration":7407,"width":640,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/everybody-betray-me.mkv-5.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":7407,"width":640,"height":480,"fps":30.1,"has_video":true,"has_audio":true} {"orientation":1,"duration":7407,"width":640,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/everybody-betray-me.mkv-9999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":7407,"width":640,"height":480,"fps":1.2,"has_video":true,"has_audio":true} {"orientation":1,"duration":7407,"width":640,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/everybody-betray-me.mkv-99999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":7407,"width":640,"height":480,"fps":16,"has_video":true,"has_audio":true} {"orientation":1,"duration":7407,"width":640,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/everybody-betray-me.mkv.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":7407,"width":640,"height":480,"has_video":true,"has_audio":true} {"orientation":1,"duration":7407,"width":640,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/macabre.mp4-10.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":3925,"width":492,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":1,"duration":3925,"width":492,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/macabre.mp4-5.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":3925,"width":492,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":1,"duration":3925,"width":492,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/macabre.mp4-9999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":3925,"width":492,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":1,"duration":3925,"width":492,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/macabre.mp4-99999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":3925,"width":492,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":1,"duration":3925,"width":492,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/macabre.mp4.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":3925,"width":492,"height":360,"has_video":true,"has_audio":true} {"orientation":1,"duration":3925,"width":492,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo.flv-10.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":2560,"width":480,"height":360,"fps":27.9,"has_video":true,"has_audio":true} {"orientation":1,"duration":2560,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo.flv-5.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":2560,"width":480,"height":360,"fps":25.6,"has_video":true,"has_audio":true} {"orientation":1,"duration":2560,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo.flv-9999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":2560,"width":480,"height":360,"fps":29.6,"has_video":true,"has_audio":true} {"orientation":1,"duration":2560,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo.flv-99999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":2560,"width":480,"height":360,"fps":29.3,"has_video":true,"has_audio":true} {"orientation":1,"duration":2560,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo.flv.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":2560,"width":480,"height":360,"has_video":true,"has_audio":true} {"orientation":1,"duration":2560,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_0.mp4-10.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":2544,"width":480,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":1,"duration":2544,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_0.mp4-5.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":2544,"width":480,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":1,"duration":2544,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_0.mp4-9999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":2544,"width":480,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":1,"duration":2544,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_0.mp4-99999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":2544,"width":480,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":1,"duration":2544,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_0.mp4.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":2544,"width":480,"height":360,"has_video":true,"has_audio":true} {"orientation":1,"duration":2544,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_180.mp4-10.meta.json vendored
View file

@ -1 +1 @@
{"orientation":3,"duration":2544,"width":480,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":3,"duration":2544,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_180.mp4-5.meta.json vendored
View file

@ -1 +1 @@
{"orientation":3,"duration":2544,"width":480,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":3,"duration":2544,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_180.mp4-9999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":3,"duration":2544,"width":480,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":3,"duration":2544,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_180.mp4-99999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":3,"duration":2544,"width":480,"height":360,"fps":30,"has_video":true,"has_audio":true} {"orientation":3,"duration":2544,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_180.mp4.meta.json vendored
View file

@ -1 +1 @@
{"orientation":3,"duration":2544,"width":480,"height":360,"has_video":true,"has_audio":true} {"orientation":3,"duration":2544,"width":480,"height":360,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_270.mp4-10.meta.json vendored
View file

@ -1 +1 @@
{"orientation":6,"duration":2544,"width":360,"height":480,"fps":30,"has_video":true,"has_audio":true} {"orientation":6,"duration":2544,"width":360,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_270.mp4-5.meta.json vendored
View file

@ -1 +1 @@
{"orientation":6,"duration":2544,"width":360,"height":480,"fps":30,"has_video":true,"has_audio":true} {"orientation":6,"duration":2544,"width":360,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_270.mp4-9999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":6,"duration":2544,"width":360,"height":480,"fps":30,"has_video":true,"has_audio":true} {"orientation":6,"duration":2544,"width":360,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_270.mp4-99999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":6,"duration":2544,"width":360,"height":480,"fps":30,"has_video":true,"has_audio":true} {"orientation":6,"duration":2544,"width":360,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_270.mp4.meta.json vendored
View file

@ -1 +1 @@
{"orientation":6,"duration":2544,"width":360,"height":480,"has_video":true,"has_audio":true} {"orientation":6,"duration":2544,"width":360,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_90.mp4-10.meta.json vendored
View file

@ -1 +1 @@
{"orientation":8,"duration":2544,"width":360,"height":480,"fps":30,"has_video":true,"has_audio":true} {"orientation":8,"duration":2544,"width":360,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_90.mp4-5.meta.json vendored
View file

@ -1 +1 @@
{"orientation":8,"duration":2544,"width":360,"height":480,"fps":30,"has_video":true,"has_audio":true} {"orientation":8,"duration":2544,"width":360,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_90.mp4-9999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":8,"duration":2544,"width":360,"height":480,"fps":30,"has_video":true,"has_audio":true} {"orientation":8,"duration":2544,"width":360,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_90.mp4-99999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":8,"duration":2544,"width":360,"height":480,"fps":30,"has_video":true,"has_audio":true} {"orientation":8,"duration":2544,"width":360,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/schizo_90.mp4.meta.json vendored
View file

@ -1 +1 @@
{"orientation":8,"duration":2544,"width":360,"height":480,"has_video":true,"has_audio":true} {"orientation":8,"duration":2544,"width":360,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/meta/with_cover.mp3-10.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":1906,"width":1280,"height":720,"has_video":true,"has_audio":true} {"orientation":1,"duration":1906,"width":1280,"height":720,"fps":90000,"has_video":true,"has_audio":true}

2
testdata/golden/meta/with_cover.mp3-5.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":1906,"width":1280,"height":720,"has_video":true,"has_audio":true} {"orientation":1,"duration":1906,"width":1280,"height":720,"fps":90000,"has_video":true,"has_audio":true}

2
testdata/golden/meta/with_cover.mp3-9999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":1906,"width":1280,"height":720,"has_video":true,"has_audio":true} {"orientation":1,"duration":1906,"width":1280,"height":720,"fps":90000,"has_video":true,"has_audio":true}

2
testdata/golden/meta/with_cover.mp3-99999.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":1906,"width":1280,"height":720,"has_video":true,"has_audio":true} {"orientation":1,"duration":1906,"width":1280,"height":720,"fps":90000,"has_video":true,"has_audio":true}

2
testdata/golden/meta/with_cover.mp3.meta.json vendored
View file

@ -1 +1 @@
{"orientation":1,"duration":1906,"width":1280,"height":720,"has_video":true,"has_audio":true} {"orientation":1,"duration":1906,"width":1280,"height":720,"fps":90000,"has_video":true,"has_audio":true}

2
testdata/golden/result/meta/everybody-betray-me.mkv vendored
View file

@ -1 +1 @@
{"format":"mkv","content_type":"video/x-matroska","orientation":1,"duration":7407,"width":640,"height":480,"has_video":true,"has_audio":true} {"format":"mkv","content_type":"video/x-matroska","orientation":1,"duration":7407,"width":640,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/result/meta/filters%3Amax_frames%28%29/everybody-betray-me.mkv vendored
View file

@ -1 +1 @@
{"format":"mkv","content_type":"video/x-matroska","orientation":1,"duration":7407,"width":640,"height":480,"fps":30,"has_video":true,"has_audio":true} {"format":"mkv","content_type":"video/x-matroska","orientation":1,"duration":7407,"width":640,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}

2
testdata/golden/result/meta/filters%3Amax_frames%286%29/everybody-betray-me.mkv vendored
View file

@ -1 +1 @@
{"format":"mkv","content_type":"video/x-matroska","orientation":1,"duration":7407,"width":640,"height":480,"fps":29.9,"has_video":true,"has_audio":true} {"format":"mkv","content_type":"video/x-matroska","orientation":1,"duration":7407,"width":640,"height":480,"fps":29.97002997002997,"has_video":true,"has_audio":true}