samvera_hls 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 248a3ec8d2a9e81ce645daa12c8d3a8f71056f52
-  data.tar.gz: 25a3e187c1359fbe35c6ac746d8cf38f5b2e9b88
+SHA256:
+  metadata.gz: '04902b097211b989489c9b083df9372d7b6a719229f3e783a84f724c9291d2f5'
+  data.tar.gz: 8f16a6db60bc8f9faa56e2985f249618c908981c28b10255ac2d0bcf45cb06fb
 SHA512:
-  metadata.gz: c927805c5399255af71c80a29336654b63b25c8fec9011b18d1ed5126cd6e3c1cef31621759483560f0f17a09707392854eb9f3377c8e63a4d710874a88bba77
-  data.tar.gz: 81b8213a48f8c9e6bd25360de8dec1dad4909b15b4fd68ddee74dbb67fdefb700982171c505d2f79a88bbaddd92c8b4341549da4bb1ec3413ae2b0416fa33de0
+  metadata.gz: 9895bdcf891e0b753aa3a29e5c19480dc064b39fabe912ab3ad851b3016a0bec6e9f39b1898d08ce28008d135804300b3723a92d457ff873b7c874e852d10923
+  data.tar.gz: 4c8d4b70cabd400f8b12593ec77f6ef74ceebe10fb9d46d52c505b2bed899aa9a5f8dd5d30df2e6c58e1f632b1bc1360c0050f4b425696d0672958ffa535cdb1

data/README.md

@@ -5,7 +5,7 @@ This gem allows a samvera application to create hls derivative media files autom
 
 ## Motivation
 
