Verify metadata is only added on the first frame when available

Update tests to ensure metadata is only added when an SPS has been encountered.

@@ -80,7 +80,8 @@
 
 
       // Check if keyframe and the length of tags.
       // Check if keyframe and the length of tags.
       // This makes sure we write metadata on the first frame of a segment.
       // This makes sure we write metadata on the first frame of a segment.
-      if (this._oldExtraData.extraDataExists() && (this._h264Frame.keyFrame || this.tags.length === 0)) {
+      if (this._oldExtraData.extraDataExists() &&
+          (this._h264Frame.keyFrame || this.tags.length === 0)) {
         // Push extra data on every IDR frame in case we did a stream change + seek
         // Push extra data on every IDR frame in case we did a stream change + seek
         this.tags.push(this._oldExtraData.metaDataTag(this._h264Frame.pts));
         this.tags.push(this._oldExtraData.metaDataTag(this._h264Frame.pts));
         this.tags.push(this._oldExtraData.extraDataTag(this._h264Frame.pts));
         this.tags.push(this._oldExtraData.extraDataTag(this._h264Frame.pts));

@@ -3,11 +3,8 @@ module('H264 Stream');
 
 
 var
 var
   nalUnitTypes = window.videojs.Hls.NALUnitType,
   nalUnitTypes = window.videojs.Hls.NALUnitType,
-  FlvTag = window.videojs.Hls.FlvTag;
+  FlvTag = window.videojs.Hls.FlvTag,
 
 
-test('metadata is generated for IDRs after a full NAL unit is written', function() {
-  var
-    h264Stream = new videojs.Hls.H264Stream(),
   accessUnitDelimiter = new Uint8Array([
   accessUnitDelimiter = new Uint8Array([
     0x00,
     0x00,
     0x00,
     0x00,
@@ -38,7 +35,11 @@ test('metadata is generated for IDRs after a full NAL unit is written', function
     0xAA,
     0xAA,
     0x4E,
     0x4E,
     0x00
     0x00
-    ]),
+  ]);
+
+test('metadata is generated for IDRs after a full NAL unit is written', function() {
+  var
+    h264Stream = new videojs.Hls.H264Stream(),
     idr = new Uint8Array([
     idr = new Uint8Array([
       0x00,
       0x00,
       0x00,
       0x00,
@@ -65,13 +66,7 @@ test('starting PTS values can be negative', function() {
     H264ExtraData = videojs.Hls.H264ExtraData,
     H264ExtraData = videojs.Hls.H264ExtraData,
     oldExtraData = H264ExtraData.prototype.extraDataTag,
     oldExtraData = H264ExtraData.prototype.extraDataTag,
     oldMetadata = H264ExtraData.prototype.metaDataTag,
     oldMetadata = H264ExtraData.prototype.metaDataTag,
-    h264Stream,
-    accessUnitDelimiter = new Uint8Array([
-      0x00,
-      0x00,
-      0x01,
-      nalUnitTypes.access_unit_delimiter_rbsp
-    ]);
+    h264Stream;
 
 
   H264ExtraData.prototype.extraDataTag = function() {
   H264ExtraData.prototype.extraDataTag = function() {
     return 'extraDataTag';
     return 'extraDataTag';
@@ -92,10 +87,6 @@ test('starting PTS values can be negative', function() {
   // flush out the last tag
   // flush out the last tag
   h264Stream.writeBytes(accessUnitDelimiter, 0, accessUnitDelimiter.byteLength);
   h264Stream.writeBytes(accessUnitDelimiter, 0, accessUnitDelimiter.byteLength);
 
 
-  // shift the metadata and extradata tags out, since we don't care about them here
-  h264Stream.tags.shift();
-  h264Stream.tags.shift();
-
   strictEqual(h264Stream.tags.length, 3, 'three tags are ready');
   strictEqual(h264Stream.tags.length, 3, 'three tags are ready');
   strictEqual(h264Stream.tags[0].pts, 0, 'the first PTS is zero');
   strictEqual(h264Stream.tags[0].pts, 0, 'the first PTS is zero');
   strictEqual(h264Stream.tags[0].dts, 0, 'the first DTS is zero');
   strictEqual(h264Stream.tags[0].dts, 0, 'the first DTS is zero');
@@ -114,13 +105,7 @@ test('make sure we add metadata and extra data at the beginning of a stream', fu
     H264ExtraData = videojs.Hls.H264ExtraData,
     H264ExtraData = videojs.Hls.H264ExtraData,
     oldExtraData = H264ExtraData.prototype.extraDataTag,
     oldExtraData = H264ExtraData.prototype.extraDataTag,
     oldMetadata = H264ExtraData.prototype.metaDataTag,
     oldMetadata = H264ExtraData.prototype.metaDataTag,
-    h264Stream,
-    accessUnitDelimiter = new Uint8Array([
-      0x00,
-      0x00,
-      0x01,
-      nalUnitTypes.access_unit_delimiter_rbsp
-    ]);
+    h264Stream;
 
 
   H264ExtraData.prototype.extraDataTag = function() {
   H264ExtraData.prototype.extraDataTag = function() {
     return 'extraDataTag';
     return 'extraDataTag';
@@ -133,6 +118,8 @@ test('make sure we add metadata and extra data at the beginning of a stream', fu
 
 
   h264Stream.setTimeStampOffset(0);
   h264Stream.setTimeStampOffset(0);
   h264Stream.setNextTimeStamp(0, 0, true);
   h264Stream.setNextTimeStamp(0, 0, true);
+  // the sps provides the metadata for the stream
+  h264Stream.writeBytes(seqParamSet, 0, seqParamSet.byteLength);
   h264Stream.writeBytes(accessUnitDelimiter, 0, accessUnitDelimiter.byteLength);
   h264Stream.writeBytes(accessUnitDelimiter, 0, accessUnitDelimiter.byteLength);
 
 
   // make sure that keyFrame is set to false but that we don't have any tags currently written out
   // make sure that keyFrame is set to false but that we don't have any tags currently written out
@@ -148,11 +135,6 @@ test('make sure we add metadata and extra data at the beginning of a stream', fu
   strictEqual(h264Stream.tags[0], 'metaDataTag', 'the first tag is the metaDataTag');
   strictEqual(h264Stream.tags[0], 'metaDataTag', 'the first tag is the metaDataTag');
   strictEqual(h264Stream.tags[1], 'extraDataTag', 'the second tag is the extraDataTag');
   strictEqual(h264Stream.tags[1], 'extraDataTag', 'the second tag is the extraDataTag');
 
 
-  strictEqual(h264Stream.tags[2].pts, 0, 'the first PTS is 0');
-  strictEqual(h264Stream.tags[2].dts, 0, 'the first DTS is 0');
-  strictEqual(h264Stream.tags[3].pts, 5, 'the second PTS is 5');
-  strictEqual(h264Stream.tags[3].dts, 5, 'the second DTS is 5');
-
   H264ExtraData.prototype.extraDataTag = oldExtraData;
   H264ExtraData.prototype.extraDataTag = oldExtraData;
   H264ExtraData.prototype.metaDataTag = oldMetadata;
   H264ExtraData.prototype.metaDataTag = oldMetadata;
 });
 });