WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-10-01 05:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: typo fixes

Browse Source 
Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
This commit is contained in:
Alexander Onnikov
2025-05-30 18:31:07 +07:00
parent b35382b216
commit d2f20a5acc
6 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/pkg/api/v1/transcoding/handler.go
+5 -1
View File
@@ -60,7 +60,11 @@ func (t *trascodeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
}
t.scheduler.Schedule(&task)
if err := t.scheduler.Schedule(&task); err != nil {
w.WriteHeader(http.StatusTooManyRequests)
return
}
w.WriteHeader(http.StatusOK)
}
internal/pkg/mediaconvert/command.go
+11 -11
View File
@@ -32,7 +32,7 @@ import (
// Options represents configuration for the ffmpeg command
type Options struct {
Input string
OuputDir string
OutputDir string
ScalingLevels []string
Level string
Threads int
@@ -56,7 +56,7 @@ func newFfmpegCommand(ctx context.Context, in io.Reader, args []string) (*exec.C
return result, nil
}
func buildCommonComamnd(opts *Options) []string {
func buildCommonCommand(opts *Options) []string {
return []string{
"-threads", fmt.Sprint(opts.Threads),
"-i", opts.Input,
@@ -65,24 +65,24 @@ func buildCommonComamnd(opts *Options) []string {
// BuildAudioCommand returns flags for getting the audio from the input
func BuildAudioCommand(opts *Options) []string {
var commonPart = buildCommonComamnd(opts)
var commonPart = buildCommonCommand(opts)
return append(commonPart,
"-vn", "-acodec",
"copy", filepath.Join(opts.OuputDir, opts.UploadID),
"copy", filepath.Join(opts.OutputDir, opts.UploadID),
)
}
// BuildRawVideoCommand returns an extremely lightweight ffmpeg command for converting raw video without extra cost.
func BuildRawVideoCommand(opts *Options) []string {
return append(buildCommonComamnd(opts),
return append(buildCommonCommand(opts),
"-c:a", "copy", // Copy audio stream
"-c:v", "copy", // Copy video stream
"-hls_time", "5",
"-hls_flags", "split_by_time",
"-hls_list_size", "0",
"-hls_segment_filename", filepath.Join(opts.OuputDir, opts.UploadID, fmt.Sprintf("%s_%s_%s.ts", opts.UploadID, "%03d", opts.Level)),
filepath.Join(opts.OuputDir, opts.UploadID, fmt.Sprintf("%s_%s_master.m3u8", opts.UploadID, opts.Level)))
"-hls_segment_filename", filepath.Join(opts.OutputDir, opts.UploadID, fmt.Sprintf("%s_%s_%s.ts", opts.UploadID, "%03d", opts.Level)),
filepath.Join(opts.OutputDir, opts.UploadID, fmt.Sprintf("%s_%s_master.m3u8", opts.UploadID, opts.Level)))
}
// BuildThumbnailCommand creates a command that creates a thumbnail for the input video
@@ -90,13 +90,13 @@ func BuildThumbnailCommand(opts *Options) []string {
return append([]string{},
"-i", opts.Input,
"-vframes", "1",
filepath.Join(opts.OuputDir, opts.UploadID, opts.UploadID+".jpg"),
filepath.Join(opts.OutputDir, opts.UploadID, opts.UploadID+".jpg"),
)
}
// BuildScalingVideoCommand returns flags for ffmpeg for video scaling
func BuildScalingVideoCommand(opts *Options) []string {
var result = buildCommonComamnd(opts)
var result = buildCommonCommand(opts)
for _, level := range opts.ScalingLevels {
result = append(result,
@@ -109,8 +109,8 @@ func BuildScalingVideoCommand(opts *Options) []string {
"-hls_time", "5",
"-hls_flags", "split_by_time",
"-hls_list_size", "0",
"-hls_segment_filename", filepath.Join(opts.OuputDir, opts.UploadID, fmt.Sprintf("%s_%s_%s.ts", opts.UploadID, "%03d", level)),
filepath.Join(opts.OuputDir, opts.UploadID, fmt.Sprintf("%s_%s_master.m3u8", opts.UploadID, level)))
"-hls_segment_filename", filepath.Join(opts.OutputDir, opts.UploadID, fmt.Sprintf("%s_%s_%s.ts", opts.UploadID, "%03d", level)),
filepath.Join(opts.OutputDir, opts.UploadID, fmt.Sprintf("%s_%s_master.m3u8", opts.UploadID, level)))
}
return result
internal/pkg/mediaconvert/command_test.go
+2 -2
View File
@@ -24,7 +24,7 @@ import (
func Test_BuildVideoCommand_Scaling(t *testing.T) {
var scaleCommand = mediaconvert.BuildScalingVideoCommand(&mediaconvert.Options{
OuputDir: "test",
OutputDir: "test",
Input: "pipe:0",
UploadID: "1",
Threads: 4,
@@ -38,7 +38,7 @@ func Test_BuildVideoCommand_Scaling(t *testing.T) {
func Test_BuildVideoCommand_Raw(t *testing.T) {
var rawCommand = mediaconvert.BuildRawVideoCommand(&mediaconvert.Options{
OuputDir: "test",
OutputDir: "test",
Input: "pipe:0",
UploadID: "1",
Threads: 4,
internal/pkg/mediaconvert/coordinator.go
+1 -1
View File
@@ -97,7 +97,7 @@ func (s *StreamCoordinator) NewUpload(ctx context.Context, info handler.FileInfo
var commandOptions = Options{
Input: "pipe:0",
OuputDir: s.conf.OutputDir,
OutputDir: s.conf.OutputDir,
Threads: s.conf.MaxThreadCount,
UploadID: info.ID,
Level: level,
internal/pkg/mediaconvert/scheduler.go
+10 -4
View File
@@ -62,15 +62,15 @@ type Scheduler struct {
}
// Schedule schedules a task to transcode
func (p *Scheduler) Schedule(t *Task) {
func (p *Scheduler) Schedule(t *Task) error {
t.ID = uuid.NewString()
t.Status = "planned"
select {
case p.taskCh <- t:
p.logger.Sugar().Debugf("task %v is scheduled", t)
return nil
default:
p.logger.Error("task channel is full")
return fmt.Errorf("task queue is full")
}
}
@@ -127,6 +127,12 @@ func (p *Scheduler) processTask(ctx context.Context, task *Task) {
return
}
defer func() {
if err := os.RemoveAll(destinationFolder); err != nil {
logger.Error("failed to cleanup temporary folder", zap.Error(err))
}
}()
logger.Debug("phase 3: get the remote file")
remoteStorage, err := storage.NewStorageByURL(ctx, p.cfg.Endpoint(), p.cfg.EndpointURL.Scheme, tokenString, task.Workspace)
@@ -176,7 +182,7 @@ func (p *Scheduler) processTask(ctx context.Context, task *Task) {
var level = resconv.Level(res)
var opts = Options{
Input: sourceFilePath,
OuputDir: p.cfg.OutputDir,
OutputDir: p.cfg.OutputDir,
Level: level,
ScalingLevels: append(resconv.SubLevels(res), level),
UploadID: task.ID,
internal/pkg/mediaconvert/stream.go
+1 -1
View File
@@ -115,7 +115,7 @@ func (s *StreamCoordinator) AsConcatableUpload(upload handler.Upload) handler.Co
func (w *Stream) start(ctx context.Context, options *Options) error {
defer w.logger.Debug("start done")
w.reader = w.writer.Transpile()
if err := manifest.GenerateHLSPlaylist(append(options.ScalingLevels, options.Level), options.OuputDir, options.UploadID); err != nil {
if err := manifest.GenerateHLSPlaylist(append(options.ScalingLevels, options.Level), options.OutputDir, options.UploadID); err != nil {
return err
}
w.commandGroup.Add(1)