-Samvera is a promising digital asset management solution with a growing feature set, and we wanted to use as a streaming media service for audiovisual collections. One Samvera based application - [Avalon Media System](https://github.com/avalonmediasystem) - is designed specifically to support multimedia streaming. However, when this module was developed, Avalon was not as feature rich or as fully developed as [Sufia](https://github.com/samvera/sufia) (another Samvera "head") as an asset management system, and its developer community is relatively small. Avalon also relies on a clunky third party transcoding service (Matterhorn) and external streaming server (Red5 or Wowza), creating an unweildly and bug-prone software stack. We wanted the streaming power and flexiblity promised by Avalon, in a more flexible and feature-rich asset management system like Sufia. This gem aims to integrate all of the benefits of adaptive bitrate streaming into Sufia's existing simple, efficient system for creating multimedia derivative files. 
+Samvera is a promising digital asset management solution with a growing feature set, and we wanted to use as a streaming media service for audiovisual collections. One Samvera based application - [Avalon Media System](https://github.com/avalonmediasystem) - is designed specifically to support multimedia streaming. However, at the time of this plugin's creation Avalon was not nearly as flexible or fully developed as [Hyrax](https://github.com/samvera-labs/hyrax) (another Samvera "head" which was then called 'Sufia') as an asset management system, and its developer community is relatively small. Avalon also relies on a clunky party transcoding service (Matterhorn) and external streaming server (Red5 or Wowza), creating an unweildly and bug-pronesoftware stack. We wanted the streaming power and flexiblity promised by Avalon, in a more flexible and feature-rich asset management system like Sufia. This gem aims to integrate all of the benefits of adaptive bitrate streaming into Sufia's existing simple, efficient system for creating multimedia derivative files. 
 
 ## Security & tokens
 
@@ -21,7 +21,7 @@ An apache server is required. This may or may not be the same server that serves
 
 ## Installation
 
-###Install the gem
+### Install the gem
 Add the following to your gem file:
 
 ```gem 'samvera_hls'```

data/app/assets/javascripts/append_playlist_toggle.js

@@ -0,0 +1,18 @@
+
+$( window ).load(function(){
+  toggleButton = $('button#playlist-toggle');
+  toggleButton.appendTo('.mejs__playlist-current');
+  toggleButton.show();
+})
+
+window.onunload = function(){};
+
+$(window).bind("pageshow", function(event) {
+  alert('pageshow event firing')
+  if (event.originalEvent.persisted) {
+    alert('reloading the damn thing!')
+    window.location.reload(); 
+  } else {
+    alert('NOT reloading tsdhe damn thing!')
+  }
+});

data/app/assets/javascripts/embed.js

@@ -10,9 +10,10 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require browser_notification
 //= require jquery
+//= require browser_notification
 //= require mediaelement-and-player
-//= require mep-feature-playlist
-//= require hls_initialize
-
+//= require playlist
+//= require playlist-i18n
+//= require append_playlist_toggle
+//= require load-player

data/app/assets/javascripts/include_player.js

@@ -12,6 +12,8 @@
 //
 //= require browser_notification
 //= require mediaelement-and-player
-//= require mep-feature-playlist
-//= require hls_initialize
+//= require playlist
+//= require playlist-i18n
+//= require append_playlist_toggle
+//= require load-player
 

data/app/assets/javascripts/load-player.js

@@ -0,0 +1,23 @@
+$("video.hls_media#primary-media-player").mediaelementplayer({pluginPath: "/mejs/", showPlaylist: false, audioWidth: "100%"});
+$("audio.hls_media.single#primary-media-player").mediaelementplayer({pluginPath: "/mejs/", showPlaylist: false, audioWidth: "100%"});
+
+$("audio.hls_media.playlist#primary-media-player").mediaelementplayer({pluginPath: "/mejs/", 
+                                                                       showPlaylist: false, 
+                                                                       audioWidth: "100%",
+                                                                       alwaysShowControls: true,
+                                                                       audioWidth: "100%",
+                                                                       showPlaylist: true,
+                                                                       autoClosePlaylist: true,
+                                                                       currentMessage: "now playing: ",
+                                                                       features: ["playpause", 
+                                                                                  "current", 
+                                                                                  "progress", 
+                                                                                  "duration", 
+                                                                                  "tracks", 
+                                                                                  "volume", 
+                                                                                  "fullscreen",
+                                                                                  "playlist",
+                                                                                  "prevtrack", 
+                                                                                  "nexttrack", 
+                                                                                  "shuffle", 
+                                                                                  "loop"]});

data/app/assets/stylesheets/embed.css

@@ -10,7 +10,7 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require mediaelementplayer.min
- *= require mep-feature-playlist
+ *= require mediaelementplayer
+ *= require playlist
  *= require samvera-hls-styles
  */

data/app/assets/stylesheets/samvera-hls-styles.scss

@@ -1,20 +1,14 @@
-.mejs-container.hls-media.mejs-audio {
-   height:auto !important;
+.mejs__container.hls_media, .mejs-container.hls_media {
+    margin-top: 15px;
+    min-height: auto !important;
 }
 
-.mejs-container.hls-media {
-    clear:both;
-    min-height: 30px;
-
-    .mejs-layers { padding-top:2em; }
+.mejs__container.hls_media.playlist_shown, .mejs-container.hls_media.playlist_shown {
+    margin-top: 15px;
+    min-height: 220px !important;
+}
 
-    .mejs-playlist.mejs-layer  {
-        position: relative !important;
-        ul.mejs { margin-top:0px !important;}
-    }
-    
-    .mejs-controls {
-        bottom:auto;
-        top:0;
-    }
+.mejs__container.hls_media.playlist_hidden, .mejs-container.hls_media.playlist_hidden {
+    margin-top: 45px;
 }
+

data/app/controllers/concerns/samvera_hls/file_sets_controller_behavior.rb

@@ -2,7 +2,10 @@ module SamveraHls
   module FileSetsControllerBehavior
     extend ActiveSupport::Concern
 
-#    skip_authorize_resource :only => [:show,:embed,:master,:variant]
+    included do
+      skip_before_action :authenticate_user!, :only => [:show,:citation, :stats,  :embed, :master, :variant]
+      skip_authorize_resource :only => [:show,:citation, :stats,  :embed, :master, :variant]
+    end
 
     def embed
       response.headers["X-FRAME-OPTIONS"] = "ALLOWALL"
@@ -23,7 +26,7 @@ module SamveraHls
     end
 
     def media_display_partial(file_set)
-      'curation_concerns/file_sets/media_display/' +
+      'hyrax/file_sets/media_display/' +
         if file_set.image?
           'image'
         elsif file_set.video?

data/app/models/concerns/samvera_hls/file_set_behavior.rb

@@ -5,7 +5,7 @@ module SamveraHls
   module FileSetBehavior
     extend ActiveSupport::Concern
 
-    def create_derivatives(filename)
+    def create_hls_derivatives(filename)
       case mime_type
       when *self.class.audio_mime_types
         hls_dir = File.join(derivative_dir,"hls")
@@ -14,7 +14,7 @@ module SamveraHls
         hls_dir = File.join(derivative_dir,"hls")
         create_video_derivates filename, hls_dir
       else
-        super
+        return false
       end
     end
 
@@ -23,6 +23,7 @@ module SamveraHls
     end
 
     def hls_master_playlist root_url
+      root_url = root_url.gsub("/?locale=en","")
         type = mime_type.split('/')[0]
         defaults = hls_config[type]["default"]
         playlist = "#EXTM3U\n"
@@ -42,6 +43,7 @@ module SamveraHls
     end
 
     def hls_segment_playlist root_url, format
+      root_url = root_url.gsub("/?locale=en","")
       playlist = ""
       File.open(segment_playlist_path(format),'r') {|file|
         file.each_line do |line|
@@ -59,6 +61,14 @@ module SamveraHls
       playlist
     end
 
+    def derivative_url(destination_name = nil)
+      if destination_name.nil?
+        @deriv_url ||= derivative_dir.gsub(Hyrax.config.derivatives_path,"")
+      else
+        path = derivative_path(destination_name)
+        URI("file://#{path}").to_s
+      end
+    end
 
     module ClassMethods
 
@@ -69,8 +79,6 @@ module SamveraHls
       end
     end
 
-
-
     private
 
     def segment_url_base
@@ -99,7 +107,7 @@ module SamveraHls
 
     def create_video_derivates filename, hls_dir
       outputs = [{ label: :thumbnail, format: 'jpg', url: derivative_url('thumbnail') },
-                 { label: 'webm', format: 'webm', url: derivative_url('webm') },
+#                 { label: 'webm', format: 'webm', url: derivative_url('webm') },
                  { label: 'mp4', format: 'mp4', url: derivative_url('mp4') },
                  { label: 'hls_high', format: "hls_high", path: hls_dir}, 
                  { label: 'hls_med', format: "hls_med", path: hls_dir}, 
@@ -127,23 +135,17 @@ module SamveraHls
         File.join(derivative_dir,"hls",format+".m3u8")
     end
 
-    def derivative_url(destination_name = nil)
-      if destination_name.nil?
-        @deriv_url ||= derivative_dir.gsub(CurationConcerns.config.derivatives_path,"")
-      else
-        path = derivative_path(destination_name)
-        URI("file://#{path}").to_s
-      end
-    end
-
     def derivative_dir
       File.split(derivative_path("dummy"))[0]
     end
 
     def derivative_path destination_name
-      CurationConcerns::DerivativePath.derivative_path_for_reference(self, destination_name)
+      derivative_path_service.derivative_path_for_reference(self, destination_name)
     end
 
+    def derivative_path_service
+      Hyrax::DerivativePath
+    end
 
   end
 end

data/app/models/concerns/samvera_hls/solr_document_behavior.rb

@@ -0,0 +1,112 @@
+module SamveraHls
+  module SolrDocumentBehavior
+    extend ActiveSupport::Concern
+
+    
+    def hls_master_url
+        File.join("file_set",id,"hls.m3u8")
+    end
+
+    def hls_master_playlist root_url
+      root_url = root_url.gsub("/?locale=en","")
+        type = mime_type.split('/')[0]
+        defaults = hls_config[type]["default"]
+        playlist = "#EXTM3U\n"
+        playlist << "#EXT-X-VERSION:6\n"
+        variants.each{|variant| 
+          next if variant.blank?
+          path, filename = File.split(variant)
+          format = filename.gsub(".m3u8","")
+          options = defaults.merge(hls_config[type][format])
+          playlist << "#EXT-X-STREAM-INF:PROGRAM-ID=1,"
+          playlist << "BANDWIDTH=#{options["maxrate"]},"
+          playlist << "CODECS=\"#{options["codec_code"]}\","
+          playlist << "RESOLUTION=#{options["resolution"]}\n"
+          playlist << File.join(root_url,variant_url(format)) + "\n"
+        }
+        playlist
+    end
+
+    def hls_segment_playlist root_url, format
+      root_url = root_url.gsub("/?locale=en","")
+      playlist = ""
+      File.open(segment_playlist_path(format),'r') {|file|
+        file.each_line do |line|
+          if ENV["RAILS_ENV"] == 'development'
+            this_segment_url = File.join(root_url,
+                                         segment_url_base,
+                                         line).strip 
+          else
+            this_segment_url = File.join(root_url,
+                                         segment_url_base,
+                                         timestamp.to_s,
+                                         token(line),
+                                         line).strip
+          end
+          if line.include? ".ts" then
+            playlist << this_segment_url + "\n"
+          else
+            playlist << line.strip+"\n"
+          end
+        end
+      }
+      playlist
+    end
+
+   
+    private
+
+    def segment_url_base
+      File.join("stream",derivative_url,"hls")
+    end
+
+    def variants
+      variants = Dir.glob(File.join(derivative_dir,"hls","*.m3u8"))
+      variants.map!{ |file| 
+        name = File.split(file)[1]
+      }
+    end
+
+    def variant_url format 
+        File.join("file_set",id,format,"variant.m3u8")
+    end
+
+    
+    def token line
+      @token ||=  Digest::SHA256.hexdigest("/" + File.join(segment_url_base,timestamp.to_s,line).strip[0...-9] + token_secret)
+    end
+
+    def timestamp
+      @timestamp ||= Time.now.to_i + 7200
+    end
+
+    def token_secret
+      if ENV["RAILS_ENV"] == 'development'
+        return ''
+      else
+        return @token_secret ||= ENV['hls_token_secret']
+      end
+    end
+
+    def hls_config
+      @hls_config ||= YAML.load_file(Rails.root.join('config','hls.yml'))
+    end
+
+    def segment_playlist_path format
+        File.join(derivative_dir,"hls",format+".m3u8")
+    end
+
+    def derivative_dir
+      File.split(derivative_path("dummy"))[0]
+    end
+
+    def derivative_path destination_name
+      derivative_path_service.derivative_path_for_reference(self, destination_name)
+    end
+
+    def derivative_path_service
+      Hyrax::DerivativePath
+    end
+
+  end
+end

data/app/services/samvera_hls/hls_output_file_service.rb

@@ -1,6 +1,6 @@
-require 'samvera/derivatives'
+require 'hydra/derivatives'
 module SamveraHls
-  class HlsOutputFileService < CurationConcerns::PersistDerivatives
+  class HlsOutputFileService < Hyrax::PersistDerivatives
     def self.call( directives,temp_dir)
       hls_dir =  directives[:path]
       FileUtils.mkdir_p(hls_dir)

data/app/views/hyrax/file_sets/media_display/_audio_hls.html.erb

@@ -1,4 +1,4 @@
-<audio controls="controls" class="hls-media" preload="auto" width="100%" height="100%">
+<audio id="primary-media-player" class="hls-media single" controls="controls" preload="auto" width="100%" height="100%">
     <source src="<%= File.join(request.base_url,"file_set",file_set.id,"hls.m3u8") %>" type="application/x-mpegurl"/>
     Your browser does not support the audio tag.
 </audio>

data/app/views/hyrax/file_sets/media_display/_video_hls.html.erb

@@ -1,4 +1,4 @@
-<video class="hls-media" preload="auto" width="100%" height="100%">
+<video class="hls-media single" id="primary-media-player" controls="controls" preload="auto" width="100%" height="100%">
     <source src="<%= File.join(request.base_url,"file_set",file_set.id,"hls.m3u8") %>" type="application/x-mpegurl"/>
     Your browser does not support the video tag.
 </video> 

data/config/routes.rb

@@ -1,4 +1,4 @@
-Rails.application.routes.draw do
+SamveraHls::Engine.routes.draw do
   
   get '/file_set/:id/hls.m3u8', to: 'file_sets#master'
   get '/file_set/:id/:format/variant.m3u8', to: 'file_sets#variant'

data/lib/generators/samvera_hls/install/install_generator.rb

@@ -16,8 +16,8 @@ class SamveraHls::InstallGenerator < Rails::Generators::Base
 
   def inject_file_set_behavior
     insert_into_file "app/models/file_set.rb", 
-                     :after => "Sufia::FileSetBehavior" do
-      %{\n  include SamveraHls::FileSetBehavior\n}
+                     :after => "Hyrax::FileSetBehavior" do
+      %{\n  include HydraHls::FileSetBehavior\n}
     end
   end
 

data/lib/generators/samvera_hls/install/templates/controllers/file_sets_controller.rb

@@ -1,4 +1,4 @@
-class FileSetsController < CurationConcerns::FileSetsController
+class FileSetsController < Hyrax::FileSetsController
   skip_before_action :authenticate_user!, :only => [:show,:citation, :stats,  :embed, :master, :variant]
   skip_authorize_resource :only => [:show,:citation, :stats,  :embed, :master, :variant]
   include SamveraHls::FileSetsControllerBehavior  

data/lib/samvera_hls/derivatives/processors/media.rb

@@ -13,7 +13,6 @@ module SamveraHls
           self.class.execute "#{Hydra::Derivatives.ffmpeg_path} #{inopts} -i \"#{input_path}\" #{outopts} #{output_files}"
         end
 
-
         def encode_file(file_suffix, options)
           return super(file_suffix,options) unless file_suffix.include?("hls")
           Dir::mktmpdir(['sufia', "_#{file_suffix}"], Hydra::Derivatives.temp_file_base){ |temp_dir|

data/lib/samvera_hls/version.rb

@@ -1,3 +1,3 @@
 module SamveraHls
-  VERSION = "0.1.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samvera_hls
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ned Henry, UCSC Library Digital Initiatives
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,20 +36,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/append_playlist_toggle.js
 - app/assets/javascripts/browser_notification.js
 - app/assets/javascripts/embed.js
-- app/assets/javascripts/hls_initialize.js.erb
 - app/assets/javascripts/include_player.js
+- app/assets/javascripts/load-player.js
 - app/assets/stylesheets/embed.css
-- app/assets/stylesheets/hydra-hls-styles.scss
 - app/assets/stylesheets/samvera-hls-styles.scss
 - app/controllers/concerns/samvera_hls/file_sets_controller_behavior.rb
 - app/models/concerns/samvera_hls/file_set_behavior.rb
+- app/models/concerns/samvera_hls/solr_document_behavior.rb
 - app/services/samvera_hls/hls_output_file_service.rb
 - app/views/_playlist.html.erb
-- app/views/curation_concerns/file_sets/embed.html.erb
-- app/views/curation_concerns/file_sets/media_display/_audio_hls.html.erb
-- app/views/curation_concerns/file_sets/media_display/_video_hls.html.erb
 - app/views/file_sets/embed.html.erb
 - app/views/file_sets/media_display/_audio_hls.html.erb
 - app/views/file_sets/media_display/_video_hls.html.erb
@@ -127,44 +125,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An engine to add hls adaptive streaming to a samvera based application.
 test_files:
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
-- spec/dummy/public/404.html
+- spec/dummy/Rakefile
+- spec/dummy/public/favicon.ico
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
+- spec/dummy/public/404.html
 - spec/dummy/README.rdoc
 - spec/test_app_templates/lib/generators/test_app_generator.rb

data/app/assets/javascripts/hls_initialize.js.erb

@@ -1,22 +0,0 @@
-$(document).ready(function(){
-
-    if(typeof isPlaylist == "undefined")
-        isPlaylist = false;
-    if(isPlaylist) {
-        $(".hls-media").mediaelementplayer({
-            audioWidth: '100%',
-            loop: true,
-            shuffle: false  ,
-            playlist: true,
-            playlistposition: 'bottom',
-            features: ['playlistfeature', 'prevtrack', 'playpause', 'nexttrack', 'loop', 'shuffle', 'playlist', 'current', 'progress', 'duration', 'volume'],
-            flashName: "<%= asset_path("flashmediaelement.swf")  %>"
-        });
-    } else {
-        $(".hls-media").mediaelementplayer({
-	    audioWidth: '100%',
-            flashName: "<%= asset_path("flashmediaelement.swf")  %>"
-        });
-    }
- });
-

data/app/assets/stylesheets/hydra-hls-styles.scss

@@ -1,20 +0,0 @@
-.mejs-container.hls-media.mejs-audio {
-   height:auto !important;
-}
-
-.mejs-container.hls-media {
-    clear:both;
-    min-height: 30px;
-
-    .mejs-layers { padding-top:2em; }
-
-    .mejs-playlist.mejs-layer  {
-        position: relative !important;
-        ul.mejs { margin-top:0px !important;}
-    }
-    
-    .mejs-controls {
-        bottom:auto;
-        top:0;
-    }
-}

data/app/views/curation_concerns/file_sets/embed.html.erb

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8" />
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta title="media">
-        <%= javascript_include_tag "embed" %>
-        <%= stylesheet_link_tag "embed" %>
-    </head>
-
-    <body>
-        <%= render @media_partial %>
-    </body>
-</html>

data/app/views/curation_concerns/file_sets/media_display/_audio_hls.html.erb

@@ -1,5 +0,0 @@
-<audio controls="controls" class="hls-media" preload="auto" width="100%" height="100%">
-    <source src="<%= File.join(request.base_url,"file_set",file_set.id,"hls.m3u8") %>" type="application/x-mpegurl"/>
-    Your browser does not support the audio tag.
-</audio>
-

data/app/views/curation_concerns/file_sets/media_display/_video_hls.html.erb

@@ -1,5 +0,0 @@
-<video class="hls-media" preload="auto" width="100%" height="100%">
-    <source src="<%= File.join(request.base_url,"file_set",file_set.id,"hls.m3u8") %>" type="application/x-mpegurl"/>
-    Your browser does not support the video tag.
-</video> 
-