Browse Source

Change audio format from ogg to mp3 for wider compatibility (#11141)

* Change audio format from ogg to mp3 for wider compatibility

* Add media description as title to links of unknown media attachments
pull/4/head
Eugen Rochko 4 years ago
committed by GitHub
parent
commit
49ebda4d49
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
  1. +1
    -1
      app/javascript/mastodon/components/media_gallery.js
  2. +1
    -0
      app/javascript/styles/mastodon/components.scss
  3. +7
    -3
      app/models/media_attachment.rb

+ 1
- 1
app/javascript/mastodon/components/media_gallery.js View File

@ -157,7 +157,7 @@ class Item extends React.PureComponent {
if (attachment.get('type') === 'unknown') {
return (
<div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ left: left, top: top, right: right, bottom: bottom, width: `${width}%`, height: `${height}%` }}>
<a className='media-gallery__item-thumbnail' href={attachment.get('remote_url')} target='_blank' style={{ cursor: 'pointer' }}>
<a className='media-gallery__item-thumbnail' href={attachment.get('remote_url')} target='_blank' style={{ cursor: 'pointer' }} title={attachment.get('description')}>
<canvas width={32} height={32} ref={this.setCanvasRef} className='media-gallery__preview' />
</a>
</div>

+ 1
- 0
app/javascript/styles/mastodon/components.scss View File

@ -557,6 +557,7 @@
.compose-form__upload-thumbnail {
border-radius: 4px;
background-color: $base-shadow-color;
background-position: center;
background-size: cover;
background-repeat: no-repeat;

+ 7
- 3
app/models/media_attachment.rb View File

@ -69,9 +69,13 @@ class MediaAttachment < ApplicationRecord
AUDIO_STYLES = {
original: {
format: 'ogg',
content_type: 'audio/ogg',
convert_options: {},
format: 'mp3',
content_type: 'audio/mpeg',
convert_options: {
output: {
'q:a' => 2,
},
},
},
}.freeze

Loading…
Cancel
Save