external-repos/pictshare
1
0
Fork 0
mirror of https://github.com/HaschekSolutions/pictshare.git synced 2025-11-14 04:04:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

extended support for mp4 converted gifs so they can be used like normal mp4s

Browse Source
This commit is contained in:
Christian Haschek
2015-11-25 10:47:14 +01:00
parent 7b6332c41c
commit f40b3721ab
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -50,7 +50,13 @@ If there is some option that's not recognized by PictShare it's simply ignored,
<width>**x**<height> | -none- | https://pictshare.net/20x20/b260e36b60.jpg | ![Resized](https://pictshare.net/20x20/b260e36b60.jpg)
forcesize | -none- | https://pictshare.net/100x400/forcesize/b260e36b60.jpg | ![Forced size](https://pictshare.net/100x400/forcesize/b260e36b60.jpg)
**GIF to mp4** | | |
mp4 | -none- | https://www.pictshare.net/mp4/102687fe65.gif | Converts gif to mp4 and displays as that. Note that you can't include that mp4 in an img tag
mp4 | -none- | https://www.pictshare.net/mp4/102687fe65.gif | Converts gif to mp4 and displays as that. Note that you can't include that mp4 in an img tag
raw | -none- | https://www.pictshare.net/mp4/raw/102687fe65.gif | Renders the converted mp4 directly. Use with /mp4/
preview | -none- | https://www.pictshare.net/mp4/preview/102687fe65.gif | Renders the first frame of generated MP4 as JPEG. Use with /mp4/
**MP4 options** | | |
-none- | -none- | https://www.pictshare.net/65714d22f0.mp4 | Renders the mp4 embedded in a simple HTML template. This link can't be embedded into video tags, use /raw/ instead if you want to embed
raw | -none- | https://www.pictshare.net/raw/65714d22f0.mp4 | Renders the mp4 video directly so you can link it
preview | -none- | https://www.pictshare.net/preview/65714d22f0.mp4 | Renders the first frame of the MP4 as an JPEG image
**Rotating** | | |
left | -none- | https://pictshare.net/left/b260e36b60.jpg | ![Rotated left](https://pictshare.net/200/left/b260e36b60.jpg)
right | -none- | https://pictshare.net/right/b260e36b60.jpg | ![Rotated right](https://pictshare.net/200/right/b260e36b60.jpg)

16
inc/core.php
View File

@@ -152,7 +152,21 @@ function renderImage($data)
case 'gif':
if($data['mp4'])
{
renderMP4($pm->gifToMP4($path),$data);
$mp4path = $path.'.mp4';
if($data['raw'])
{
serveFile($mp4path, 'gif/raw/'.$hash,'video/mp4');
}
else if($data['preview'])
{
$file = $mp4path.'.jpg';
if(!file_exists($file))
$pm->saveFirstFrameOfMP4($mp4path);
header ("Content-type: image/jpeg");
readfile($file);
}
else
renderMP4($pm->gifToMP4($path),$data);
}
else
{