mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 20:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

grc: Updated for new-ipc and fixed cmd order.

Browse Source
This commit is contained in:
yellows8 2019-10-13 22:49:06 -04:00
parent 67ccc66f15
commit a489a123c2
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
2 changed files with 125 additions and 557 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nx/include/switch/services/grc.h
View File

@ -6,7 +6,7 @@
*/ */
#pragma once #pragma once
#include "../types.h" #include "../types.h"
#include "../services/sm.h" #include "../sf/service.h"
#include "../services/caps.h" #include "../services/caps.h"
#include "../kernel/event.h" #include "../kernel/event.h"
#include "../kernel/tmem.h" #include "../kernel/tmem.h"
@ -118,13 +118,6 @@ static inline NWindow* grcMovieMakerGetNWindow(GrcMovieMaker *m) {
return &m->win; return &m->win;
} }
/**
* @brief Starts recording with the specified MovieMaker and \ref GrcOffscreenRecordingParameter.
* @param m \ref GrcMovieMaker
* @param[in] param \ref GrcOffscreenRecordingParameter
*/
Result grcMovieMakerStart(GrcMovieMaker *m, const GrcOffscreenRecordingParameter *param);
/** /**
* @brief Aborts recording with the specified MovieMaker. * @brief Aborts recording with the specified MovieMaker.
* @note This is used automatically by \ref grcMovieMakerClose. * @note This is used automatically by \ref grcMovieMakerClose.
@ -133,6 +126,13 @@ Result grcMovieMakerStart(GrcMovieMaker *m, const GrcOffscreenRecordingParameter
*/ */
Result grcMovieMakerAbort(GrcMovieMaker *m); Result grcMovieMakerAbort(GrcMovieMaker *m);
/**
* @brief Starts recording with the specified MovieMaker and \ref GrcOffscreenRecordingParameter.
* @param m \ref GrcMovieMaker
* @param[in] param \ref GrcOffscreenRecordingParameter
*/
Result grcMovieMakerStart(GrcMovieMaker *m, const GrcOffscreenRecordingParameter *param);
/** /**
* @brief Finishes recording with the specified MovieMaker. * @brief Finishes recording with the specified MovieMaker.
* @note This automatically uses \ref grcMovieMakerAbort on error. * @note This automatically uses \ref grcMovieMakerAbort on error.

666
nx/source/services/grc.c
View File

@ -1,11 +1,7 @@
#include "service_guard.h"
#include <string.h> #include <string.h>
#include "types.h"
#include "result.h"
#include "arm/atomics.h"
#include "kernel/ipc.h"
#include "kernel/event.h" #include "kernel/event.h"
#include "kernel/tmem.h" #include "kernel/tmem.h"
#include "services/sm.h"
#include "services/grc.h" #include "services/grc.h"
#include "services/caps.h" #include "services/caps.h"
#include "services/applet.h" #include "services/applet.h"
@ -13,256 +9,57 @@
#include "audio/audio.h" #include "audio/audio.h"
#include "runtime/hosversion.h" #include "runtime/hosversion.h"
static Service g_grcdSrv;
static void _grcGameMovieTrimmerClose(GrcGameMovieTrimmer *t); static void _grcGameMovieTrimmerClose(GrcGameMovieTrimmer *t);
static Result _grcCmdNoIO(Service* srv, u64 cmd_id) { static Result _grcCmdNoIO(Service* srv, u32 cmd_id) {
IpcCommand c; return serviceDispatch(srv, cmd_id);
ipcInitialize(&c); }
struct { static Result _grcCmdInU64NoOut(Service* srv, u64 inval, u32 cmd_id) {
u64 magic; return serviceDispatchIn(srv, cmd_id, inval);
u64 cmd_id; }
} *raw;
raw = serviceIpcPrepareHeader(srv, &c, sizeof(*raw)); static Result _grcCmdInU64OutU32(Service* srv, u64 inval, u32 *out, u32 cmd_id) {
return serviceDispatchInOut(srv, cmd_id, inval, *out);
}
raw->magic = SFCI_MAGIC; static Result _grcCmdNoInOutU64(Service* srv, u64 *out, u32 cmd_id) {
raw->cmd_id = cmd_id; return serviceDispatchOut(srv, cmd_id, *out);
}
Result rc = serviceIpcDispatch(srv); static Result _grcCmdGetEvent(Service* srv, Event* out_event, bool autoclear, u32 cmd_id) {
Handle event = INVALID_HANDLE;
Result rc = serviceDispatch(srv, cmd_id,
.out_handle_attrs = { SfOutHandleAttr_HipcCopy },
.out_handles = &event,
);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc))
IpcParsedCommand r; eventLoadRemote(out_event, event, autoclear);
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(srv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc; return rc;
} }
static Result _grcCmdInU64(Service* srv, u64 inval, u64 cmd_id) { static Result _grcCmdInU64OutEvent(Service* srv, u64 inval, Event* out_event, bool autoclear, u32 cmd_id) {
IpcCommand c; Handle event = INVALID_HANDLE;
ipcInitialize(&c); Result rc = serviceDispatchIn(srv, cmd_id, inval,
.out_handle_attrs = { SfOutHandleAttr_HipcCopy },
.out_handles = &event,
);
struct { if (R_SUCCEEDED(rc))
u64 magic; eventLoadRemote(out_event, event, autoclear);
u64 cmd_id;
u64 inval;
} *raw;
raw = serviceIpcPrepareHeader(srv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = cmd_id;
raw->inval = inval;
Result rc = serviceIpcDispatch(srv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(srv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc; return rc;
} }
static Result _grcCmdInU64Out32(Service* srv, u64 inval, u32 *out, u64 cmd_id) { static Result _grcCmdGetSession(Service* srv, Service* srv_out, u32 cmd_id) {
IpcCommand c; return serviceDispatch(srv, cmd_id,
ipcInitialize(&c); .out_num_objects = 1,
.out_objects = srv_out,
struct { );
u64 magic;
u64 cmd_id;
u64 inval;
} *raw;
raw = serviceIpcPrepareHeader(srv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = cmd_id;
raw->inval = inval;
Result rc = serviceIpcDispatch(srv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
u32 out;
} *resp;
serviceIpcParse(srv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc) && out) *out = resp->out;
}
return rc;
}
static Result _grcCmdNoInOut64(Service* srv, u64 *out, u64 cmd_id) {
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
} *raw;
raw = serviceIpcPrepareHeader(srv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = cmd_id;
Result rc = serviceIpcDispatch(srv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
u64 out;
} *resp;
serviceIpcParse(srv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc) && out) {
*out = resp->out;
}
}
return rc;
}
static Result _grcGetEvent(Service* srv, Event* out_event, u64 cmd_id, bool autoclear) {
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
} *raw;
raw = serviceIpcPrepareHeader(srv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = cmd_id;
Result rc = serviceIpcDispatch(srv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(srv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc)) {
eventLoadRemote(out_event, r.Handles[0], autoclear);
}
}
return rc;
}
static Result _grcCmdInU64OutEvent(Service* srv, u64 inval, Event* out_event, u64 cmd_id, bool autoclear) {
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
u64 inval;
} *raw;
raw = serviceIpcPrepareHeader(srv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = cmd_id;
raw->inval = inval;
Result rc = serviceIpcDispatch(srv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(srv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc)) {
eventLoadRemote(out_event, r.Handles[0], autoclear);
}
}
return rc;
}
static Result _grcGetSession(Service* srv, Service* srv_out, u64 cmd_id) {
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
} *raw;
raw = serviceIpcPrepareHeader(srv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = cmd_id;
Result rc = serviceIpcDispatch(srv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(srv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc)) {
serviceCreateSubservice(srv_out, srv, &r, 0);
}
}
return rc;
} }
static Result _grcCreateGameMovieTrimmer(GrcGameMovieTrimmer *t, size_t size) { static Result _grcCreateGameMovieTrimmer(GrcGameMovieTrimmer *t, size_t size) {
@ -297,127 +94,42 @@ static Result _grcGameMovieTrimmerBeginTrim(GrcGameMovieTrimmer *t, const GrcGam
if (!serviceIsActive(&t->s)) if (!serviceIsActive(&t->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
IpcCommand c; const struct {
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
s32 start; s32 start;
s32 end; s32 end;
GrcGameMovieId id; GrcGameMovieId id;
} *raw; } in = { start, end, *id };
raw = serviceIpcPrepareHeader(&t->s, &c, sizeof(*raw)); return serviceDispatchIn(&t->s, 1, in);
raw->magic = SFCI_MAGIC;
raw->cmd_id = 1;
raw->start = start;
raw->end = end;
memcpy(&raw->id, id, sizeof(GrcGameMovieId));
Result rc = serviceIpcDispatch(&t->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&t->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
} }
static Result _grcGameMovieTrimmerEndTrim(GrcGameMovieTrimmer *t, GrcGameMovieId *id) { static Result _grcGameMovieTrimmerEndTrim(GrcGameMovieTrimmer *t, GrcGameMovieId *id) {
if (!serviceIsActive(&t->s)) if (!serviceIsActive(&t->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
IpcCommand c; return serviceDispatchOut(&t->s, 2, *id);
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
} *raw;
raw = serviceIpcPrepareHeader(&t->s, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 2;
Result rc = serviceIpcDispatch(&t->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
GrcGameMovieId id;
} *resp;
serviceIpcParse(&t->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc) && id) memcpy(id, &resp->id, sizeof(GrcGameMovieId));
}
return rc;
} }
static Result _grcGameMovieTrimmerGetNotTrimmingEvent(GrcGameMovieTrimmer *t, Event *out_event) { static Result _grcGameMovieTrimmerGetNotTrimmingEvent(GrcGameMovieTrimmer *t, Event *out_event) {
if (!serviceIsActive(&t->s)) if (!serviceIsActive(&t->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
return _grcGetEvent(&t->s, out_event, 10, false); return _grcCmdGetEvent(&t->s, out_event, false, 10);
} }
static Result _grcGameMovieTrimmerSetThumbnailRgba(GrcGameMovieTrimmer *t, const void* buffer, size_t size, s32 width, s32 height) { static Result _grcGameMovieTrimmerSetThumbnailRgba(GrcGameMovieTrimmer *t, const void* buffer, size_t size, s32 width, s32 height) {
if (!serviceIsActive(&t->s)) if (!serviceIsActive(&t->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
IpcCommand c; const struct {
ipcInitialize(&c);
ipcAddSendBuffer(&c, buffer, size, BufferType_Type1);
struct {
u64 magic;
u64 cmd_id;
s32 width; s32 width;
s32 height; s32 height;
} *raw; } in = { width, height };
raw = serviceIpcPrepareHeader(&t->s, &c, sizeof(*raw)); return serviceDispatchIn(&t->s, 20, in,
.buffer_attrs = { SfBufferAttr_HipcMapTransferAllowsNonSecure | SfBufferAttr_HipcMapAlias | SfBufferAttr_In },
raw->magic = SFCI_MAGIC; .buffers = { { buffer, size } },
raw->cmd_id = 20; );
raw->width = width;
raw->height = height;
Result rc = serviceIpcDispatch(&t->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&t->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
} }
Result grcTrimGameMovie(GrcGameMovieId *dst_movieid, const GrcGameMovieId *src_movieid, size_t tmem_size, const void* thumbnail, s32 start, s32 end) { Result grcTrimGameMovie(GrcGameMovieId *dst_movieid, const GrcGameMovieId *src_movieid, size_t tmem_size, const void* thumbnail, s32 start, s32 end) {
@ -482,23 +194,22 @@ Result grcCreateMovieMaker(GrcMovieMaker *m, size_t size) {
} }
} }
if (R_SUCCEEDED(rc)) rc = _grcGetSession(&m->a, &m->s, 0); // GetGrcMovieMaker if (R_SUCCEEDED(rc)) rc = _grcCmdGetSession(&m->a, &m->s, 0); // GetGrcMovieMaker
if (R_SUCCEEDED(rc) && hosversionAtLeast(7,0,0)) rc = _grcCmdInU64(&m->s, capsGetShimLibraryVersion(), 9); // SetAlbumShimLibraryVersion if (R_SUCCEEDED(rc) && hosversionAtLeast(7,0,0)) rc = _grcCmdInU64NoOut(&m->s, capsGetShimLibraryVersion(), 9); // SetAlbumShimLibraryVersion
if (R_SUCCEEDED(rc)) rc = _grcCmdNoInOut64(&m->a, &m->layer_handle, 1); // GetLayerHandle if (R_SUCCEEDED(rc)) rc = _grcCmdNoInOutU64(&m->a, &m->layer_handle, 1); // GetLayerHandle
if (R_SUCCEEDED(rc)) rc = _grcCmdGetSession(&m->s, &m->video_proxy, 2); // CreateVideoProxy
if (R_SUCCEEDED(rc)) rc = _grcGetSession(&m->s, &m->video_proxy, 2); // CreateVideoProxy if (R_SUCCEEDED(rc)) rc = _grcCmdInU64OutU32(&m->s, m->layer_handle, (u32*)&binder_id, 10); // OpenOffscreenLayer
if (R_SUCCEEDED(rc)) rc = _grcCmdInU64Out32(&m->s, m->layer_handle, (u32*)&binder_id, 10); // OpenOffscreenLayer
if (R_SUCCEEDED(rc)) m->layer_open = true; if (R_SUCCEEDED(rc)) m->layer_open = true;
if (R_SUCCEEDED(rc)) rc = nwindowCreate(&m->win, &m->video_proxy, binder_id, false); if (R_SUCCEEDED(rc)) rc = nwindowCreate(&m->win, &m->video_proxy, binder_id, false);
if (R_SUCCEEDED(rc)) rc = nwindowSetDimensions(&m->win, 1280, 720); if (R_SUCCEEDED(rc)) rc = nwindowSetDimensions(&m->win, 1280, 720);
if (R_SUCCEEDED(rc)) rc = _grcCmdInU64OutEvent(&m->s, m->layer_handle, &m->recording_event, 50, false); // GetOffscreenLayerRecordingFinishReadyEvent if (R_SUCCEEDED(rc)) rc = _grcCmdInU64OutEvent(&m->s, m->layer_handle, &m->recording_event, false, 50); // GetOffscreenLayerRecordingFinishReadyEvent
if (R_SUCCEEDED(rc)) rc = _grcCmdInU64OutEvent(&m->s, m->layer_handle, &m->audio_event, 52, false); // GetOffscreenLayerAudioEncodeReadyEvent if (R_SUCCEEDED(rc)) rc = _grcCmdInU64OutEvent(&m->s, m->layer_handle, &m->audio_event, false, 52); // GetOffscreenLayerAudioEncodeReadyEvent
if (R_FAILED(rc)) grcMovieMakerClose(m); if (R_FAILED(rc)) grcMovieMakerClose(m);
@ -513,7 +224,7 @@ void grcMovieMakerClose(GrcMovieMaker *m) {
nwindowClose(&m->win); nwindowClose(&m->win);
if (m->layer_open) { if (m->layer_open) {
_grcCmdInU64(&m->s, m->layer_handle, 11); // CloseOffscreenLayer _grcCmdInU64NoOut(&m->s, m->layer_handle, 11); // CloseOffscreenLayer
m->layer_open = false; m->layer_open = false;
} }
@ -523,47 +234,6 @@ void grcMovieMakerClose(GrcMovieMaker *m) {
tmemClose(&m->tmem); tmemClose(&m->tmem);
} }
Result grcMovieMakerStart(GrcMovieMaker *m, const GrcOffscreenRecordingParameter *param) {
if (!serviceIsActive(&m->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
u64 layer_handle;
GrcOffscreenRecordingParameter param;
} *raw;
raw = serviceIpcPrepareHeader(&m->s, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 24;
raw->layer_handle = m->layer_handle;
memcpy(&raw->param, param, sizeof(GrcOffscreenRecordingParameter));
Result rc = serviceIpcDispatch(&m->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&m->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
if (R_SUCCEEDED(rc)) m->started_flag = true;
return rc;
}
Result grcMovieMakerAbort(GrcMovieMaker *m) { Result grcMovieMakerAbort(GrcMovieMaker *m) {
Result rc=0; Result rc=0;
@ -572,98 +242,64 @@ Result grcMovieMakerAbort(GrcMovieMaker *m) {
if (!m->started_flag) if (!m->started_flag)
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
rc = _grcCmdInU64(&m->s, m->layer_handle, 21); // AbortOffscreenRecording rc = _grcCmdInU64NoOut(&m->s, m->layer_handle, 21); // AbortOffscreenRecording
if (R_SUCCEEDED(rc)) m->started_flag = false; if (R_SUCCEEDED(rc)) m->started_flag = false;
return rc; return rc;
} }
Result grcMovieMakerStart(GrcMovieMaker *m, const GrcOffscreenRecordingParameter *param) {
if (!serviceIsActive(&m->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
const struct {
u64 layer_handle;
GrcOffscreenRecordingParameter param;
} in = { m->layer_handle, *param };
Result rc = serviceDispatchIn(&m->s, 24, in);
if (R_SUCCEEDED(rc)) m->started_flag = true;
return rc;
}
static Result _grcMovieMakerCompleteOffscreenRecordingFinishEx0(GrcMovieMaker *m, s32 width, s32 height, const void* userdata, size_t userdata_size, const void* thumbnail, size_t thumbnail_size) { static Result _grcMovieMakerCompleteOffscreenRecordingFinishEx0(GrcMovieMaker *m, s32 width, s32 height, const void* userdata, size_t userdata_size, const void* thumbnail, size_t thumbnail_size) {
IpcCommand c; const struct {
ipcInitialize(&c);
ipcAddSendBuffer(&c, userdata, userdata_size, BufferType_Normal);
ipcAddSendBuffer(&c, thumbnail, thumbnail_size, BufferType_Normal);
struct {
u64 magic;
u64 cmd_id;
s32 width; s32 width;
s32 height; s32 height;
u64 layer_handle; u64 layer_handle;
} *raw; } in = { width, height, m->layer_handle };
raw = serviceIpcPrepareHeader(&m->s, &c, sizeof(*raw)); return serviceDispatchIn(&m->s, 25, in,
.buffer_attrs = {
raw->magic = SFCI_MAGIC; SfBufferAttr_HipcMapAlias | SfBufferAttr_In,
raw->cmd_id = 25; SfBufferAttr_HipcMapAlias | SfBufferAttr_In,
raw->width = width; },
raw->height = height; .buffers = {
raw->layer_handle = m->layer_handle; { userdata, userdata_size },
{ thumbnail, thumbnail_size },
Result rc = serviceIpcDispatch(&m->s); },
);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
CapsApplicationAlbumEntry entry;
} *resp;
serviceIpcParse(&m->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
} }
static Result _grcMovieMakerCompleteOffscreenRecordingFinishEx1(GrcMovieMaker *m, s32 width, s32 height, const void* userdata, size_t userdata_size, const void* thumbnail, size_t thumbnail_size, CapsApplicationAlbumEntry *entry) { static Result _grcMovieMakerCompleteOffscreenRecordingFinishEx1(GrcMovieMaker *m, s32 width, s32 height, const void* userdata, size_t userdata_size, const void* thumbnail, size_t thumbnail_size, CapsApplicationAlbumEntry *entry) {
if (hosversionBefore(7,0,0)) if (hosversionBefore(7,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
IpcCommand c; const struct {
ipcInitialize(&c);
ipcAddSendBuffer(&c, userdata, userdata_size, BufferType_Normal);
ipcAddSendBuffer(&c, thumbnail, thumbnail_size, BufferType_Normal);
struct {
u64 magic;
u64 cmd_id;
s32 width; s32 width;
s32 height; s32 height;
u64 layer_handle; u64 layer_handle;
} *raw; } in = { width, height, m->layer_handle };
raw = serviceIpcPrepareHeader(&m->s, &c, sizeof(*raw)); return serviceDispatchInOut(&m->s, 26, in, *entry,
.buffer_attrs = {
raw->magic = SFCI_MAGIC; SfBufferAttr_HipcMapAlias | SfBufferAttr_In,
raw->cmd_id = 26; SfBufferAttr_HipcMapAlias | SfBufferAttr_In,
raw->width = width; },
raw->height = height; .buffers = {
raw->layer_handle = m->layer_handle; { userdata, userdata_size },
{ thumbnail, thumbnail_size },
Result rc = serviceIpcDispatch(&m->s); },
);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
CapsApplicationAlbumEntry entry;
} *resp;
serviceIpcParse(&m->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc) && entry) *entry = resp->entry;
}
return rc;
} }
Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void* userdata, size_t userdata_size, const void* thumbnail, size_t thumbnail_size, CapsApplicationAlbumEntry *entry) { Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void* userdata, size_t userdata_size, const void* thumbnail, size_t thumbnail_size, CapsApplicationAlbumEntry *entry) {
@ -674,7 +310,7 @@ Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void*
if (hosversionBefore(7,0,0) && entry) if (hosversionBefore(7,0,0) && entry)
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
rc = _grcCmdInU64(&m->s, m->layer_handle, 22); // RequestOffscreenRecordingFinishReady rc = _grcCmdInU64NoOut(&m->s, m->layer_handle, 22); // RequestOffscreenRecordingFinishReady
if (R_SUCCEEDED(rc)) rc = eventWait(&m->recording_event, U64_MAX); if (R_SUCCEEDED(rc)) rc = eventWait(&m->recording_event, U64_MAX);
@ -691,46 +327,14 @@ Result grcMovieMakerGetError(GrcMovieMaker *m) {
if (!serviceIsActive(&m->s)) if (!serviceIsActive(&m->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
return _grcCmdInU64(&m->s, m->layer_handle, 30); // GetOffscreenLayerError return _grcCmdInU64NoOut(&m->s, m->layer_handle, 30); // GetOffscreenLayerError
} }
static Result _grcMovieMakerEncodeOffscreenLayerAudioSample(GrcMovieMaker *m, const void* buffer, size_t size, u64 *out_size) { static Result _grcMovieMakerEncodeOffscreenLayerAudioSample(GrcMovieMaker *m, const void* buffer, size_t size, u64 *out_size) {
IpcCommand c; return serviceDispatchInOut(&m->s, 41, m->layer_handle, *out_size,
ipcInitialize(&c); .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_In },
.buffers = { { buffer, size } },
ipcAddSendBuffer(&c, buffer, size, BufferType_Normal); );
struct {
u64 magic;
u64 cmd_id;
u64 layer_handle;
} *raw;
raw = serviceIpcPrepareHeader(&m->s, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 41;
raw->layer_handle = m->layer_handle;
Result rc = serviceIpcDispatch(&m->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
u64 out_size;
} *resp;
serviceIpcParse(&m->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc) && out_size) *out_size = resp->out_size;
}
return rc;
} }
Result grcMovieMakerEncodeAudioSample(GrcMovieMaker *m, const void* buffer, size_t size) { Result grcMovieMakerEncodeAudioSample(GrcMovieMaker *m, const void* buffer, size_t size) {
@ -755,25 +359,14 @@ Result grcMovieMakerEncodeAudioSample(GrcMovieMaker *m, const void* buffer, size
// grc:d // grc:d
static Service g_grcdSrv; NX_GENERATE_SERVICE_GUARD(grcd);
static u64 g_grcdRefCnt;
Result grcdInitialize(void) { Result _grcdInitialize(void) {
atomicIncrement64(&g_grcdRefCnt); return smGetService(&g_grcdSrv, "grc:d");
if (serviceIsActive(&g_grcdSrv))
return 0;
Result rc = smGetService(&g_grcdSrv, "grc:d");
if (R_FAILED(rc)) grcdExit();
return rc;
} }
void grcdExit(void) { void _grcdCleanup(void) {
if (atomicDecrement64(&g_grcdRefCnt) == 0) serviceClose(&g_grcdSrv);
serviceClose(&g_grcdSrv);
} }
Service* grcdGetServiceSession(void) { Service* grcdGetServiceSession(void) {
@ -785,47 +378,22 @@ Result grcdBegin(void) {
} }
Result grcdRead(GrcStream stream, void* buffer, size_t size, u32 *unk, u32 *data_size, u64 *timestamp) { Result grcdRead(GrcStream stream, void* buffer, size_t size, u32 *unk, u32 *data_size, u64 *timestamp) {
IpcCommand c;
ipcInitialize(&c);
ipcAddRecvBuffer(&c, buffer, size, BufferType_Normal);
struct { struct {
u64 magic; u32 unk;
u64 cmd_id; u32 data_size;
u32 stream; u64 timestamp;
} *raw; } out;
raw = serviceIpcPrepareHeader(&g_grcdSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 2;
raw->stream = stream;
Result rc = serviceIpcDispatch(&g_grcdSrv);
u32 tmp=stream;
Result rc = serviceDispatchInOut(&g_grcdSrv, 2, tmp, out,
.buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
.buffers = { { buffer, size } },
);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; if (unk) *unk = out.unk;
struct { if (data_size) *data_size = out.data_size;
u64 magic; if (timestamp) *timestamp = out.timestamp;
u64 result;
u32 unk;
u32 data_size;
u64 timestamp;
} *resp;
serviceIpcParse(&g_grcdSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc)) {
if (unk) *unk = resp->unk;
if (data_size) *data_size = resp->data_size;
if (timestamp) *timestamp = resp->timestamp;
}
} }
return rc; return rc;
} }