cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow OffscreenCanvas to be used by DrawingUtils

Browse Source 
PiperOrigin-RevId: 579021013
This commit is contained in:
Sebastian Schmidt 2023-11-02 17:00:30 -07:00 committed by Copybara-Service
parent 1cc79001f4
commit 8f564c4b7b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mediapipe/tasks/web/vision/core/drawing_utils.ts
View File

@ -116,7 +116,8 @@ export {RGBAColor, CategoryToColorMap};
export class DrawingUtils { export class DrawingUtils {
private categoryMaskShaderContext?: CategoryMaskShaderContext; private categoryMaskShaderContext?: CategoryMaskShaderContext;
private convertToWebGLTextureShaderContext?: MPImageShaderContext; private convertToWebGLTextureShaderContext?: MPImageShaderContext;
private readonly context2d?: CanvasRenderingContext2D; private readonly context2d?: CanvasRenderingContext2D|
OffscreenCanvasRenderingContext2D;
private readonly contextWebGL?: WebGL2RenderingContext; private readonly contextWebGL?: WebGL2RenderingContext;
/** /**
@ -139,12 +140,14 @@ export class DrawingUtils {
* `setOptions({ canvas: .. })`). * `setOptions({ canvas: .. })`).
*/ */
constructor( constructor(
cpuContext: CanvasRenderingContext2D, cpuContext: CanvasRenderingContext2D|OffscreenCanvasRenderingContext2D,
gpuContext?: WebGL2RenderingContext); gpuContext?: WebGL2RenderingContext);
constructor( constructor(
cpuOrGpuGontext: CanvasRenderingContext2D|WebGL2RenderingContext, cpuOrGpuGontext: CanvasRenderingContext2D|
OffscreenCanvasRenderingContext2D|WebGL2RenderingContext,
gpuContext?: WebGL2RenderingContext) { gpuContext?: WebGL2RenderingContext) {
if (cpuOrGpuGontext instanceof CanvasRenderingContext2D) { if (cpuOrGpuGontext instanceof CanvasRenderingContext2D ||
cpuOrGpuGontext instanceof OffscreenCanvasRenderingContext2D) {
this.context2d = cpuOrGpuGontext; this.context2d = cpuOrGpuGontext;
this.contextWebGL = gpuContext; this.contextWebGL = gpuContext;
} else { } else {
@ -186,7 +189,8 @@ export class DrawingUtils {
return DrawingUtils.clamp(out, y0, y1); return DrawingUtils.clamp(out, y0, y1);
} }
private getCanvasRenderingContext(): CanvasRenderingContext2D { private getCanvasRenderingContext(): CanvasRenderingContext2D
|OffscreenCanvasRenderingContext2D {
if (!this.context2d) { if (!this.context2d) {
throw new Error( throw new Error(
'CPU rendering requested but CanvasRenderingContext2D not provided.'); 'CPU rendering requested but CanvasRenderingContext2D not provided.');