Merge pull request #14436 from annando/hls

Support for HLS added

src/Content/Post/Entity/PostMedia.php

@@ -51,6 +51,7 @@ class PostMedia extends BaseEntity
 	const TYPE_PLAIN       = 19;
 	const TYPE_ACTIVITY    = 20;
 	const TYPE_ACCOUNT     = 21;
+	const TYPE_HLS         = 22;
 	const TYPE_DOCUMENT    = 128;
 
 	/** @var int */

src/Content/Post/Repository/PostMedia.php

@@ -153,7 +153,7 @@ class PostMedia extends BaseRepository
 			}
 
 			if (
-				in_array($PostMedia->type, [Entity\PostMedia::TYPE_AUDIO, Entity\PostMedia::TYPE_IMAGE]) ||
+				in_array($PostMedia->type, [Entity\PostMedia::TYPE_AUDIO, Entity\PostMedia::TYPE_IMAGE, Entity\PostMedia::TYPE_HLS]) ||
 				in_array($PostMedia->mimetype->type, ['audio', 'image'])
 			) {
 				$attachments['visual'][] = $PostMedia;

src/Model/Item.php

@@ -3687,7 +3687,7 @@ class Item
 				continue;
 			}
 
-			if ($PostMedia->mimetype->type == 'video') {
+			if (($PostMedia->mimetype->type == 'video') || ($PostMedia->type == Post\Media::HLS)) {
 				if (($PostMedia->height ?? 0) > ($PostMedia->width ?? 0)) {
 					$height = min(DI::config()->get('system', 'max_video_height') ?: '100%', $PostMedia->height);
 					$width  = 'auto';
@@ -3696,7 +3696,7 @@ class Item
 					$width  = '100%';
 				}
 				/// @todo Move the template to /content as well
-				$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
+				$media = Renderer::replaceMacros(Renderer::getMarkupTemplate($PostMedia->type == Post\Media::HLS ? 'hls_top.tpl' : 'video_top.tpl'), [
 					'$video' => [
 						'id'          => $PostMedia->id,
 						'src'         => (string)$PostMedia->url,

src/Model/Post/Engagement.php

@@ -345,7 +345,7 @@ class Engagement
 		foreach ($media as $entry) {
 			if ($entry['type'] == Post\Media::IMAGE) {
 				$type = $type | self::MEDIA_IMAGE;
-			} elseif ($entry['type'] == Post\Media::VIDEO) {
+			} elseif (in_array($entry['type'], [Post\Media::VIDEO, Post\Media::HLS])) {
 				$type = $type | self::MEDIA_VIDEO;
 			} elseif ($entry['type'] == Post\Media::AUDIO) {
 				$type = $type | self::MEDIA_AUDIO;

src/Model/Post/Media.php

@@ -50,6 +50,7 @@ class Media
 	const PLAIN       = 19;
 	const ACTIVITY    = 20;
 	const ACCOUNT     = 21;
+	const HLS         = 22;
 	const DOCUMENT    = 128;
 
 	/**
@@ -220,19 +221,16 @@ class Media
 			} else {
 				Logger::notice('No image data', ['media' => $media]);
 			}
-			if (!empty($media['preview'])) {
-				$imagedata = Images::getInfoFromURLCached($media['preview']);
-				if ($imagedata) {
-					$media['preview-width'] = $imagedata[0];
-					$media['preview-height'] = $imagedata[1];
-				}
-			}
 		}
 
 		if ($media['type'] != self::DOCUMENT) {
 			$media = self::addType($media);
 		}
 
+		if (!empty($media['preview'])) {
+			$media = self::addPreviewData($media);
+		}
+
 		if (in_array($media['type'], [self::TEXT, self::APPLICATION, self::HTML, self::XML, self::PLAIN])) {
 			$media = self::addActivity($media);
 		}
@@ -248,6 +246,21 @@ class Media
 		return $media;
 	}
 
+	private static function addPreviewData(array $media): array
+	{
+		if (!empty($media['preview-width']) && !empty($media['preview-height'])) {
+			return $media;
+		}
+
+		$imagedata = Images::getInfoFromURLCached($media['preview']);
+		if ($imagedata) {
+			$media['preview-width'] = $imagedata[0];
+			$media['preview-height'] = $imagedata[1];
+		}
+
+		return $media;
+	}
+
 	/**
 	 * Adds the activity type if the media entry is linked to an activity
 	 *
@@ -466,6 +479,8 @@ class Media
 			$type = self::TEXT;
 		} elseif (($filetype == 'application') && ($subtype == 'x-bittorrent')) {
 			$type = self::TORRENT;
+		} elseif (($filetype == 'application') && ($subtype == 'vnd.apple.mpegurl')) {
+			$type = self::HLS;
 		} elseif ($filetype == 'application') {
 			$type = self::APPLICATION;
 		} else {
@@ -473,7 +488,7 @@ class Media
 			Logger::info('Unknown type', ['filetype' => $filetype, 'subtype' => $subtype, 'media' => $mimeType]);
 		}
 
-		Logger::debug('Detected type', ['filetype' => $filetype, 'subtype' => $subtype, 'media' => $mimeType]);
+		Logger::debug('Detected type', ['type' => $type, 'filetype' => $filetype, 'subtype' => $subtype, 'media' => $mimeType]);
 		return $type;
 	}
 

view/templates/hls_top.tpl

@@ -0,0 +1,24 @@
+{{*
+  * Copyright (C) 2010-2024, the Friendica project
+  * SPDX-FileCopyrightText: 2010-2024 the Friendica project
+  *
+  * SPDX-License-Identifier: AGPL-3.0-or-later
+  *}}
+<div class="video-top-wrapper lframe" id="video-top-wrapper-{{$video.id}}">
+	<script src="view/js/hls/hls.min.js"></script>
+	<video id="{{$video.id}}" controls poster="{{$video.preview}}" width="{{$video.width}}" height="{{$video.height}}"
+		title="{{$video.description}}">
+		<a href="{{$video.src}}">{{$video.name}}</a>
+	</video>
+	<script>
+		var video = document.getElementById('{{$video.id}}');
+		var videoSrc = '{{$video.src}}';
+		if (Hls.isSupported()) {
+			var hls = new Hls();
+			hls.loadSource(videoSrc);
+			hls.attachMedia(video);
+		} else if (video.canPlayType('application/vnd.apple.mpegurl')) {
+			video.src = videoSrc;
+		}
+	</script>
+</div>