Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# clang-format pre-commit hook
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v19.1.6
rev: v22.1.2
hooks:
- id: clang-format
types_or: [c++, c, cuda]
Expand Down
4 changes: 2 additions & 2 deletions mediapipe/calculators/tensor/inference_calculator_gl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ namespace api2 {
absl::Status LoadDelegate(CalculatorContext* cc,
const mediapipe::InferenceCalculatorOptions::Delegate& delegate_options);
absl::Status
LoadDelegateAndAllocateTensors(CalculatorContext* cc,
const mediapipe::InferenceCalculatorOptions::Delegate& delegate_options);
LoadDelegateAndAllocateTensors(CalculatorContext* cc,
const mediapipe::InferenceCalculatorOptions::Delegate& delegate_options);
absl::Status Process(CalculatorContext* cc, const TensorSpan& input_tensors, std::vector<Tensor>& output_tensors);
const InputOutputTensorNames& GetInputOutputTensorNames() const;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace {

return options.oval() ? options.filled() ? annotation->mutable_filled_oval()->mutable_oval()->mutable_rectangle()
: annotation->mutable_oval()->mutable_rectangle()
: options.filled() ? annotation->mutable_filled_rectangle()->mutable_rectangle()
: options.filled() ? annotation->mutable_filled_rectangle()->mutable_rectangle()
: annotation->mutable_rectangle();
}

Expand Down
12 changes: 6 additions & 6 deletions mediapipe/framework/deps/strong_int.h
Original file line number Diff line number Diff line change
Expand Up @@ -429,12 +429,12 @@ namespace intops {
// Define operators that take one StrongInt and one native integer argument.
// These operators are defined in terms of their op-equal member function
// cousins, mostly.
#define STRONG_INT_VS_NUMERIC_BINARY_OP(op) \
template<typename TagType, typename ValueType, typename ValidatorType, typename NumType> \
inline StrongInt<TagType, ValueType, ValidatorType> operator op(StrongInt<TagType, ValueType, ValidatorType> lhs, \
NumType rhs) { \
lhs op## = rhs; \
return lhs; \
#define STRONG_INT_VS_NUMERIC_BINARY_OP(op) \
template<typename TagType, typename ValueType, typename ValidatorType, typename NumType> \
inline StrongInt<TagType, ValueType, ValidatorType> operator op(StrongInt<TagType, ValueType, ValidatorType> lhs, \
NumType rhs) { \
lhs op## = rhs; \
return lhs; \
}
// This is used for commutative operators between one StrongInt and one native
// integer argument. That is a long way of saying "multiplication".
Expand Down
4 changes: 2 additions & 2 deletions mediapipe/framework/input_stream_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ NodeReadiness SyncSet::GetReadiness(Timestamp* min_stream_timestamp) {
// can arrive. Timestamp::PostStream is treated specially because it is
// omitted by Timestamp::PreviousAllowedInStream.
Timestamp settled = (min_packet == Timestamp::PostStream() && min_bound > min_packet)
? min_packet
: min_bound.PreviousAllowedInStream();
? min_packet
: min_bound.PreviousAllowedInStream();
Timestamp input_timestamp = std::min(min_packet, settled);
if (input_timestamp > std::max(last_processed_ts_, Timestamp::Unstarted())) {
*min_stream_timestamp = input_timestamp;
Expand Down
2 changes: 1 addition & 1 deletion mediapipe/framework/packet_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ namespace internal {
PacketTypeSet* output_side_packets) = 0;
virtual absl::Status Generate(const PacketGeneratorOptions& extendable_options, //
const PacketSet& input_side_packets, //
PacketSet* output_side_packets) = 0;
PacketSet* output_side_packets) = 0;
};

using StaticAccessToGeneratorRegistry = GlobalFactoryRegistry<std::unique_ptr<StaticAccessToGenerator>>;
Expand Down
6 changes: 3 additions & 3 deletions mediapipe/framework/status_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ namespace internal {
virtual ~StaticAccessToStatusHandler() { }

virtual absl::Status FillExpectations(const MediaPipeOptions& extendable_options,
PacketTypeSet* input_side_packets) = 0;
PacketTypeSet* input_side_packets) = 0;
virtual absl::Status HandlePreRunStatus(const MediaPipeOptions& extendable_options, const PacketSet& input_side_packets,
const absl::Status& pre_run_status) = 0;
const absl::Status& pre_run_status) = 0;
virtual absl::Status HandleStatus(const MediaPipeOptions& extendable_options,
const PacketSet& input_side_packets, //
const absl::Status& run_status) = 0;
const absl::Status& run_status) = 0;
};

