Page MenuHomePhabricator
Differential D10613

[NativeRustLibrary] support `std::promise`
ClosedPublic
Actions

Authored by kamil on Jan 11 2024, 10:04 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 8, 7:16 AM
Unknown Object (File)
Sat, Mar 1, 5:53 AM
Unknown Object (File)
Tue, Feb 25, 1:29 PM
Unknown Object (File)
Feb 22 2025, 1:26 PM
Unknown Object (File)
Feb 22 2025, 1:26 PM
Unknown Object (File)
Feb 22 2025, 1:26 PM
Unknown Object (File)
Feb 22 2025, 1:26 PM
Unknown Object (File)
Feb 22 2025, 1:25 PM
View All 96 Files
Subscribers
ashoat
tomek

Details

Reviewers
marcin
michal
varun
Commits
rCOMMc98e25d3f6a7: [NativeRustLibrary] support `std::promise`
Summary

Context in ENG-6384

I tried to implement it using the template (std::promise<T>) but this complicates the code. I think we can assume the caller will handle it properly.

Test Plan
  1. Test both rejecting/resolving
  2. I used one of existing methods and added sleep in Rust code to wait long enough and make sure it works

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Jan 11 2024, 10:04 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJan 11 2024, 10:04 AM
kamil edited the summary of this revision. (Show Details)Jan 11 2024, 10:05 AM
kamil retitled this revision from [NativeRustModule] support `std::promise` to [NativeRustLibrary] support `std::promise`.
Harbormaster completed remote builds in B25715: Diff 35556.Jan 11 2024, 10:28 AM
kamil published this revision for review.Jan 11 2024, 10:33 AM
varun requested changes to this revision.Jan 12 2024, 11:58 AM

you tested that both promise types work?

