forked from cybrespace/mastodon
		
	Use more widely supported MP4 format for gifv's
This commit is contained in:
		
							parent
							
								
									8d93f0ca56
								
							
						
					
					
						commit
						03a857f59a
					
				
					 2 changed files with 9 additions and 7 deletions
				
			
		| 
						 | 
					@ -59,13 +59,15 @@ class MediaAttachment < ApplicationRecord
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
          small: IMAGE_STYLES[:small],
 | 
					          small: IMAGE_STYLES[:small],
 | 
				
			||||||
          original: {
 | 
					          original: {
 | 
				
			||||||
            format: 'webm',
 | 
					            format: 'mp4',
 | 
				
			||||||
            convert_options: {
 | 
					            convert_options: {
 | 
				
			||||||
              output: {
 | 
					              output: {
 | 
				
			||||||
                'c:v'   => 'libvpx',
 | 
					                'movflags' => 'faststart',
 | 
				
			||||||
                'crf'   => 4,
 | 
					                'pix_fmt'  => 'yuv420p',
 | 
				
			||||||
                'b:v'   => '1300K',
 | 
					                'vf'       => 'scale=\'trunc(iw/2)*2:trunc(ih/2)*2\'',
 | 
				
			||||||
                'vsync'    => 'cfr',
 | 
					                'vsync'    => 'cfr',
 | 
				
			||||||
 | 
					                'b:v'      => '1300K',
 | 
				
			||||||
 | 
					                'crf'      => 4,
 | 
				
			||||||
              },
 | 
					              },
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
          },
 | 
					          },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,8 +11,8 @@ module Paperclip
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      final_file = Paperclip::Transcoder.make(file, options, attachment)
 | 
					      final_file = Paperclip::Transcoder.make(file, options, attachment)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      attachment.instance.file_file_name    = 'media.webm'
 | 
					      attachment.instance.file_file_name    = 'media.mp4'
 | 
				
			||||||
      attachment.instance.file_content_type = 'video/webm'
 | 
					      attachment.instance.file_content_type = 'video/mp4'
 | 
				
			||||||
      attachment.instance.type              = MediaAttachment.types[:gifv]
 | 
					      attachment.instance.type              = MediaAttachment.types[:gifv]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      final_file
 | 
					      final_file
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue