Permalink
Browse files

Change license to Apache 2.0

  • Loading branch information...
1 parent 0790ac9 commit 4dc9a2c1430ffcfac34a2a2a74520e48ed45cb63 @protyposis committed Aug 21, 2016
Showing with 684 additions and 1,299 deletions.
  1. +0 −9 .idea/copyright/ITEC_MediaPlayer_GPLv3.xml
  2. +9 −0 .idea/copyright/MediaPlayer_Extended_Apache_2_0.xml
  3. +1 −5 .idea/copyright/profiles_settings.xml
  4. +202 −674 LICENSE
  5. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/AdaptationLogic.java
  6. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/AdaptationSet.java
  7. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/CachedSegment.java
  8. +10 −13 ...Player-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/ConstantPropertyBasedLogic.java
  9. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/DashMediaExtractor.java
  10. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/DashParser.java
  11. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/DashParserException.java
  12. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/DashSource.java
  13. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/MPD.java
  14. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/Period.java
  15. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/Representation.java
  16. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/Segment.java
  17. +10 −13 MediaPlayer-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/SegmentLruCache.java
  18. +10 −13 ...er-DASH/src/main/java/net/protyposis/android/mediaplayer/dash/SimpleRateBasedAdaptationLogic.java
  19. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/AudioPlayback.java
  20. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/Decoders.java
  21. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/FileSource.java
  22. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/MediaCodecAudioDecoder.java
  23. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/MediaCodecDecoder.java
  24. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/MediaCodecVideoDecoder.java
  25. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/MediaExtractor.java
  26. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/MediaPlayer.java
  27. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/MediaSource.java
  28. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/TimeBase.java
  29. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/UriSource.java
  30. +10 −13 MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/VideoView.java
  31. +10 −11 MediaPlayerDemo/src/main/assets/licenses.html
  32. +10 −13 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/MainActivity.java
  33. +10 −13 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/SideBySideActivity.java
  34. +10 −13 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/SideBySideSeekTestActivity.java
  35. +10 −13 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/Utils.java
  36. +10 −13 ...aPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/VideoURIInputDialogFragment.java
  37. +10 −13 MediaPlayerDemo/src/main/java/net/protyposis/android/mediaplayerdemo/VideoViewActivity.java
  38. +10 −13 MediaPlayerDemo/src/main/res/layout-land/activity_side_by_side.xml
  39. +10 −13 MediaPlayerDemo/src/main/res/layout-land/activity_side_by_side_seektest.xml
  40. +10 −13 MediaPlayerDemo/src/main/res/layout/activity_main.xml
  41. +10 −13 MediaPlayerDemo/src/main/res/layout/activity_side_by_side.xml
  42. +10 −13 MediaPlayerDemo/src/main/res/layout/activity_side_by_side_seektest.xml
  43. +10 −13 MediaPlayerDemo/src/main/res/layout/activity_videoview.xml
  44. +10 −13 MediaPlayerDemo/src/main/res/layout/fragment_uriinput_dialog.xml
  45. +10 −13 MediaPlayerDemo/src/main/res/menu/side_by_side.xml
  46. +10 −13 MediaPlayerDemo/src/main/res/menu/videoview.xml
  47. +10 −13 MediaPlayerDemo/src/main/res/values-w820dp/dimens.xml
  48. +10 −13 MediaPlayerDemo/src/main/res/values/colors.xml
  49. +10 −13 MediaPlayerDemo/src/main/res/values/dimens.xml
  50. +11 −14 MediaPlayerDemo/src/main/res/values/strings.xml
  51. +10 −13 MediaPlayerDemo/src/main/res/values/styles.xml
  52. +1 −1 README.md
@@ -1,9 +0,0 @@
-<component name="CopyrightManager">
- <copyright>
- <option name="notice" value="Copyright (c) 2016 Mario Guggenberger &lt;mg@protyposis.net&gt;&#10;&#10;This file is part of MediaPlayer-Extended.&#10;&#10;MediaPlayer-Extended is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;MediaPlayer-Extended is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with MediaPlayer-Extended. If not, see &lt;http://www.gnu.org/licenses/&gt;." />
- <option name="keyword" value="Copyright" />
- <option name="allowReplaceKeyword" value="" />
- <option name="myName" value="ITEC MediaPlayer GPLv3" />
- <option name="myLocal" value="true" />
- </copyright>
-</component>
@@ -0,0 +1,9 @@
+<component name="CopyrightManager">
+ <copyright>
+ <option name="notice" value="Copyright 2016 Mario Guggenberger &lt;mg@protyposis.net&gt;&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10; http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+ <option name="keyword" value="Copyright" />
+ <option name="allowReplaceKeyword" value="" />
+ <option name="myName" value="MediaPlayer-Extended Apache 2.0" />
+ <option name="myLocal" value="true" />
+ </copyright>
+</component>
@@ -1,7 +1,3 @@
<component name="CopyrightManager">
- <settings default="">
- <module2copyright>
- <element module="Own Code for GPL License" copyright="ITEC MediaPlayer GPLv3" />
- </module2copyright>
- </settings>
+ <settings default="MediaPlayer-Extended Apache 2.0" />
</component>
View
Oops, something went wrong.
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2014 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2014 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2014 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2014 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2014 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2014 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2014 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2014 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2014 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2014 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2014 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2014 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2015 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2015 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2014 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2014 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2014 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2014 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2015 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2015 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
@@ -1,20 +1,17 @@
/*
- * Copyright (c) 2014 Mario Guggenberger <mg@protyposis.net>
+ * Copyright 2014 Mario Guggenberger <mg@protyposis.net>
*
- * This file is part of MediaPlayer-Extended.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * MediaPlayer-Extended is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * MediaPlayer-Extended is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MediaPlayer-Extended. If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
*/
package net.protyposis.android.mediaplayer.dash;
Oops, something went wrong.

0 comments on commit 4dc9a2c

Please sign in to comment.