procyberian
/
projectx
Archived
forked from Albatross/projectx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'width x height fixed' (#16) from video-size-fix into master

Browse Source 
Reviewed-on: xcoder/projectx#16
#8 fixed
master
Mustafa Yontar 5 years ago
parent ca00e32800 01500c61df
commit 087700dc4d
2 changed files with 16 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 19
      src/lib/RemoteFeed.vue
  2. 6
      src/lib/VueJanus.vue

19
src/lib/RemoteFeed.vue
Unescape View File

@ -1,7 +1,8 @@
<template> <template>
<div class="vid_main" @mouseleave="showaction = false" @mouseover="showaction = true"> <v-card max-height="150" height="150" dark
<video ref="feed_video" width="100%" height="100%" autoplay playsinline/> class="vid_main" @mouseleave="showaction = false" @mouseover="showaction = true">
<div class="info">{{ bitrate }}</div> <video ref="feed_video" class="vid_container" autoplay playsinline/>
<div class="infor">{{ bitrate }}</div>
<div class="infoSlow">Slow Connection</div> <div class="infoSlow">Slow Connection</div>
<div class="infoName">{{ remoteStream.display }}</div> <div class="infoName">{{ remoteStream.display }}</div>
<div class="actions" v-show="showaction"> <div class="actions" v-show="showaction">
@ -12,7 +13,7 @@
dark dark
></v-slider> ></v-slider>
</div> </div>
</div> </v-card>
</template> </template>
<script> <script>
@ -155,6 +156,10 @@
.vid_main { .vid_main {
position: relative; position: relative;
} }
.vid_container {
width: 100%;
height: 100%;
}
.infoSlow { .infoSlow {
position: absolute; position: absolute;
right: 0; right: 0;
@ -162,15 +167,17 @@
color:#fff; color:#fff;
display:none display:none
} }
.info { .infor {
position: absolute; position: absolute;
right: 0; right: 0;
top:0; top:0;
font-size: 10px;
text-shadow: 1px 1px #000;
} }
.infoName { .infoName {
position: absolute; position: absolute;
left: 5px; left: 5px;
top:5px; top:10px;
color:#fff; color:#fff;
font-size: 10px; font-size: 10px;
text-shadow: 1px 1px #000; text-shadow: 1px 1px #000;

6
src/lib/VueJanus.vue
Unescape View File

@ -86,15 +86,15 @@
</v-card> </v-card>
</v-dialog> </v-dialog>
<v-row> <v-row>
<v-col cols="12" md="3"> <v-col cols="12" md="2">
<video ref="ownstream" class="rounded centered" id="myvideo" width="100%" height="100%" autoplay <video ref="ownstream" class="rounded centered" id="myvideo" width="100%" height="100%" autoplay
playsinline muted="muted"/> playsinline muted="muted"/>
</v-col> </v-col>
<v-col cols="12" md="3" style="display: none"> <v-col cols="12" md="2" style="display: none">
<video ref="ownstreamscreen" class="rounded centered" id="myvideo2" width="100%" height="100%" autoplay <video ref="ownstreamscreen" class="rounded centered" id="myvideo2" width="100%" height="100%" autoplay
playsinline muted="muted"/> playsinline muted="muted"/>
</v-col> </v-col>
<v-col cols="12" md="3" v-for="remoteStream in remoteStreams" :key="remoteStream.id"> <v-col cols="12" md="2" v-for="remoteStream in remoteStreams" :key="remoteStream.id">
<RemoteFeed :opaqueId="opaqueId" :mypvtid="mypvtid" :feedid="remoteStream.id" :remote-stream="remoteStream" :janusInit="janusInit" :room="room" ></RemoteFeed> <RemoteFeed :opaqueId="opaqueId" :mypvtid="mypvtid" :feedid="remoteStream.id" :remote-stream="remoteStream" :janusInit="janusInit" :room="room" ></RemoteFeed>
</v-col> </v-col>
</v-row> </v-row>