Skip to content

Commit 2a22c0b

Browse files
hexbabeclaude
andcommitted
RSDK-13626: Remove getImage, Format helpers, and format field usage
Pre-emptive removal ahead of viamrobotics/api#758 which deletes GetImage, RenderFrame, and the Format enum from camera.proto. Removes: - getImage abstract method and mimeToFormat/formatToMime from Camera.java - getImage implementation from CameraRPCClient.java - getImage handler and deleted type imports from CameraRPCService.java - Format import from Media.kt; switches Image.dimensions to use mimeType Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent dfaff40 commit 2a22c0b

File tree

4 files changed

+4
-84
lines changed

4 files changed

+4
-84
lines changed

core/sdk/src/main/java/com/viam/sdk/core/component/camera/Camera.java

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.google.protobuf.Struct;
44
import com.viam.common.v1.Common;
5-
import com.viam.component.camera.v1.Camera.Format;
65
import com.viam.component.camera.v1.Camera.Image;
76
import com.viam.sdk.core.component.Component;
87
import com.viam.sdk.core.resource.Resource;
@@ -47,13 +46,6 @@ public static Camera fromRobot(final RobotClient robot, final String name) {
4746
return robot.getResource(Camera.class, named(name));
4847
}
4948

50-
/**
51-
* @deprecated please utilize getImages instead
52-
*/
53-
@Deprecated
54-
public abstract Image getImage(final Format format,
55-
final Optional<Struct> extra);
56-
5749
public abstract Entry<List<Image>, Common.ResponseMetadata> getImages(
5850
final Optional<List<String>> filterSourceNames,
5951
final Optional<Struct> extra);
@@ -62,35 +54,4 @@ public Entry<List<Image>, Common.ResponseMetadata> getImages() {
6254
return getImages(Optional.empty(), Optional.empty());
6355
}
6456

65-
@Deprecated
66-
static Format mimeToFormat(final String mimeType) {
67-
switch (mimeType) {
68-
case "image/jpeg":
69-
return Format.FORMAT_JPEG;
70-
case "image/png":
71-
return Format.FORMAT_PNG;
72-
case "image/vnd.viam.rgba":
73-
return Format.FORMAT_RAW_RGBA;
74-
case "image/vnd.viam.dep":
75-
return Format.FORMAT_RAW_DEPTH;
76-
default:
77-
return Format.FORMAT_UNSPECIFIED;
78-
}
79-
}
80-
81-
@Deprecated
82-
static String formatToMime(final Format format) {
83-
switch (format) {
84-
case FORMAT_JPEG:
85-
return "image/jpeg";
86-
case FORMAT_PNG:
87-
return "image/png";
88-
case FORMAT_RAW_RGBA:
89-
return "image/vnd.viam.rgba";
90-
case FORMAT_RAW_DEPTH:
91-
return "image/vnd.viam.dep";
92-
default:
93-
return "unknown";
94-
}
95-
}
9657
}

core/sdk/src/main/java/com/viam/sdk/core/component/camera/CameraRPCClient.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,6 @@ public List<Common.Geometry> getGeometries(final Optional<Struct> extra) {
4848
return client.getGeometries(builder.build()).getGeometriesList();
4949
}
5050

