Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Heresphere perf #8

Merged
merged 5 commits into from
Sep 4, 2023
Merged

Heresphere perf #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a4dc56
remove scene counts when querying for heresphere/deo
Sep 3, 2023
96f0ffa
simplify filtering on attributes
Sep 3, 2023
4cd6ebd
enable content encoding
Sep 3, 2023
30bb424
only fetch ids for heresphere api
Sep 3, 2023
d036903
fetch only as much as necessary for deovr lists
Sep 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions pkg/api/deovr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ import (
"github.com/emicklei/go-restful/v3"
"github.com/markphelps/optional"
"github.com/tidwall/gjson"
"golang.org/x/crypto/bcrypt"

"github.com/xbapps/xbvr/pkg/common"
"github.com/xbapps/xbvr/pkg/config"
"github.com/xbapps/xbvr/pkg/models"
"github.com/xbapps/xbvr/pkg/session"
"golang.org/x/crypto/bcrypt"
)

type DeoLibrary struct {
Expand All @@ -32,7 +33,7 @@ type DeoListScenes struct {

type DeoListItem struct {
Title string `json:"title"`
VideoLength int `json:"videoLength"`
VideoLength uint `json:"videoLength"`
ThumbnailURL string `json:"thumbnailUrl"`
VideoURL string `json:"video_url"`
}
Expand Down Expand Up @@ -285,8 +286,8 @@ func (i DeoVRResource) getDeoFile(req *restful.Request, resp *restful.Response)
var file models.File
db.Where(&models.File{ID: uint(fileId)}).First(&file)

var height = file.VideoHeight
var width = file.VideoWidth
height := file.VideoHeight
width := file.VideoWidth
var sources []DeoSceneEncoding
sources = append(sources, DeoSceneEncoding{
Name: fmt.Sprintf("File 1/1 - %v", humanize.Bytes(uint64(file.Size))),
Expand Down Expand Up @@ -389,9 +390,9 @@ func (i DeoVRResource) getDeoScene(req *restful.Request, resp *restful.Response)
var sceneMultiProjection bool = true

for i, file := range videoFiles {
var height = file.VideoHeight
var width = file.VideoWidth
var source = DeoSceneEncoding{
height := file.VideoHeight
width := file.VideoWidth
source := DeoSceneEncoding{
Name: fmt.Sprintf("File %v/%v %vp - %v", i+1, len(videoFiles), file.VideoHeight, humanize.Bytes(uint64(file.Size))),
VideoSources: []DeoSceneVideoSource{
{
Expand Down Expand Up @@ -499,7 +500,7 @@ func (i DeoVRResource) getDeoScene(req *restful.Request, resp *restful.Response)
title := scene.Title
thumbnailURL := session.DeoRequestHost + "/img/700x/" + strings.Replace(scene.CoverURL, "://", ":/", -1)

//Passthrough
// Passthrough
var ckdata map[string]interface{}
// nochromaKey := `{"enabled":false,"hasAlpha":false,"h":0,"opacity":0,"s":0,"threshold":0,"v":0}`
chromaKey := gjson.Parse(scene.ChromaKey)
Expand All @@ -512,7 +513,7 @@ func (i DeoVRResource) getDeoScene(req *restful.Request, resp *restful.Response)
if !result.Exists() || ckdata["hasAlpha"] == "" {
// if ckdata["."].(map[string]interface{})["hasAlpha"] = "false" || ckdata["."].(map[string]interface{})["hasAlpha"] = "" {

//setting hasAlpha to false
// setting hasAlpha to false
ckdata["hasAlpha"] = "false"
}
// Convert back to JSON string
Expand Down Expand Up @@ -624,12 +625,11 @@ func (i DeoVRResource) getDeoLibrary(req *restful.Request, resp *restful.Respons
if err := json.Unmarshal([]byte(savedPlaylists[i].SearchParams), &r); err == nil {
r.IsAccessible = optional.NewBool(true)
r.IsAvailable = optional.NewBool(true)
r.Limit = optional.NewInt(10000)

q := models.QueryScenes(r, false)
summaries := models.QuerySceneSummaries(r)
sceneLists = append(sceneLists, DeoListScenes{
Name: savedPlaylists[i].Name,
List: scenesToDeoList(req, q.Scenes),
List: scenesToDeoList(req, summaries),
})
}
}
Expand All @@ -654,15 +654,16 @@ func (i DeoVRResource) getDeoLibrary(req *restful.Request, resp *restful.Respons
})
}

func scenesToDeoList(req *restful.Request, scenes []models.Scene) []DeoListItem {
func scenesToDeoList(req *restful.Request, scenes []models.SceneSummary) []DeoListItem {
setDeoPlayerHost(req)

list := make([]DeoListItem, 0)
for i := range scenes {
thumbnailURL := fmt.Sprintf("%v/img/700x/%v", session.DeoRequestHost, strings.Replace(scenes[i].CoverURL, "://", ":/", -1))

var thumbnailURL string
if config.Config.Interfaces.DeoVR.RenderHeatmaps && scenes[i].IsScripted {
thumbnailURL = fmt.Sprintf("%v/imghm/%d/%v", session.DeoRequestHost, scenes[i].ID, strings.Replace(scenes[i].CoverURL, "://", ":/", -1))
} else {
thumbnailURL = fmt.Sprintf("%v/img/700x/%v", session.DeoRequestHost, strings.Replace(scenes[i].CoverURL, "://", ":/", -1))
}

item := DeoListItem{
Expand Down Expand Up @@ -693,7 +694,7 @@ func filesToDeoList(req *restful.Request, files []models.File) []DeoListItem {
}
item := DeoListItem{
Title: files[i].Filename,
VideoLength: int(files[i].VideoDuration),
VideoLength: uint(files[i].VideoDuration),
ThumbnailURL: session.DeoRequestHost + "/ui/images/blank.png",
VideoURL: fmt.Sprintf("%v/deovr/file/%v%v", session.DeoRequestHost, files[i].ID, dnt),
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/api/dms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"github.com/jinzhu/gorm"

"github.com/xbapps/xbvr/pkg/common"
"github.com/xbapps/xbvr/pkg/models"
"github.com/xbapps/xbvr/pkg/session"
Expand All @@ -36,18 +37,22 @@ func (i DMSResource) WebService() *restful.WebService {

ws.Route(ws.GET("/file/{file-id}").To(i.getFile).
Param(ws.PathParameter("file-id", "File ID").DataType("int")).
ContentEncodingEnabled(false).
Metadata(restfulspec.KeyOpenAPITags, tags))

ws.Route(ws.GET("/file/{file-id}/{var:*}").To(i.getFile).
Param(ws.PathParameter("file-id", "File ID").DataType("int")).
ContentEncodingEnabled(false).
Metadata(restfulspec.KeyOpenAPITags, tags))

ws.Route(ws.GET("/heatmap/{file-id}").To(i.getHeatmap).
Param(ws.PathParameter("file-id", "File ID").DataType("int")).
ContentEncodingEnabled(false).
Metadata(restfulspec.KeyOpenAPITags, tags))

ws.Route(ws.GET("/preview/{scene-id}").To(i.getPreview).
Param(ws.PathParameter("scene-id", "Scene ID")).
ContentEncodingEnabled(false).
Metadata(restfulspec.KeyOpenAPITags, tags))

return ws
Expand Down
9 changes: 3 additions & 6 deletions pkg/api/heresphere.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,14 +969,11 @@ func (i HeresphereResource) getHeresphereLibrary(req *restful.Request, resp *res
if err := json.Unmarshal([]byte(savedPlaylists[i].SearchParams), &r); err == nil {
r.IsAccessible = optional.NewBool(true)
r.IsAvailable = optional.NewBool(true)
r.Limit = optional.NewInt(20000)

q := models.QueryScenes(r, false)
list := models.QuerySceneIDs(r)

list := make([]string, len(q.Scenes))
for i := range q.Scenes {
url := fmt.Sprintf("%v://%v/heresphere/%v", getProto(req), req.Request.Host, q.Scenes[i].ID)
list[i] = url
for i := range list {
list[i] = fmt.Sprintf("%v://%v/heresphere/%v", getProto(req), req.Request.Host, list[i])
}

sceneLists = append(sceneLists, HeresphereListScenes{
Expand Down
Loading