alteropen/streamyfin
1
0
Fork 0
mirror of https://github.com/streamyfin/streamyfin.git synced 2026-01-15 15:48:05 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix: not working

Browse Source
This commit is contained in:
Fredrik Burmester
2024-08-04 14:26:54 +02:00
parent c4ae33510d
commit 25a7edd86b
4 changed files with 50 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/(auth)/items/[id]/page.tsx
View File

@@ -37,28 +37,13 @@ const page: React.FC = () => {
staleTime: Infinity,
});
const { data: playbackURL, isLoading: l2 } = useQuery({
queryKey: ["playbackUrl", id],
queryFn: async () => {
if (!api || !user?.Id) return;
return await getStreamUrl({
api,
userId: user.Id,
item,
startTimeTicks: item?.UserData?.PlaybackPositionTicks || 0,
});
},
enabled: !!id && !!api && !!user?.Id && !!item,
staleTime: Infinity,
});
useEffect(() => {
navigation.setOptions({
headerRight: () => {
<Ionicons name="accessibility" />;
},
});
}, [item, playbackURL, navigation]);
}, [item, navigation]);
const { data: posterUrl } = useQuery({
queryKey: ["backdrop", item?.Id],
@@ -67,7 +52,7 @@ const page: React.FC = () => {
staleTime: Infinity,
});
if (l1 || l2)
if (l1)
return (
<View className="justify-center items-center h-full">
<ActivityIndicator />
@@ -75,7 +60,6 @@ const page: React.FC = () => {
);
if (!item?.Id) return null;
if (!playbackURL) return null;
return (
<ScrollView style={[{ flex: 1 }]} keyboardDismissMode="on-drag">
@@ -109,7 +93,7 @@ const page: React.FC = () => {
</View>
<View className="flex flex-row justify-center items-center w-full my-4 space-x-4">
{playbackURL && <DownloadItem item={item} url={playbackURL} />}
<DownloadItem item={item} />
<View className="ml-4">
<PlayedStatus item={item} />
</View>

3
components/DownloadItem.tsx
View File

@@ -16,7 +16,6 @@ import { ProcessItem, runningProcesses } from "@/utils/atoms/downloads";
type DownloadProps = {
item: BaseItemDto;
url: string;
};
// const useRemuxHlsToMp4 = (inputUrl: string, item: BaseItemDto) => {
@@ -152,7 +151,7 @@ type DownloadProps = {
// return { session, startRemuxing, cancelRemuxing };
// };
export const DownloadItem: React.FC<DownloadProps> = ({ url, item }) => {
export const DownloadItem: React.FC<DownloadProps> = ({ item }) => {
// const { session, startRemuxing, cancelRemuxing } = useRemuxHlsToMp4(
// url,
// item

42
components/VideoPlayer.tsx
View File

@@ -72,7 +72,17 @@ export const VideoPlayer: React.FC<VideoPlayerProps> = ({ itemId }) => {
const [api] = useAtom(apiAtom);
const [user] = useAtom(userAtom);
const {} = useJellyfin();
const { data: item } = useQuery({
queryKey: ["item", itemId],
queryFn: async () =>
await getUserItemData({
api,
userId: user?.Id,
itemId,
}),
enabled: !!itemId && !!api,
staleTime: 0,
});
const { data: sessionData } = useQuery({
queryKey: ["sessionData", itemId],
@@ -85,23 +95,11 @@ export const VideoPlayer: React.FC<VideoPlayerProps> = ({ itemId }) => {
return playbackData.data;
},
enabled: !!itemId && !!api && !!user?.Id,
staleTime: Infinity,
});
const { data: item } = useQuery({
queryKey: ["item", itemId],
queryFn: async () =>
await getUserItemData({
api,
userId: user?.Id,
itemId,
}),
enabled: !!itemId && !!api,
staleTime: Infinity,
staleTime: 0,
});
const { data: playbackURL } = useQuery({
queryKey: ["playbackUrl", itemId, maxBitrate, forceTranscoding],
queryKey: ["playbackUrl", itemId, maxBitrate],
queryFn: async () => {
if (!api || !user?.Id || !sessionData) return null;
@@ -112,14 +110,13 @@ export const VideoPlayer: React.FC<VideoPlayerProps> = ({ itemId }) => {
startTimeTicks: item?.UserData?.PlaybackPositionTicks || 0,
maxStreamingBitrate: maxBitrate,
sessionData,
forceTranscoding: forceTranscoding,
});
console.log("Transcode URL:", url);
return url;
},
enabled: !!itemId && !!api && !!user?.Id && !!item && !!sessionData,
enabled: !!sessionData,
staleTime: 0,
});
@@ -185,11 +182,11 @@ export const VideoPlayer: React.FC<VideoPlayerProps> = ({ itemId }) => {
return (
<View>
{enableVideo && (
{playbackURL && (
<Video
style={{ width: 0, height: 0 }}
source={{
uri: playbackURL!,
uri: playbackURL,
isNetwork: true,
startPosition,
}}
@@ -221,13 +218,6 @@ export const VideoPlayer: React.FC<VideoPlayerProps> = ({ itemId }) => {
/>
)}
<View className="flex flex-row items-center justify-between">
<View className="flex flex-col mb-2">
<Text className="opacity-50 text-xs mb-1">Force transcoding</Text>
<Switch
value={forceTranscoding}
onValueChange={setForceTranscoding}
/>
</View>
<DropdownMenu.Root>
<DropdownMenu.Trigger>
<View className="flex flex-col mb-2">

109
utils/jellyfin.ts
View File

@@ -1,6 +1,7 @@
import { Api } from "@jellyfin/sdk";
import {
BaseItemDto,
MediaSourceInfo,
PlaybackInfoResponse,
} from "@jellyfin/sdk/lib/generated-client/models";
import {
@@ -13,6 +14,7 @@ import AsyncStorage from "@react-native-async-storage/async-storage";
import { useAtom } from "jotai";
import { runningProcesses } from "./atoms/downloads";
import { useCallback, useState } from "react";
import { createVideoUrl } from "./video/createVideoUrl";
export const useDownloadMedia = (api: Api | null) => {
const [isDownloading, setIsDownloading] = useState(false);
@@ -421,20 +423,12 @@ export const getItemById = async (
}
};
/**
* Retrieves a stream URL for the given item ID and user ID.
*
* @param api - The Jellyfin API instance.
* @param itemId - The ID of the media item to retrieve the stream URL for.
* @param userId - The ID of the user requesting the stream URL.
*/
export const getStreamUrl = async ({
api,
item,
userId,
startTimeTicks = 0,
maxStreamingBitrate = 140000000,
forceTranscoding = false,
maxStreamingBitrate,
sessionData,
}: {
api: Api | null | undefined;
@@ -442,17 +436,15 @@ export const getStreamUrl = async ({
userId: string | null | undefined;
startTimeTicks: number;
maxStreamingBitrate?: number;
forceTranscoding?: boolean;
sessionData: PlaybackInfoResponse;
}) => {
if (!api || !userId || !item?.Id) {
return null;
}
const itemId = item.Id;
let url: string = "";
try {
const itemId = item.Id;
const response = await api.axiosInstance.post(
`${api.basePath}/Items/${itemId}/PlaybackInfo`,
{
@@ -464,10 +456,10 @@ export const getStreamUrl = async ({
UserId: userId,
MaxStreamingBitrate: maxStreamingBitrate,
StartTimeTicks: startTimeTicks,
EnableTranscoding: forceTranscoding,
EnableTranscoding: maxStreamingBitrate ? true : undefined,
AutoOpenLiveStream: true,
MediaSourceId: itemId,
AllowVideoStreamCopy: forceTranscoding ? false : true,
AllowVideoStreamCopy: maxStreamingBitrate ? false : true,
},
{
headers: {
@@ -476,78 +468,37 @@ export const getStreamUrl = async ({
}
);
const data = response.data;
const mediaSource = item.MediaSources?.[0];
const sessionId = sessionData.PlaySessionId;
const mediaSource = response.data.MediaSources?.[0] as MediaSourceInfo;
if (!mediaSource) throw new Error("no media source");
if (!sessionId) throw new Error("no sessionId");
if (!mediaSource) {
throw new Error("No media source");
}
if (!sessionData.PlaySessionId) {
throw new Error("no PlaySessionId");
}
const streamParams = new URLSearchParams({
Static: "true",
api_key: api.accessToken,
playSessionId: sessionData.PlaySessionId || "",
videoCodec: "hevc,h264",
audioCodec: "aac,mp3,ac3,eac3,flac,alac",
maxAudioChannels: "6",
itemId,
deviceId: "",
mediaSourceId: itemId,
Tag: mediaSource.ETag || "",
VideoBitrate: "324036",
TranscodingMaxAudioChannels: "2",
RequireAvc: "false",
SegmentContainer: "mp4",
MinSegments: "2",
BreakOnNonKeyFrames: "True",
"h264-level": "40",
"h264-videobitdepth": "8",
"h264-profile": "high",
"h264-audiochannels": "2",
"aac-profile": "lc",
"h264-rangetype": "SDR",
"h264-deinterlace": "true",
TranscodeReasons: "ContainerBitrateExceedsLimit",
videoCodec: "h264,h264",
audioCodec: "aac",
playSessionId: sessionData.PlaySessionId,
transcodingMaxAudioChannels: "2",
tag: mediaSource.ETag || "",
segmentContainer: "mp4",
});
url = `${
api.basePath
}/Videos/${itemId}/main.m3u8?${streamParams.toString()}`;
if (maxStreamingBitrate) {
// streamParams.append("videoBitRate", maxStreamingBitrate.toString());
// streamParams.append("transcodeReasons", "ContainerBitrateExceedsLimit");
}
// if (item.MediaSources?.[0].SupportsDirectPlay) {
// console.log("Direct play supported");
// }
// if (
// item.MediaSources?.[0].SupportsTranscoding &&
// data.MediaSources?.[0].TranscodingUrl
// ) {
// console.log("Supports transcoding");
// }
// if (
// item.MediaSources?.[0].SupportsTranscoding &&
// !data.MediaSources?.[0].TranscodingUrl
// ) {
// console.log("Supports transcoding, but no URL found");
// }
// if (data.MediaSources?.[0].TranscodingUrl) {
// url = api.basePath + data.MediaSources?.[0].TranscodingUrl;
// } else {
// url = buildStreamUrl({
// apiKey: api.accessToken || "",
// sessionId: "",
// itemId: itemId,
// serverUrl: api.basePath || "",
// deviceId: "unique-device-id",
// mediaSourceId: data.MediaSources?.[0].Id || "",
// tag: data.MediaSources?.[0]?.ETag || "",
// }).toString();
// }
} catch (e) {
console.error(e);
return `/Videos/${itemId}/main.m3u8?${streamParams.toString()}`;
} catch (error) {
console.log(error);
return null;
}
return url;
};
/**