native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.cpp
47–49 ↗(On Diff #35556)

i introduced this code originally but it looks wrong to me now. we probably shouldn't be adding JSI promises to promises if the jsInvoker is missing

This revision now requires changes to proceed.Jan 12 2024, 11:58 AM
ashoat added inline comments.Jan 12 2024, 1:52 PM
native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.cpp
8 ↗(On Diff #35556)

Can you explain what’s going on with the formatting changes?

varun added inline comments.Jan 12 2024, 2:33 PM
native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.cpp
8 ↗(On Diff #35556)

This is consistent with CommConstants.cpp (which was introduced afterwards, but uses the better style IMO)

ashoat added inline comments.Jan 13 2024, 6:07 PM
native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.cpp
8 ↗(On Diff #35556)

Shouldn't the style be set by clang-format?

kamil updated this revision to Diff 35617.Jan 15 2024, 6:33 AM

address review

kamil added a comment.Jan 15 2024, 6:35 AM
In D10613#307308, @varun wrote:

you tested that both promise types work?

yes, in D10631 where we use both, C++ for prekey rotation and JSI to log in to Identity (D10327)

native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.cpp
8 ↗(On Diff #35556)

I manually ran clang-format so now it is, not sure why previously it wasn't (it should have been formatted last time the file was committed)

47–49 ↗(On Diff #35556)

fixed

kamil added a child revision: D10631: [native] implement prekey rotation handler and call Identity.Jan 15 2024, 6:37 AM
Harbormaster completed remote builds in B25765: Diff 35617.Jan 15 2024, 6:51 AM
varun accepted this revision.Jan 15 2024, 12:08 PM
This revision is now accepted and ready to land.Jan 15 2024, 12:08 PM
Closed by commit rCOMMc98e25d3f6a7: [NativeRustLibrary] support `std::promise` (authored by kamil). · Explain WhyJan 16 2024, 4:04 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMc98e25d3f6a7: [NativeRustLibrary] support `std::promise`.

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
NativeModules/
4 lines
22 lines
InternalModules/
25 lines
47 lines

Diff 35658

View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

Show First 20 Lines • Show All 91 Lines • ▼ Show 20 Linesfunction getVideoProcessingPlan(input: Input): Plan {
} }
const outputFilename = replaceExtension( const outputFilename = replaceExtension(
`transcode.${uuid}.${sanitizedFilename}`, `transcode.${uuid}.${sanitizedFilename}`,
'mp4', 'mp4',
); );
const outputPath = `${outputDirectory}${outputFilename}`; const outputPath = `${outputDirectory}${outputFilename}`;
let quality, speed, scale; let hardwareAcceleration, quality, speed, scale, pixelFormat;
if (outputCodec === 'h264') { if (outputCodec === 'h264_mediacodec') {
const { floor, min, max, log2 } = Math; hardwareAcceleration = 'mediacodec';
const crf = floor(min(5, max(0, log2(inputDuration / 5)))) + 23; quality = '';
quality = `-crf ${crf}`; speed = '';
speed = '-preset ultrafast';
scale = `-vf scale=${maxWidth}:${maxHeight}:force_original_aspect_ratio=decrease`; scale = `-vf scale=${maxWidth}:${maxHeight}:force_original_aspect_ratio=decrease`;
pixelFormat = '';
} else if (outputCodec === 'h264_videotoolbox') { } else if (outputCodec === 'h264_videotoolbox') {
hardwareAcceleration = 'videotoolbox';
quality = '-profile:v baseline'; quality = '-profile:v baseline';
speed = '-realtime 1'; speed = '-realtime 1';
const { width, height } = inputDimensions; const { width, height } = inputDimensions;
scale = ''; scale = '';
const exceedsDimensions = width > maxWidth || height > maxHeight; const exceedsDimensions = width > maxWidth || height > maxHeight;
if (exceedsDimensions && width / height > maxWidth / maxHeight) { if (exceedsDimensions && width / height > maxWidth / maxHeight) {
scale = `-vf scale=${maxWidth}:-1`; scale = `-vf scale=${maxWidth}:-1`;
} else if (exceedsDimensions) { } else if (exceedsDimensions) {
scale = `-vf scale=-1:${maxHeight}`; scale = `-vf scale=-1:${maxHeight}`;
} }
pixelFormat = '-pix_fmt yuv420p';
} else { } else {
invariant(false, `unrecognized outputCodec ${outputCodec}`); invariant(false, `unrecognized outputCodec ${outputCodec}`);
} }
const ffmpegCommand = const ffmpegCommand =
`-hwaccel ${hardwareAcceleration} ` +
`-i ${inputPath} ` + `-i ${inputPath} ` +
`-c:a copy -c:v ${outputCodec} ` + `-c:a copy -c:v ${outputCodec} ` +
`${quality} ` + `${quality} ` +
'-vsync 2 -r 30 ' + '-fps_mode cfr -r 30 ' +
`${scale} ` + `${scale} ` +
`${speed} ` + `${speed} ` +
'-movflags +faststart ' + '-movflags +faststart ' +
'-pix_fmt yuv420p ' + `${pixelFormat} ` +
'-v quiet ' + '-v quiet ' +
outputPath; outputPath;
return { action: 'process', thumbnailPath, outputPath, ffmpegCommand }; return { action: 'process', thumbnailPath, outputPath, ffmpegCommand };
} }
function getHasMultipleFramesProbeCommand(path: string): string { function getHasMultipleFramesProbeCommand(path: string): string {
const ffprobeCommand = const ffprobeCommand =
Show All 17 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommRustModule.cpp

Show First 20 Lines • Show All 91 Lines • ▼ Show 20 Linesfunction getVideoProcessingPlan(input: Input): Plan {
} }
const outputFilename = replaceExtension( const outputFilename = replaceExtension(
`transcode.${uuid}.${sanitizedFilename}`, `transcode.${uuid}.${sanitizedFilename}`,
'mp4', 'mp4',
); );
const outputPath = `${outputDirectory}${outputFilename}`; const outputPath = `${outputDirectory}${outputFilename}`;
let quality, speed, scale; let hardwareAcceleration, quality, speed, scale, pixelFormat;
if (outputCodec === 'h264') { if (outputCodec === 'h264_mediacodec') {
const { floor, min, max, log2 } = Math; hardwareAcceleration = 'mediacodec';
const crf = floor(min(5, max(0, log2(inputDuration / 5)))) + 23; quality = '';
quality = `-crf ${crf}`; speed = '';
speed = '-preset ultrafast';
scale = `-vf scale=${maxWidth}:${maxHeight}:force_original_aspect_ratio=decrease`; scale = `-vf scale=${maxWidth}:${maxHeight}:force_original_aspect_ratio=decrease`;
pixelFormat = '';
} else if (outputCodec === 'h264_videotoolbox') { } else if (outputCodec === 'h264_videotoolbox') {
hardwareAcceleration = 'videotoolbox';
quality = '-profile:v baseline'; quality = '-profile:v baseline';
speed = '-realtime 1'; speed = '-realtime 1';
const { width, height } = inputDimensions; const { width, height } = inputDimensions;
scale = ''; scale = '';
const exceedsDimensions = width > maxWidth || height > maxHeight; const exceedsDimensions = width > maxWidth || height > maxHeight;
if (exceedsDimensions && width / height > maxWidth / maxHeight) { if (exceedsDimensions && width / height > maxWidth / maxHeight) {
scale = `-vf scale=${maxWidth}:-1`; scale = `-vf scale=${maxWidth}:-1`;
} else if (exceedsDimensions) { } else if (exceedsDimensions) {
scale = `-vf scale=-1:${maxHeight}`; scale = `-vf scale=-1:${maxHeight}`;
} }
pixelFormat = '-pix_fmt yuv420p';
} else { } else {
invariant(false, `unrecognized outputCodec ${outputCodec}`); invariant(false, `unrecognized outputCodec ${outputCodec}`);
} }
const ffmpegCommand = const ffmpegCommand =
`-hwaccel ${hardwareAcceleration} ` +
`-i ${inputPath} ` + `-i ${inputPath} ` +
`-c:a copy -c:v ${outputCodec} ` + `-c:a copy -c:v ${outputCodec} ` +
`${quality} ` + `${quality} ` +
'-vsync 2 -r 30 ' + '-fps_mode cfr -r 30 ' +
`${scale} ` + `${scale} ` +
`${speed} ` + `${speed} ` +
'-movflags +faststart ' + '-movflags +faststart ' +
'-pix_fmt yuv420p ' + `${pixelFormat} ` +
'-v quiet ' + '-v quiet ' +
outputPath; outputPath;
return { action: 'process', thumbnailPath, outputPath, ffmpegCommand }; return { action: 'process', thumbnailPath, outputPath, ffmpegCommand };
} }
function getHasMultipleFramesProbeCommand(path: string): string { function getHasMultipleFramesProbeCommand(path: string): string {
const ffprobeCommand = const ffprobeCommand =
Show All 17 Lines
View Options

native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.h

Show First 20 Lines • Show All 91 Lines • ▼ Show 20 Linesfunction getVideoProcessingPlan(input: Input): Plan {
} }
const outputFilename = replaceExtension( const outputFilename = replaceExtension(
`transcode.${uuid}.${sanitizedFilename}`, `transcode.${uuid}.${sanitizedFilename}`,
'mp4', 'mp4',
); );
const outputPath = `${outputDirectory}${outputFilename}`; const outputPath = `${outputDirectory}${outputFilename}`;
let quality, speed, scale; let hardwareAcceleration, quality, speed, scale, pixelFormat;
if (outputCodec === 'h264') { if (outputCodec === 'h264_mediacodec') {
const { floor, min, max, log2 } = Math; hardwareAcceleration = 'mediacodec';
const crf = floor(min(5, max(0, log2(inputDuration / 5)))) + 23; quality = '';
quality = `-crf ${crf}`; speed = '';
speed = '-preset ultrafast';
scale = `-vf scale=${maxWidth}:${maxHeight}:force_original_aspect_ratio=decrease`; scale = `-vf scale=${maxWidth}:${maxHeight}:force_original_aspect_ratio=decrease`;
pixelFormat = '';
} else if (outputCodec === 'h264_videotoolbox') { } else if (outputCodec === 'h264_videotoolbox') {
hardwareAcceleration = 'videotoolbox';
quality = '-profile:v baseline'; quality = '-profile:v baseline';
speed = '-realtime 1'; speed = '-realtime 1';
const { width, height } = inputDimensions; const { width, height } = inputDimensions;
scale = ''; scale = '';
const exceedsDimensions = width > maxWidth || height > maxHeight; const exceedsDimensions = width > maxWidth || height > maxHeight;
if (exceedsDimensions && width / height > maxWidth / maxHeight) { if (exceedsDimensions && width / height > maxWidth / maxHeight) {
scale = `-vf scale=${maxWidth}:-1`; scale = `-vf scale=${maxWidth}:-1`;
} else if (exceedsDimensions) { } else if (exceedsDimensions) {
scale = `-vf scale=-1:${maxHeight}`; scale = `-vf scale=-1:${maxHeight}`;
} }
pixelFormat = '-pix_fmt yuv420p';
} else { } else {
invariant(false, `unrecognized outputCodec ${outputCodec}`); invariant(false, `unrecognized outputCodec ${outputCodec}`);
} }
const ffmpegCommand = const ffmpegCommand =
`-hwaccel ${hardwareAcceleration} ` +
`-i ${inputPath} ` + `-i ${inputPath} ` +
`-c:a copy -c:v ${outputCodec} ` + `-c:a copy -c:v ${outputCodec} ` +
`${quality} ` + `${quality} ` +
'-vsync 2 -r 30 ' + '-fps_mode cfr -r 30 ' +
`${scale} ` + `${scale} ` +
`${speed} ` + `${speed} ` +
'-movflags +faststart ' + '-movflags +faststart ' +
'-pix_fmt yuv420p ' + `${pixelFormat} ` +
'-v quiet ' + '-v quiet ' +
outputPath; outputPath;
return { action: 'process', thumbnailPath, outputPath, ffmpegCommand }; return { action: 'process', thumbnailPath, outputPath, ffmpegCommand };
} }
function getHasMultipleFramesProbeCommand(path: string): string { function getHasMultipleFramesProbeCommand(path: string): string {
const ffprobeCommand = const ffprobeCommand =
Show All 17 Lines
View Options

native/cpp/CommonCpp/NativeModules/InternalModules/RustPromiseManager.cpp

Show First 20 Lines • Show All 91 Lines • ▼ Show 20 Linesfunction getVideoProcessingPlan(input: Input): Plan {
} }
const outputFilename = replaceExtension( const outputFilename = replaceExtension(
`transcode.${uuid}.${sanitizedFilename}`, `transcode.${uuid}.${sanitizedFilename}`,
'mp4', 'mp4',
); );
const outputPath = `${outputDirectory}${outputFilename}`; const outputPath = `${outputDirectory}${outputFilename}`;
let quality, speed, scale; let hardwareAcceleration, quality, speed, scale, pixelFormat;
if (outputCodec === 'h264') { if (outputCodec === 'h264_mediacodec') {
const { floor, min, max, log2 } = Math; hardwareAcceleration = 'mediacodec';
const crf = floor(min(5, max(0, log2(inputDuration / 5)))) + 23; quality = '';
quality = `-crf ${crf}`; speed = '';
speed = '-preset ultrafast';
scale = `-vf scale=${maxWidth}:${maxHeight}:force_original_aspect_ratio=decrease`; scale = `-vf scale=${maxWidth}:${maxHeight}:force_original_aspect_ratio=decrease`;
pixelFormat = '';
} else if (outputCodec === 'h264_videotoolbox') { } else if (outputCodec === 'h264_videotoolbox') {
hardwareAcceleration = 'videotoolbox';
quality = '-profile:v baseline'; quality = '-profile:v baseline';
speed = '-realtime 1'; speed = '-realtime 1';
const { width, height } = inputDimensions; const { width, height } = inputDimensions;
scale = ''; scale = '';
const exceedsDimensions = width > maxWidth || height > maxHeight; const exceedsDimensions = width > maxWidth || height > maxHeight;
if (exceedsDimensions && width / height > maxWidth / maxHeight) { if (exceedsDimensions && width / height > maxWidth / maxHeight) {
scale = `-vf scale=${maxWidth}:-1`; scale = `-vf scale=${maxWidth}:-1`;
} else if (exceedsDimensions) { } else if (exceedsDimensions) {
scale = `-vf scale=-1:${maxHeight}`; scale = `-vf scale=-1:${maxHeight}`;
} }
pixelFormat = '-pix_fmt yuv420p';
} else { } else {
invariant(false, `unrecognized outputCodec ${outputCodec}`); invariant(false, `unrecognized outputCodec ${outputCodec}`);
} }
const ffmpegCommand = const ffmpegCommand =
`-hwaccel ${hardwareAcceleration} ` +
`-i ${inputPath} ` + `-i ${inputPath} ` +
`-c:a copy -c:v ${outputCodec} ` + `-c:a copy -c:v ${outputCodec} ` +
`${quality} ` + `${quality} ` +
'-vsync 2 -r 30 ' + '-fps_mode cfr -r 30 ' +
`${scale} ` + `${scale} ` +
`${speed} ` + `${speed} ` +
'-movflags +faststart ' + '-movflags +faststart ' +
'-pix_fmt yuv420p ' + `${pixelFormat} ` +
'-v quiet ' + '-v quiet ' +
outputPath; outputPath;
return { action: 'process', thumbnailPath, outputPath, ffmpegCommand }; return { action: 'process', thumbnailPath, outputPath, ffmpegCommand };
} }
function getHasMultipleFramesProbeCommand(path: string): string { function getHasMultipleFramesProbeCommand(path: string): string {
const ffprobeCommand = const ffprobeCommand =
Show All 17 Lines