@christianriedl/media 1.0.161 → 1.0.163

package/dist/iMedia.d.ts

@@ -210,6 +210,7 @@ export interface IVideoInfo {
 }
 export interface IMediaInfo {
     durationSeconds: number;
+    numActiveStreams: number;
     videoStream: IVideoInfo;
     audioStreams: IAudioInfo[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@christianriedl/media",
-  "version": "1.0.161",
+  "version": "1.0.163",
   "description": "RIC media interfaces",
 
   "main": "dist/index.js",

package/src/views/OnlineTVsPage.vue

@@ -23,7 +23,8 @@
     const listHeight = ref(0);
     const listhead = ref<ComponentPublicInstance | null>(null);
     const audioStreams: IValueText[] = reactive([]);
-    const audioStream = ref(0);
+    const audioStream = ref<number | null>(null);
+    const numActiveStreams = ref("");
     const qualities = MediaHelper.getVideoQualities();
     const quality = ref(0);
     let params: ITranscodeParams; 
@@ -36,6 +37,9 @@
         if (mediaAppConfig.useMediaBin) {
             const rc = await mediaService.initialize(EMediaType.Online);
         }
+        if (mediaAppConfig.useSatIp) {
+            await getActiveStreams();
+        }
         const root = await mediaService.getOnlineTVs();
         for (var i = 0; i < root.files.length; i++) {
             const video = root.files[i];
@@ -61,10 +65,12 @@
         let url;
         if (mediaAppConfig.useSatIp) {
             url = `${(mediaService as MediaService).rest.serviceUrl}apistream/satipstream?channelName=${selected.value.name}&url=${encodeURIComponent(selected.value.url)}`;
-            if (audioStream.value)
+            if (audioStream.value != null)
                 url += `&audioStream=${audioStream.value}`;
             if (params)
                 url += `&width=${params.width}&height=${params.height}&videoBitRate=${params.videoBitRate}&audioBitRate=${params.audioBitRate}`;
+            else if (audioStream.value != null && audioStreams[audioStream.value].text.toLowerCase().startsWith('ac'))
+                url += '&audioBitRate=0';
         }
         else {
             url = await epgCache.epg.requestChannelStream(selected.value.name, 'mp4', undefined, params.videoBitRate, params.scaleFactor);
@@ -92,24 +98,50 @@
             selected.value = item;
             computeListHeight();
             if (mediaAppConfig.useSatIp) {
-                const mediaInfo = await mediaService.getSatIpProbe(item.name, item.url);
-                const as = MediaHelper.getAudioStreams(mediaInfo);
-                audioStreams.splice(0, audioStreams.length, ...as);
+                audioStreams.splice(0, audioStreams.count);
+                audioStream.value = null;
+                await getActiveStreams();
             }
             const video = item as IVideoFile;
-            params = MediaHelper.getTranscodeParams(mediaAppConfig.useSatIp, video.width, video.height, window.innerWidth, quality.value);
-            paramsText.value = params.text;
+            paramsText.value = `${video.width}x${video.height}`;
             return;
         }
     }
     function onQualityChange() {
         const video = selected.value as IVideoFile;
-        params = MediaHelper.getTranscodeParams(mediaAppConfig.useSatIp, video.width, video.height, window.innerWidth, quality.value);
-        paramsText.value = params.text;
+        if (quality.value > 0) {
+            params = MediaHelper.getTranscodeParams(mediaAppConfig.useSatIp, video.width, video.height, window.innerWidth, quality.value);
+            paramsText.value = params.text;
+        }
+        else {
+            params = null;
+            paramsText.value = `${video.width}x${video.height}`;
+        }
     }
     function listBack() {
         router.back();
     }
+    async function getActiveStreams() {
+        let channel = "";
+        let url = "";
+        if (selected.value.itemType == EItemType.VideoBroadcast && audioStreams.length == 0) {
+            channel = selected.value.name;
+            url = selected.value.url;
+        }
+        const mediaInfo = await mediaService.getSatIpProbe(channel, url);
+        if (mediaInfo) {
+            numActiveStreams.value = `${mediaInfo.numActiveStreams}`;
+            if (mediaInfo.audioStreams) {
+                const as = MediaHelper.getAudioStreams(mediaInfo);
+                audioStreams.splice(0, audioStreams.length, ...as);
+                audioStream.value = 0;
+                return;
+            }
+        }
+        if (numActiveStreams.value > 0) {
+            window.setTimeout(async () => await getActiveStreams(), 1000);
+        }
+    }
 </script>
 
 <template>
@@ -125,6 +157,11 @@
                 <v-list-item-subtitle>{{paramsText}}</v-list-item-subtitle>
             </v-list-item-content>
         </v-list-item>
+        <v-list-item v-if="mediaAppConfig.useSatIp" lines="one">
+            <v-list-item-content>
+                <v-list-item-title>{{numActiveStreams}}</v-list-item-title>
+            </v-list-item-content>
+        </v-list-item>
         <v-card-actions>
             <v-btn @click="listBack">
                 <v-icon icon="$back" />

package/src/views/PhotosPage.vue

@@ -106,7 +106,7 @@
         }
     }
     function showPictures(folder: IMediaFolder) {
-        if (folder.files) {
+        if (folder.itemType == EItemType.PictureAlbum) {
             selected.selectedAlbum = folder;
             router.push({ path: 'photoalbum', query: { id: folder.dlnaid } });
         }