heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fetch spectrogram for thumbnail creation, create spectrogram if not found

Browse Source
This commit is contained in:
Rodney Ewing 2013-08-13 11:29:44 -07:00
parent 757376e34a
commit d8f886dcb4
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mediagoblin/media_types/audio/processing.py
View File

@ -66,11 +66,6 @@ class CommonAudioProcessor(MediaProcessor):
self.entry, self.workbench) self.entry, self.workbench)
self.name_builder = FilenameBuilder(self.orig_filename) self.name_builder = FilenameBuilder(self.orig_filename)
# spectrogram_tmp is used for thumbnails and spectograms
self.spectrogram_tmp = os.path.join(self.workbench.dir,
self.name_builder.fill(
'{basename}-spectrogram.jpg'))
self.transcoder = AudioTranscoder() self.transcoder = AudioTranscoder()
self.thumbnailer = AudioThumbnailer() self.thumbnailer = AudioThumbnailer()
@ -118,14 +113,18 @@ class CommonAudioProcessor(MediaProcessor):
wav_tmp, wav_tmp,
mux_string='vorbisenc quality={0} ! oggmux'.format(quality)) mux_string='vorbisenc quality={0} ! oggmux'.format(quality))
spectrogram_tmp = os.path.join(self.workbench.dir,
self.name_builder.fill(
'{basename}-spectrogram.jpg'))
self.thumbnailer.spectrogram( self.thumbnailer.spectrogram(
wav_tmp, wav_tmp,
self.spectrogram_tmp, spectrogram_tmp,
width=max_width, width=max_width,
fft_size=fft_size) fft_size=fft_size)
_log.debug('Saving spectrogram...') _log.debug('Saving spectrogram...')
store_public(self.entry, 'spectrogram', self.spectrogram_tmp, store_public(self.entry, 'spectrogram', spectrogram_tmp,
self.name_builder.fill('{basename}.spectrogram.jpg')) self.name_builder.fill('{basename}.spectrogram.jpg'))
def generate_thumb(self, size=None): def generate_thumb(self, size=None):
@ -137,8 +136,17 @@ class CommonAudioProcessor(MediaProcessor):
thumb_tmp = os.path.join(self.workbench.dir, self.name_builder.fill( thumb_tmp = os.path.join(self.workbench.dir, self.name_builder.fill(
'{basename}-thumbnail.jpg')) '{basename}-thumbnail.jpg'))
# We need the spectrogram to create a thumbnail
spectrogram = self.entry.media_files.get('spectrogram')
if not spectrogram:
_log.info('No spectrogram found, we will create one.')
self.create_spectrogram()
spectrogram = self.entry.media_files['spectrogram']
spectrogram_filepath = mgg.public_store.get_local_path(spectrogram)
self.thumbnailer.thumbnail_spectrogram( self.thumbnailer.thumbnail_spectrogram(
self.spectrogram_tmp, spectrogram_filepath,
thumb_tmp, thumb_tmp,
size) size)
@ -171,7 +179,7 @@ class InitialProcessor(CommonAudioProcessor):
parser.add_argument( parser.add_argument(
'--quality', '--quality',
help='vorbisenc quality') help='vorbisenc quality. Range: -0.1..1')
parser.add_argument( parser.add_argument(
'--fft_size', '--fft_size',