abrizer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc9378a163fb93bef80e0850ac0133674ac9106f
-  data.tar.gz: 633f89376f94e84237122b36a4aba365d34ef3db
+  metadata.gz: b2cc86e1f64991ede59039402b26923049110110
+  data.tar.gz: 03522fe0d4fdf46fd41387356969cf416a84a524
 SHA512:
-  metadata.gz: 5a9aff673d64f3ae930cdffc748aed9a844f82414dd1fd12bb93ddbcc0ae9624096c5a869a5a930ad75f90481aa34e12a8f3b12e0662bb68e6751fa6dbba5891
-  data.tar.gz: 3ef0a0a10a9b21f7645fb9f869f6df5b3a34aff48a87f02928077eb29d0259226fa7860d5c69b9acb41bdfab7382d51b01ed9075853587c4830621c380de2881
+  metadata.gz: 7034f59f985cda22b3fd31f6f4f4cbe2574d7e45b80a00b89aa61ba0cb8c83e92ae8d6e18d21473457f6d41ac596a61c5714b232666dfdfc0add5d0cb8e311e9
+  data.tar.gz: 1486ff06789e71d6d9e29d7a9825318ff1fb564b2b08ba2de3a08f8b52159e5088cb5fafa908a19d814afba69949fda88c405af4698bcbeef5131faec1c91a73

data/lib/abrizer/canvas.rb

@@ -43,25 +43,39 @@ module Abrizer
     end
 
     def media_json(json)
-      json.media do
+      json.content do
         json.child! do
-          json.type "Annotation"
-          json.motivation 'painting'
-          json.target canvas_id
-          json.body do
-            json.type "Choice"
-            json.items do
-              mpd_item(json)
-              hlsts_item(json)
-              vp9_item(json)
-              mp4_item(json)
-            end
-            json.seeAlso do
-              # TODO: Allow for adding more than one captions/subtitle file
-              captions_seealso(json)
-              sprites_seealso(json)
+          json.type "AnnotationPage"
+
+          json.items do
+            json.child! do
+              json.type 'Annotation'
+              json.motivation 'painting'
+              json.target canvas_id
+              json.body do
+                json.child! do
+                  json.type "Choice"
+                  json.choiceHint 'client'
+                  json.items do
+                    mpd_item(json)
+                    hlsts_item(json)
+                    vp9_item(json)
+                    mp4_item(json)
+                    aac_item(json)
+                  end
+                end
+                json.child! do
+                  json.type 'Choice'
+                  json.choiceHint 'client'
+                  json.items do
+                    captions_item(json)
+                  end
+                end
+              end
             end
+            sprites_item(json)
           end
+
         end
       end
     end
@@ -117,27 +131,49 @@ module Abrizer
       end
     end
 
-    def captions_seealso(json)
-      # TODO: update captions seeAlso for multiple captions
+    def aac_item(json)
+      if File.exist? hlsts_aac_filepath
+        json.child! do
+          json.id hlsts_aac_id
+          json.type "Audio"
+          json.format 'audio/aac'
+        end
+      end
+    end
+
+    def captions_item(json)
+      # TODO: update captions for multiple captions
       captions_file = File.join output_directory, 'vtt/captions.vtt'
       if File.exist? captions_file
         json.child! do
           json.id vtt_id
-          json.format 'application/webvtt'
+          json.type 'Text'
+          json.format 'text/vtt'
+          json.kind 'captions'
           json.label 'English captions'
           json.language 'en'
-          json._comments "How make explicit how whether to use these as captions or subtitles?"
+          json._comments "How make explicit how whether to use these as captions or subtitles, descriptions, or chapters?"
         end
       end
     end
 
-    def sprites_seealso(json)
+    def sprites_item(json)
       if File.exist? sprites_filepath
         json.child! do
-          json.id sprites_id
-          json.format 'application/webvtt'
-          json.label 'image sprite metadata'
-          json._comments "How to include resources like video image sprites like those created by https://github.com/jronallo/video_sprites and used by various players?"
+          json.type 'Annotation'
+          json.motivation 'video-thumbnails'
+          json.target canvas_id
+          json.body do
+            json.child! do
+              json.id sprites_id
+              json.type 'Text'
+              json.format 'text/vtt'
+              json.kind 'metadata'
+              json.label 'image sprite metadata'
+              json._comments "How to include resources like video image sprites like those created by https://github.com/jronallo/video_sprites and used by various players?"
+            end
+          end
+
         end
       end
     end
@@ -162,6 +198,10 @@ module Abrizer
       File.join media_base_url, hlsts_partial_filepath
     end
 
+    def hlsts_aac_id
+      File.join media_base_url, hlsts_aac_partial_filepath
+    end
+
     def mp4_id
       File.join media_base_url, mp4_partial_filepath
     end

data/lib/abrizer/filepath_helpers.rb

@@ -54,6 +54,14 @@ module Abrizer
       File.join output_directory, hlsts_partial_filepath
     end
 
+    def hlsts_aac_partial_filepath
+      'hls/audio/aac/eng/media.aac'
+    end
+
+    def hlsts_aac_filepath
+      File.join output_directory, hlsts_aac_partial_filepath
+    end
+
     def mp4_partial_filepath
       'progressive.mp4'
     end

data/lib/abrizer/version.rb

@@ -1,3 +1,3 @@
 module Abrizer
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abrizer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Ronallo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler