talksik/mediapipe
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Project import generated by Copybara.

Browse Source 
PiperOrigin-RevId: 255500495
This commit is contained in:
MediaPipe Team
2019-06-27 17:10:09 -07:00
committed by jqtang
parent 2aaf4693db
commit 56cdbaf140
12 changed files with 86 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mediapipe/calculators/image/recolor_calculator.cc
+3
View File
@@ -216,6 +216,9 @@ REGISTER_CALCULATOR(RecolorCalculator);
GlRender();
glActiveTexture(GL_TEXTURE2);
glBindTexture(GL_TEXTURE_2D, 0);
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, 0);
glFlush();
}
mediapipe/calculators/image/set_alpha_calculator.cc
+7 -3
View File
@@ -321,13 +321,20 @@ REGISTER_CALCULATOR(SetAlphaCalculator);
glActiveTexture(GL_TEXTURE2);
glBindTexture(GL_TEXTURE_2D, alpha_texture.name());
GlRender(cc); // use channel 0 of mask
glActiveTexture(GL_TEXTURE2);
glBindTexture(GL_TEXTURE_2D, 0);
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, 0);
alpha_texture.Release();
} else {
gpu_helper_.BindFramebuffer(output_texture); // GL_TEXTURE0
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, input_texture.name());
GlRender(cc); // use value from options
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, 0);
}
glFlush();
// Send out image as GPU packet.
auto output_frame = output_texture.GetFrame<mediapipe::GpuBuffer>();
@@ -393,9 +400,6 @@ REGISTER_CALCULATOR(SetAlphaCalculator);
glDeleteVertexArrays(1, &vao);
glDeleteBuffers(2, vbo);
// execute command queue
glBindTexture(GL_TEXTURE_2D, 0);
glFlush();
#endif // __ANDROID__
return ::mediapipe::OkStatus();
mediapipe/calculators/tflite/tflite_tensors_to_detections_calculator.cc
+2 -4
View File
@@ -506,8 +506,7 @@ Detection TfLiteTensorsToDetectionsCalculator::ConvertToDetection(
#if defined(__ANDROID__)
// A shader to decode detection boxes.
const std::string decode_src = absl::Substitute(
R"(
#version 310 es
R"( #version 310 es
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -643,8 +642,7 @@ void main() {
// A shader to score detection boxes.
const std::string score_src = absl::Substitute(
R"(
#version 310 es
R"( #version 310 es
layout(local_size_x = 1, local_size_y = $0, local_size_z = 1) in;
mediapipe/calculators/tflite/tflite_tensors_to_segmentation_calculator.cc
+3 -2
View File
@@ -301,6 +301,8 @@ REGISTER_CALCULATOR(TfLiteTensorsToSegmentationCalculator);
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, input_mask_texture.name());
mask_program_with_prev_->Dispatch(workgroups);
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, 0);
}
}
@@ -413,8 +415,7 @@ void TfLiteTensorsToSegmentationCalculator::GlRender() {
// Currently uses 4 channels for output,
// and sets both R and A channels as mask value.
const std::string shader_src_template =
R"(
#version 310 es
R"( #version 310 es
layout(local_size_x = $0, local_size_y = $0, local_size_z = 1) in;
mediapipe/calculators/util/annotation_overlay_calculator.cc
+3
View File
@@ -359,6 +359,9 @@ REGISTER_CALCULATOR(AnnotationOverlayCalculator);
RETURN_IF_ERROR(GlRender(cc));
glActiveTexture(GL_TEXTURE2);
glBindTexture(GL_TEXTURE_2D, 0);
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, 0);
glFlush();
}
mediapipe/framework/formats/annotation/BUILD
-1
View File
@@ -25,7 +25,6 @@ package(default_visibility = ["//visibility:private"])
proto_library(
name = "locus_proto",
srcs = ["locus.proto"],
visibility = ["//mediapipe:__subpackages__"],
deps = ["//mediapipe/framework/formats/annotation:rasterization_proto"],
)
mediapipe/graphs/face_detection/face_detection_android_cpu.pbtxt
+2 -9
View File
@@ -45,8 +45,8 @@ node: {
# resulting in potential letterboxing in the transformed image.
node: {
calculator: "ImageTransformationCalculator"
input_stream: "IMAGE_GPU:throttled_input_video"
output_stream: "IMAGE_GPU:transformed_input_video"
input_stream: "IMAGE:input_video_cpu"
output_stream: "IMAGE:transformed_input_video_cpu"
output_stream: "LETTERBOX_PADDING:letterbox_padding"
node_options: {
[type.googleapis.com/mediapipe.ImageTransformationCalculatorOptions] {
@@ -57,13 +57,6 @@ node: {
}
}
# Transfers the transformed input image from GPU to CPU memory.
node: {
calculator: "GpuBufferToImageFrameCalculator"
input_stream: "transformed_input_video"
output_stream: "transformed_input_video_cpu"
}
# Converts the transformed input image on CPU into an image tensor as a
# TfLiteTensor. The zero_center option is set to true to normalize the
# pixel values to [-1.f, 1.f] as opposed to [0.f, 1.f]. The flip_vertically
mediapipe/java/com/google/mediapipe/components/FrameProcessor.java
+14 -5
View File
@@ -109,7 +109,7 @@ public class FrameProcessor implements TextureFrameProcessor {
mediapipeGraph.setParentGlContext(parentNativeContext);
} catch (MediaPipeException e) {
// TODO: Report this error from MediaPipe.
Log.e(TAG, "Mediapipe error: ", e);
}
videoSurfaceOutput = mediapipeGraph.addSurfaceOutput(videoOutputStream);
@@ -199,7 +199,7 @@ public class FrameProcessor implements TextureFrameProcessor {
try {
mediapipeGraph.tearDown();
} catch (MediaPipeException e) {
// TODO: Report this error from MediaPipe.
Log.e(TAG, "Mediapipe error: ", e);
}
}
}
@@ -209,6 +209,7 @@ public class FrameProcessor implements TextureFrameProcessor {
*
* <p>Normally the graph is initialized when the first frame arrives. You can optionally call this
* method to initialize it ahead of time.
* @throws MediaPipeException for any error status.
*/
public void preheat() {
if (!started.getAndSet(true)) {
@@ -220,6 +221,10 @@ public class FrameProcessor implements TextureFrameProcessor {
this.addFrameListener = addFrameListener;
}
/**
* Returns true if the MediaPipe graph can accept one more input frame.
* @throws MediaPipeException for any error status.
*/
private boolean maybeAcceptNewFrame() {
if (!started.getAndSet(true)) {
startGraph();
@@ -254,7 +259,7 @@ public class FrameProcessor implements TextureFrameProcessor {
mediapipeGraph.addConsumablePacketToInputStream(
videoInputStream, imagePacket, frame.getTimestamp());
} catch (MediaPipeException e) {
// TODO: Report this error from MediaPipe.
Log.e(TAG, "Mediapipe error: ", e);
}
imagePacket.release();
}
@@ -281,7 +286,7 @@ public class FrameProcessor implements TextureFrameProcessor {
// packet, which may allow for more memory optimizations.
mediapipeGraph.addConsumablePacketToInputStream(videoInputStreamCpu, packet, timestamp);
} catch (MediaPipeException e) {
// TODO: Report this error from MediaPipe.
Log.e(TAG, "Mediapipe error: ", e);
}
packet.release();
}
@@ -290,10 +295,14 @@ public class FrameProcessor implements TextureFrameProcessor {
try {
mediapipeGraph.waitUntilGraphIdle();
} catch (MediaPipeException e) {
// TODO: Report this error from MediaPipe.
Log.e(TAG, "Mediapipe error: ", e);
}
}
/**
* Starts running the MediaPipe graph.
* @throws MediaPipeException for any error status.
*/
private void startGraph() {
mediapipeGraph.startRunningGraph();
}
mediapipe/java/com/google/mediapipe/framework/Graph.java
+25 -3
View File
@@ -128,6 +128,7 @@ public class Graph {
*
* @param streamName The output stream name in the graph for callback.
* @param callback The callback for handling the call when output stream gets a {@link Packet}.
* @throws MediaPipeException for any error status.
*/
public synchronized void addPacketCallback(String streamName, PacketCallback callback) {
Preconditions.checkState(
@@ -145,6 +146,7 @@ public class Graph {
* @param streamName The output stream name in the graph for callback.
* @param callback The callback for handling the call when output stream gets a {@link Packet} and
* has a stream header.
* @throws MediaPipeException for any error status.
*/
public synchronized void addPacketWithHeaderCallback(
String streamName, PacketWithHeaderCallback callback) {
@@ -251,6 +253,7 @@ public class Graph {
* Runs the mediapipe graph until it finishes.
*
* <p>Side packets that are needed by the graph should be set using {@link setInputSidePackets}.
* @throws MediaPipeException for any error status.
*/
public synchronized void runGraphUntilClose() {
Preconditions.checkState(
@@ -268,6 +271,7 @@ public class Graph {
* <p>Returns immediately after starting the scheduler.
*
* <p>Side packets that are needed by the graph should be set using {@link setInputSidePackets}.
* @throws MediaPipeException for any error status.
*/
public synchronized void startRunningGraph() {
Preconditions.checkState(
@@ -319,6 +323,7 @@ public class Graph {
* @param packet the mediapipe packet.
* @param timestamp the timestamp of the packet, although not enforced, the unit is normally
* microsecond.
* @throws MediaPipeException for any error status.
*/
public synchronized void addPacketToInputStream(
String streamName, Packet packet, long timestamp) {
@@ -343,6 +348,7 @@ public class Graph {
* @param packet the mediapipe packet.
* @param timestamp the timestamp of the packet, although not enforced, the unit is normally
* microsecond.
* @throws MediaPipeException for any error status.
*/
public synchronized void addConsumablePacketToInputStream(
String streamName, Packet packet, long timestamp) {
@@ -363,20 +369,30 @@ public class Graph {
}
}
/** Closes the specified input stream. */
/**
* Closes the specified input stream.
* @throws MediaPipeException for any error status.
*/
public synchronized void closeInputStream(String streamName) {
Preconditions.checkState(
nativeGraphHandle != 0, "Invalid context, tearDown() might have been called.");
nativeCloseInputStream(nativeGraphHandle, streamName);
}
/** Closes all the input streams in the mediapipe graph. */
/**
* Closes all the input streams in the mediapipe graph.
* @throws MediaPipeException for any error status.
*/
public synchronized void closeAllInputStreams() {
Preconditions.checkState(
nativeGraphHandle != 0, "Invalid context, tearDown() might have been called.");
nativeCloseAllInputStreams(nativeGraphHandle);
}
/**
* Closes all the input streams and source calculators in the mediapipe graph.
* @throws MediaPipeException for any error status.
*/
public synchronized void closeAllPacketSources() {
Preconditions.checkState(
nativeGraphHandle != 0, "Invalid context, tearDown() might have been called.");
@@ -387,6 +403,7 @@ public class Graph {
* Waits until the graph is done processing.
*
* <p>This should be called after all sources and input streams are closed.
* @throws MediaPipeException for any error status.
*/
public synchronized void waitUntilGraphDone() {
Preconditions.checkState(
@@ -394,7 +411,10 @@ public class Graph {
nativeWaitUntilGraphDone(nativeGraphHandle);
}
/** Waits until the graph runner is idle. */
/**
* Waits until the graph runner is idle.
* @throws MediaPipeException for any error status.
*/
public synchronized void waitUntilGraphIdle() {
Preconditions.checkState(
nativeGraphHandle != 0, "Invalid context, tearDown() might have been called.");
@@ -455,6 +475,7 @@ public class Graph {
* OpenGL. This runner should be connected to the calculators by specifiying an input side packet
* in the graph file with the same name.
*
* @throws MediaPipeException for any error status.
* @deprecated Call {@link setParentGlContext} to set up texture sharing between contexts. Apart
* from that, GL is set up automatically.
*/
@@ -471,6 +492,7 @@ public class Graph {
* enable the sharing of textures and other objects between the two contexts.
*
* <p>Cannot be called after the graph has been started.
* @throws MediaPipeException for any error status.
*/
public synchronized void setParentGlContext(long javaGlContext) {
Preconditions.checkState(