presets: Update descriptions for Apple devices.

Adds the recently released iPhone XR, XS, XS Max to the Apple 2160p60 4K HEVC Surround preset.

Revises other product listings with most recent information.

Moves iPad 1st Generation and iPad 2 to the Apple 720p30 Surround preset. The old iPad preset was 720p30, display resolution is higher than 540p, and storage space is not a huge concern.

diff --git a/libhb/preset_builtin.h b/libhb/preset_builtin.h
index 5ba74e53da228921f330bcbbc40caaeb031b05cd..357c011d036b7e3cfe76db0839ebbd9d9d88f42d 100644 (file)
--- a/libhb/preset_builtin.h
+++ b/libhb/preset_builtin.h
@@ -3067,7 +3067,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 3840, \n"
-"                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 7, 7 Plus, 8, 8 Plus, X, and later; Apple TV 4K.\", \n"
+"                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 7, 7 Plus, 8, 8 Plus, X, XR, XS, XS Max; Apple TV 4K.\", \n"
 "                    \"PresetName\": \"Apple 2160p60 4K HEVC Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -3183,7 +3183,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad Pro; iPad Air; iPad mini 2nd, 3rd Generation and later; Apple TV 4th Generation and later.\", \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad 5th and 6th Generation; iPad mini 2, 3, and 4; iPad Air 1st Generation and Air 2; iPad Pro 1st and 2nd Generation; Apple TV 4th Generation and later.\", \n"
 "                    \"PresetName\": \"Apple 1080p60 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -3299,7 +3299,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 5, 5s, SE, 6, 6 Plus, 6s, 6s Plus and later; iPod touch 6th Generation and later; iPad Pro; iPad Air; iPad 3rd, 4th Generation and later; iPad mini; Apple TV 3rd Generation and later.\", \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 5, 5s, SE, 6, 6 Plus, 6s, 6s Plus, and later; iPod touch 6th Generation; iPad 3rd, 4th Generation and later; iPad mini 1st Generation and later; Apple TV 3rd, 4th Generation and later.\", \n"
 "                    \"PresetName\": \"Apple 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -3415,7 +3415,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4, 4S and later; iPod touch 4th, 5th Generation and later; Apple TV 2nd Generation and later.\", \n"
+"                    \"PresetDescription\": \"H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4, 4S, and later; iPod touch 4th, 5th Generation and later; iPad 1st Generation, iPad 2, and later; Apple TV 2nd Generation and later.\", \n"
 "                    \"PresetName\": \"Apple 720p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -3531,7 +3531,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 960, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPad 1st Generation and later; iPod Classic; Apple TV 1st Generation and later.\", \n"
+"                    \"PresetDescription\": \"H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPod Classic; Apple TV 1st Generation and later.\", \n"
 "                    \"PresetName\": \"Apple 540p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"

diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json
index 962317663c12a81a1949bfac0510afc5636b5b4a..a3442eebeb5cd31734ae05927223c2d4371fbbbd 100644 (file)
--- a/preset/preset_builtin.json
+++ b/preset/preset_builtin.json
@@ -3151,7 +3151,7 @@
                     "PictureHeight": 2160,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 7, 7 Plus, 8, 8 Plus, X, and later; Apple TV 4K.",
+                    "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 7, 7 Plus, 8, 8 Plus, X, XR, XS, XS Max; Apple TV 4K.",
                     "PresetName": "Apple 2160p60 4K HEVC Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
@@ -3270,7 +3270,7 @@
                     "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad Pro; iPad Air; iPad mini 2nd, 3rd Generation and later; Apple TV 4th Generation and later.",
+                    "PresetDescription": "H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad 5th and 6th Generation; iPad mini 2, 3, and 4; iPad Air 1st Generation and Air 2; iPad Pro 1st and 2nd Generation; Apple TV 4th Generation and later.",
                     "PresetName": "Apple 1080p60 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
@@ -3389,7 +3389,7 @@
                     "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 5, 5s, SE, 6, 6 Plus, 6s, 6s Plus and later; iPod touch 6th Generation and later; iPad Pro; iPad Air; iPad 3rd, 4th Generation and later; iPad mini; Apple TV 3rd Generation and later.",
+                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 5, 5s, SE, 6, 6 Plus, 6s, 6s Plus, and later; iPod touch 6th Generation; iPad 3rd, 4th Generation and later; iPad mini 1st Generation and later; Apple TV 3rd, 4th Generation and later.",
                     "PresetName": "Apple 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
@@ -3508,7 +3508,7 @@
                     "PictureHeight": 720,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4, 4S and later; iPod touch 4th, 5th Generation and later; Apple TV 2nd Generation and later.",
+                    "PresetDescription": "H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4, 4S, and later; iPod touch 4th, 5th Generation and later; iPad 1st Generation, iPad 2, and later; Apple TV 2nd Generation and later.",
                     "PresetName": "Apple 720p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
@@ -3627,7 +3627,7 @@
                     "PictureHeight": 540,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPad 1st Generation and later; iPod Classic; Apple TV 1st Generation and later.",
+                    "PresetDescription": "H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPod Classic; Apple TV 1st Generation and later.",
                     "PresetName": "Apple 540p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,