summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRudolf Polzer <divverent@xonotic.org>2012-12-01 19:50:15 +0100
committerRudolf Polzer <divverent@xonotic.org>2012-12-01 19:51:25 +0100
commit96fb9103b55b253002fa8bc536c65f07477d4b69 (patch)
tree912ab313da7acb117d8dc3660e1d11bf3b58c030
parentbb8e3dd0a285eb38884d915db339a697505b9a54 (diff)
downloadmpv-96fb9103b55b253002fa8bc536c65f07477d4b69.tar.bz2
mpv-96fb9103b55b253002fa8bc536c65f07477d4b69.tar.xz
encoding-example-profiles: updates, iphone 5 support
Now the scaling for iPhones properly optimizes for the zoomed-in (pan-scan) view.
-rw-r--r--DOCS/encoding.rst3
-rw-r--r--etc/encoding-example-profiles.conf15
2 files changed, 13 insertions, 5 deletions
diff --git a/DOCS/encoding.rst b/DOCS/encoding.rst
index 84b1007afd..a414bdf3f9 100644
--- a/DOCS/encoding.rst
+++ b/DOCS/encoding.rst
@@ -104,7 +104,8 @@ options are added by it::
-profile enc-to-nok-6300 3GP for Nokia 6300
-profile enc-to-psp MP4 for PlayStation Portable
-profile enc-to-iphone MP4 for iPhone
- -profile enc-to-iphone4 MP4 for iPhone 4 (double res)
+ -profile enc-to-iphone-4 MP4 for iPhone 4 (double res)
+ -profile enc-to-iphone-5 MP4 for iPhone 5 (even larger res)
You can encode using these with a command line like::
diff --git a/etc/encoding-example-profiles.conf b/etc/encoding-example-profiles.conf
index bf31a8a056..9c2b1da27d 100644
--- a/etc/encoding-example-profiles.conf
+++ b/etc/encoding-example-profiles.conf
@@ -150,7 +150,7 @@ ovcopts-add = g=18,b=6000000,maxrate=9000000,minrate=0,bufsize=1835008
[enc-to-bb-9000]
profile-desc = "MP4 for Blackberry Bold 9000"
profile = enc-f-mp4
-vf-add = scale=w=480:h=-2:noup=2,scale=h=-2 # second scaler serves to fix aspect ratio in case "noup" of the first scaler has hit
+vf-add = dsize=480:360:0:2,scale=w=0:h=0,dsize=-1:-1 # native screen res, letterbox
ovcopts-add = maxrate=1500k,bufsize=1000k,rc_init_occupancy=900k,refs=1,profile=baseline
[enc-to-nok-6300]
@@ -166,7 +166,7 @@ oacopts-add = b=32k
profile-desc = "MP4 for PlayStation Portable"
profile = enc-f-mp4
ofps = 30000/1001
-vf-add = scale=w=480:h=272,dsize=w=480:h=270
+vf-add = scale=w=480:h=272,dsize=480:270
srate = 48000
channels = 2
ovcopts-add = b=512k,profile=baseline
@@ -175,12 +175,19 @@ ovcopts-add = b=512k,profile=baseline
profile-desc = "MP4 for iPhone"
profile = enc-f-mp4
oautofps = yes # iphone supports 30fps max
-vf-add = scale=w=-2:h=320:noup=2 # half native screen res is probably best here, full res is no fun on tiny display anyway
+vf-add = dsize=480:320:1:2,scale=w=0:h=0,dsize=-1:-1 # half native screen res is probably best here, full res is no fun on tiny display anyway
ovcopts-add = maxrate=2500k,bufsize=1000k,rc_init_occupancy=900k,level=30,profile=baseline
[enc-to-iphone-4]
profile-desc = "MP4 for iPhone 4 (960x640)"
profile = enc-f-mp4
oautofps = yes # iphone supports 30fps max
-vf-add = scale=w=-2:h=640:noup=2 # native screen res
+vf-add = dsize=960:480:1:2,scale=w=0:h=0,dsize=-1:-1 # native screen res, panscan
+ovcopts-add = maxrate=2500k,bufsize=1000k,rc_init_occupancy=900k,level=30,profile=baseline
+
+[enc-to-iphone-5]
+profile-desc = "MP4 for iPhone 5 (1136x640)"
+profile = enc-f-mp4
+oautofps = yes # iphone supports 30fps max
+vf-add = dsize=1136:480:1:2,scale=w=0:h=0,dsize=-1:-1 # native screen res, panscan
ovcopts-add = maxrate=2500k,bufsize=1000k,rc_init_occupancy=900k,level=30,profile=baseline