@gkatsev ensure segments without an initial IDR are not displayed in 4:3 initially.

Closes #272.

Squashed commit of the following:

commit de597c3ee10075cece7036aeaacedb74f33d9ef5
Author: David LaPalomento <dlapalomento@gmail.com>
Date:   Fri May 22 14:02:27 2015 -0400

    Remove vim swap file
    Ignore them in version control in the future.

commit fb189ba16330311371bb6b9cf1bb6248005e10b7
Author: Gary Katsevman <git@gkatsev.com>
Date:   Wed May 20 18:30:07 2015 -0400

    Default 'nextFrameKeyFrame' to false.

commit 3788ad0607fabb2cde1a1d5eea4163ceafb5fab5
Author: Gary Katsevman <git@gkatsev.com>
Date:   Wed May 20 18:24:16 2015 -0400

    setNextFrameKeyFrame

commit 6944234afd99285a448a9cf3adbcaf1eb26cfe33
Author: Gary Katsevman <git@gkatsev.com>
Date:   Wed May 20 18:06:26 2015 -0400

    Another camelcase usage

commit da6e32a4d9024d859ca58bc1d4bc3fcbe1de7a33
Author: Gary Katsevman <git@gkatsev.com>
Date:   Wed May 20 18:05:30 2015 -0400

    Dont parse unused fields. Use camel case names

commit fb7990b6606501a549d7448de6eec38784695896
Author: Gary Katsevman <git@gkatsev.com>
Date:   Wed May 20 16:28:28 2015 -0400

    ifs should have curly braces

commit 92e40c642270e4ce4652a874073a66876312072f
Author: Gary Katsevman <git@gkatsev.com>
Date:   Wed May 20 15:58:18 2015 -0400

    Adaptation Field vars. Use Random Access Indicator
    The Random Access Indicator tells us whether something is a keyframe.
    Set the stream's frame's keyFrame property to true if the Random Access
    Indicator is set.

commit 047a6d7771cd2d9c324b6da9bd76d4b6aeeadaf0
Author: Gary Katsevman <git@gkatsev.com>
Date:   Mon May 18 16:56:23 2015 -0400

    Set up the test with exact conditions

commit e2f8b18656d4cdb830cd23013fe7e5fcfa599ca4
Author: Gary Katsevman <git@gkatsev.com>
Date:   Mon May 18 16:56:01 2015 -0400

    Restore stubbed out methods

commit ff5f3b5fdb9dbe5e34447f8a4680c294163e0c46
Author: Gary Katsevman <git@gkatsev.com>
Date:   Mon May 18 16:50:22 2015 -0400

    prototypeify h264-stream

commit 7ee359d582550474a33730547742ce3d656dad52
Author: Gary Katsevman <git@gkatsev.com>
Date:   Mon May 18 16:28:08 2015 -0400

    Initial test for metadata

commit 0e3a961c7594d67280958cf21330fb347e1dda0a
Author: Gary Katsevman <git@gkatsev.com>
Date:   Mon May 18 16:21:55 2015 -0400

    Fix test properly

commit 7e0de308227a4373c6abd71769ed474e59c7edeb
Author: Gary Katsevman <git@gkatsev.com>
Date:   Mon May 18 16:14:57 2015 -0400

    Move h264-extradata into separate file

commit 66a676c234e6e087694611d710cad6414cbc984c
Author: Gary Katsevman <git@gkatsev.com>
Date:   Mon May 18 15:52:08 2015 -0400

    prototypeify H264ExtraData

