Don't convert audio message if file is already ogg

This commit is contained in:
Tulir Asokan 2024-03-18 15:55:36 +02:00
parent a0602d6c94
commit 44fb681955

View file

@ -1231,13 +1231,15 @@ func (portal *Portal) convertGoogleMedia(ctx context.Context, source *User, inte
// TODO convert weird formats to mp4 // TODO convert weird formats to mp4
case "audio": case "audio":
msgtype = event.MsgAudio msgtype = event.MsgAudio
data, err = ffmpeg.ConvertBytes(ctx, data, ".ogg", []string{}, []string{"-c:a", "libopus"}, mime) if mime != "audio/ogg" {
if err != nil { data, err = ffmpeg.ConvertBytes(ctx, data, ".ogg", []string{}, []string{"-c:a", "libopus"}, mime)
return nil, nil, fmt.Errorf("%w (%s to ogg): %w", errMediaConvertFailed, mime, err) if err != nil {
return nil, nil, fmt.Errorf("%w (%s to ogg): %w", errMediaConvertFailed, mime, err)
}
fileName += ".ogg"
mime = "audio/ogg"
} }
extra["org.matrix.msc3245.voice"] = map[string]any{} extra["org.matrix.msc3245.voice"] = map[string]any{}
fileName += ".ogg"
mime = "audio/ogg"
} }
content := &event.MessageEventContent{ content := &event.MessageEventContent{
MsgType: msgtype, MsgType: msgtype,