Skip to content

Commit c4d1d32

Browse files
dizcologyJon Wayne Parrott
authored and
Jon Wayne Parrott
committed
* update analyze_safe_search * update analyze_shots * update explicit_content_detection and test * update fece detection * update label detection (path) * update label detection (file) * flake * safe search --> explicit content * update faces tutorial * update client library quickstart * update shotchange tutorial * update labels tutorial * correct spelling * correction start_time_offset * import order * rebased
1 parent cab45cc commit c4d1d32

File tree

2 files changed

+22
-17
lines changed

2 files changed

+22
-17
lines changed

samples/labels/labels.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,15 @@
3232
import sys
3333
import time
3434

35-
from google.cloud.gapic.videointelligence.v1beta1 import enums
36-
from google.cloud.gapic.videointelligence.v1beta1 import (
37-
video_intelligence_service_client)
35+
from google.cloud import videointelligence_v1beta2
36+
from google.cloud.videointelligence_v1beta2 import enums
3837
# [END imports]
3938

4039

4140
def analyze_labels(path):
4241
""" Detects labels given a GCS path. """
4342
# [START construct_request]
44-
video_client = (video_intelligence_service_client.
45-
VideoIntelligenceServiceClient())
43+
video_client = videointelligence_v1beta2.VideoIntelligenceServiceClient()
4644
features = [enums.Feature.LABEL_DETECTION]
4745
operation = video_client.annotate_video(path, features)
4846
# [END construct_request]
@@ -60,15 +58,23 @@ def analyze_labels(path):
6058
# [START parse_response]
6159
results = operation.result().annotation_results[0]
6260

63-
for label in results.label_annotations:
64-
print('Label description: {}'.format(label.description))
65-
print('Locations:')
66-
67-
for l, location in enumerate(label.locations):
68-
print('\t{}: {} to {}'.format(
69-
l,
70-
location.segment.start_time_offset,
71-
location.segment.end_time_offset))
61+
for i, segment_label in enumerate(results.segment_label_annotations):
62+
print('Video label description: {}'.format(
63+
segment_label.entity.description))
64+
for category_entity in segment_label.category_entities:
65+
print('\tLabel category description: {}'.format(
66+
category_entity.description))
67+
68+
for i, segment in enumerate(segment_label.segments):
69+
start_time = (segment.segment.start_time_offset.seconds +
70+
segment.segment.start_time_offset.nanos / 1e9)
71+
end_time = (segment.segment.end_time_offset.seconds +
72+
segment.segment.end_time_offset.nanos / 1e9)
73+
positions = '{}s to {}s'.format(start_time, end_time)
74+
confidence = segment.confidence
75+
print('\tSegment {}: {}'.format(i, positions))
76+
print('\tConfidence: {}'.format(confidence))
77+
print('\n')
7278
# [END parse_response]
7379

7480

samples/labels/labels_test.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
# limitations under the License.
1616

1717
import os
18-
18+
import labels
1919
import pytest
2020

21-
import labels
2221

2322
BUCKET = os.environ['CLOUD_STORAGE_BUCKET']
2423
LABELS_FILE_PATH = '/video/cat.mp4'
@@ -29,4 +28,4 @@ def test_feline_video_labels(capsys):
2928
labels.analyze_labels(
3029
'gs://{}{}'.format(BUCKET, LABELS_FILE_PATH))
3130
out, _ = capsys.readouterr()
32-
assert 'Whiskers' in out
31+
assert 'Video label description: cat' in out

0 commit comments

Comments
 (0)