Bug fix for broken MKV generated due to difference between trackInfoT…

…ype in Java and C layer.
awslabs · Feb 21, 2019 · 8d7faf7 · 8d7faf7
1 parent b08c91e
commit 8d7faf7
Show file tree

Hide file tree

Showing 22 changed files with 8 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -132,6 +132,8 @@ export LD_LIBRARY_PATH=/<YOUR_PRODUCER_SDK_CPP_DOWNLOAD>/amazon-kinesis-video-st
 This should resolve native library loading issues.
 
 ## Release Notes
+### Release 1.9.2 (21 Feburary 2019)
+* Bug fix for broken MKV generated due to difference between trackInfoType in Java and C layer.
 
 ### Release 1.9.1 (19 Feburary 2019)
 * Bug fix for credentials not rotating issue when given credentials expire in less than 40 minutes.

diff --git a/...asource/DefaultOnStreamDataAvailable.java → ...asource/DefaultOnStreamDataAvailable.java b/...asource/DefaultOnStreamDataAvailable.java → ...asource/DefaultOnStreamDataAvailable.java
diff --git a/...al/mediasource/OnStreamDataAvailable.java → ...al/mediasource/OnStreamDataAvailable.java b/...al/mediasource/OnStreamDataAvailable.java → ...al/mediasource/OnStreamDataAvailable.java
diff --git a/...nal/mediasource/bytes/BytesGenerator.java → ...nal/mediasource/bytes/BytesGenerator.java b/...nal/mediasource/bytes/BytesGenerator.java → ...nal/mediasource/bytes/BytesGenerator.java
diff --git a/...l/mediasource/bytes/BytesMediaSource.java → ...l/mediasource/bytes/BytesMediaSource.java b/...l/mediasource/bytes/BytesMediaSource.java → ...l/mediasource/bytes/BytesMediaSource.java
diff --git a/.../bytes/BytesMediaSourceConfiguration.java → .../bytes/BytesMediaSourceConfiguration.java b/.../bytes/BytesMediaSourceConfiguration.java → .../bytes/BytesMediaSourceConfiguration.java
diff --git a/...rce/multitrack/MultiTrackFrameSource.java → ...rce/multitrack/MultiTrackFrameSource.java b/...rce/multitrack/MultiTrackFrameSource.java → ...rce/multitrack/MultiTrackFrameSource.java
diff --git a/...rce/multitrack/MultiTrackMediaSource.java → ...rce/multitrack/MultiTrackMediaSource.java b/...rce/multitrack/MultiTrackMediaSource.java → ...rce/multitrack/MultiTrackMediaSource.java
diff --git a/...k/MultiTrackMediaSourceConfiguration.java → ...k/MultiTrackMediaSourceConfiguration.java b/...k/MultiTrackMediaSourceConfiguration.java → ...k/MultiTrackMediaSourceConfiguration.java
diff --git a/...ava/auth/JavaCredentialsProviderImpl.java → ...ava/auth/JavaCredentialsProviderImpl.java b/...ava/auth/JavaCredentialsProviderImpl.java → ...ava/auth/JavaCredentialsProviderImpl.java
diff --git a/...o/java/client/JavaKinesisVideoClient.java → ...o/java/client/JavaKinesisVideoClient.java b/...o/java/client/JavaKinesisVideoClient.java → ...o/java/client/JavaKinesisVideoClient.java
diff --git a/...client/KinesisVideoJavaClientFactory.java → ...client/KinesisVideoJavaClientFactory.java b/...client/KinesisVideoJavaClientFactory.java → ...client/KinesisVideoJavaClientFactory.java
diff --git a/...svideo/java/logging/SysOutLogChannel.java → ...svideo/java/logging/SysOutLogChannel.java b/...svideo/java/logging/SysOutLogChannel.java → ...svideo/java/logging/SysOutLogChannel.java
diff --git a/...ource/file/AudioVideoFileMediaSource.java → ...ource/file/AudioVideoFileMediaSource.java b/...ource/file/AudioVideoFileMediaSource.java → ...ource/file/AudioVideoFileMediaSource.java
diff --git a/...dioVideoFileMediaSourceConfiguration.java → ...dioVideoFileMediaSourceConfiguration.java b/...dioVideoFileMediaSourceConfiguration.java → ...dioVideoFileMediaSourceConfiguration.java
diff --git a/...diasource/file/AudioVideoFrameSource.java → ...diasource/file/AudioVideoFrameSource.java b/...diasource/file/AudioVideoFrameSource.java → ...diasource/file/AudioVideoFrameSource.java
diff --git a/...ediasource/file/ImageFileMediaSource.java → ...ediasource/file/ImageFileMediaSource.java b/...ediasource/file/ImageFileMediaSource.java → ...ediasource/file/ImageFileMediaSource.java
@@ -18,6 +18,7 @@
 import static com.amazonaws.kinesisvideo.util.StreamInfoConstants.RETENTION_ONE_HOUR;
 import static com.amazonaws.kinesisvideo.util.StreamInfoConstants.USE_FRAME_TIMECODES;
 import static com.amazonaws.kinesisvideo.util.StreamInfoConstants.VERSION_ZERO;
