summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xscripts/manicure.rb48
-rw-r--r--test/test.c18
2 files changed, 33 insertions, 33 deletions
diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index 924070298..8a32a0b52 100755
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -285,13 +285,7 @@ class Display
#Video encoder
if hash["VideoEncoder"] != "FFmpeg"
commandString << " -e "
- if hash["VideoEncoder"] == "x264 (h.264 Main)"
- commandString << "x264"
- elsif hash["VideoEncoder"] == "x264 (h.264 iPod)"
- commandString << "x264b30"
- else
- commandString << hash["VideoEncoder"].to_s.downcase
- end
+ commandString << hash["VideoEncoder"].to_s.downcase
end
#VideoRateControl
@@ -341,6 +335,11 @@ class Display
commandString << "mkv"
end
+ #iPod MP4 atom
+ if hash["Mp4iPodCompatible"].to_i == 1
+ commandString << " -I"
+ end
+
#Cropping
if !hash["PictureAutoCrop"].to_i
commandString << " --crop "
@@ -425,13 +424,7 @@ class Display
#Video encoder
if hash["VideoEncoder"] != "FFmpeg"
commandString << " -e "
- if hash["VideoEncoder"] == "x264 (h.264 Main)"
- commandString << "x264"
- elsif hash["VideoEncoder"] == "x264 (h.264 iPod)"
- commandString << "x264b30"
- else
- commandString << hash["VideoEncoder"].to_s.downcase
- end
+ commandString << hash["VideoEncoder"].to_s.downcase
end
#VideoRateControl
@@ -481,6 +474,11 @@ class Display
commandString << "mkv"
end
+ #iPod MP4 atom
+ if hash["Mp4iPodCompatible"].to_i == 1
+ commandString << " -I"
+ end
+
#Cropping
if !hash["PictureAutoCrop"].to_i
commandString << " --crop "
@@ -574,13 +572,16 @@ class Display
commandString << "mux = " << "HB_MUX_MKV;\n "
end
+ #iPod MP4 atom
+ if hash["Mp4iPodCompatible"].to_i == 1
+ commandString << "job->ipod_atom = 1;\n "
+ end
+
#Video encoder
if hash["VideoEncoder"] != "FFmpeg"
commandString << "vcodec = "
- if hash["VideoEncoder"] == "x264 (h.264 Main)"
+ if hash["VideoEncoder"] == "x264"
commandString << "HB_VCODEC_X264;\n "
- elsif hash["VideoEncoder"] == "x264 (h.264 iPod)"
- commandString << "HB_VCODEC_X264;\njob->h264_level = 30;\n "
elsif hash["VideoEncoder"].to_s.downcase == "xvid"
commandString << "HB_VCODEC_XVID;\n "
end
@@ -729,13 +730,7 @@ class Display
#Video encoder
if hash["VideoEncoder"] != "FFmpeg"
commandString << " -e "
- if hash["VideoEncoder"] == "x264 (h.264 Main)"
- commandString << "x264"
- elsif hash["VideoEncoder"] == "x264 (h.264 iPod)"
- commandString << "x264b30"
- else
- commandString << hash["VideoEncoder"].to_s.downcase
- end
+ commandString << hash["VideoEncoder"].to_s.downcase
end
#VideoRateControl
@@ -793,6 +788,11 @@ class Display
commandString << "mkv"
end
+ #iPod MP4 atom
+ if hash["Mp4iPodCompatible"].to_i == 1
+ commandString << " -I"
+ end
+
#Cropping
if !hash["PictureAutoCrop"].to_i
commandString << " --crop "
diff --git a/test/test.c b/test/test.c
index 892636981..671592366 100644
--- a/test/test.c
+++ b/test/test.c
@@ -523,42 +523,42 @@ static int HandleEvents( hb_handle_t * h )
if (!strcmp(preset_name, "iPhone / iPod Touch"))
{
mux = HB_MUX_MP4;
+ job->ipod_atom = 1;
vcodec = HB_VCODEC_X264;
- job->h264_level = 30;
job->vbitrate = 960;
job->abitrate = 128;
job->arate = 48000;
acodec = HB_ACODEC_FAAC;
job->width = 480;
- x264opts = strdup("cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1");
+ x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1");
job->chapter_markers = 1;
}
if (!strcmp(preset_name, "iPod High-Rez"))
{
mux = HB_MUX_MP4;
+ job->ipod_atom = 1;
vcodec = HB_VCODEC_X264;
- job->h264_level = 30;
job->vbitrate = 1500;
job->abitrate = 160;
job->arate = 48000;
acodec = HB_ACODEC_FAAC;
job->width = 640;
- x264opts = strdup("bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1");
+ x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1");
job->chapter_markers = 1;
}
if (!strcmp(preset_name, "iPod Low-Rez"))
{
mux = HB_MUX_MP4;
+ job->ipod_atom = 1;
vcodec = HB_VCODEC_X264;
- job->h264_level = 30;
job->vbitrate = 700;
job->abitrate = 160;
job->arate = 48000;
acodec = HB_ACODEC_FAAC;
job->width = 320;
- x264opts = strdup("bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1");
+ x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1");
job->chapter_markers = 1;
}
@@ -1245,11 +1245,11 @@ static void ShowPresets()
printf("\n+ Film: -e x264 -b 1800 -E ac3 -f mkv -m -p -2 -T -x ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip\n");
- printf("\n+ iPhone / iPod Touch: -e x264b30 -b 960 -B 128 -R 48 -E faac -f mp4 -w 480 -m -x cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1\n");
+ printf("\n+ iPhone / iPod Touch: -e x264 -b 960 -B 128 -R 48 -E faac -f mp4 -I -w 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1\n");
- printf("\n+ iPod High-Rez: -e x264b30 -b 1500 -B 160 -R 48 -E faac -f mp4 -w 640 -m -x bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n");
+ printf("\n+ iPod High-Rez: -e x264 -b 1500 -B 160 -R 48 -E faac -f mp4 -I -w 640 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n");
- printf("\n+ iPod Low-Rez: -e x264b30 -b 700 -B 160 -R 48 -E faac -f mp4 -w 320 -m -x bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n");
+ printf("\n+ iPod Low-Rez: -e x264 -b 700 -B 160 -R 48 -E faac -f mp4 -I -w 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n");
printf("\n+ Normal: -e x264 -b 1500 -B 160 -R 48 -E faac -f mp4 -m -p -2 -T -x ref=2:bframes=2:subme=5:me=umh\n");
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 05:29:19 +0000