Migrate audio transcoding from DASH to a single AAC (.m4a) file
This commit is contained in:
@@ -11,6 +11,6 @@ namespace Musify.Application.Configuration
|
|||||||
public required string PublicBaseUrl { get; set; }
|
public required string PublicBaseUrl { get; set; }
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string ManifestFileName { get; set; } = "manifest.mpd";
|
public string AudioFileName { get; set; } = "audio.m4a";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ namespace Musify.Application.Contracts
|
|||||||
{
|
{
|
||||||
public interface IAudioTranscoderService
|
public interface IAudioTranscoderService
|
||||||
{
|
{
|
||||||
Task<int> TranscodeToDashAsync(Stream audioStream, string destinationPath, CancellationToken cancellationToken);
|
Task<int> TranscodeToAudioFileAsync(Stream audioStream, string destinationPath, CancellationToken cancellationToken);
|
||||||
|
|
||||||
Task<bool> IsValidAudioFileAsync(string filePath, CancellationToken cancellationToken);
|
Task<bool> IsValidAudioFileAsync(string filePath, CancellationToken cancellationToken);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ namespace Musify.Application.Tracks.Handlers
|
|||||||
streamGatewayConfiguration.PublicBaseUrl.TrimEnd('/'),
|
streamGatewayConfiguration.PublicBaseUrl.TrimEnd('/'),
|
||||||
"media",
|
"media",
|
||||||
folderPath,
|
folderPath,
|
||||||
streamGatewayConfiguration.ManifestFileName);
|
streamGatewayConfiguration.AudioFileName);
|
||||||
|
|
||||||
logger.LogInformation("Issued stream ticket for track {TrackId} to user {UserId}", request.TrackId, request.UserId);
|
logger.LogInformation("Issued stream ticket for track {TrackId} to user {UserId}", request.TrackId, request.UserId);
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace Musify.Infrastructure.Configuration
|
|||||||
public string ExecutableName { get; set; } = "ffmpeg";
|
public string ExecutableName { get; set; } = "ffmpeg";
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string ManifestFileName { get; set; } = "manifest.mpd";
|
public string OutputFileName { get; set; } = "audio.m4a";
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string AudioCodec { get; set; } = "aac";
|
public string AudioCodec { get; set; } = "aac";
|
||||||
@@ -36,15 +36,6 @@ namespace Musify.Infrastructure.Configuration
|
|||||||
[Required]
|
[Required]
|
||||||
public string AudioProfile { get; set; } = "aac_low";
|
public string AudioProfile { get; set; } = "aac_low";
|
||||||
|
|
||||||
[Range(1, 60)]
|
|
||||||
public int SegmentDurationSeconds { get; set; } = 4;
|
|
||||||
|
|
||||||
[Required]
|
|
||||||
public string InitSegmentName { get; set; } = "init-stream$RepresentationID$.m4s";
|
|
||||||
|
|
||||||
[Required]
|
|
||||||
public string MediaSegmentName { get; set; } = "chunk-stream$RepresentationID$-$Number$.m4s";
|
|
||||||
|
|
||||||
public string AdditionalArguments { get; set; } = string.Empty;
|
public string AdditionalArguments { get; set; } = string.Empty;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+8
-8
@@ -9,15 +9,15 @@ using Musify.Infrastructure.MassTransit.Logs;
|
|||||||
|
|
||||||
namespace Musify.Infrastructure.MassTransit.Activities
|
namespace Musify.Infrastructure.MassTransit.Activities
|
||||||
{
|
{
|
||||||
internal class TranscodeDashAudioActivity(
|
internal class TranscodeAudioActivity(
|
||||||
IDatabase database,
|
IDatabase database,
|
||||||
IAudioTranscoderService audioTranscoder,
|
IAudioTranscoderService audioTranscoder,
|
||||||
ILogger<TranscodeDashAudioActivity> logger)
|
ILogger<TranscodeAudioActivity> logger)
|
||||||
: IActivity<TranscodeDashAudioArguments, TranscodeDashAudioLog>
|
: IActivity<TranscodeAudioArguments, TranscodeAudioLog>
|
||||||
{
|
{
|
||||||
public const string ExecuteEndpointName = "transcode-dash-audio";
|
public const string ExecuteEndpointName = "transcode-audio";
|
||||||
|
|
||||||
public async Task<ExecutionResult> Execute(ExecuteContext<TranscodeDashAudioArguments> executeContext)
|
public async Task<ExecutionResult> Execute(ExecuteContext<TranscodeAudioArguments> executeContext)
|
||||||
{
|
{
|
||||||
var sourceFilePath = executeContext.GetVariable<string>(executeContext.Arguments.SourceFilePathVariable);
|
var sourceFilePath = executeContext.GetVariable<string>(executeContext.Arguments.SourceFilePathVariable);
|
||||||
ArgumentNullException.ThrowIfNull(sourceFilePath, nameof(sourceFilePath));
|
ArgumentNullException.ThrowIfNull(sourceFilePath, nameof(sourceFilePath));
|
||||||
@@ -40,7 +40,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
|
|||||||
{
|
{
|
||||||
await using (var fileStream = File.OpenRead(sourceFilePath))
|
await using (var fileStream = File.OpenRead(sourceFilePath))
|
||||||
{
|
{
|
||||||
await audioTranscoder.TranscodeToDashAsync(
|
await audioTranscoder.TranscodeToAudioFileAsync(
|
||||||
fileStream,
|
fileStream,
|
||||||
workingDirectory,
|
workingDirectory,
|
||||||
executeContext.CancellationToken);
|
executeContext.CancellationToken);
|
||||||
@@ -68,7 +68,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<CompensationResult> Compensate(CompensateContext<TranscodeDashAudioLog> compensateContext)
|
public Task<CompensationResult> Compensate(CompensateContext<TranscodeAudioLog> compensateContext)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -86,4 +86,4 @@ namespace Musify.Infrastructure.MassTransit.Activities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
namespace Musify.Infrastructure.MassTransit.Arguments
|
namespace Musify.Infrastructure.MassTransit.Arguments
|
||||||
{
|
{
|
||||||
public record TranscodeDashAudioArguments(
|
public record TranscodeAudioArguments(
|
||||||
Guid TrackId,
|
Guid TrackId,
|
||||||
string SourceFilePathVariable,
|
string SourceFilePathVariable,
|
||||||
string WorkingDirectoryVariable);
|
string WorkingDirectoryVariable);
|
||||||
}
|
}
|
||||||
+3
-3
@@ -52,7 +52,7 @@ namespace Musify.Infrastructure.MassTransit
|
|||||||
options.AddActivity<UpdatePlayListPictureActivity, UpdatePlayListPictureArguments, UpdatePlayListPictureLog>();
|
options.AddActivity<UpdatePlayListPictureActivity, UpdatePlayListPictureArguments, UpdatePlayListPictureLog>();
|
||||||
options.AddActivity<UpdateTrackPictureActivity, UpdateTrackPictureArguments, UpdateTrackPictureLog>();
|
options.AddActivity<UpdateTrackPictureActivity, UpdateTrackPictureArguments, UpdateTrackPictureLog>();
|
||||||
options.AddActivity<DownloadFileFromBucketActivity, DownloadFileFromBucketArguments, DownloadFileFromBucketLog>();
|
options.AddActivity<DownloadFileFromBucketActivity, DownloadFileFromBucketArguments, DownloadFileFromBucketLog>();
|
||||||
options.AddActivity<TranscodeDashAudioActivity, TranscodeDashAudioArguments, TranscodeDashAudioLog>();
|
options.AddActivity<TranscodeAudioActivity, TranscodeAudioArguments, TranscodeAudioLog>();
|
||||||
options.AddActivity<TransferFilesToBucketActivity, TransferFilesToBucketArguments, TransferFilesToBucketLog>();
|
options.AddActivity<TransferFilesToBucketActivity, TransferFilesToBucketArguments, TransferFilesToBucketLog>();
|
||||||
options.AddActivity<UpdateTrackAudioActivity, UpdateTrackAudioArguments, UpdateTrackAudioLog>();
|
options.AddActivity<UpdateTrackAudioActivity, UpdateTrackAudioArguments, UpdateTrackAudioLog>();
|
||||||
options.AddActivity<UploadFileToBucketActivity, UploadFileToBucketArguments, UploadFileToBucketLog>();
|
options.AddActivity<UploadFileToBucketActivity, UploadFileToBucketArguments, UploadFileToBucketLog>();
|
||||||
@@ -178,10 +178,10 @@ namespace Musify.Infrastructure.MassTransit
|
|||||||
busRegistrationContext,
|
busRegistrationContext,
|
||||||
DownloadFileFromBucketActivity.ExecuteEndpointName);
|
DownloadFileFromBucketActivity.ExecuteEndpointName);
|
||||||
|
|
||||||
ConfigureActivityEndpoint<TranscodeDashAudioActivity, TranscodeDashAudioArguments, TranscodeDashAudioLog>(
|
ConfigureActivityEndpoint<TranscodeAudioActivity, TranscodeAudioArguments, TranscodeAudioLog>(
|
||||||
busFactoryConfigurator,
|
busFactoryConfigurator,
|
||||||
busRegistrationContext,
|
busRegistrationContext,
|
||||||
TranscodeDashAudioActivity.ExecuteEndpointName);
|
TranscodeAudioActivity.ExecuteEndpointName);
|
||||||
|
|
||||||
ConfigureActivityEndpoint<TransferFilesToBucketActivity, TransferFilesToBucketArguments, TransferFilesToBucketLog>(
|
ConfigureActivityEndpoint<TransferFilesToBucketActivity, TransferFilesToBucketArguments, TransferFilesToBucketLog>(
|
||||||
busFactoryConfigurator,
|
busFactoryConfigurator,
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
namespace Musify.Infrastructure.MassTransit.Logs
|
||||||
|
{
|
||||||
|
public record TranscodeAudioLog(string WorkingDirectory);
|
||||||
|
}
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
namespace Musify.Infrastructure.MassTransit.Logs
|
|
||||||
{
|
|
||||||
public record TranscodeDashAudioLog(string WorkingDirectory);
|
|
||||||
}
|
|
||||||
@@ -39,8 +39,8 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
|
|||||||
|
|
||||||
routingSlipBuilder.AddActivity(
|
routingSlipBuilder.AddActivity(
|
||||||
ActivityNames.TranscodeAudio,
|
ActivityNames.TranscodeAudio,
|
||||||
EndpointHelper.BuildExecuteActivityUri(TranscodeDashAudioActivity.ExecuteEndpointName),
|
EndpointHelper.BuildExecuteActivityUri(TranscodeAudioActivity.ExecuteEndpointName),
|
||||||
new TranscodeDashAudioArguments(
|
new TranscodeAudioArguments(
|
||||||
message.TrackId,
|
message.TrackId,
|
||||||
RoutingSlipVariableNames.Audio.SourceFilePath,
|
RoutingSlipVariableNames.Audio.SourceFilePath,
|
||||||
RoutingSlipVariableNames.Workflow.TemporalDirectory));
|
RoutingSlipVariableNames.Workflow.TemporalDirectory));
|
||||||
|
|||||||
@@ -11,29 +11,29 @@ namespace Musify.Infrastructure.Services
|
|||||||
{
|
{
|
||||||
record FfmpegExecutionResult(int ExitCode, string StandardOutput, string StandardError);
|
record FfmpegExecutionResult(int ExitCode, string StandardOutput, string StandardError);
|
||||||
|
|
||||||
public async Task<int> TranscodeToDashAsync(Stream audioStream, string destinationPath, CancellationToken cancellationToken)
|
public async Task<int> TranscodeToAudioFileAsync(Stream audioStream, string destinationPath, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Directory.CreateDirectory(destinationPath);
|
Directory.CreateDirectory(destinationPath);
|
||||||
|
|
||||||
logger.LogInformation("Starting audio transcoding to DASH for {DestinationPath}", destinationPath);
|
logger.LogInformation("Starting audio transcoding for {DestinationPath}", destinationPath);
|
||||||
|
|
||||||
var executionResult = await ExecuteFfmpegWithInputAsync(
|
var executionResult = await ExecuteFfmpegWithInputAsync(
|
||||||
BuildDashArguments(destinationPath, audioTranscoderConfiguration.Ffmpeg),
|
BuildAudioFileArguments(destinationPath, audioTranscoderConfiguration.Ffmpeg),
|
||||||
destinationPath,
|
destinationPath,
|
||||||
audioStream,
|
audioStream,
|
||||||
"TranscodeToDash",
|
"TranscodeToAudioFile",
|
||||||
cancellationToken);
|
cancellationToken);
|
||||||
|
|
||||||
if (executionResult.ExitCode != 0)
|
if (executionResult.ExitCode != 0)
|
||||||
{
|
{
|
||||||
logger.LogError("Audio transcoding to DASH failed with exit code {ExitCode}. Output: {StandardOutput}, Error: {StandardError}",
|
logger.LogError("Audio transcoding failed with exit code {ExitCode}. Output: {StandardOutput}, Error: {StandardError}",
|
||||||
executionResult.ExitCode, executionResult.StandardOutput, executionResult.StandardError);
|
executionResult.ExitCode, executionResult.StandardOutput, executionResult.StandardError);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
logger.LogInformation("Audio transcoding to DASH completed for {DestinationPath}", destinationPath);
|
logger.LogInformation("Audio transcoding completed for {DestinationPath}", destinationPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
return executionResult.ExitCode;
|
return executionResult.ExitCode;
|
||||||
@@ -45,7 +45,7 @@ namespace Musify.Infrastructure.Services
|
|||||||
}
|
}
|
||||||
catch (Exception exception)
|
catch (Exception exception)
|
||||||
{
|
{
|
||||||
logger.LogError(exception, "Failed to transcode audio to DASH for {DestinationPath}", destinationPath);
|
logger.LogError(exception, "Failed to transcode audio for {DestinationPath}", destinationPath);
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -188,9 +188,9 @@ namespace Musify.Infrastructure.Services
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static string BuildDashArguments(string outputDirectory, FfmpegConfiguration ffmpegConfiguration)
|
static string BuildAudioFileArguments(string outputDirectory, FfmpegConfiguration ffmpegConfiguration)
|
||||||
{
|
{
|
||||||
var manifestPath = Path.Combine(outputDirectory, ffmpegConfiguration.ManifestFileName);
|
var outputPath = Path.Combine(outputDirectory, ffmpegConfiguration.OutputFileName);
|
||||||
var additionalArguments = string.IsNullOrWhiteSpace(ffmpegConfiguration.AdditionalArguments)
|
var additionalArguments = string.IsNullOrWhiteSpace(ffmpegConfiguration.AdditionalArguments)
|
||||||
? string.Empty
|
? string.Empty
|
||||||
: $" {ffmpegConfiguration.AdditionalArguments.Trim()}";
|
: $" {ffmpegConfiguration.AdditionalArguments.Trim()}";
|
||||||
@@ -204,15 +204,9 @@ namespace Musify.Infrastructure.Services
|
|||||||
$"-ac {ffmpegConfiguration.AudioChannels} " +
|
$"-ac {ffmpegConfiguration.AudioChannels} " +
|
||||||
$"-ar {ffmpegConfiguration.AudioSampleRate} " +
|
$"-ar {ffmpegConfiguration.AudioSampleRate} " +
|
||||||
$"-profile:a {ffmpegConfiguration.AudioProfile} " +
|
$"-profile:a {ffmpegConfiguration.AudioProfile} " +
|
||||||
"-f dash " +
|
"-movflags +faststart" +
|
||||||
$"-seg_duration {ffmpegConfiguration.SegmentDurationSeconds} " +
|
|
||||||
"-streaming 1 " +
|
|
||||||
"-use_template 1 " +
|
|
||||||
"-use_timeline 0 " +
|
|
||||||
$"-init_seg_name \"{ffmpegConfiguration.InitSegmentName}\" " +
|
|
||||||
$"-media_seg_name \"{ffmpegConfiguration.MediaSegmentName}\"" +
|
|
||||||
additionalArguments +
|
additionalArguments +
|
||||||
$" \"{manifestPath}\"";
|
$" \"{outputPath}\"";
|
||||||
}
|
}
|
||||||
|
|
||||||
static string BuildValidateAudioArguments(string filePath)
|
static string BuildValidateAudioArguments(string filePath)
|
||||||
|
|||||||
Reference in New Issue
Block a user