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

Updated docs for OffscreenRecordingParameter. Updated param names for grcMovieMakerFinish.

Browse Source
This commit is contained in:
yellows8 2019-08-31 19:06:15 -04:00
parent 7d08c7cc7c
commit 4f74aa1ad1
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,18 +47,18 @@ typedef struct {
/// OffscreenRecordingParameter
typedef struct {
u8 unk_x0[0x10]; ///< Unknown. Default value is 0.
u32 unk_x10; ///< Unknown. Default value is 0x103.
u32 unk_x10; ///< Unknown. Must match value 0x103, which is the default value.
s32 video_bitrate; ///< VideoBitRate. Default value is 8000000.
s32 video_width; ///< VideoWidth. Default value is 1280.
s32 video_height; ///< VideoHeight. Default value is 720.
s32 video_framerate; ///< VideoFrameRate. Default value is 30.
s32 video_keyFrameInterval; ///< VideoKeyFrameInterval. Default value is 30.
s32 video_bitrate; ///< VideoBitRate, 0 is invalid. Default value is 8000000.
s32 video_width; ///< VideoWidth, must match 1280 or 1920. Default value is 1280.
s32 video_height; ///< VideoHeight, must match 720 or 1080. Default value is 720.
s32 video_framerate; ///< VideoFrameRate, must match 30 or 60. Default value is 30.
s32 video_keyFrameInterval; ///< VideoKeyFrameInterval, 0 is invalid. Default value is 30.
s32 audio_bitrate; ///< AudioBitRate. Default value is 128000 ([5.0.0-5.1.0] 1536000).
s32 audio_samplerate; ///< AudioSampleRate. Default value is 48000.
s32 audio_channel_count; ///< AudioChannelCount. Default value is 2.
s32 audio_sample_format; ///< \ref PcmFormat AudioSampleFormat. Default value is PcmFormat_Int16.
s32 audio_samplerate; ///< AudioSampleRate, 0 is invalid. Default value is 48000.
s32 audio_channel_count; ///< AudioChannelCount. Must match 2, which is the default value.
s32 audio_sample_format; ///< \ref PcmFormat AudioSampleFormat. Must match PcmFormat_Int16, which is the default value.
s32 video_imageOrientation; ///< \ref AlbumImageOrientation VideoImageOrientation. Default value is ::AlbumImageOrientation_Unknown0.
@ -140,13 +140,13 @@ Result grcMovieMakerAbort(GrcMovieMaker *m);
* @param m \ref GrcMovieMaker
* @param width Width for the thumbnail, must be 1280.
* @param height Height for the thumbnail, must be 720.
* @param[in] appdata UserData input buffer for the JPEG thumbnail. Optional, can be NULL.
* @param[in] appdata_size Size of the UserData input buffer. Optional, can be 0. Must be <=0x400.
* @param[in] userdata UserData input buffer for the JPEG thumbnail. Optional, can be NULL.
* @param[in] userdata_size Size of the UserData input buffer. Optional, can be 0. Must be <=0x400.
* @param[in] thumbnail RGBA8 image buffer containing the thumbnail. Optional, can be NULL.
* @param[in] thumbnail_size Size of the thumbnail buffer. Optional, can be 0.
* @param[out] entry Output \ref CapsApplicationAlbumEntry for the recorded video. Optional, can be NULL. Only available on [7.0.0+], if this is not NULL on pre-7.0.0 an error is thrown.
*/
Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void* appdata, size_t appdata_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);
/**
* @brief Gets the recording error with the specified MovieMaker.

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

@ -577,12 +577,12 @@ Result grcMovieMakerAbort(GrcMovieMaker *m) {
return rc;
}
static Result _grcMovieMakerCompleteOffscreenRecordingFinishEx0(GrcMovieMaker *m, s32 width, s32 height, const void* buffer0, size_t size0, const void* buffer1, size_t size1) {
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;
ipcInitialize(&c);
ipcAddSendBuffer(&c, buffer0, size0, BufferType_Normal);
ipcAddSendBuffer(&c, buffer1, size1, BufferType_Normal);
ipcAddSendBuffer(&c, userdata, userdata_size, BufferType_Normal);
ipcAddSendBuffer(&c, thumbnail, thumbnail_size, BufferType_Normal);
struct {
u64 magic;
@ -619,15 +619,15 @@ static Result _grcMovieMakerCompleteOffscreenRecordingFinishEx0(GrcMovieMaker *m
return rc;
}
static Result _grcMovieMakerCompleteOffscreenRecordingFinishEx1(GrcMovieMaker *m, s32 width, s32 height, const void* buffer0, size_t size0, const void* buffer1, size_t size1, 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))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
IpcCommand c;
ipcInitialize(&c);
ipcAddSendBuffer(&c, buffer0, size0, BufferType_Normal);
ipcAddSendBuffer(&c, buffer1, size1, BufferType_Normal);
ipcAddSendBuffer(&c, userdata, userdata_size, BufferType_Normal);
ipcAddSendBuffer(&c, thumbnail, thumbnail_size, BufferType_Normal);
struct {
u64 magic;
@ -666,7 +666,7 @@ static Result _grcMovieMakerCompleteOffscreenRecordingFinishEx1(GrcMovieMaker *m
return rc;
}
Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void* buffer0, size_t size0, const void* buffer1, size_t size1, 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) {
Result rc=0;
if (!serviceIsActive(&m->s))
@ -679,9 +679,9 @@ Result grcMovieMakerFinish(GrcMovieMaker *m, s32 width, s32 height, const void*
if (R_SUCCEEDED(rc)) rc = eventWait(&m->recording_event, U64_MAX);
if (hosversionAtLeast(7,0,0))
rc = _grcMovieMakerCompleteOffscreenRecordingFinishEx1(m, width, height, buffer0, size0, buffer1, size1, entry);
rc = _grcMovieMakerCompleteOffscreenRecordingFinishEx1(m, width, height, userdata, userdata_size, thumbnail, thumbnail_size, entry);
else
rc = _grcMovieMakerCompleteOffscreenRecordingFinishEx0(m, width, height, buffer0, size0, buffer1, size1);
rc = _grcMovieMakerCompleteOffscreenRecordingFinishEx0(m, width, height, userdata, userdata_size, thumbnail, thumbnail_size);
if (R_FAILED(rc)) grcMovieMakerAbort(m);
return rc;