From: Vijeth Aradhya <vijthaaa@gmail.com>
Date: Tue, 29 Aug 2017 06:06:23 +0000 (+0000)
Subject: Merge branch 'multiple-qualities-frontend' into 'transcoding_progress'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0eeb2adad7e75b8969719cef14ab763810ceb66a;p=mediagoblin.git

Merge branch 'multiple-qualities-frontend' into 'transcoding_progress'

Minor changes

See merge request !3
---

0eeb2adad7e75b8969719cef14ab763810ceb66a
diff --cc mediagoblin/media_types/video/transcoders.py
index dbe56d9e,437b0bf8..75f5ef86
--- a/mediagoblin/media_types/video/transcoders.py
+++ b/mediagoblin/media_types/video/transcoders.py
@@@ -369,14 -367,9 +368,12 @@@ class VideoTranscoder(object)
                      percent_increment = percent - self.progress_percentage
                      self.progress_percentage = percent
                      if self._progress_callback:
 -                        self._progress_callback(percent_increment/self.num_of_resolutions)
 +                        if ACCEPTED_RESOLUTIONS[self.default_resolution] == self.destination_dimensions:
 +                            self._progress_callback(percent_increment/self.num_of_resolutions, percent)
 +                        else:
 +                            self._progress_callback(percent_increment/self.num_of_resolutions)
                      _log.info('{percent}% of {dest} resolution done..'
                                '.'.format(percent=percent, dest=self.destination_dimensions))
-                     _log.info('{0:.2f}% of all resolutions done'
-                               '...'.format(self.entry.transcoding_progress))
          elif message.type == Gst.MessageType.ERROR:
              _log.error('Got error: {0}'.format(message.parse_error()))
              self.dst_data = None