Check audio codec on uploaded videos #1414
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 25 commits
October 18, 2024 16:45
|
Your Testserver will be ready at https://1414.test.live.mm.rbg.tum.de in a few minutes. Logins
|
joschahenningsen
changed the title
joschahenningsen
requested changes
Nov 24, 2024
worker/worker/ffmegtools.go
Outdated
| probe, err := probe(file) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| return gjson.Get(probe, "streams.0.codec_name").String(), nil | ||
| codecNumber := gjson.Get(probe, "streams.#").Int() |
There was a problem hiding this comment.
I think a more descriptive name would be nice, something like
Suggested change
| codecNumber := gjson.Get(probe, "streams.#").Int() | |
| nStreams := gjson.Get(probe, "streams.#").Int() |
worker/worker/ffmegtools.go
Outdated
Comment on lines
28
to
29
| videoIndex = int(gjson.Get(probe, fmt.Sprintf("streams.%d.index", i)).Int()) | ||
| break |
There was a problem hiding this comment.
Instead we could just return here
Suggested change
| videoIndex = int(gjson.Get(probe, fmt.Sprintf("streams.%d.index", i)).Int()) | |
| break | |
| return gjson.Get(probe, fmt.Sprintf("streams.%d.codec_name", i)).String(), nil |
worker/worker/ffmegtools.go
Outdated
| return "", errors.New("no video stream found") | ||
| } | ||
|
|
||
| func getAudioCodec(file string) (string, error) { |
There was a problem hiding this comment.
I wonder if we could combine these methods into one, something like this:
Suggested change
| func getAudioCodec(file string) (string, error) { | |
| // getCodec returns the codec of the file, codecType=video returns the video codec, codecType=audio the audio codec. | |
| func getCodec(file string, codecType string) (string, error) { |
worker/worker/ffmegtools.go
Outdated
Comment on lines
25
to
39
| if codecType == "video" { | ||
| for i := 0; i < int(nStreams); i++ { | ||
| if gjson.Get(probe, fmt.Sprintf("streams.%d.codec_type", i)).String() == "video" { | ||
| return gjson.Get(probe, fmt.Sprintf("streams.%d.codec_name", i)).String(), nil | ||
| } | ||
| } | ||
| return "", errors.New("no video stream found") | ||
| } | ||
| if codecType == "audio" { | ||
| for i := 0; i < int(nStreams); i++ { | ||
| if gjson.Get(probe, fmt.Sprintf("streams.%d.codec_type", i)).String() == "audio" { | ||
| return gjson.Get(probe, fmt.Sprintf("streams.%d.codec_name", i)).String(), nil | ||
| } | ||
| } | ||
| return "", errors.New("no audio stream found") |
There was a problem hiding this comment.
This should do the exact same, no?
Suggested change
| if codecType == "video" { | |
| for i := 0; i < int(nStreams); i++ { | |
| if gjson.Get(probe, fmt.Sprintf("streams.%d.codec_type", i)).String() == "video" { | |
| return gjson.Get(probe, fmt.Sprintf("streams.%d.codec_name", i)).String(), nil | |
| } | |
| } | |
| return "", errors.New("no video stream found") | |
| } | |
| if codecType == "audio" { | |
| for i := 0; i < int(nStreams); i++ { | |
| if gjson.Get(probe, fmt.Sprintf("streams.%d.codec_type", i)).String() == "audio" { | |
| return gjson.Get(probe, fmt.Sprintf("streams.%d.codec_name", i)).String(), nil | |
| } | |
| } | |
| return "", errors.New("no audio stream found") | |
| for i := 0; i < int(nStreams); i++ { | |
| if gjson.Get(probe, fmt.Sprintf("streams.%d.codec_type", i)).String() == codecType { | |
| return gjson.Get(probe, fmt.Sprintf("streams.%d.codec_name", i)).String(), nil | |
| } | |
| } | |
| return "", fmt.Errorf("no %s stream found", streamType) |
There was a problem hiding this comment.
Yeah you are right, this is much more compact than my version. I will push this change before today's meeting.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
closes #1336
Description
Audio codec is now also checked during filavigate to a Livestreame upload and if it is not in aac format it will be transcoded.
Steps for Testing
Screenshots