Skip to content

Commit

Permalink
Overhaul license comments and file annotations
Browse files Browse the repository at this point in the history
* Updates all Copyright years to 2015.
* Adds licenses annotations to all JS.
* Makes all licenses identical to avoid repeated appearance in the
  compiled output.
* Drops fileoverview annotations, which do not affect docs output.
* The linter still requires fileoverview on externs.

This patch required a newer closure compiler, since the previous
version we used had a bug regarding license annotations that caused
the license comment block to appear in the output once per file
regardless of uniqueness.

Change-Id: I2e9272db680cba7ecc4613d97f1d3a94ac2244cc
  • Loading branch information
joeyparrish committed Sep 8, 2015
1 parent c04ad3e commit 4cc4e96
Show file tree
Hide file tree
Showing 119 changed files with 273 additions and 363 deletions.
10 changes: 6 additions & 4 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright 2014 Google Inc.
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,12 +13,13 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview Implements the application layer of the test application.
*/


/** @class */
/**
* The application layer of the test application.
* @class
*/
var app = function() {};


Expand Down
8 changes: 5 additions & 3 deletions controls.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/**
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,12 +13,13 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview Implements the video controls overlay.
*/


/** @class */
/**
* The video controls overlay for the test app.
* @class
*/
var playerControls = function() {};


Expand Down
7 changes: 5 additions & 2 deletions externs/fullscreen.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright 2014 Google Inc.
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,7 +13,9 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

/**
* @fileoverview Externs for prefixed fullscreen methods.
* @externs
*/
Expand Down
9 changes: 6 additions & 3 deletions externs/htmltrackelement.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright 2014 Google Inc.
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,8 +13,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview HTMLTrackElement externs.
*/

/**
* @fileoverview Externs for HTMLTrackElement.
* @externs
*/

Expand Down
7 changes: 5 additions & 2 deletions externs/jwk_set.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright 2014 Google Inc.
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,7 +13,9 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

