Skip to content
Next
Projects
Groups
Snippets
Help
Sign in / Register
Toggle navigation
Minds Frontend
Project
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
803
Merge Requests
51
CI / CD
Security & Compliance
Packages
Wiki
Snippets
Members
Collapse sidebar
Close sidebar
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Compare Revisions
5f0eb8ea6f1fa53aae0636bc114677135db87e03...b27c8c2ed47a5d4d26c919b39b825c0541d878e4
Source
b27c8c2ed47a5d4d26c919b39b825c0541d878e4
...
Target
5f0eb8ea6f1fa53aae0636bc114677135db87e03
Compare
Commits (2)
add 1080p resolution for pro users
· f7fdb97e
Marcelo Rivera
authored
42 minutes ago
f7fdb97e
Merge branch 'feat/1080p-encoding-for-pro' into 'master'
· b27c8c2e
Mark Harding
authored
42 minutes ago
add 1080p resolution for pro users Closes
#1548
See merge request
!598
b27c8c2e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
82 additions
and
16 deletions
+82
-16
src/app/modules/media/modal/modal.component.html
View file @
b27c8c2e
...
...
@@ -53,16 +53,10 @@
[autoplay]=
"true"
[muted]=
"false"
[poster]=
"entity.thumbnail_src"
[src]=
"[
{
res: '360',
uri: 'api/v1/media/' + entity.entity_guid + '/play?s=modal',
type: 'video/mp4'
}
]"
[src]=
"videoDirectSrc"
[guid]=
"entity.entity_guid"
[playCount]=
"entity['play:count']"
[torrent]=
"
[{ res: '360', key: entity.entity_guid + '/360.mp4' }]
"
[torrent]=
"
videoTorrentSrc
"
(videoCanPlayThrough)=
"isLoaded()"
[@
slowFadeAnimation]=
"isLoading ? 'out' : 'in'"
#player
...
...
This diff is collapsed.
src/app/modules/media/modal/modal.component.ts
View file @
b27c8c2e
...
...
@@ -119,6 +119,46 @@ export class MediaModalComponent implements OnInit, OnDestroy {
@
ViewChild
(
MindsVideoComponent
,
{
static
:
false
})
videoComponent
:
MindsVideoComponent
;
get
videoDirectSrc
()
{
const
sources
=
[
{
res
:
'
720
'
,
uri
:
'
api/v1/media/
'
+
this
.
entity
.
entity_guid
+
'
/play?s=modal&res=720
'
,
type
:
'
video/mp4
'
,
},
{
res
:
'
360
'
,
uri
:
'
api/v1/media/
'
+
this
.
entity
.
entity_guid
+
'
/play?s=modal
'
,
type
:
'
video/mp4
'
,
},
];
if
(
this
.
entity
.
custom_data
.
full_hd
)
{
sources
.
push
({
res
:
'
1080
'
,
uri
:
'
api/v1/media/
'
+
this
.
entity
.
entity_guid
+
'
/play?s=modal&res=1080
'
,
type
:
'
video/mp4
'
,
});
}
return
sources
;
}
get
videoTorrentSrc
()
{
const
sources
=
[
{
res
:
'
720
'
,
key
:
this
.
entity
.
entity_guid
+
'
/720.mp4
'
},
{
res
:
'
360
'
,
key
:
this
.
entity
.
entity_guid
+
'
/360.mp4
'
},
];
if
(
this
.
entity
.
custom_data
.
full_hd
)
{
sources
.
push
({
res
:
'
1080
'
,
key
:
this
.
entity
.
entity_guid
+
'
/1080.mp4
'
});
}
return
sources
;
}
constructor
(
public
session
:
Session
,
public
analyticsService
:
AnalyticsService
,
...
...
This diff is collapsed.
src/app/modules/media/view/views/theatre.component.ts
View file @
b27c8c2e
...
...
@@ -43,14 +43,8 @@ import { MindsVideoComponent } from '../../components/video/video.component';
[autoplay]="!object.monetized"
[muted]="false"
(finished)="loadNext()"
[src]="[
{ res: '720', uri: object.src['720.mp4'] },
{ res: '360', uri: object.src['360.mp4'] }
]"
[torrent]="[
{ res: '720', key: object.guid + '/720.mp4' },
{ res: '360', key: object.guid + '/360.mp4' }
]"
[src]="videoDirectSrc"
[torrent]="videoTorrentSrc"
[log]="object.guid"
[playCount]="false"
#player
...
...
@@ -77,6 +71,44 @@ export class MediaTheatreComponent {
@
ViewChild
(
MindsVideoComponent
,
{
static
:
false
})
videoComponent
:
MindsVideoComponent
;
get
videoDirectSrc
()
{
const
sources
=
[
{
res
:
'
720
'
,
uri
:
'
api/v1/media/
'
+
this
.
object
.
guid
+
'
/play?s=modal&res=720
'
,
type
:
'
video/mp4
'
,
},
{
res
:
'
360
'
,
uri
:
'
api/v1/media/
'
+
this
.
object
.
guid
+
'
/play?s=modal
'
,
type
:
'
video/mp4
'
,
},
];
if
(
this
.
object
.
flags
.
full_hd
)
{
sources
.
push
({
res
:
'
1080
'
,
uri
:
'
api/v1/media/
'
+
this
.
object
.
guid
+
'
/play?s=modal&res=1080
'
,
type
:
'
video/mp4
'
,
});
}
return
sources
;
}
get
videoTorrentSrc
()
{
const
sources
=
[
{
res
:
'
720
'
,
key
:
this
.
object
.
guid
+
'
/720.mp4
'
},
{
res
:
'
360
'
,
key
:
this
.
object
.
guid
+
'
/360.mp4
'
},
];
if
(
this
.
object
.
flags
.
full_hd
)
{
sources
.
push
({
res
:
'
1080
'
,
key
:
this
.
object
.
guid
+
'
/1080.mp4
'
});
}
return
sources
;
}
constructor
(
public
session
:
Session
,
public
client
:
Client
,
...
...
This diff is collapsed.