Skip to content

Commit cadbf52

Browse files
telpiriontelpirion
authored
samples: updates face and people to v1 (#449)
* samples: updates face and people to v1 * fix: appease the linter
1 parent bd8b41d commit cadbf52

File tree

5 files changed

+38
-34
lines changed

5 files changed

+38
-34
lines changed

‎video/src/main/java/com/example/video/Detect.java

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
public class Detect {
4646
/**
4747
* Detects labels, shots, and explicit content in a video using the Video Intelligence API
48+
*
4849
* @param args specifies features to detect and the path to the video on Google Cloud Storage.
4950
*/
5051
public static void main(String[] args) {
@@ -58,6 +59,7 @@ public static void main(String[] args) {
5859

5960
/**
6061
* Helper that handles the input passed to the program.
62+
*
6163
* @param args specifies features to detect and the path to the video on Google Cloud Storage.
6264
*
6365
* @throws IOException on Input/Output errors.

‎video/src/main/java/beta/video/DetectFaces.java renamed to ‎video/src/main/java/video/DetectFaces.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@
1414
* limitations under the License.
1515
*/
1616

17-
package beta.video;
17+
package video;
1818

19-
// [START video_detect_faces_beta]
19+
// [START video_detect_faces]
2020

2121
import com.google.api.gax.longrunning.OperationFuture;
22-
import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoProgress;
23-
import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoRequest;
24-
import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoResponse;
25-
import com.google.cloud.videointelligence.v1p3beta1.DetectedAttribute;
26-
import com.google.cloud.videointelligence.v1p3beta1.FaceDetectionAnnotation;
27-
import com.google.cloud.videointelligence.v1p3beta1.FaceDetectionConfig;
28-
import com.google.cloud.videointelligence.v1p3beta1.Feature;
29-
import com.google.cloud.videointelligence.v1p3beta1.TimestampedObject;
30-
import com.google.cloud.videointelligence.v1p3beta1.Track;
31-
import com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults;
32-
import com.google.cloud.videointelligence.v1p3beta1.VideoContext;
33-
import com.google.cloud.videointelligence.v1p3beta1.VideoIntelligenceServiceClient;
34-
import com.google.cloud.videointelligence.v1p3beta1.VideoSegment;
22+
import com.google.cloud.videointelligence.v1.AnnotateVideoProgress;
23+
import com.google.cloud.videointelligence.v1.AnnotateVideoRequest;
24+
import com.google.cloud.videointelligence.v1.AnnotateVideoResponse;
25+
import com.google.cloud.videointelligence.v1.DetectedAttribute;
26+
import com.google.cloud.videointelligence.v1.FaceDetectionAnnotation;
27+
import com.google.cloud.videointelligence.v1.FaceDetectionConfig;
28+
import com.google.cloud.videointelligence.v1.Feature;
29+
import com.google.cloud.videointelligence.v1.TimestampedObject;
30+
import com.google.cloud.videointelligence.v1.Track;
31+
import com.google.cloud.videointelligence.v1.VideoAnnotationResults;
32+
import com.google.cloud.videointelligence.v1.VideoContext;
33+
import com.google.cloud.videointelligence.v1.VideoIntelligenceServiceClient;
34+
import com.google.cloud.videointelligence.v1.VideoSegment;
3535
import com.google.protobuf.ByteString;
3636
import java.nio.file.Files;
3737
import java.nio.file.Path;
@@ -109,4 +109,4 @@ public static void detectFaces(String localFilePath) throws Exception {
109109
}
110110
}
111111
}
112-
// [END video_detect_faces_beta]
112+
// [END video_detect_faces]

‎video/src/main/java/beta/video/DetectFacesGcs.java renamed to ‎video/src/main/java/video/DetectFacesGcs.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@
1414
* limitations under the License.
1515
*/
1616

17-
package beta.video;
17+
package video;
1818

19-
// [START video_detect_faces_gcs_beta]
19+
// [START video_detect_faces_gcs]
2020

2121
import com.google.api.gax.longrunning.OperationFuture;
22-
import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoProgress;
23-
import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoRequest;
24-
import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoResponse;
25-
import com.google.cloud.videointelligence.v1p3beta1.DetectedAttribute;
26-
import com.google.cloud.videointelligence.v1p3beta1.FaceDetectionAnnotation;
27-
import com.google.cloud.videointelligence.v1p3beta1.FaceDetectionConfig;
28-
import com.google.cloud.videointelligence.v1p3beta1.Feature;
29-
import com.google.cloud.videointelligence.v1p3beta1.TimestampedObject;
30-
import com.google.cloud.videointelligence.v1p3beta1.Track;
31-
import com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults;
32-
import com.google.cloud.videointelligence.v1p3beta1.VideoContext;
33-
import com.google.cloud.videointelligence.v1p3beta1.VideoIntelligenceServiceClient;
34-
import com.google.cloud.videointelligence.v1p3beta1.VideoSegment;
22+
import com.google.cloud.videointelligence.v1.AnnotateVideoProgress;
23+
import com.google.cloud.videointelligence.v1.AnnotateVideoRequest;
24+
import com.google.cloud.videointelligence.v1.AnnotateVideoResponse;
25+
import com.google.cloud.videointelligence.v1.DetectedAttribute;
26+
import com.google.cloud.videointelligence.v1.FaceDetectionAnnotation;
27+
import com.google.cloud.videointelligence.v1.FaceDetectionConfig;
28+
import com.google.cloud.videointelligence.v1.Feature;
29+
import com.google.cloud.videointelligence.v1.TimestampedObject;
30+
import com.google.cloud.videointelligence.v1.Track;
31+
import com.google.cloud.videointelligence.v1.VideoAnnotationResults;
32+
import com.google.cloud.videointelligence.v1.VideoContext;
33+
import com.google.cloud.videointelligence.v1.VideoIntelligenceServiceClient;
34+
import com.google.cloud.videointelligence.v1.VideoSegment;
3535

3636
public class DetectFacesGcs {
3737

@@ -101,4 +101,4 @@ public static void detectFacesGcs(String gcsUri) throws Exception {
101101
}
102102
}
103103
}
104-
// [END video_detect_faces_gcs_beta]
104+
// [END video_detect_faces_gcs]

‎video/src/test/java/beta/video/DetectFacesGcsIT.java renamed to ‎video/src/test/java/video/DetectFacesGcsIT.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package beta.video;
17+
package video;
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020

@@ -23,6 +23,7 @@
2323
import org.junit.After;
2424
import org.junit.Before;
2525
import org.junit.Test;
26+
import video.DetectFacesGcs;
2627

2728
@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
2829
public class DetectFacesGcsIT {

‎video/src/test/java/beta/video/DetectFacesIT.java renamed to ‎video/src/test/java/video/DetectFacesIT.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package beta.video;
17+
package video;
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020

@@ -23,6 +23,7 @@
2323
import org.junit.After;
2424
import org.junit.Before;
2525
import org.junit.Test;
26+
import video.DetectFaces;
2627

2728
@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
2829
public class DetectFacesIT {

0 commit comments

Comments
 (0)