[xiph-commits] r16569 - in trunk/ffmpeg2theora: . src

[j at svn.xiph.org]

Author: j
Date: 2009-09-24 14:29:06 -0700 (Thu, 24 Sep 2009)
New Revision: 16569

Modified:
   trunk/ffmpeg2theora/ChangeLog
   trunk/ffmpeg2theora/ffmpeg2theora.1
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
Log:
shift quality in presets by 1

Modified: trunk/ffmpeg2theora/ChangeLog
===================================================================
--- trunk/ffmpeg2theora/ChangeLog	2009-09-24 21:18:22 UTC (rev 16568)
+++ trunk/ffmpeg2theora/ChangeLog	2009-09-24 21:29:06 UTC (rev 16569)
@@ -5,6 +5,7 @@
     - frontend mode outputs one json dict per line now
     - select video stream if input has more than one video(--videostream N)
     - update to ffmpeg trunk and new ffmepg api
+    - use new libtheora 1.1
     - use new libtheora encoding api
       add new encoding options --soft-target, --buf-delay
     - two pass encoding, --two-pass

Modified: trunk/ffmpeg2theora/ffmpeg2theora.1
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.1	2009-09-24 21:18:22 UTC (rev 16568)
+++ trunk/ffmpeg2theora/ffmpeg2theora.1	2009-09-24 21:29:06 UTC (rev 16569)
@@ -45,13 +45,13 @@
 .B \-e, \-\-endtime
 End encoding at this time (in seconds).
 .TP
-.B \-p, \-\-v2v-preset
+.B \-p, \-\-preset
 Encode file with v2v preset.  Right now, there is preview, pro and videobin.  Run
 \*(lqffmpeg2theora \-p info\*(rq for more information.
 .SS Video output options:
 .TP
 .B \-v, \-\-videoquality
-[0 to 10] Set encoding quality for video (default: 5).
+[0 to 10] Set encoding quality for video (default: 6).
           use higher values for better quality
 .TP
 .B \-V, \-\-videobitrate

Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-09-24 21:18:22 UTC (rev 16568)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-09-24 21:29:06 UTC (rev 16569)
@@ -1776,11 +1776,11 @@
         //  "v2v presets - more info at http://wiki.v2v.cc/presets"
         "v2v presets:\n"
         "  preview        Video: 320x240 if fps ~ 30, 384x288 otherwise\n"
-        "                        Quality 5\n"
+        "                        Quality 6\n"
         "                 Audio: Max 2 channels - Quality 1\n"
         "\n"
         "  pro            Video: 720x480 if fps ~ 30, 720x576 otherwise\n"
-        "                        Quality 7\n"
+        "                        Quality 8\n"
         "                 Audio: Max 2 channels - Quality 3\n"
         "\n"
         "  videobin       Video: 512x288 for 16:9 material, 448x336 for 4:3 material\n"
@@ -1788,7 +1788,7 @@
         "                 Audio: Max 2 channels - Quality 3\n"
         "\n"
         "  padma          Video: 640x360 for 16:9 material, 640x480 for 4:3 material\n"
-        "                        Quality 5\n"
+        "                        Quality 6\n"
         "                 Audio: Max 2 channels - Quality 3\n"
         "\n"
         "  padma-stream   Video: 128x72 for 16:9 material, 128x96 for 4:3 material\n"
@@ -1814,7 +1814,7 @@
         "                          '"PACKAGE" -p info' for more informations\n"
         "\n"
         "Video output options:\n"
-        "  -v, --videoquality     [0 to 10] encoding quality for video (default: 5)\n"
+        "  -v, --videoquality     [0 to 10] encoding quality for video (default: 6)\n"
         "                                   use higher values for better quality\n"
         "  -V, --videobitrate     encoding bitrate for video (kb/s)\n"
         "      --soft-target      Use a large reservoir and treat the rate\n"
@@ -2380,14 +2380,14 @@
                 else if (!strcmp(optarg, "pro")) {
                     //need a way to set resize here. and not later
                     convert->preset=V2V_PRESET_PRO;
-                    convert->video_quality = rint(7*6.3);
+                    convert->video_quality = rint(8*6.3);
                     convert->audio_quality = 3.00;
                     info.speed_level = 0;
                 }
                 else if (!strcmp(optarg,"preview")) {
                     //need a way to set resize here. and not later
                     convert->preset=V2V_PRESET_PREVIEW;
-                    convert->video_quality = rint(5*6.3);
+                    convert->video_quality = rint(6*6.3);
                     convert->audio_quality = 1.00;
                     info.speed_level = 0;
                 }
@@ -2400,7 +2400,7 @@
                 }
                 else if (!strcmp(optarg,"padma")) {
                     convert->preset=V2V_PRESET_PADMA;
-                    convert->video_quality = rint(5*6.3);
+                    convert->video_quality = rint(6*6.3);
                     convert->audio_quality = 3.00;
                     info.speed_level = 0;
                 }
@@ -2494,7 +2494,7 @@
             if (convert->video_bitrate > 0)
                 convert->video_quality = 0;
             else
-                convert->video_quality = rint(5*6.3); // default quality 5
+                convert->video_quality = rint(6*6.3); // default quality 5
     }
     if (convert->buf_delay>0 && convert->video_bitrate == 0) {
         fprintf(stderr, "Buffer delay can only be used with target bitrate (-V).\n");