Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b85c44e
Draft. adding GA samples for Logo detection
munkhuushmgl Mar 12, 2020
865527f
Merge branch 'master' into logo-detection
munkhuushmgl Mar 12, 2020
49235a0
Merge branch 'master' into logo-detection
munkhuushmgl Mar 16, 2020
8f00d73
Merge branch 'master' into logo-detection
munkhuushmgl Mar 17, 2020
1e3a9cc
Update video/cloud-client/src/main/java/com/example/video/LogoDetecti…
munkhuushmgl Mar 18, 2020
6a9bcf2
Update video/cloud-client/src/main/java/com/example/video/LogoDetecti…
munkhuushmgl Mar 18, 2020
ab97a53
Update video/cloud-client/src/main/java/com/example/video/LogoDetecti…
munkhuushmgl Mar 18, 2020
e470cd0
made requested changes
munkhuushmgl Mar 18, 2020
1412cb1
Merge branch 'master' into logo-detection
munkhuushmgl Mar 18, 2020
e2b736f
Update video/cloud-client/src/test/java/com/example/video/DetectLogoG…
munkhuushmgl Mar 18, 2020
b3fe692
Update video/cloud-client/src/test/java/com/example/video/DetectLogoT…
munkhuushmgl Mar 18, 2020
d493141
added spec exceptions
munkhuushmgl Mar 18, 2020
2ccb0af
Merge branch 'logo-detection' of https://github.com/GoogleCloudPlatfo…
munkhuushmgl Mar 18, 2020
49a6cf2
Merge branch 'master' into logo-detection
munkhuushmgl Mar 18, 2020
bf9073f
Update video/cloud-client/src/main/java/com/example/video/LogoDetecti…
munkhuushmgl Mar 18, 2020
e1a8851
Update video/cloud-client/src/main/java/com/example/video/LogoDetecti…
munkhuushmgl Mar 18, 2020
4f4db50
Merge branch 'master' into logo-detection
munkhuushmgl Mar 18, 2020
a125bfe
Merge branch 'master' into logo-detection
nnegrey Mar 19, 2020
e22796e
Merge branch 'master' into logo-detection
munkhuushmgl Mar 19, 2020
132e7ad
Merge branch 'master' into logo-detection
munkhuushmgl Mar 20, 2020
44486c5
clean up gcs code
munkhuushmgl Mar 23, 2020
82a1aa3
Merge branch 'logo-detection' of https://github.com/GoogleCloudPlatfo…
munkhuushmgl Mar 23, 2020
9ef7acb
Merge branch 'master' into logo-detection
munkhuushmgl Mar 23, 2020
8ffe457
Update video/cloud-client/src/main/java/com/example/video/LogoDetecti…
munkhuushmgl Mar 23, 2020
317e889
Update video/cloud-client/src/main/java/com/example/video/LogoDetecti…
munkhuushmgl Mar 23, 2020
1423719
Update video/cloud-client/src/main/java/com/example/video/LogoDetecti…
munkhuushmgl Mar 23, 2020
9d27e97
Merge branch 'master' into logo-detection
munkhuushmgl Mar 23, 2020
b09b433
Merge branch 'master' into logo-detection
nnegrey Mar 24, 2020
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
138 changes: 138 additions & 0 deletions video/cloud-client/src/main/java/com/example/video/LogoDetection.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
/*
* Copyright 2020 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.example.video;

import com.google.api.gax.longrunning.OperationFuture;
import com.google.cloud.videointelligence.v1.AnnotateVideoProgress;
import com.google.cloud.videointelligence.v1.AnnotateVideoRequest;
import com.google.cloud.videointelligence.v1.AnnotateVideoResponse;
import com.google.cloud.videointelligence.v1.DetectedAttribute;
import com.google.cloud.videointelligence.v1.Entity;
import com.google.cloud.videointelligence.v1.Feature;
import com.google.cloud.videointelligence.v1.LogoRecognitionAnnotation;
import com.google.cloud.videointelligence.v1.NormalizedBoundingBox;
import com.google.cloud.videointelligence.v1.TimestampedObject;
import com.google.cloud.videointelligence.v1.Track;
import com.google.cloud.videointelligence.v1.VideoAnnotationResults;
import com.google.cloud.videointelligence.v1.VideoIntelligenceServiceClient;
import com.google.cloud.videointelligence.v1.VideoSegment;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;

import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.concurrent.TimeUnit;

public class LogoDetection {

public static void detectLogo() throws Exception {
// TODO(developer): Replace these variables before running the sample.
String localFilePath = "resources/googlework_short.mp4";
detectLogo(localFilePath);
}

// [START video_detect_logo]
public static void detectLogo(String filePath) throws Exception {
try (VideoIntelligenceServiceClient client = VideoIntelligenceServiceClient.create()) {
// Read file
Path path = Paths.get(filePath);
byte[] data = Files.readAllBytes(path);
// Create the request
AnnotateVideoRequest request = AnnotateVideoRequest.newBuilder()
.setInputContent(ByteString.copyFrom(data))
.addFeatures(Feature.LOGO_RECOGNITION)
.build();

// asynchronously perform object tracking on videos
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> future =
client.annotateVideoAsync(request);

System.out.println("Waiting for operation to complete...");
// The first result is retrieved because a single video was processed.
AnnotateVideoResponse response = future.get(300, TimeUnit.SECONDS);
VideoAnnotationResults annotationResult = response.getAnnotationResults(0);

// Annotations for list of logos detected, tracked and recognized in video.
for (LogoRecognitionAnnotation logoRecognitionAnnotation :
annotationResult.getLogoRecognitionAnnotationsList()) {
Entity entity = logoRecognitionAnnotation.getEntity();
// Opaque entity ID. Some IDs may be available in
// [Google Knowledge Graph Search API](https://developers.google.com/knowledge-graph/).
System.out.printf("Entity Id : %s\n", entity.getEntityId());
// Textual description, e.g. `Google`.
System.out.printf("Description : %s\n", entity.getDescription());
// All logo tracks where the recognized logo appears. Each track corresponds
// to one logo instance appearing in consecutive frames.
for (Track track : logoRecognitionAnnotation.getTracksList()) {
// Video segment of a track.
VideoSegment segment = track.getSegment();
Duration segmentStartTimeOffset = segment.getStartTimeOffset();
System.out.printf(
"\n\tStart Time Offset : %s.%s\n",
segmentStartTimeOffset.getSeconds(), segmentStartTimeOffset.getNanos());
Duration segmentEndTimeOffset = segment.getEndTimeOffset();
System.out.printf(
"\tEnd Time Offset : %s.%s\n",
segmentEndTimeOffset.getSeconds(), segmentEndTimeOffset.getNanos());
System.out.printf("\tConfidence : %s\n", track.getConfidence());
// The object with timestamp and attributes per frame in the track.
for (TimestampedObject timestampedObject : track.getTimestampedObjectsList()) {
// Normalized Bounding box in a frame, where the object is located.
NormalizedBoundingBox normalizedBoundingBox =
timestampedObject.getNormalizedBoundingBox();
System.out.printf("\n\t\tLeft : %s\n", normalizedBoundingBox.getLeft());
System.out.printf("\t\tTop : %s\n", normalizedBoundingBox.getTop());
System.out.printf("\t\tRight : %s\n", normalizedBoundingBox.getRight());
System.out.printf("\t\tBottom : %s\n", normalizedBoundingBox.getBottom());
// Optional. The attributes of the object in the bounding box.
for (DetectedAttribute attribute : timestampedObject.getAttributesList()) {
System.out.printf("\n\t\t\tName : %s\n", attribute.getName());
System.out.printf("\t\t\tConfidence : %s\n", attribute.getConfidence());
System.out.printf("\t\t\tValue : %s\n", attribute.getValue());
}
}
// Optional. Attributes in the track level.
for (DetectedAttribute trackAttribute : track.getAttributesList()) {
System.out.printf("\n\t\tName : %s\n", trackAttribute.getName());
System.out.printf("\t\tConfidence : %s\n", trackAttribute.getConfidence());
System.out.printf("\t\tValue : %s\n", trackAttribute.getValue());
}
}
// All video segments where the recognized logo appears.
// There might be multiple instances of the same logo class appearing in one VideoSegment.
for (VideoSegment logoRecognitionAnnotationSegment :
logoRecognitionAnnotation.getSegmentsList()) {
Duration logoRecognitionAnnotationSegmentStartTimeOffset =
logoRecognitionAnnotationSegment.getStartTimeOffset();
System.out.printf(
"\n\tStart Time Offset : %s.%s\n",
logoRecognitionAnnotationSegmentStartTimeOffset.getSeconds(),
logoRecognitionAnnotationSegmentStartTimeOffset.getNanos());
Duration logoRecognitionAnnotationSegmentEndTimeOffset =
logoRecognitionAnnotationSegment.getEndTimeOffset();
System.out.printf(
"\tEnd Time Offset : %s.%s\n",
logoRecognitionAnnotationSegmentEndTimeOffset.getSeconds(),
logoRecognitionAnnotationSegmentEndTimeOffset.getNanos());
}
}
}
}
// [END video_detect_logo]
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
/*
* Copyright 2020 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.example.video;

import com.google.api.gax.longrunning.OperationFuture;
import com.google.cloud.videointelligence.v1.AnnotateVideoProgress;
import com.google.cloud.videointelligence.v1.AnnotateVideoRequest;
import com.google.cloud.videointelligence.v1.AnnotateVideoResponse;
import com.google.cloud.videointelligence.v1.DetectedAttribute;
import com.google.cloud.videointelligence.v1.Entity;
import com.google.cloud.videointelligence.v1.Feature;
import com.google.cloud.videointelligence.v1.LogoRecognitionAnnotation;
import com.google.cloud.videointelligence.v1.NormalizedBoundingBox;
import com.google.cloud.videointelligence.v1.TimestampedObject;
import com.google.cloud.videointelligence.v1.Track;
import com.google.cloud.videointelligence.v1.VideoAnnotationResults;
import com.google.cloud.videointelligence.v1.VideoIntelligenceServiceClient;
import com.google.cloud.videointelligence.v1.VideoSegment;
import com.google.protobuf.Duration;

import java.util.concurrent.TimeUnit;

public class LogoDetectionGcs {

public static void detectLogoGcs() throws Exception {
// TODO(developer): Replace these variables before running the sample.
String gcsUri = "gs://cloud-samples-data/video/googlework_short.mp4";
detectLogoGcs(gcsUri);
}

// [START video_detect_logo_gcs]
public static void detectLogoGcs(String inputUri) throws Exception {
try (VideoIntelligenceServiceClient client = VideoIntelligenceServiceClient.create()) {
// Create the request
AnnotateVideoRequest request = AnnotateVideoRequest.newBuilder()
.setInputUri(inputUri)
.addFeatures(Feature.LOGO_RECOGNITION)
.build();

// asynchronously perform object tracking on videos
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> future =
client.annotateVideoAsync(request);

System.out.println("Waiting for operation to complete...");
// The first result is retrieved because a single video was processed.
AnnotateVideoResponse response = future.get(300, TimeUnit.SECONDS);
VideoAnnotationResults annotationResult = response.getAnnotationResults(0);

// Annotations for list of logos detected, tracked and recognized in video.
for (LogoRecognitionAnnotation logoRecognitionAnnotation :
annotationResult.getLogoRecognitionAnnotationsList()) {
Entity entity = logoRecognitionAnnotation.getEntity();
// Opaque entity ID. Some IDs may be available in
// [Google Knowledge Graph Search API](https://developers.google.com/knowledge-graph/).
System.out.printf("Entity Id : %s\n", entity.getEntityId());
// Textual description, e.g. `Google`.
System.out.printf("Description : %s\n", entity.getDescription());
// All logo tracks where the recognized logo appears. Each track corresponds
// to one logo instance appearing in consecutive frames.
for (Track track : logoRecognitionAnnotation.getTracksList()) {
// Video segment of a track.
VideoSegment segment = track.getSegment();
Duration segmentStartTimeOffset = segment.getStartTimeOffset();
System.out.printf(
"\n\tStart Time Offset : %s.%s\n",
segmentStartTimeOffset.getSeconds(), segmentStartTimeOffset.getNanos());
Duration segmentEndTimeOffset = segment.getEndTimeOffset();
System.out.printf(
"\tEnd Time Offset : %s.%s\n",
segmentEndTimeOffset.getSeconds(), segmentEndTimeOffset.getNanos());
System.out.printf("\tConfidence : %s\n", track.getConfidence());
// The object with timestamp and attributes per frame in the track.
for (TimestampedObject timestampedObject : track.getTimestampedObjectsList()) {
// Normalized Bounding box in a frame, where the object is located.
NormalizedBoundingBox normalizedBoundingBox =
timestampedObject.getNormalizedBoundingBox();
System.out.printf("\n\t\tLeft : %s\n", normalizedBoundingBox.getLeft());
System.out.printf("\t\tTop : %s\n", normalizedBoundingBox.getTop());
System.out.printf("\t\tRight : %s\n", normalizedBoundingBox.getRight());
System.out.printf("\t\tBottom : %s\n", normalizedBoundingBox.getBottom());
// Optional. The attributes of the object in the bounding box.
for (DetectedAttribute attribute : timestampedObject.getAttributesList()) {
System.out.printf("\n\t\t\tName : %s\n", attribute.getName());
System.out.printf("\t\t\tConfidence : %s\n", attribute.getConfidence());
System.out.printf("\t\t\tValue : %s\n", attribute.getValue());
}
}
// Optional. Attributes in the track level.
for (DetectedAttribute trackAttribute : track.getAttributesList()) {
System.out.printf("\n\t\tName : %s\n", trackAttribute.getName());
System.out.printf("\t\tConfidence : %s\n", trackAttribute.getConfidence());
System.out.printf("\t\tValue : %s\n", trackAttribute.getValue());
}
}
// All video segments where the recognized logo appears.
// There might be multiple instances of the same logo class appearing in one VideoSegment.
for (VideoSegment logoRecognitionAnnotationSegment :
logoRecognitionAnnotation.getSegmentsList()) {
Duration logoRecognitionAnnotationSegmentStartTimeOffset =
logoRecognitionAnnotationSegment.getStartTimeOffset();
System.out.printf(
"\n\tStart Time Offset : %s.%s\n",
logoRecognitionAnnotationSegmentStartTimeOffset.getSeconds(),
logoRecognitionAnnotationSegmentStartTimeOffset.getNanos());
Duration logoRecognitionAnnotationSegmentEndTimeOffset =
logoRecognitionAnnotationSegment.getEndTimeOffset();
System.out.printf(
"\tEnd Time Offset : %s.%s\n",
logoRecognitionAnnotationSegmentEndTimeOffset.getSeconds(),
logoRecognitionAnnotationSegmentEndTimeOffset.getNanos());
}
}
}
}
// [END video_detect_logo_gcs]
}

39 changes: 32 additions & 7 deletions video/cloud-client/src/test/java/com/example/video/DetectIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,35 @@
import com.google.cloud.videointelligence.v1.ObjectTrackingAnnotation;
import com.google.cloud.videointelligence.v1.TextAnnotation;
import com.google.cloud.videointelligence.v1.VideoAnnotationResults;

import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.Arrays;
import java.util.List;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

/** Tests for video analysis sample. */
/**
* Tests for video analysis sample.
*/
@RunWith(JUnit4.class)
@SuppressWarnings("checkstyle:abbreviationaswordinname")
public class DetectIT {
private ByteArrayOutputStream bout;
private PrintStream out;

static final String LABEL_GCS_LOCATION = "gs://cloud-samples-data/video/cat.mp4";
static final String LABEL_FILE_LOCATION = "./resources/cat.mp4";
static final String SHOTS_FILE_LOCATION = "gs://cloud-samples-data/video/gbikes_dinosaur.mp4";
static final String EXPLICIT_CONTENT_LOCATION = "gs://cloud-samples-data/video/cat.mp4";
static final String EXPLICIT_CONTENT_LOCATION = "gs://cloud-samples-data/video/cat.mp4";
static final String SPEECH_GCS_LOCATION =
"gs://java-docs-samples-testing/video/googlework_short.mp4";
private static final List<String> POSSIBLE_TEXTS = Arrays.asList(
"Google", "SUR", "SUR", "ROTO", "Vice President", "58oo9", "LONDRES", "OMAR", "PARIS",
"METRO", "RUE", "CARLO");
"Google", "SUR", "SUR", "ROTO", "Vice President", "58oo9", "LONDRES", "OMAR", "PARIS",
"METRO", "RUE", "CARLO");
private ByteArrayOutputStream bout;
private PrintStream out;

@Before
public void setUp() {
Expand Down Expand Up @@ -78,6 +81,28 @@ public void testLabelsFile() throws Exception {
assertThat(got.toUpperCase()).contains("WHISKERS");
}

@Test
public void testLogoDetect() throws Exception {
LogoDetection.detectLogo("resources/googlework_short.mp4");
String got = bout.toString();

assertThat(got).contains("Description : Google Maps");
assertThat(got).contains("Confidence");
assertThat(got).contains("Start Time Offset");
assertThat(got).contains("End Time Offset");
}

@Test
public void testLogoDetectGcs() throws Exception {
LogoDetectionGcs.detectLogoGcs("gs://cloud-samples-data/video/googlework_tiny.mp4");
String got = bout.toString();

assertThat(got).contains("Description : Google Maps");
assertThat(got).contains("Confidence");
assertThat(got).contains("Start Time Offset");
assertThat(got).contains("End Time Offset");
}

@Test
public void testExplicitContent() throws Exception {
String[] args = {"explicit-content", EXPLICIT_CONTENT_LOCATION};
Expand Down