summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinichi Watanabe <swatanabe@xevo.com>2020-09-02 14:57:12 +0900
committerShinichi Watanabe <swatanabe@xevo.com>2020-09-02 14:57:12 +0900
commita4f25398780ef4ef94e930baa54857534f2cbf0a (patch)
treed8a2912b0a0e52368dc3249a35f3e47e3f9e9d4c
parent8e522c5de346b3f3c593e05bd0b3c20a1aadd9f3 (diff)
downloadsdl_android-a4f25398780ef4ef94e930baa54857534f2cbf0a.tar.gz
Restored the old constructor of VideoStreamParameters for backward compatibility, which is suggested during the code review at https://github.com/smartdevicelink/sdl_java_suite/pull/1389.
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java5
-rw-r--r--base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java22
2 files changed, 27 insertions, 0 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
index 920b962b0..201c7e5ca 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
@@ -125,6 +125,11 @@ public class VirtualDisplayEncoder {
return this.streamingParams;
}
+ @Deprecated
+ public void setStreamingParams(int displayDensity, ImageResolution resolution, int frameRate, int bitrate, int interval, VideoStreamingFormat format) {
+ this.streamingParams = new VideoStreamingParameters(displayDensity, frameRate, bitrate, interval, resolution, format);
+ }
+
@SuppressWarnings("unused")
public void setStreamingParams(int displayDensity, ImageResolution resolution, int frameRate, int bitrate, int interval, VideoStreamingFormat format, boolean stableFrameRate) {
this.streamingParams = new VideoStreamingParameters(displayDensity, frameRate, bitrate, interval, resolution, format, stableFrameRate);
diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
index bf2ff3957..6727e0ead 100644
--- a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
+++ b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
@@ -79,6 +79,28 @@ public class VideoStreamingParameters {
stableFrameRate = true;
}
+ @Deprecated
+ public VideoStreamingParameters(int displayDensity, int frameRate, int bitrate, int interval,
+ ImageResolution resolution, VideoStreamingFormat format){
+ this.displayDensity = displayDensity;
+ this.frameRate = frameRate;
+ this.bitrate = bitrate;
+ this.interval = interval;
+ this.resolution = resolution;
+ this.format = format;
+ this.stableFrameRate = true;
+ }
+
+ /**
+ * new constructor of VideoStreamingParameters, which now has stableFrameRate param.
+ * @param displayDensity
+ * @param frameRate
+ * @param bitrate
+ * @param interval
+ * @param resolution
+ * @param format
+ * @param stableFrameRate
+ */
public VideoStreamingParameters(int displayDensity, int frameRate, int bitrate, int interval,
ImageResolution resolution, VideoStreamingFormat format, boolean stableFrameRate){
this.displayDensity = displayDensity;