/**
* @fileoverview Externs for JWK set.
* @externs
*/
Expand Down
10 changes: 7 additions & 3 deletions externs/mediakeys.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright 2014 Google Inc.
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,9 +13,12 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* @fileoverview Externs for MediaKeys based on
* {@link http://goo.gl/blgtZZ EME draft 12 March 2015}
*
* @fileoverview MediaKey externs.
* Based on {@link http://goo.gl/blgtZZ EME draft 12 March 2015}.
* @externs
*/

Expand Down
7 changes: 5 additions & 2 deletions externs/prefixed_eme.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright 2014 Google Inc.
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,7 +13,9 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

/**
* @fileoverview Externs for prefixed EME v0.1b.
* @externs
*/
Expand Down
7 changes: 6 additions & 1 deletion externs/xmlhttprequest.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/**
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,8 +13,12 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* @fileoverview Externs for XMLHttpRequest which are missing from the closure
* compiler.
*
* @fileoverview XMLHttpRequest externs missing from closure.
* @externs
*/

Expand Down
2 changes: 1 addition & 1 deletion index.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2014 Google Inc.
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
Copyright 2014 Google Inc.
Copyright 2015 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion integration_tests.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
Copyright 2014 Google Inc.
Copyright 2015 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
7 changes: 3 additions & 4 deletions lib/dash/container_segment_index_source.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/**
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,9 +13,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview Implements a SegmentIndexSource that constructs a SegmentIndex
* from an MP4 or WebM container.
*/

goog.provide('shaka.dash.ContainerSegmentIndexSource');
Expand All @@ -34,7 +32,8 @@ goog.require('shaka.util.TypedBind');


/**
* Creates a ContainerSegmentIndexSource.
* Creates an ISegmentIndexSource that constructs a SegmentIndex from an MP4 or
* WebM container.
*
* @param {!shaka.dash.mpd.Mpd} mpd
* @param {!shaka.dash.mpd.Period} period
Expand Down
7 changes: 3 additions & 4 deletions lib/dash/duration_segment_index_source.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/**
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,9 +13,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview Implements an ISegmentIndexSource that constructs a
* SegmentIndex from a SegmentTemplate with a segment duration.
*/

goog.provide('shaka.dash.DurationSegmentIndexSource');
Expand All @@ -32,7 +30,8 @@ goog.require('shaka.util.TypedBind');


/**
* Creates a DurationSegmentIndexSource.
* Creates an ISegmentIndexSource that constructs a SegmentIndex from a
* SegmentTemplate with a segment duration.
*
* @param {!shaka.dash.mpd.Mpd} mpd
* @param {!shaka.dash.mpd.Period} period
Expand Down
11 changes: 4 additions & 7 deletions lib/dash/dynamic_live_segment_index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/**
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,9 +13,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview Implements a SegmentIndex that supports live DASH content and
* dynamically generates SegmentReferences.
*/

goog.provide('shaka.dash.DynamicLiveSegmentIndex');
Expand All @@ -28,10 +26,9 @@ goog.require('shaka.util.ArrayUtils');


/**
* Creates a DynamicLiveSegmentIndex.
*
* A DynamicLiveSegmentIndex generates SegmentReferences as needed and
* automatically evicts SegmentReferences that are no longer available.
* Creates a SegmentIndex that supports live DASH content by generating
* SegmentReferences as needed and automatically evicting SegmentReferences
* that are no longer available.
*
* If the SegmentIndex's corresponding stream is not available yet then the
* SegmentIndex will be inactive: it will not contain any SegmentReferences nor
Expand Down
7 changes: 3 additions & 4 deletions lib/dash/list_segment_index_source.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/**
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,9 +13,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview Implements an ISegmentIndexSource that constructs a
* SegmentIndex from a SegmentList.
*/

goog.provide('shaka.dash.ListSegmentIndexSource');
Expand All @@ -31,7 +29,8 @@ goog.require('shaka.util.TypedBind');


/**
* Creates a ListSegmentIndexSource.
* Creates an ISegmentIndexSource that constructs a SegmentIndex from a
* SegmentList.
*
* @param {!shaka.dash.mpd.Mpd} mpd
* @param {!shaka.dash.mpd.Period} period
Expand Down
5 changes: 2 additions & 3 deletions lib/dash/live_segment_index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/**
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,8 +13,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview Implements a SegmentIndex that supports live DASH content.
*/

goog.provide('shaka.dash.LiveSegmentIndex');
Expand All @@ -27,7 +26,7 @@ goog.require('shaka.util.Clock');


/**
* Creates a LiveSegmentIndex.
* Creates a SegmentIndex that supports live DASH content.
*
* A LiveSegmentIndex automatically evicts SegmentReferences that are no longer
* available. However, it does not generate any new SegmentReferences.
Expand Down
5 changes: 2 additions & 3 deletions lib/dash/mpd_parser.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright 2014 Google Inc.
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,8 +13,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview Implements a media presentation description object.
*/

goog.provide('shaka.dash.mpd');
Expand Down
9 changes: 4 additions & 5 deletions lib/dash/mpd_processor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright 2014 Google Inc.
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,8 +13,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview Implements MpdProcessor.
*/

goog.provide('shaka.dash.MpdProcessor');
Expand Down Expand Up @@ -1015,7 +1014,7 @@ shaka.dash.MpdProcessor.prototype.validateSegmentTemplate_ = function(


/**
* Creates a SegmentIndexSource from a SegmentTemplate.
* Creates an ISegmentIndexSource from a SegmentTemplate.
*
* @param {!shaka.dash.mpd.Mpd} mpd
* @param {!shaka.dash.mpd.Period} period
Expand Down Expand Up @@ -1069,7 +1068,7 @@ shaka.dash.MpdProcessor.prototype.makeSegmentIndexSourceViaSegmentTemplate_ =


/**
* Creates a SegmentIndexSource from a SegmentTemplate with an index URL
* Creates an ISegmentIndexSource from a SegmentTemplate with an index URL
* template.
*
* @param {!shaka.dash.mpd.Mpd} mpd
Expand Down
5 changes: 2 additions & 3 deletions lib/dash/mpd_request.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright 2014 Google Inc.
* @license
* Copyright 2015 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -12,8 +13,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @fileoverview Implements an MPD request.
*/

goog.provide('shaka.dash.MpdRequest');
Expand Down
Loading

0 comments on commit 4cc4e96

Please sign in to comment.