markus/photofloat
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Use H264 (rather than webm)

Browse Source 
Primarily done to support IE and Safari.
This commit is contained in:
Joachim Tingvold 2015-06-17 17:30:35 +02:00
parent fa5f0c1fcd
commit 52e025b07d
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scanner/CachePath.py
View File

@ -44,6 +44,6 @@ def image_cache(path, size, square=False):
suffix = str(size) suffix = str(size)
return cache_base(path, True) + "_" + suffix + ".jpg" return cache_base(path, True) + "_" + suffix + ".jpg"
def video_cache(path): def video_cache(path):
return cache_base(path, True) + ".webm" return cache_base(path, True) + ".mp4"
def file_mtime(path): def file_mtime(path):
return datetime.fromtimestamp(int(os.path.getmtime(path))) return datetime.fromtimestamp(int(os.path.getmtime(path)))

25
scanner/PhotoAlbum.py
View File

@ -408,15 +408,34 @@ class Photo(object):
transcode_path = os.path.join(transcode_path, video_cache(self._path)) transcode_path = os.path.join(transcode_path, video_cache(self._path))
# get number of cores on the system, and use all minus one # get number of cores on the system, and use all minus one
num_of_cores = os.sysconf('SC_NPROCESSORS_ONLN') - 1 num_of_cores = os.sysconf('SC_NPROCESSORS_ONLN') - 1
transcode_cmd = ['-i', original_path, '-c:v', 'libvpx', '-crf', '10', '-b:v', '4M', '-c:a', 'libvorbis', '-f', 'webm', '-threads', str(num_of_cores), '-loglevel', '0', '-y'] transcode_cmd = [
'-i', original_path, # original file to be encoded
'-c:v', 'libx264', # set h264 as videocodec
'-preset', 'slow', # set specific preset that provides a certain encoding speed to compression ratio
'-profile:v', 'baseline', # set output to specific h264 profile
'-level', '3.0', # sets highest compatibility with target devices
'-crf', '20', # set quality
'-b:v', '4M', # set videobitrate to 4Mbps
'-strict', 'experimental', # allow native aac codec below
'-c:a', 'aac', # set aac as audiocodec
'-ac', '2', # force two audiochannels
'-ab', '160k', # set audiobitrate to 160Kbps
'-maxrate', '10000000', # limits max rate, will degrade CRF if needed
'-bufsize', '10000000', # define how much the client should buffer
'-f', 'mp4', # fileformat mp4
'-threads', str(num_of_cores), # number of cores (all minus one)
'-loglevel', '0', # don't display anything
'-y' # don't prompt for overwrite
]
filters = [] filters = []
info_string = "%s -> webm" % (os.path.basename(original_path)) info_string = "%s -> mp4, h264" % (os.path.basename(original_path))
message("transcoding", info_string) message("transcoding", info_string)
if os.path.exists(transcode_path) and file_mtime(transcode_path) >= self._attributes["dateTimeFile"]: if os.path.exists(transcode_path) and file_mtime(transcode_path) >= self._attributes["dateTimeFile"]:
self._video_metadata(transcode_path, False) self._video_metadata(transcode_path, False)
return return
if "originalSize" in self._attributes and self._attributes["originalSize"][1] > 720: if "originalSize" in self._attributes and self._attributes["originalSize"][1] > 720:
filters.append("scale='trunc(oh*a/2)*2:min(720\,iw)'") transcode_cmd.append('-s')
transcode_cmd.append('hd720')
if "rotate" in self._attributes: if "rotate" in self._attributes:
if self._attributes["rotate"] == "90": if self._attributes["rotate"] == "90":
filters.append('transpose=1') filters.append('transpose=1')

2
web/js/010-libphotofloat.js
View File

@ -148,7 +148,7 @@
return "cache/" + hash; return "cache/" + hash;
}; };
PhotoFloat.videoPath = function(album, video) { PhotoFloat.videoPath = function(album, video) {
return "cache/" + PhotoFloat.cachePath(PhotoFloat.photoHash(album, video) + ".webm"); return "cache/" + PhotoFloat.cachePath(PhotoFloat.photoHash(album, video) + ".mp4");
}; };
PhotoFloat.originalPhotoPath = function(album, photo) { PhotoFloat.originalPhotoPath = function(album, photo) {
return "albums/" + album.path + "/" + photo.name; return "albums/" + album.path + "/" + photo.name;

4
web/js/011-display.js
View File

@ -190,8 +190,8 @@ $(document).ready(function() {
if (!Modernizr.video) { if (!Modernizr.video) {
$('<div id="video-unsupported"><p>Sorry, your browser doesn\'t support the HTML5 &lt;video&gt; element!</p><p>Here\'s a <a href="http://caniuse.com/video">list of which browsers do</a>.</p></div>').appendTo('#video-box-inner'); $('<div id="video-unsupported"><p>Sorry, your browser doesn\'t support the HTML5 &lt;video&gt; element!</p><p>Here\'s a <a href="http://caniuse.com/video">list of which browsers do</a>.</p></div>').appendTo('#video-box-inner');
} }
else if (!Modernizr.video.webm) { else if (!Modernizr.video.h264) {
$('<div id="video-unsupported"><p>Sorry, your browser doesn\'t support the WebM video format!</p></div>').appendTo('#video-box-inner'); $('<div id="video-unsupported"><p>Sorry, your browser doesn\'t support the H.264 video format!</p></div>').appendTo('#video-box-inner');
} }
else { else {
$(window).unbind("resize", scaleVideo); $(window).unbind("resize", scaleVideo);