Add support for HEIC uploads (#19618)
This commit is contained in:
parent
4390103b44
commit
ca1dec3831
1 changed files with 15 additions and 2 deletions
|
@ -44,7 +44,7 @@ class MediaAttachment < ApplicationRecord
|
||||||
MAX_VIDEO_MATRIX_LIMIT = 2_304_000 # 1920x1200px
|
MAX_VIDEO_MATRIX_LIMIT = 2_304_000 # 1920x1200px
|
||||||
MAX_VIDEO_FRAME_RATE = 60
|
MAX_VIDEO_FRAME_RATE = 60
|
||||||
|
|
||||||
IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif .webp).freeze
|
IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif .webp .heic .heif).freeze
|
||||||
VIDEO_FILE_EXTENSIONS = %w(.webm .mp4 .m4v .mov).freeze
|
VIDEO_FILE_EXTENSIONS = %w(.webm .mp4 .m4v .mov).freeze
|
||||||
AUDIO_FILE_EXTENSIONS = %w(.ogg .oga .mp3 .wav .flac .opus .aac .m4a .3gp .wma).freeze
|
AUDIO_FILE_EXTENSIONS = %w(.ogg .oga .mp3 .wav .flac .opus .aac .m4a .3gp .wma).freeze
|
||||||
|
|
||||||
|
@ -55,7 +55,8 @@ class MediaAttachment < ApplicationRecord
|
||||||
small
|
small
|
||||||
).freeze
|
).freeze
|
||||||
|
|
||||||
IMAGE_MIME_TYPES = %w(image/jpeg image/png image/gif image/webp).freeze
|
IMAGE_MIME_TYPES = %w(image/jpeg image/png image/gif image/heic image/heif image/webp).freeze
|
||||||
|
IMAGE_CONVERTIBLE_MIME_TYPES = %w(image/heic image/heif).freeze
|
||||||
VIDEO_MIME_TYPES = %w(video/webm video/mp4 video/quicktime video/ogg).freeze
|
VIDEO_MIME_TYPES = %w(video/webm video/mp4 video/quicktime video/ogg).freeze
|
||||||
VIDEO_CONVERTIBLE_MIME_TYPES = %w(video/webm video/quicktime).freeze
|
VIDEO_CONVERTIBLE_MIME_TYPES = %w(video/webm video/quicktime).freeze
|
||||||
AUDIO_MIME_TYPES = %w(audio/wave audio/wav audio/x-wav audio/x-pn-wave audio/vnd.wave audio/ogg audio/vorbis audio/mpeg audio/mp3 audio/webm audio/flac audio/aac audio/m4a audio/x-m4a audio/mp4 audio/3gpp video/x-ms-asf).freeze
|
AUDIO_MIME_TYPES = %w(audio/wave audio/wav audio/x-wav audio/x-pn-wave audio/vnd.wave audio/ogg audio/vorbis audio/mpeg audio/mp3 audio/webm audio/flac audio/aac audio/m4a audio/x-m4a audio/mp4 audio/3gpp video/x-ms-asf).freeze
|
||||||
|
@ -78,6 +79,16 @@ class MediaAttachment < ApplicationRecord
|
||||||
}.freeze,
|
}.freeze,
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
|
IMAGE_CONVERTED_STYLES = {
|
||||||
|
original: {
|
||||||
|
format: 'jpeg',
|
||||||
|
}.merge(IMAGE_STYLES[:original]).freeze,
|
||||||
|
|
||||||
|
small: {
|
||||||
|
format: 'jpeg',
|
||||||
|
}.merge(IMAGE_STYLES[:small]).freeze,
|
||||||
|
}.freeze
|
||||||
|
|
||||||
VIDEO_FORMAT = {
|
VIDEO_FORMAT = {
|
||||||
format: 'mp4',
|
format: 'mp4',
|
||||||
content_type: 'video/mp4',
|
content_type: 'video/mp4',
|
||||||
|
@ -277,6 +288,8 @@ class MediaAttachment < ApplicationRecord
|
||||||
def file_styles(attachment)
|
def file_styles(attachment)
|
||||||
if attachment.instance.file_content_type == 'image/gif' || VIDEO_CONVERTIBLE_MIME_TYPES.include?(attachment.instance.file_content_type)
|
if attachment.instance.file_content_type == 'image/gif' || VIDEO_CONVERTIBLE_MIME_TYPES.include?(attachment.instance.file_content_type)
|
||||||
VIDEO_CONVERTED_STYLES
|
VIDEO_CONVERTED_STYLES
|
||||||
|
elsif IMAGE_CONVERTIBLE_MIME_TYPES.include?(attachment.instance.file_content_type)
|
||||||
|
IMAGE_CONVERTED_STYLES
|
||||||
elsif IMAGE_MIME_TYPES.include?(attachment.instance.file_content_type)
|
elsif IMAGE_MIME_TYPES.include?(attachment.instance.file_content_type)
|
||||||
IMAGE_STYLES
|
IMAGE_STYLES
|
||||||
elsif VIDEO_MIME_TYPES.include?(attachment.instance.file_content_type)
|
elsif VIDEO_MIME_TYPES.include?(attachment.instance.file_content_type)
|
||||||
|
|
Loading…
Reference in a new issue