Fix propagation of sample encryption key for webm

library/src/main/java/com/google/android/exoplayer/extractor/webm/WebmExtractor.java

@@ -168,6 +168,7 @@ public final class WebmExtractor implements Extractor {
   private int sampleCurrentNalBytesRemaining;
   private int sampleCurrentNalBytesRemaining;
   private int sampleTrackNumber;
   private int sampleTrackNumber;
   private int sampleFlags;
   private int sampleFlags;
+  private byte[] sampleEncryptionKeyId;
   private long sampleTimeUs;
   private long sampleTimeUs;
   private boolean sampleRead;
   private boolean sampleRead;
   private boolean sampleSeenReferenceBlock;
   private boolean sampleSeenReferenceBlock;
@@ -608,6 +609,7 @@ public final class WebmExtractor implements Extractor {
           sampleFlags = (isKeyframe ? C.SAMPLE_FLAG_SYNC : 0)
           sampleFlags = (isKeyframe ? C.SAMPLE_FLAG_SYNC : 0)
               | (isInvisible ? C.SAMPLE_FLAG_DECODE_ONLY : 0)
               | (isInvisible ? C.SAMPLE_FLAG_DECODE_ONLY : 0)
               | (isEncrypted ? C.SAMPLE_FLAG_ENCRYPTED : 0);
               | (isEncrypted ? C.SAMPLE_FLAG_ENCRYPTED : 0);
+          sampleEncryptionKeyId = sampleTrackFormat.encryptionKeyId;
           sampleSize = contentSize - blockBytesRead;
           sampleSize = contentSize - blockBytesRead;
           if (isEncrypted) {
           if (isEncrypted) {
             // Write the vector size.
             // Write the vector size.
@@ -682,7 +684,7 @@ public final class WebmExtractor implements Extractor {
   }
   }
 
 
   private void outputSampleMetadata(TrackOutput trackOutput) {
   private void outputSampleMetadata(TrackOutput trackOutput) {
-    trackOutput.sampleMetadata(sampleTimeUs, sampleFlags, sampleSize, 0, null);
+    trackOutput.sampleMetadata(sampleTimeUs, sampleFlags, sampleSize, 0, sampleEncryptionKeyId);
     sampleState = SAMPLE_STATE_START;
     sampleState = SAMPLE_STATE_START;
     sampleRead = true;
     sampleRead = true;
   }
   }