Add audio uploads #11123

Gargron · 2019-06-19T15:27:37Z

Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts them to OGG. Media attachments get a new audio type. In the UI, audio uploads are displayed identically to video uploads.

This is a second take on #9480 because the audio player design was giving me grief and it was ambigous whether or not we need to parse, save, and edit special information about the files, like title, artist, album, etc. An audio player looks barren without those things, but they introduce more complexity, require a system-level dependency (libtag1-dev), require deciding on subset of tags to duplicate into our own schema, and require a way to store cover art within the media attachment model.

Fix #4827 Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts them to OGG. Media attachments get a new `audio` type. In the UI, audio uploads are displayed identically to video uploads.

nightpool · 2019-06-19T21:12:44Z

app/javascript/mastodon/components/status.js

@@ -333,7 +333,7 @@ class Status extends ImmutablePureComponent {
            media={status.get('media_attachments')}
          />
        );
-      } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+      } else if (['video', 'audio'].includes(status.getIn(['media_attachments', 0, 'type']))) {
        const video = status.getIn(['media_attachments', 0]);


mb rename video to something more generic?

attachment?

nightpool · 2019-06-19T21:15:09Z

app/views/stream_entries/_detailed_status.html.haml

@@ -27,7 +27,7 @@
          = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay }

  - if !status.media_attachments.empty?
-    - if status.media_attachments.first.video?
+    - if status.media_attachments.first.video? || status.media_attachments.first.audio?


let's put this into a method on MediaAttachment, like use_video_player?

nightpool · 2019-06-19T21:15:39Z

app/views/stream_entries/_simple_status.html.haml

@@ -31,7 +31,7 @@
          = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay }

  - if !status.media_attachments.empty?
-    - if status.media_attachments.first.video?
+    - if status.media_attachments.first.video? || status.media_attachments.first.audio?


nightpool · 2019-06-19T21:16:08Z

app/services/post_status_service.rb

@@ -100,7 +100,7 @@ def validate_media!

    @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))

-    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:video?)
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find { |x| x.video? || x.audio? }


this should be larger_media_format? right?

nightpool · 2019-06-19T21:17:16Z

app/controllers/media_controller.rb

@@ -19,7 +19,7 @@ def show
  def player
    @body_classes = 'player'
    response.headers['X-Frame-Options'] = 'ALLOWALL'
-    raise ActiveRecord::RecordNotFound unless @media_attachment.video? || @media_attachment.gifv?
+    raise ActiveRecord::RecordNotFound unless @media_attachment.video? || @media_attachment.gifv? || @media_attachment.audio?


can/should this also be larger_media_format?

nightpool

LGTM

koyuawsmbrtn · 2019-06-21T20:51:06Z

Sick! 🎉

tn5421 · 2019-06-22T10:09:55Z

Is there any way we can simply embed the file as-is, without transcoding lossy source files to another format?

Gargron · 2019-06-22T10:11:50Z

No, it won't be playable on all platforms then

tn5421 · 2019-06-22T10:13:44Z

Perhaps an option could be included in a users settings that allows them to override this default setting, with a warning given to the tune of your reply.

if I upload a 96kbps opus file and it gets transcoded to 192kbps mp3 it's going to sound like a 96kbps mp3 regardless of the extra file size

edit: i know remarkably little about actual software engineering so if this isn't tenable please let me know, i can be tooted at @tn5421@niu.moe

Gargron · 2019-06-22T12:21:25Z

We use variable bitrate so I don't think the file will be bigger if the source isn't higher quality

koyuawsmbrtn · 2019-06-22T13:26:25Z

Suggestion: Make the audio player smaller like in the previous PR

trwnh · 2019-06-22T16:43:23Z

@tn5421 96kbps opus and 96kbps mp3 are not the same at all -- the 96kbps opus will sound vastly better since the opus codec is more efficient than mp3. also as stated, with variable bitrate the bitrate of a section of audio is allowed to dip down. there is still a quality loss with lossy->lossy transcode, but not so much that it makes the audio unusable.