@@ -6,4 +6,4 @@ dist/*
 *.ipr
 *.ipr
 *.iws
 *.iws
 *.swp
 *.swp
-tmp/**
\ No newline at end of file
+tmp/**.*.swo

@@ -5,6 +5,7 @@ CHANGELOG
 * @dmlap use contribflow to manage contributions ([view](https://github.com/videojs/videojs-contrib-hls/pull/275))
 * @dmlap use contribflow to manage contributions ([view](https://github.com/videojs/videojs-contrib-hls/pull/275))
 * @dmlap add a contribflow configuration ([view](https://github.com/videojs/videojs-contrib-hls/pull/276))
 * @dmlap add a contribflow configuration ([view](https://github.com/videojs/videojs-contrib-hls/pull/276))
 * @ntadej Do not unnecessarily reset to the live point when refreshing playlists. Clean up playlist loader timeouts. ([view](https://github.com/videojs/videojs-contrib-hls/pull/274))
 * @ntadej Do not unnecessarily reset to the live point when refreshing playlists. Clean up playlist loader timeouts. ([view](https://github.com/videojs/videojs-contrib-hls/pull/274))
+* @gkatsev ensure segments without an initial IDR are not displayed in 4
 
 
 --------------------
 --------------------
 
 

@@ -27,6 +27,7 @@ module.exports = function(grunt) {
               'src/stream.js',
               'src/stream.js',
               'src/flv-tag.js',
               'src/flv-tag.js',
               'src/exp-golomb.js',
               'src/exp-golomb.js',
+              'src/h264-extradata.js',
               'src/h264-stream.js',
               'src/h264-stream.js',
               'src/aac-stream.js',
               'src/aac-stream.js',
               'src/metadata-stream.js',
               'src/metadata-stream.js',

@@ -20,6 +20,7 @@
   <script src="src/flv-tag.js"></script>
   <script src="src/flv-tag.js"></script>
   <script src="src/stream.js"></script>
   <script src="src/stream.js"></script>
   <script src="src/exp-golomb.js"></script>
   <script src="src/exp-golomb.js"></script>
+  <script src="src/h264-extradata.js"></script>
   <script src="src/h264-stream.js"></script>
   <script src="src/h264-stream.js"></script>
   <script src="src/aac-stream.js"></script>
   <script src="src/aac-stream.js"></script>
   <script src="src/metadata-stream.js"></script>
   <script src="src/metadata-stream.js"></script>

+(function() {
+  var
+    H264ExtraData,
+    ExpGolomb = window.videojs.Hls.ExpGolomb,
+    FlvTag = window.videojs.Hls.FlvTag;
+
+  window.videojs.Hls.H264ExtraData = H264ExtraData = function() {
+    this.sps = []; // :Array
+    this.pps = []; // :Array
+  };
+
+  H264ExtraData.prototype.extraDataExists = function() { // :Boolean
+    return this.sps.length > 0;
+  };
+
+  // (sizeOfScalingList:int, expGolomb:ExpGolomb):void
+  H264ExtraData.prototype.scaling_list = function(sizeOfScalingList, expGolomb) {
+    var
+      lastScale = 8, // :int
+      nextScale = 8, // :int
+      j,
+      delta_scale; // :int
+
+    for (j = 0; j < sizeOfScalingList; ++j) {
+      if (0 !== nextScale) {
+        delta_scale = expGolomb.readExpGolomb();
+        nextScale = (lastScale + delta_scale + 256) % 256;
+        //useDefaultScalingMatrixFlag = ( j = = 0 && nextScale = = 0 )
+      }
+
+      lastScale = (nextScale === 0) ? lastScale : nextScale;
+      // scalingList[ j ] = ( nextScale == 0 ) ? lastScale : nextScale;
+      // lastScale = scalingList[ j ]
+    }
+  };
+
+  /**
+   * RBSP: raw bit-stream payload. The actual encoded video data.
+   *
+   * SPS: sequence parameter set. Part of the RBSP. Metadata to be applied
+   * to a complete video sequence, like width and height.
+   */
+  H264ExtraData.prototype.getSps0Rbsp = function() { // :ByteArray
+    var
+      sps = this.sps[0],
+      offset = 1,
+      start = 1,
+      written = 0,
+      end = sps.byteLength - 2,
+      result = new Uint8Array(sps.byteLength);
+
+    // In order to prevent 0x0000 01 from being interpreted as a
+    // NAL start code, occurences of that byte sequence in the
+    // RBSP are escaped with an "emulation byte". That turns
+    // sequences of 0x0000 01 into 0x0000 0301. When interpreting
+    // a NAL payload, they must be filtered back out.
+    while (offset < end) {
+      if (sps[offset]     === 0x00 &&
+          sps[offset + 1] === 0x00 &&
+          sps[offset + 2] === 0x03) {
+        result.set(sps.subarray(start, offset + 1), written);
+        written += offset + 1 - start;
+        start = offset + 3;
+      }
+      offset++;
+    }
+    result.set(sps.subarray(start), written);
+    return result.subarray(0, written + (sps.byteLength - start));
+  };
+
+  // (pts:uint):FlvTag
+  H264ExtraData.prototype.metaDataTag = function(pts) {
+    var
+      tag = new FlvTag(FlvTag.METADATA_TAG), // :FlvTag
+      expGolomb, // :ExpGolomb
+      profile_idc, // :int
+      chroma_format_idc, // :int
+      imax, // :int
+      i, // :int
+
+      pic_order_cnt_type, // :int
+      num_ref_frames_in_pic_order_cnt_cycle, // :uint
+
+      pic_width_in_mbs_minus1, // :int
+      pic_height_in_map_units_minus1, // :int
+
+      frame_mbs_only_flag, // :int
+      frame_cropping_flag, // :Boolean
+
+      frame_crop_left_offset = 0, // :int
+      frame_crop_right_offset = 0, // :int
+      frame_crop_top_offset = 0, // :int
+      frame_crop_bottom_offset = 0, // :int
+
+      width,
+      height;
+
+      tag.dts = pts;
+      tag.pts = pts;
+      expGolomb = new ExpGolomb(this.getSps0Rbsp());
+
+    // :int = expGolomb.readUnsignedByte(); // profile_idc u(8)
+    profile_idc = expGolomb.readUnsignedByte();
+
+    // constraint_set[0-5]_flag, u(1), reserved_zero_2bits u(2), level_idc u(8)
+    expGolomb.skipBits(16);
+
+    // seq_parameter_set_id
+    expGolomb.skipUnsignedExpGolomb();
+
+    if (profile_idc === 100 ||
+        profile_idc === 110 ||
+        profile_idc === 122 ||
+        profile_idc === 244 ||
+        profile_idc === 44 ||
+        profile_idc === 83 ||
+        profile_idc === 86 ||
+        profile_idc === 118 ||
+        profile_idc === 128) {
+      chroma_format_idc = expGolomb.readUnsignedExpGolomb();
+      if (3 === chroma_format_idc) {
+        expGolomb.skipBits(1); // separate_colour_plane_flag
+      }
+      expGolomb.skipUnsignedExpGolomb(); // bit_depth_luma_minus8
+      expGolomb.skipUnsignedExpGolomb(); // bit_depth_chroma_minus8
+      expGolomb.skipBits(1); // qpprime_y_zero_transform_bypass_flag
+      if (expGolomb.readBoolean()) { // seq_scaling_matrix_present_flag
+        imax = (chroma_format_idc !== 3) ? 8 : 12;
+        for (i = 0 ; i < imax ; ++i) {
+          if (expGolomb.readBoolean()) { // seq_scaling_list_present_flag[ i ]
+            if (i < 6) {
+              this.scaling_list(16, expGolomb);
+            } else {
+              this.scaling_list(64, expGolomb);
+            }
+          }
+        }
+      }
+    }
+
+    expGolomb.skipUnsignedExpGolomb(); // log2_max_frame_num_minus4
+    pic_order_cnt_type = expGolomb.readUnsignedExpGolomb();
+
+    if ( 0 === pic_order_cnt_type ) {
+      expGolomb.readUnsignedExpGolomb(); //log2_max_pic_order_cnt_lsb_minus4
+    } else if ( 1 === pic_order_cnt_type ) {
+      expGolomb.skipBits(1); // delta_pic_order_always_zero_flag
+      expGolomb.skipExpGolomb(); // offset_for_non_ref_pic
+      expGolomb.skipExpGolomb(); // offset_for_top_to_bottom_field
+      num_ref_frames_in_pic_order_cnt_cycle = expGolomb.readUnsignedExpGolomb();
+      for(i = 0 ; i < num_ref_frames_in_pic_order_cnt_cycle ; ++i) {
+        expGolomb.skipExpGolomb(); // offset_for_ref_frame[ i ]
+      }
+    }
+
+    expGolomb.skipUnsignedExpGolomb(); // max_num_ref_frames
+    expGolomb.skipBits(1); // gaps_in_frame_num_value_allowed_flag
+    pic_width_in_mbs_minus1 = expGolomb.readUnsignedExpGolomb();
+    pic_height_in_map_units_minus1 = expGolomb.readUnsignedExpGolomb();
+
+    frame_mbs_only_flag = expGolomb.readBits(1);
+    if (0 === frame_mbs_only_flag) {
+      expGolomb.skipBits(1); // mb_adaptive_frame_field_flag
+    }
+
+    expGolomb.skipBits(1); // direct_8x8_inference_flag
+    frame_cropping_flag = expGolomb.readBoolean();
+    if (frame_cropping_flag) {
+      frame_crop_left_offset = expGolomb.readUnsignedExpGolomb();
+      frame_crop_right_offset = expGolomb.readUnsignedExpGolomb();
+      frame_crop_top_offset = expGolomb.readUnsignedExpGolomb();
+      frame_crop_bottom_offset = expGolomb.readUnsignedExpGolomb();
+    }
+
+    width = ((pic_width_in_mbs_minus1 + 1) * 16) - frame_crop_left_offset * 2 - frame_crop_right_offset * 2;
+    height = ((2 - frame_mbs_only_flag) * (pic_height_in_map_units_minus1 + 1) * 16) - (frame_crop_top_offset * 2) - (frame_crop_bottom_offset * 2);
+
+    tag.writeMetaDataDouble("videocodecid", 7);
+    tag.writeMetaDataDouble("width", width);
+    tag.writeMetaDataDouble("height", height);
+    // tag.writeMetaDataDouble("videodatarate", 0 );
+    // tag.writeMetaDataDouble("framerate", 0);
+
+    return tag;
+  };
+
+  // (pts:uint):FlvTag
+  H264ExtraData.prototype.extraDataTag = function(pts) {
+    var
+      i,
+      tag = new FlvTag(FlvTag.VIDEO_TAG, true);
+
+    tag.dts = pts;
+    tag.pts = pts;
+
+    tag.writeByte(0x01);// version
+    tag.writeByte(this.sps[0][1]);// profile
+    tag.writeByte(this.sps[0][2]);// compatibility
+    tag.writeByte(this.sps[0][3]);// level
+    tag.writeByte(0xFC | 0x03); // reserved (6 bits), NULA length size - 1 (2 bits)
+    tag.writeByte(0xE0 | 0x01 ); // reserved (3 bits), num of SPS (5 bits)
+    tag.writeShort( this.sps[0].length ); // data of SPS
+    tag.writeBytes( this.sps[0] ); // SPS
+
+    tag.writeByte( this.pps.length ); // num of PPS (will there ever be more that 1 PPS?)
+    for (i = 0 ; i < this.pps.length ; ++i) {
+      tag.writeShort(this.pps[i].length); // 2 bytes for length of PPS
+      tag.writeBytes(this.pps[i]); // data of PPS
+    }
+
+    return tag;
+  };
+})();

