TIKA-4838 - wording: drms/enca/encv/drmi are protected sample entry formats, not protection schemes

Author: dschmidt

tika-core/src/main/java/org/apache/tika/metadata/Audio.java

@@ -86,9 +86,9 @@ public interface Audio {
 
     /**
      * The audio track's four-character codec identifier from the MP4/QuickTime
-     * sample description (e.g. "mp4a" for AAC, "alac", "ac-3"), or the protection
-     * scheme ("drms"/"enca") for protected streams, where {@link #HAS_DRM} is also
-     * set. A per-stream value: with several audio tracks it reflects the last one.
+     * sample description (e.g. "mp4a" for AAC, "alac", "ac-3"), or the protected
+     * sample entry format ("drms"/"enca") for protected streams, where {@link #HAS_DRM}
+     * is also set. A per-stream value: with several audio tracks it reflects the last one.
      * Distinct from {@link XMPDM#AUDIO_COMPRESSOR}, the human-readable codec name.
      */
     Property FORMAT = Property.internalText("audio:format");

tika-core/src/main/java/org/apache/tika/metadata/Video.java

@@ -41,7 +41,7 @@ public interface Video {
     /**
      * The video track's four-character codec identifier from the MP4/QuickTime
      * sample description (e.g. "avc1" for H.264, "hvc1"/"hev1" for HEVC), or the
-     * protection scheme ("encv"/"drmi") for protected streams. A per-stream value:
+     * protected sample entry format ("encv"/"drmi") for protected streams. A per-stream value:
      * with several video tracks it reflects the last one. Distinct from
      * {@link XMPDM#VIDEO_COMPRESSOR}, the human-readable compressor name.
      */

tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/TikaMp4SoundHandler.java

@@ -70,8 +70,8 @@ private void extractFromSampleDescriptions(byte[] b) {
             }
             int end = pos + (int) size;
             String format = fourCc(b, pos + 4);
-            //protected streams carry a protection scheme fourcc as the format:
-            //'drms' (FairPlay) or 'enca' (ISO common encryption)
+            //protected streams carry a protected sample entry format as the fourcc:
+            //'drms' (FairPlay) or 'enca' (generic protected audio)
             if ("drms".equals(format) || "enca".equals(format)) {
                 tikaMetadata.set(Audio.HAS_DRM, true);
             }

tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/TikaMp4VideoHandler.java

@@ -77,7 +77,7 @@ private void extractFromSampleDescriptions(byte[] b) {
             }
             int end = pos + (int) size;
             //the format fourcc is the video codec ('avc1', 'hev1', ...) or, for
-            //protected streams, the protection scheme ('encv'/'drmi')
+            //protected streams, the protected sample entry format ('encv'/'drmi')
             tikaMetadata.set(Video.FORMAT, fourCc(b, pos + 4));
             int bitRate = findBtrtAverageBitRate(b, pos + VISUAL_ENTRY_SIZE, end);
             if (bitRate > 0) {