what could be done is, if you are uploading an mp3 and it is already below a certain size or bitrate, then the transcode is skipped.

Gargron · 2019-06-22T20:08:02Z

what could be done is, if you are uploading an mp3 and it is already below a certain size or bitrate, then the transcode is skipped.

Nothing needs to be done. That's how it is

* Add audio uploads Fix mastodon#4827 Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts them to OGG. Media attachments get a new `audio` type. In the UI, audio uploads are displayed identically to video uploads. * Improve code style

Gargron force-pushed the feature-audio-v2 branch from 27ec10d to 1804f7b Compare June 19, 2019 15:39

Add audio uploads

cdb7c5a

Fix #4827 Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts them to OGG. Media attachments get a new `audio` type. In the UI, audio uploads are displayed identically to video uploads.

Gargron force-pushed the feature-audio-v2 branch from 1804f7b to cdb7c5a Compare June 19, 2019 16:25

nightpool requested changes Jun 19, 2019

View reviewed changes

Improve code style

98d1014

nightpool approved these changes Jun 19, 2019

View reviewed changes

Gargron merged commit f7f23b4 into master Jun 19, 2019

Gargron deleted the feature-audio-v2 branch June 19, 2019 21:42

rhaamo mentioned this pull request Jun 19, 2019

Support of incoming Audio object activities #11127

Closed

ryliejamesthomas mentioned this pull request Jun 20, 2019

Tracking issue for upstream issues to consider florence-social/mastodon-fork#17

Open

connyduck mentioned this pull request Jun 21, 2019

Implement new attachment type audio tuskyapp/Tusky#1334

Closed

neet mentioned this pull request Jun 22, 2019

Add audio to AttachmentType neet/masto.js#67

Merged

sammy8806 mentioned this pull request Mar 9, 2020

Uploading webm with no video stream causes "500 Internal Server Error" #7619

Open

2 tasks

ariasuni mentioned this pull request Jun 3, 2020

Improve wording of the “Add media” button tooltip #13954

Merged

JohannesBuchner mentioned this pull request Feb 23, 2023

Embed audio/MP3 from external websites #23839

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add audio uploads #11123

Add audio uploads #11123

Gargron commented Jun 19, 2019 •

edited

Loading

nightpool Jun 19, 2019

nightpool Jun 19, 2019

nightpool Jun 19, 2019

nightpool Jun 19, 2019

nightpool Jun 19, 2019

nightpool Jun 19, 2019

nightpool left a comment

koyuawsmbrtn commented Jun 21, 2019

tn5421 commented Jun 22, 2019

Gargron commented Jun 22, 2019

tn5421 commented Jun 22, 2019 •

edited

Loading

Gargron commented Jun 22, 2019

koyuawsmbrtn commented Jun 22, 2019

trwnh commented Jun 22, 2019

Gargron commented Jun 22, 2019

Add audio uploads #11123

Add audio uploads #11123

Conversation

Gargron commented Jun 19, 2019 • edited Loading

nightpool Jun 19, 2019

Choose a reason for hiding this comment

nightpool Jun 19, 2019

Choose a reason for hiding this comment

nightpool Jun 19, 2019

Choose a reason for hiding this comment

nightpool Jun 19, 2019

Choose a reason for hiding this comment

nightpool Jun 19, 2019

Choose a reason for hiding this comment

nightpool Jun 19, 2019

Choose a reason for hiding this comment

nightpool left a comment

Choose a reason for hiding this comment

koyuawsmbrtn commented Jun 21, 2019

tn5421 commented Jun 22, 2019

Gargron commented Jun 22, 2019

tn5421 commented Jun 22, 2019 • edited Loading

Gargron commented Jun 22, 2019

koyuawsmbrtn commented Jun 22, 2019

trwnh commented Jun 22, 2019

Gargron commented Jun 22, 2019

Gargron commented Jun 19, 2019 •

edited

Loading

tn5421 commented Jun 22, 2019 •

edited

Loading