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

Internal change

Browse Source 
PiperOrigin-RevId: 525399975
This commit is contained in:
MediaPipe Team 2023-04-19 03:30:43 -07:00 committed by Copybara-Service
parent de84696be6
commit 01f4439d83
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediapipe/calculators/core/matrix_to_vector_calculator_test.cc
View File

@ -35,7 +35,7 @@ class MatrixToVectorCalculatorTest
void SetUp() override { calculator_name_ = "MatrixToVectorCalculator"; } void SetUp() override { calculator_name_ = "MatrixToVectorCalculator"; }
void AppendInput(const std::vector<float>& column_major_data, void AppendInput(const std::vector<float>& column_major_data,
int64 timestamp) { int64_t timestamp) {
ASSERT_EQ(num_input_samples_ * num_input_channels_, ASSERT_EQ(num_input_samples_ * num_input_channels_,
column_major_data.size()); column_major_data.size());
Eigen::Map<const Matrix> data_map(&column_major_data[0], Eigen::Map<const Matrix> data_map(&column_major_data[0],

20
mediapipe/calculators/core/packet_resampler_calculator_test.cc
View File

@ -51,9 +51,9 @@ class SimpleRunner : public CalculatorRunner {
virtual ~SimpleRunner() {} virtual ~SimpleRunner() {}
void SetInput(const std::vector<int64>& timestamp_list) { void SetInput(const std::vector<int64_t>& timestamp_list) {
MutableInputs()->Index(0).packets.clear(); MutableInputs()->Index(0).packets.clear();
for (const int64 ts : timestamp_list) { for (const int64_t ts : timestamp_list) {
MutableInputs()->Index(0).packets.push_back( MutableInputs()->Index(0).packets.push_back(
Adopt(new std::string(absl::StrCat("Frame #", ts))) Adopt(new std::string(absl::StrCat("Frame #", ts)))
.At(Timestamp(ts))); .At(Timestamp(ts)));
@ -72,8 +72,8 @@ class SimpleRunner : public CalculatorRunner {
} }
void CheckOutputTimestamps( void CheckOutputTimestamps(
const std::vector<int64>& expected_frames, const std::vector<int64_t>& expected_frames,
const std::vector<int64>& expected_timestamps) const { const std::vector<int64_t>& expected_timestamps) const {
EXPECT_EQ(expected_frames.size(), Outputs().Index(0).packets.size()); EXPECT_EQ(expected_frames.size(), Outputs().Index(0).packets.size());
EXPECT_EQ(expected_timestamps.size(), Outputs().Index(0).packets.size()); EXPECT_EQ(expected_timestamps.size(), Outputs().Index(0).packets.size());
int count = 0; int count = 0;
@ -112,7 +112,7 @@ MATCHER_P2(PacketAtTimestamp, payload, timestamp,
*result_listener << "at incorrect timestamp = " << arg.Timestamp().Value(); *result_listener << "at incorrect timestamp = " << arg.Timestamp().Value();
return false; return false;
} }
int64 actual_payload = arg.template Get<int64>(); int64_t actual_payload = arg.template Get<int64_t>();
if (actual_payload != payload) { if (actual_payload != payload) {
*result_listener << "with incorrect payload = " << actual_payload; *result_listener << "with incorrect payload = " << actual_payload;
return false; return false;
@ -137,18 +137,18 @@ class ReproducibleJitterWithReflectionStrategyForTesting
// //
// An EXPECT will fail if sequence is less than the number requested during // An EXPECT will fail if sequence is less than the number requested during
// processing. // processing.
static std::vector<uint64> random_sequence; static std::vector<uint64_t> random_sequence;
protected: protected:
virtual uint64 GetNextRandom(uint64 n) { virtual uint64_t GetNextRandom(uint64_t n) {
EXPECT_LT(sequence_index_, random_sequence.size()); EXPECT_LT(sequence_index_, random_sequence.size());
return random_sequence[sequence_index_++] % n; return random_sequence[sequence_index_++] % n;
} }
private: private:
int32 sequence_index_ = 0; int32_t sequence_index_ = 0;
}; };
std::vector<uint64> std::vector<uint64_t>
ReproducibleJitterWithReflectionStrategyForTesting::random_sequence; ReproducibleJitterWithReflectionStrategyForTesting::random_sequence;
// PacketResamplerCalculator child class which injects a specified stream // PacketResamplerCalculator child class which injects a specified stream
@ -469,7 +469,7 @@ TEST(PacketResamplerCalculatorTest, SetVideoHeader) {
} }
)pb")); )pb"));
for (const int64 ts : {0, 5000, 10010, 15001, 19990}) { for (const int64_t ts : {0, 5000, 10010, 15001, 19990}) {
runner.MutableInputs()->Tag(kDataTag).packets.push_back( runner.MutableInputs()->Tag(kDataTag).packets.push_back(
Adopt(new std::string(absl::StrCat("Frame #", ts))).At(Timestamp(ts))); Adopt(new std::string(absl::StrCat("Frame #", ts))).At(Timestamp(ts)));
} }

6
mediapipe/calculators/core/previous_loopback_calculator_test.cc
View File

@ -43,8 +43,8 @@ constexpr char kDisallowTag[] = "DISALLOW";
// Returns the timestamp values for a vector of Packets. // Returns the timestamp values for a vector of Packets.
// TODO: puth this kind of test util in a common place. // TODO: puth this kind of test util in a common place.
std::vector<int64> TimestampValues(const std::vector<Packet>& packets) { std::vector<int64_t> TimestampValues(const std::vector<Packet>& packets) {
std::vector<int64> result; std::vector<int64_t> result;
for (const Packet& packet : packets) { for (const Packet& packet : packets) {
result.push_back(packet.Timestamp().Value()); result.push_back(packet.Timestamp().Value());
} }
@ -371,7 +371,7 @@ TEST(PreviousLoopbackCalculator, EmptyLoopForever) {
for (int main_ts = 0; main_ts < 50; ++main_ts) { for (int main_ts = 0; main_ts < 50; ++main_ts) {
send_packet("in", main_ts); send_packet("in", main_ts);
MP_EXPECT_OK(graph_.WaitUntilIdle()); MP_EXPECT_OK(graph_.WaitUntilIdle());
std::vector<int64> ts_values = TimestampValues(outputs); std::vector<int64_t> ts_values = TimestampValues(outputs);
EXPECT_EQ(ts_values.size(), main_ts + 1); EXPECT_EQ(ts_values.size(), main_ts + 1);
for (int j = 0; j < main_ts + 1; ++j) { for (int j = 0; j < main_ts + 1; ++j) {
EXPECT_EQ(ts_values[j], j); EXPECT_EQ(ts_values[j], j);

6
mediapipe/calculators/core/side_packet_to_stream_calculator.cc
View File

@ -121,7 +121,7 @@ absl::Status SidePacketToStreamCalculator::GetContract(CalculatorContract* cc) {
if (cc->Outputs().HasTag(kTagAtTimestamp)) { if (cc->Outputs().HasTag(kTagAtTimestamp)) {
RET_CHECK_EQ(num_entries + 1, cc->InputSidePackets().NumEntries()) RET_CHECK_EQ(num_entries + 1, cc->InputSidePackets().NumEntries())
<< "For AT_TIMESTAMP tag, 2 input side packets are required."; << "For AT_TIMESTAMP tag, 2 input side packets are required.";
cc->InputSidePackets().Tag(kTagSideInputTimestamp).Set<int64>(); cc->InputSidePackets().Tag(kTagSideInputTimestamp).Set<int64_t>();
} else { } else {
RET_CHECK_EQ(num_entries, cc->InputSidePackets().NumEntries()) RET_CHECK_EQ(num_entries, cc->InputSidePackets().NumEntries())
<< "Same number of input side packets and output streams is required."; << "Same number of input side packets and output streams is required.";
@ -178,8 +178,8 @@ absl::Status SidePacketToStreamCalculator::Close(CalculatorContext* cc) {
.AddPacket(cc->InputSidePackets().Index(i).At(timestamp)); .AddPacket(cc->InputSidePackets().Index(i).At(timestamp));
} }
} else if (cc->Outputs().HasTag(kTagAtTimestamp)) { } else if (cc->Outputs().HasTag(kTagAtTimestamp)) {
int64 timestamp = int64_t timestamp =
cc->InputSidePackets().Tag(kTagSideInputTimestamp).Get<int64>(); cc->InputSidePackets().Tag(kTagSideInputTimestamp).Get<int64_t>();
for (int i = 0; i < cc->Outputs().NumEntries(output_tag_); ++i) { for (int i = 0; i < cc->Outputs().NumEntries(output_tag_); ++i) {
cc->Outputs() cc->Outputs()
.Get(output_tag_, i) .Get(output_tag_, i)