51-
@Override
52-
@Deprecated
53-
/*
54-
* @deprecated please utilize getImages instead
55-
*/
56-
public Image getImage(final Format format,
57-
Optional<Struct> extra) {
58-
final GetImageRequest.Builder builder = GetImageRequest.newBuilder().
59-
setName(getName().getName()).
60-
setMimeType(Camera.formatToMime(format));
61-
extra.ifPresent(builder::setExtra);
62-
final GetImageResponse resp = client.getImage(builder.build());
63-
final Image.Builder imgBuilder = Image.newBuilder().
64-
setSourceName(getName().getName()).
65-
setImage(resp.getImage());
66-
67-
return imgBuilder.setFormat(Camera.mimeToFormat(resp.getMimeType())).build();
68-
}
69-
7051
@Override
7152
public Entry<List<Image>, ResponseMetadata> getImages(final Optional<List<String>> filterSourceNames,
7253
final Optional<Struct> extra) {

core/sdk/src/main/java/com/viam/sdk/core/component/camera/CameraRPCService.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import com.viam.common.v1.Common.Geometry;
66
import com.viam.common.v1.Common.GetGeometriesResponse;
77
import com.viam.common.v1.Common.ResponseMetadata;
8-
import com.viam.component.camera.v1.Camera.GetImageRequest;
9-
import com.viam.component.camera.v1.Camera.GetImageResponse;
108
import com.viam.component.camera.v1.Camera.GetImagesRequest;
119
import com.viam.component.camera.v1.Camera.GetImagesResponse;
1210
import com.viam.component.camera.v1.Camera.Image;
@@ -51,24 +49,6 @@ public void getGeometries(Common.GetGeometriesRequest request,
5149
responseObserver.onCompleted();
5250
}
5351

54-
@Override
55-
@Deprecated
56-
/*
57-
* @deprecated please utilize getImages instead
58-
*/
59-
public void getImage(GetImageRequest request,
60-
StreamObserver<GetImageResponse> responseObserver) {
61-
final Camera camera = getResource(
62-
Camera.named(request.getName()));
63-
final Image result = camera.getImage(Camera.mimeToFormat(request.getMimeType()),
64-
Optional.of(request.getExtra()));
65-
66-
responseObserver.onNext(
67-
GetImageResponse.newBuilder().setImage(result.getImage())
68-
.setMimeType(Camera.formatToMime(result.getFormat())).build());
69-
responseObserver.onCompleted();
70-
}
71-
7252
@Override
7353
public void getImages(GetImagesRequest request,
7454
StreamObserver<GetImagesResponse> responseObserver) {

core/sdk/src/main/kotlin/com/viam/sdk/core/util/Media.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@file:JvmName("MediaUtils")
22
package com.viam.sdk.core.util
33

4-
import com.viam.component.camera.v1.Camera.Format
54
import com.viam.component.camera.v1.Camera.Image
65
import java.nio.ByteBuffer
76

@@ -18,7 +17,6 @@ data class ImageDimensions(val width: Int, val height: Int) {
1817
* Get the dimensions of an image from its data and mime-type.
1918
*
2019
* Only specific mime-types are supported: PNG, JPEG, and a custom vnd.viam.rgba.
21-
* The corresponding [Format] are [Format.FORMAT_PNG], [Format.FORMAT_JPEG], and [Format.FORMAT_RAW_RGBA].
2220
*
2321
* @param image the byte data of the image
2422
* @param mimeType the mime-type of the image
@@ -37,25 +35,25 @@ fun getDimensions(image: Iterable<Byte>, mimeType: String): ImageDimensions {
3735
}
3836

3937
/**
40-
* The dimensions of the image, if [Image.getFormat] returns a supported [Format].
38+
* The dimensions of the image based on its mime type.
4139
* See [getDimensions] for more details.
4240
*/
4341
val Image.dimensions: ImageDimensions?
4442
get() = try {
45-
getDimensions(this.image, this.format.name)
43+
getDimensions(this.image, this.mimeType)
4644
} catch (e: Exception) {
4745
null
4846
}
4947

5048
/**
51-
* The width of the image, if [Image.getFormat] returns a supported [Format].
49+
* The width of the image based on its mime type.
5250
* See [getDimensions] for more details.
5351
*/
5452
val Image.width: Int?
5553
get() = this.dimensions?.width
5654

5755
/**
58-
* The height of the image, if [Image.getFormat] returns a supported [Format].
56+
* The height of the image based on its mime type.
5957
* See [getDimensions] for more details.
6058
*/
6159
val Image.height: Int?

0 commit comments

Comments
 (0)