@@ -214,6 +214,9 @@
         // adaptation_field_control, whether this header is followed by an
         // adaptation_field_control, whether this header is followed by an
         // adaptation field, a payload, or both
         // adaptation field, a payload, or both
         afflag = (data[offset + 3] & 0x30 ) >>> 4,
         afflag = (data[offset + 3] & 0x30 ) >>> 4,
+        adaptationFieldLength,
+        afftemp,
+        randomAccessIndicator,
 
 
         patTableId, // :int
         patTableId, // :int
         patCurrentNextIndicator, // Boolean
         patCurrentNextIndicator, // Boolean
@@ -247,7 +250,19 @@
       // used to specify some forms of timing and control data that we
       // used to specify some forms of timing and control data that we
       // do not currently use.
       // do not currently use.
       if (afflag > 0x01) {
       if (afflag > 0x01) {
-        offset += data[offset] + 1;
+        adaptationFieldLength = data[offset];
+
+        if (adaptationFieldLength > 0) {
+          afftemp = data[offset + 1];
+
+          randomAccessIndicator = (afftemp & 0x40) >>> 6;
+
+          if (randomAccessIndicator === 1) {
+            h264Stream.setNextFrameKeyFrame();
+          }
+        }
+
+        offset += adaptationFieldLength + 1;
       }
       }
 
 
       // Handle a Program Association Table (PAT). PATs map PIDs to
       // Handle a Program Association Table (PAT). PATs map PIDs to

