From e51b923bdaa1d0c44a525cde79fbae8069f367d4 Mon Sep 17 00:00:00 2001 From: Chris McClanahan Date: Mon, 11 Sep 2023 09:09:07 -0700 Subject: [PATCH] internal fix PiperOrigin-RevId: 564404269 --- mediapipe/calculators/util/BUILD | 1 + mediapipe/calculators/util/annotation_overlay_calculator.cc | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mediapipe/calculators/util/BUILD b/mediapipe/calculators/util/BUILD index ad75c65d..328b24fd 100644 --- a/mediapipe/calculators/util/BUILD +++ b/mediapipe/calculators/util/BUILD @@ -269,6 +269,7 @@ cc_library( "//mediapipe/gpu:gl_calculator_helper", "//mediapipe/gpu:gl_simple_shaders", "//mediapipe/gpu:gpu_buffer", + "//mediapipe/gpu:gpu_buffer_format", "//mediapipe/gpu:shader_util", ], }), diff --git a/mediapipe/calculators/util/annotation_overlay_calculator.cc b/mediapipe/calculators/util/annotation_overlay_calculator.cc index f31ce915..33490359 100644 --- a/mediapipe/calculators/util/annotation_overlay_calculator.cc +++ b/mediapipe/calculators/util/annotation_overlay_calculator.cc @@ -37,6 +37,7 @@ #include "mediapipe/gpu/gl_calculator_helper.h" #include "mediapipe/gpu/gl_simple_shaders.h" #include "mediapipe/gpu/gpu_buffer.h" +#include "mediapipe/gpu/gpu_buffer_format.h" #include "mediapipe/gpu/shader_util.h" #endif // !MEDIAPIPE_DISABLE_GPU @@ -449,7 +450,8 @@ absl::Status AnnotationOverlayCalculator::RenderToGpu(CalculatorContext* cc, auto input_texture = gpu_helper_.CreateSourceTexture(input_frame); auto output_texture = gpu_helper_.CreateDestinationTexture( - width_, height_, mediapipe::GpuBufferFormat::kBGRA32); + input_texture.width(), input_texture.height(), + mediapipe::GpuBufferFormat::kBGRA32); // Upload render target to GPU. { @@ -478,7 +480,7 @@ absl::Status AnnotationOverlayCalculator::RenderToGpu(CalculatorContext* cc, } // Send out blended image as GPU packet. - auto output_frame = output_texture.GetFrame(); + auto output_frame = output_texture.template GetFrame(); cc->Outputs().Tag(Tag).Add(output_frame.release(), cc->InputTimestamp()); // Cleanup