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

Internal change

Browse Source 
PiperOrigin-RevId: 503157344
This commit is contained in:
Adam Cozzette 2023-01-19 07:17:40 -08:00 committed by Copybara-Service
parent e2dedcbfe5
commit 7a7cc77a81
7 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediapipe/calculators/tensorflow/unpack_media_sequence_calculator_test.cc
View File

@ -647,7 +647,7 @@ TEST_F(UnpackMediaSequenceCalculatorTest, GetAudioDecoderOptionsOverride) {
TEST_F(UnpackMediaSequenceCalculatorTest, GetPacketResamplingOptions) { TEST_F(UnpackMediaSequenceCalculatorTest, GetPacketResamplingOptions) {
// TODO: Suport proto3 proto.Any in CalculatorOptions. // TODO: Suport proto3 proto.Any in CalculatorOptions.
// TODO: Avoid proto2 extensions in "RESAMPLER_OPTIONS". // TODO: Avoid google::protobuf extensions in "RESAMPLER_OPTIONS".
CalculatorOptions options; CalculatorOptions options;
options.MutableExtension(UnpackMediaSequenceCalculatorOptions::ext) options.MutableExtension(UnpackMediaSequenceCalculatorOptions::ext)
->set_padding_before_label(1); ->set_padding_before_label(1);

4
mediapipe/framework/calculator_context_test.cc
View File

@ -131,10 +131,10 @@ TEST(CalculatorTest, GetOptions) {
auto calculator_state_3 = MakeCalculatorState(config.node(3), 3); auto calculator_state_3 = MakeCalculatorState(config.node(3), 3);
auto cc_3 = MakeCalculatorContext(&*calculator_state_3); auto cc_3 = MakeCalculatorContext(&*calculator_state_3);
// Get a proto2 options extension from Node::options. // Get a google::protobuf options extension from Node::options.
EXPECT_EQ(cc_0->Options<NightLightCalculatorOptions>().jitter(), 0.123); EXPECT_EQ(cc_0->Options<NightLightCalculatorOptions>().jitter(), 0.123);
// Get a proto2 options extension from Node::node_options. // Get a google::protobuf options extension from Node::node_options.
EXPECT_EQ(cc_1->Options<NightLightCalculatorOptions>().jitter(), 0.123); EXPECT_EQ(cc_1->Options<NightLightCalculatorOptions>().jitter(), 0.123);
// Get a proto3 options protobuf::Any from Node::node_options. // Get a proto3 options protobuf::Any from Node::node_options.

5
mediapipe/framework/port/proto_ns.h
View File

@ -17,8 +17,9 @@
#include <string> #include <string>
// Temporary forward declarations for proto2 support on portable targets. // Temporary forward declarations for google::protobuf support on portable
// Use proto_ns inside namespace mediapipe instead of proto2 namespace. // targets. Use proto_ns inside namespace mediapipe instead of google::protobuf
// namespace.
#include "google/protobuf/message.h" #include "google/protobuf/message.h"
#include "google/protobuf/message_lite.h" #include "google/protobuf/message_lite.h"
#include "google/protobuf/repeated_field.h" #include "google/protobuf/repeated_field.h"

18
mediapipe/framework/profiler/graph_profiler_test.cc
View File

@ -39,13 +39,15 @@ constexpr char kDummyTestCalculatorName[] = "DummyTestCalculator";
CalculatorGraphConfig::Node CreateNodeConfig( CalculatorGraphConfig::Node CreateNodeConfig(
const std::string& raw_node_config) { const std::string& raw_node_config) {
CalculatorGraphConfig::Node node_config; CalculatorGraphConfig::Node node_config;
QCHECK(proto2::TextFormat::ParseFromString(raw_node_config, &node_config)); QCHECK(google::protobuf::TextFormat::ParseFromString(raw_node_config,
&node_config));
return node_config; return node_config;
} }
CalculatorGraphConfig CreateGraphConfig(const std::string& raw_graph_config) { CalculatorGraphConfig CreateGraphConfig(const std::string& raw_graph_config) {
CalculatorGraphConfig graph_config; CalculatorGraphConfig graph_config;
QCHECK(proto2::TextFormat::ParseFromString(raw_graph_config, &graph_config)); QCHECK(google::protobuf::TextFormat::ParseFromString(raw_graph_config,
&graph_config));
return graph_config; return graph_config;
} }
@ -1167,7 +1169,7 @@ TEST_F(GraphProfilerTestPeer, AddProcessSampleWithStreamLatency) {
TEST(GraphProfilerTest, ParallelReads) { TEST(GraphProfilerTest, ParallelReads) {
// A graph that processes a certain number of packets before finishing. // A graph that processes a certain number of packets before finishing.
CalculatorGraphConfig config; CalculatorGraphConfig config;
QCHECK(proto2::TextFormat::ParseFromString(R"( QCHECK(google::protobuf::TextFormat::ParseFromString(R"(
profiler_config { profiler_config {
enable_profiler: true enable_profiler: true
} }
@ -1189,7 +1191,7 @@ TEST(GraphProfilerTest, ParallelReads) {
} }
output_stream: "OUT:0:the_integers" output_stream: "OUT:0:the_integers"
)", )",
&config)); &config));
// Start running the graph on its own threads. // Start running the graph on its own threads.
absl::Mutex out_1_mutex; absl::Mutex out_1_mutex;
@ -1246,7 +1248,7 @@ std::set<std::string> GetCalculatorNames(const CalculatorGraphConfig& config) {
TEST(GraphProfilerTest, CalculatorProfileFilter) { TEST(GraphProfilerTest, CalculatorProfileFilter) {
CalculatorGraphConfig config; CalculatorGraphConfig config;
QCHECK(proto2::TextFormat::ParseFromString(R"( QCHECK(google::protobuf::TextFormat::ParseFromString(R"(
profiler_config { profiler_config {
enable_profiler: true enable_profiler: true
} }
@ -1268,7 +1270,7 @@ TEST(GraphProfilerTest, CalculatorProfileFilter) {
} }
output_stream: "OUT:0:the_integers" output_stream: "OUT:0:the_integers"
)", )",
&config)); &config));
std::set<std::string> expected_names; std::set<std::string> expected_names;
expected_names = {"RangeCalculator", "PassThroughCalculator"}; expected_names = {"RangeCalculator", "PassThroughCalculator"};
@ -1295,7 +1297,7 @@ TEST(GraphProfilerTest, CalculatorProfileFilter) {
TEST(GraphProfilerTest, CaptureProfilePopulateConfig) { TEST(GraphProfilerTest, CaptureProfilePopulateConfig) {
CalculatorGraphConfig config; CalculatorGraphConfig config;
QCHECK(proto2::TextFormat::ParseFromString(R"( QCHECK(google::protobuf::TextFormat::ParseFromString(R"(
profiler_config { profiler_config {
enable_profiler: true enable_profiler: true
trace_enabled: true trace_enabled: true
@ -1310,7 +1312,7 @@ TEST(GraphProfilerTest, CaptureProfilePopulateConfig) {
input_stream: "input_stream" input_stream: "input_stream"
} }
)", )",
&config)); &config));
CalculatorGraph graph; CalculatorGraph graph;
MP_ASSERT_OK(graph.Initialize(config)); MP_ASSERT_OK(graph.Initialize(config));
GraphProfile profile; GraphProfile profile;

2
mediapipe/framework/tool/options_lib_template.cc
View File

@ -28,7 +28,7 @@ constexpr char kDescriptorContents[] =
mediapipe::FieldData ReadFileDescriptorSet(const std::string& pb) { mediapipe::FieldData ReadFileDescriptorSet(const std::string& pb) {
mediapipe::FieldData result; mediapipe::FieldData result;
*result.mutable_message_value()->mutable_type_url() = *result.mutable_message_value()->mutable_type_url() =
"proto2.FileDescriptorSet"; "google::protobuf.FileDescriptorSet";
*result.mutable_message_value()->mutable_value() = pb; *result.mutable_message_value()->mutable_value() = pb;
// Force linking of the generated options protobuf. // Force linking of the generated options protobuf.

22
mediapipe/framework/tool/options_registry.cc
View File

@ -66,26 +66,28 @@ std::string GetFieldString(const FieldData& message_data,
void RegisterDescriptorProtos( void RegisterDescriptorProtos(
absl::flat_hash_map<std::string, Descriptor>& result) { absl::flat_hash_map<std::string, Descriptor>& result) {
std::vector<Descriptor> descriptors = { std::vector<Descriptor> descriptors = {
{"proto2.FileDescriptorSet", {"google::protobuf.FileDescriptorSet",
{ {
{"file", 1, FieldType::TYPE_MESSAGE, "proto2.FileDescriptorProto"}, {"file", 1, FieldType::TYPE_MESSAGE,
"google::protobuf.FileDescriptorProto"},
}}, }},
{"proto2.FileDescriptorProto", {"google::protobuf.FileDescriptorProto",
{ {
{"package", 2, FieldType::TYPE_STRING, ""}, {"package", 2, FieldType::TYPE_STRING, ""},
{"message_type", 4, FieldType::TYPE_MESSAGE, {"message_type", 4, FieldType::TYPE_MESSAGE,
"proto2.DescriptorProto"}, "google::protobuf.DescriptorProto"},
}}, }},
{"proto2.DescriptorProto", {"google::protobuf.DescriptorProto",
{ {
{"name", 1, FieldType::TYPE_STRING, ""}, {"name", 1, FieldType::TYPE_STRING, ""},
{"field", 2, FieldType::TYPE_MESSAGE, "proto2.FieldDescriptorProto"}, {"field", 2, FieldType::TYPE_MESSAGE,
"google::protobuf.FieldDescriptorProto"},
{"extension", 6, FieldType::TYPE_MESSAGE, {"extension", 6, FieldType::TYPE_MESSAGE,
"proto2.FieldDescriptorProto"}, "google::protobuf.FieldDescriptorProto"},
{"nested_type", 3, FieldType::TYPE_MESSAGE, {"nested_type", 3, FieldType::TYPE_MESSAGE,
"proto2.DescriptorProto"}, "google::protobuf.DescriptorProto"},
}}, }},
{"proto2.FieldDescriptorProto", {"google::protobuf.FieldDescriptorProto",
{ {
{"name", 1, FieldType::TYPE_STRING, ""}, {"name", 1, FieldType::TYPE_STRING, ""},
{"number", 3, FieldType::TYPE_INT32, ""}, {"number", 3, FieldType::TYPE_INT32, ""},
@ -140,7 +142,7 @@ void OptionsRegistry::Register(const FieldData& message_type,
const Descriptor* OptionsRegistry::GetProtobufDescriptor( const Descriptor* OptionsRegistry::GetProtobufDescriptor(
const std::string& type_name) { const std::string& type_name) {
if (descriptors().count("proto2.DescriptorProto") == 0) { if (descriptors().count("google::protobuf.DescriptorProto") == 0) {
RegisterDescriptorProtos(descriptors()); RegisterDescriptorProtos(descriptors());
} }
absl::ReaderMutexLock lock(&mutex()); absl::ReaderMutexLock lock(&mutex());

2
mediapipe/framework/tool/options_registry.h
View File

@ -28,7 +28,7 @@ class OptionsRegistry {
// Finds the descriptor for a protobuf. // Finds the descriptor for a protobuf.
static const Descriptor* GetProtobufDescriptor(const std::string& type_name); static const Descriptor* GetProtobufDescriptor(const std::string& type_name);
// Returns all known proto2 extensions to a type. // Returns all known google::protobuf extensions to a type.
static void FindAllExtensions(absl::string_view extendee, static void FindAllExtensions(absl::string_view extendee,
std::vector<const FieldDescriptor*>* result); std::vector<const FieldDescriptor*>* result);