@@ -62,7 +62,10 @@ test('metadata is generated for IDRs after a full NAL unit is written', function
 
 
 test('starting PTS values can be negative', function() {
 test('starting PTS values can be negative', function() {
   var
   var
-    h264Stream = new videojs.Hls.H264Stream(),
+    H264ExtraData = videojs.Hls.H264ExtraData,
+    oldExtraData = H264ExtraData.prototype.extraDataTag,
+    oldMetadata = H264ExtraData.prototype.metaDataTag,
+    h264Stream,
     accessUnitDelimiter = new Uint8Array([
     accessUnitDelimiter = new Uint8Array([
       0x00,
       0x00,
       0x00,
       0x00,
@@ -70,8 +73,14 @@ test('starting PTS values can be negative', function() {
       nalUnitTypes.access_unit_delimiter_rbsp
       nalUnitTypes.access_unit_delimiter_rbsp
     ]);
     ]);
 
 
-  // add a "tag" to the stream so that it doesn't try and parse metadata
-  h264Stream.tags.push('spacer tag');
+  H264ExtraData.prototype.extraDataTag = function() {
+    return 'extraDataTag';
+  };
+  H264ExtraData.prototype.metaDataTag = function() {
+    return 'metaDataTag';
+  };
+
+  h264Stream = new videojs.Hls.H264Stream();
 
 
   h264Stream.setTimeStampOffset(-100);
   h264Stream.setTimeStampOffset(-100);
   h264Stream.setNextTimeStamp(-100, -100, true);
   h264Stream.setNextTimeStamp(-100, -100, true);
@@ -83,6 +92,8 @@ 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();
   h264Stream.tags.shift();
 
 
   strictEqual(h264Stream.tags.length, 3, 'three tags are ready');
   strictEqual(h264Stream.tags.length, 3, 'three tags are ready');
@@ -93,6 +104,57 @@ test('starting PTS values can be negative', function() {
 
 
   strictEqual(h264Stream.tags[2].pts, 100, 'the third PTS is 100');
   strictEqual(h264Stream.tags[2].pts, 100, 'the third PTS is 100');
   strictEqual(h264Stream.tags[2].dts, 100, 'the third DTS is 100');
   strictEqual(h264Stream.tags[2].dts, 100, 'the third DTS is 100');
+
+  H264ExtraData.prototype.extraDataTag = oldExtraData;
+  H264ExtraData.prototype.metaDataTag = oldMetadata;
+});
+
+test('make sure we add metadata and extra data at the beginning of a stream', function() {
+  var
+    H264ExtraData = videojs.Hls.H264ExtraData,
+    oldExtraData = H264ExtraData.prototype.extraDataTag,
+    oldMetadata = H264ExtraData.prototype.metaDataTag,
+    h264Stream,
+    accessUnitDelimiter = new Uint8Array([
+      0x00,
+      0x00,
+      0x01,
+      nalUnitTypes.access_unit_delimiter_rbsp
+    ]);
+
+  H264ExtraData.prototype.extraDataTag = function() {
+    return 'extraDataTag';
+  };
+  H264ExtraData.prototype.metaDataTag = function() {
+    return 'metaDataTag';
+  };
+
+  h264Stream = new videojs.Hls.H264Stream();
+
+  h264Stream.setTimeStampOffset(0);
+  h264Stream.setNextTimeStamp(0, 0, true);
+  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
+  h264Stream._h264Frame.keyFrame = false;
+  h264Stream.tags = [];
+
+  h264Stream.setNextTimeStamp(5, 5, true);
+  h264Stream.writeBytes(accessUnitDelimiter, 0, accessUnitDelimiter.byteLength);
+  // flush out the last tag
+  h264Stream.writeBytes(accessUnitDelimiter, 0, accessUnitDelimiter.byteLength);
+
+  strictEqual(h264Stream.tags.length, 4, 'three tags are ready');
+  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[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.metaDataTag = oldMetadata;
 });
 });
 
 
 })(window.videojs);
 })(window.videojs);

@@ -83,6 +83,7 @@ module.exports = function(config) {
       '../src/stream.js',
       '../src/stream.js',
       '../src/flv-tag.js',
       '../src/flv-tag.js',
       '../src/exp-golomb.js',
       '../src/exp-golomb.js',
+      '../src/h264-extradata.js',
       '../src/h264-stream.js',
       '../src/h264-stream.js',
       '../src/aac-stream.js',
       '../src/aac-stream.js',
       '../src/metadata-stream.js',
       '../src/metadata-stream.js',

@@ -47,6 +47,7 @@ module.exports = function(config) {
       '../src/stream.js',
       '../src/stream.js',
       '../src/flv-tag.js',
       '../src/flv-tag.js',
       '../src/exp-golomb.js',
       '../src/exp-golomb.js',
+      '../src/h264-extradata.js',
       '../src/h264-stream.js',
       '../src/h264-stream.js',
       '../src/aac-stream.js',
       '../src/aac-stream.js',
       '../src/metadata-stream.js',
       '../src/metadata-stream.js',

@@ -24,6 +24,7 @@
   <script src="../src/stream.js"></script>
   <script src="../src/stream.js"></script>
   <script src="../src/flv-tag.js"></script>
   <script src="../src/flv-tag.js"></script>
   <script src="../src/exp-golomb.js"></script>
   <script src="../src/exp-golomb.js"></script>
+  <script src="../src/h264-extradata.js"></script>
   <script src="../src/h264-stream.js"></script>
   <script src="../src/h264-stream.js"></script>
   <script src="../src/aac-stream.js"></script>
   <script src="../src/aac-stream.js"></script>
   <script src="../src/metadata-stream.js"></script>
   <script src="../src/metadata-stream.js"></script>