Do not expose DrishtiGraphGPUData.h in public header
This class is an implementation detail. PiperOrigin-RevId: 490530823
This commit is contained in:
parent
b5189758f7
commit
3c53ec2cdb
|
@ -550,12 +550,7 @@ cc_library(
|
||||||
name = "gpu_shared_data_header",
|
name = "gpu_shared_data_header",
|
||||||
textual_hdrs = [
|
textual_hdrs = [
|
||||||
"gpu_shared_data_internal.h",
|
"gpu_shared_data_internal.h",
|
||||||
] + select({
|
],
|
||||||
"//conditions:default": [],
|
|
||||||
"//mediapipe:apple": [
|
|
||||||
"MPPGraphGPUData.h",
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
visibility = ["//visibility:private"],
|
visibility = ["//visibility:private"],
|
||||||
deps = [
|
deps = [
|
||||||
":gl_base",
|
":gl_base",
|
||||||
|
|
|
@ -21,37 +21,35 @@
|
||||||
|
|
||||||
#include "mediapipe/framework/packet.h"
|
#include "mediapipe/framework/packet.h"
|
||||||
#include "mediapipe/framework/packet_type.h"
|
#include "mediapipe/framework/packet_type.h"
|
||||||
#include "mediapipe/gpu/MPPGraphGPUData.h"
|
|
||||||
#include "mediapipe/gpu/gpu_shared_data_internal.h"
|
#include "mediapipe/gpu/gpu_shared_data_internal.h"
|
||||||
|
|
||||||
NS_ASSUME_NONNULL_BEGIN
|
NS_ASSUME_NONNULL_BEGIN
|
||||||
|
|
||||||
@interface MPPMetalHelper : NSObject {
|
@interface MPPMetalHelper : NSObject {
|
||||||
MPPGraphGPUData* _gpuShared;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (instancetype)init NS_UNAVAILABLE;
|
- (instancetype)init NS_UNAVAILABLE;
|
||||||
|
|
||||||
/// Initialize. This initializer is recommended for calculators.
|
/// Initialize. This initializer is recommended for calculators.
|
||||||
- (instancetype)initWithCalculatorContext:(mediapipe::CalculatorContext*)cc;
|
- (instancetype)initWithCalculatorContext:(mediapipe::CalculatorContext *)cc;
|
||||||
|
|
||||||
/// Initialize.
|
/// Initialize.
|
||||||
- (instancetype)initWithGpuResources:(mediapipe::GpuResources*)gpuResources
|
- (instancetype)initWithGpuResources:(mediapipe::GpuResources *)gpuResources
|
||||||
NS_DESIGNATED_INITIALIZER;
|
NS_DESIGNATED_INITIALIZER;
|
||||||
|
|
||||||
/// Configures a calculator's contract for accessing GPU resources.
|
/// Configures a calculator's contract for accessing GPU resources.
|
||||||
/// Calculators should use this in GetContract.
|
/// Calculators should use this in GetContract.
|
||||||
+ (absl::Status)updateContract:(mediapipe::CalculatorContract*)cc;
|
+ (absl::Status)updateContract:(mediapipe::CalculatorContract *)cc;
|
||||||
|
|
||||||
/// Deprecated initializer.
|
/// Deprecated initializer.
|
||||||
- (instancetype)initWithSidePackets:(const mediapipe::PacketSet&)inputSidePackets;
|
- (instancetype)initWithSidePackets:(const mediapipe::PacketSet &)inputSidePackets;
|
||||||
|
|
||||||
/// Deprecated initializer.
|
/// Deprecated initializer.
|
||||||
- (instancetype)initWithGpuSharedData:(mediapipe::GpuSharedData*)gpuShared;
|
- (instancetype)initWithGpuSharedData:(mediapipe::GpuSharedData *)gpuShared;
|
||||||
|
|
||||||
/// Configures a calculator's side packets for accessing GPU resources.
|
/// Configures a calculator's side packets for accessing GPU resources.
|
||||||
/// Calculators should use this in FillExpectations.
|
/// Calculators should use this in FillExpectations.
|
||||||
+ (absl::Status)setupInputSidePackets:(mediapipe::PacketTypeSet*)inputSidePackets;
|
+ (absl::Status)setupInputSidePackets:(mediapipe::PacketTypeSet *)inputSidePackets;
|
||||||
|
|
||||||
/// Get a metal command buffer.
|
/// Get a metal command buffer.
|
||||||
/// Calculators should use this method instead of getting a buffer from the
|
/// Calculators should use this method instead of getting a buffer from the
|
||||||
|
@ -63,23 +61,23 @@ NS_ASSUME_NONNULL_BEGIN
|
||||||
/// Creates a CVMetalTextureRef linked to the provided GpuBuffer.
|
/// Creates a CVMetalTextureRef linked to the provided GpuBuffer.
|
||||||
/// Ownership follows the copy rule, so the caller is responsible for
|
/// Ownership follows the copy rule, so the caller is responsible for
|
||||||
/// releasing the CVMetalTextureRef.
|
/// releasing the CVMetalTextureRef.
|
||||||
- (CVMetalTextureRef)copyCVMetalTextureWithGpuBuffer:(const mediapipe::GpuBuffer&)gpuBuffer;
|
- (CVMetalTextureRef)copyCVMetalTextureWithGpuBuffer:(const mediapipe::GpuBuffer &)gpuBuffer;
|
||||||
|
|
||||||
/// Creates a CVMetalTextureRef linked to the provided GpuBuffer given a specific plane.
|
/// Creates a CVMetalTextureRef linked to the provided GpuBuffer given a specific plane.
|
||||||
/// Ownership follows the copy rule, so the caller is responsible for
|
/// Ownership follows the copy rule, so the caller is responsible for
|
||||||
/// releasing the CVMetalTextureRef.
|
/// releasing the CVMetalTextureRef.
|
||||||
- (CVMetalTextureRef)copyCVMetalTextureWithGpuBuffer:(const mediapipe::GpuBuffer&)gpuBuffer
|
- (CVMetalTextureRef)copyCVMetalTextureWithGpuBuffer:(const mediapipe::GpuBuffer &)gpuBuffer
|
||||||
plane:(size_t)plane;
|
plane:(size_t)plane;
|
||||||
|
|
||||||
/// Returns a MTLTexture linked to the provided GpuBuffer.
|
/// Returns a MTLTexture linked to the provided GpuBuffer.
|
||||||
/// A calculator can freely use it as a rendering source, but it should not
|
/// A calculator can freely use it as a rendering source, but it should not
|
||||||
/// use it as a rendering target if the GpuBuffer was provided as an input.
|
/// use it as a rendering target if the GpuBuffer was provided as an input.
|
||||||
- (id<MTLTexture>)metalTextureWithGpuBuffer:(const mediapipe::GpuBuffer&)gpuBuffer;
|
- (id<MTLTexture>)metalTextureWithGpuBuffer:(const mediapipe::GpuBuffer &)gpuBuffer;
|
||||||
|
|
||||||
/// Returns a MTLTexture linked to the provided GpuBuffer given a specific plane.
|
/// Returns a MTLTexture linked to the provided GpuBuffer given a specific plane.
|
||||||
/// A calculator can freely use it as a rendering source, but it should not
|
/// A calculator can freely use it as a rendering source, but it should not
|
||||||
/// use it as a rendering target if the GpuBuffer was provided as an input.
|
/// use it as a rendering target if the GpuBuffer was provided as an input.
|
||||||
- (id<MTLTexture>)metalTextureWithGpuBuffer:(const mediapipe::GpuBuffer&)gpuBuffer
|
- (id<MTLTexture>)metalTextureWithGpuBuffer:(const mediapipe::GpuBuffer &)gpuBuffer
|
||||||
plane:(size_t)plane;
|
plane:(size_t)plane;
|
||||||
|
|
||||||
/// Obtains a new GpuBuffer to be used as an output destination.
|
/// Obtains a new GpuBuffer to be used as an output destination.
|
||||||
|
@ -91,7 +89,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||||
format:(mediapipe::GpuBufferFormat)format;
|
format:(mediapipe::GpuBufferFormat)format;
|
||||||
|
|
||||||
/// Convenience method to load a Metal library stored as a bundle resource.
|
/// Convenience method to load a Metal library stored as a bundle resource.
|
||||||
- (id<MTLLibrary>)newLibraryWithResourceName:(NSString*)name error:(NSError* _Nullable*)error;
|
- (id<MTLLibrary>)newLibraryWithResourceName:(NSString *)name error:(NSError *_Nullable *)error;
|
||||||
|
|
||||||
/// Shared Metal resources.
|
/// Shared Metal resources.
|
||||||
@property(readonly) id<MTLDevice> mtlDevice;
|
@property(readonly) id<MTLDevice> mtlDevice;
|
||||||
|
|
|
@ -14,11 +14,17 @@
|
||||||
|
|
||||||
#import "mediapipe/gpu/MPPMetalHelper.h"
|
#import "mediapipe/gpu/MPPMetalHelper.h"
|
||||||
|
|
||||||
|
#import "mediapipe/gpu/MPPGraphGPUData.h"
|
||||||
#import "mediapipe/gpu/graph_support.h"
|
#import "mediapipe/gpu/graph_support.h"
|
||||||
#import "GTMDefines.h"
|
#import "GTMDefines.h"
|
||||||
|
|
||||||
#include "mediapipe/framework/port/ret_check.h"
|
#include "mediapipe/framework/port/ret_check.h"
|
||||||
|
|
||||||
|
@interface MPPMetalHelper () {
|
||||||
|
MPPGraphGPUData* _gpuShared;
|
||||||
|
}
|
||||||
|
@end
|
||||||
|
|
||||||
namespace mediapipe {
|
namespace mediapipe {
|
||||||
|
|
||||||
// Using a C++ class so it can be declared as a friend of LegacyCalculatorSupport.
|
// Using a C++ class so it can be declared as a friend of LegacyCalculatorSupport.
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#include "mediapipe/framework/formats/image.h"
|
#include "mediapipe/framework/formats/image.h"
|
||||||
#include "mediapipe/framework/formats/image_frame.h"
|
#include "mediapipe/framework/formats/image_frame.h"
|
||||||
#include "mediapipe/framework/graph_service.h"
|
#include "mediapipe/framework/graph_service.h"
|
||||||
#include "mediapipe/gpu/MPPGraphGPUData.h"
|
|
||||||
#include "mediapipe/gpu/gl_base.h"
|
#include "mediapipe/gpu/gl_base.h"
|
||||||
#include "mediapipe/gpu/gpu_shared_data_internal.h"
|
#include "mediapipe/gpu/gpu_shared_data_internal.h"
|
||||||
#include "mediapipe/objc/util.h"
|
#include "mediapipe/objc/util.h"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user