using StaticAccessToStatusHandlerRegistry = GlobalFactoryRegistry<std::unique_ptr<StaticAccessToStatusHandler>>;
Expand Down
6 changes: 3 additions & 3 deletions mediapipe/gpu/gpu_buffer_storage_image_frame.cc
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ namespace {
std::shared_ptr<FrameBuffer> ImageFrameToFrameBuffer(std::shared_ptr<ImageFrame> image_frame) {
FrameBuffer::Format format = FrameBufferFormatForImageFrameFormat(image_frame->Format());
ABSL_CHECK(format != FrameBuffer::Format::kUNKNOWN) << "Invalid format. Only SRGB, SRGBA and GRAY8 are supported.";
const FrameBuffer::Dimension dimension{/*width=*/image_frame->Width(),
const FrameBuffer::Dimension dimension{/*width=*/image_frame->Width(),
/*height=*/image_frame->Height()};
const FrameBuffer::Stride stride{/*row_stride_bytes=*/image_frame->WidthStep(),
/*pixel_stride_bytes=*/image_frame->ByteDepth() * image_frame->NumberOfChannels()};
const FrameBuffer::Stride stride{/*row_stride_bytes=*/image_frame->WidthStep(),
/*pixel_stride_bytes=*/image_frame->ByteDepth() * image_frame->NumberOfChannels()};
const std::vector<FrameBuffer::Plane> planes{{image_frame->MutablePixelData(), stride}};
return std::make_shared<FrameBuffer>(planes, dimension, format);
}
Expand Down
20 changes: 10 additions & 10 deletions openxr/test/external/openxr_headers/XR_MNDX_xdev_space.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
* @ingroup external_openxr
*/
#ifndef XR_MNDX_XDEV_SPACE_H
#define XR_MNDX_XDEV_SPACE_H 1
#define XR_MNDX_XDEV_SPACE_H 1

#include "openxr_extension_helpers.h"
#include "openxr_extension_helpers.h"

#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif
#endif

// Extension number 445 (444 prefix)
#define XR_MNDX_xdev_space 1
#define XR_MNDX_xdev_space_SPEC_VERSION 1
#define XR_MNDX_XDEV_SPACE_EXTENSION_NAME "XR_MNDX_xdev_space"
// Extension number 445 (444 prefix)
#define XR_MNDX_xdev_space 1
#define XR_MNDX_xdev_space_SPEC_VERSION 1
#define XR_MNDX_XDEV_SPACE_EXTENSION_NAME "XR_MNDX_xdev_space"

XR_DEFINE_ATOM(XrXDevIdMNDX)
XR_DEFINE_HANDLE(XrXDevListMNDX)
Expand Down Expand Up @@ -78,8 +78,8 @@ typedef XrResult(XRAPI_PTR* PFN_xrDestroyXDevListMNDX)(XrXDevListMNDX xdevList);
typedef XrResult(XRAPI_PTR* PFN_xrCreateXDevSpaceMNDX)(XrSession session, const XrCreateXDevSpaceInfoMNDX* createInfo,
XrSpace* space);

#ifdef __cplusplus
#ifdef __cplusplus
}
#endif
#endif

#endif
Loading