From 780283788515bb13007f4574fb6d9f8c82281da2 Mon Sep 17 00:00:00 2001
From: yufushiro <62991447+yufushiro@users.noreply.github.com>
Date: Wed, 23 Aug 2023 15:44:56 +0900
Subject: [PATCH] Fix unexpected audio stream transcoding when uploaded video
is eligible to passthrough (#26608)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
lib/paperclip/transcoder.rb | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/paperclip/transcoder.rb b/lib/paperclip/transcoder.rb
index be40b4924..0f2e30f7d 100644
--- a/lib/paperclip/transcoder.rb
+++ b/lib/paperclip/transcoder.rb
@@ -37,12 +37,14 @@ module Paperclip
@output_options['f'] = 'image2'
@output_options['vframes'] = 1
when 'mp4'
- @output_options['acodec'] = 'aac'
- @output_options['strict'] = 'experimental'
+ unless eligible_to_passthrough?(metadata)
+ @output_options['acodec'] = 'aac'
+ @output_options['strict'] = 'experimental'
- if high_vfr?(metadata) && !eligible_to_passthrough?(metadata)
- @output_options['vsync'] = 'vfr'
- @output_options['r'] = @vfr_threshold
+ if high_vfr?(metadata)
+ @output_options['vsync'] = 'vfr'
+ @output_options['r'] = @vfr_threshold
+ end
end
end