+import static com.amazonaws.kinesisvideo.util.StreamInfoConstants.VIDEO_CODEC_ID;
 import static com.amazonaws.kinesisvideo.util.StreamInfoConstants.VIDEO_CONTENT_TYPE;
 
 import javax.annotation.Nonnull;
@@ -97,7 +98,7 @@ public StreamInfo getStreamInfo() {
                 RELATIVE_TIMECODES,
                 REQUEST_FRAGMENT_ACKS,
                 RECOVER_ON_FAILURE,
-                VIDEO_CONTENT_TYPE,
+                VIDEO_CODEC_ID,
                 "test-track",
                 DEFAULT_BITRATE,
                 imageFileMediaSourceConfiguration.getFps(),

diff --git a/...le/ImageFileMediaSourceConfiguration.java → ...le/ImageFileMediaSourceConfiguration.java b/...le/ImageFileMediaSourceConfiguration.java → ...le/ImageFileMediaSourceConfiguration.java
diff --git a/...va/mediasource/file/ImageFrameSource.java → ...va/mediasource/file/ImageFrameSource.java b/...va/mediasource/file/ImageFrameSource.java → ...va/mediasource/file/ImageFrameSource.java
diff --git a/...ervice/JavaKinesisVideoServiceClient.java → ...ervice/JavaKinesisVideoServiceClient.java b/...ervice/JavaKinesisVideoServiceClient.java → ...ervice/JavaKinesisVideoServiceClient.java
diff --git a/src/main/java/com/amazonaws/kinesisvideo/producer/MkvTrackInfoType.java b/src/main/java/com/amazonaws/kinesisvideo/producer/MkvTrackInfoType.java
@@ -1,7 +1,9 @@
 package com.amazonaws.kinesisvideo.producer;
 
+/* IMPORTANT!!! Make sure the values in this file correspond to their native counterparts in MKV_TRACK_INFO_TYPE
+stucture from amazon-kinesis-video-streams-producer-sdk-cpp/kinesis-video-pic/src/mkvgen/include/com/amazonaws/kinesis/video/mkvgen/Include.h */
 public enum MkvTrackInfoType {
-    VIDEO(0), AUDIO(1), UNKNOWN(-1);
+    VIDEO(1), AUDIO(2), UNKNOWN(3);
     private final int mValue;
 
     public static final int getStatusCode(String status) {

diff --git a/src/main/java/com/amazonaws/kinesisvideo/util/VersionUtil.java b/src/main/java/com/amazonaws/kinesisvideo/util/VersionUtil.java
@@ -6,7 +6,7 @@
 
 public final class VersionUtil {
 
-    public static final String AWS_SDK_KVS_PRODUCER_VERSION_STRING = "1.9.1";
+    public static final String AWS_SDK_KVS_PRODUCER_VERSION_STRING = "1.9.2";
 
     private static final String DEFAULT_USER_AGENT_NAME = "AWS-SDK-KVS";