WinGui: Adding support for the VP8 encoder. Changing "CQ" to "RF" for x265

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6168 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 8 insertions, 20 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
index b27678b6e..4799fc2e9 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
@@ -299,6 +299,8 @@ namespace HandBrake.ApplicationServices.Utilities
                     return VideoEncoder.Theora;

                 case "x265":

                     return VideoEncoder.X265;

+                case "VP8":

+                    return VideoEncoder.VP8;

                 default:

                     return VideoEncoder.X264;

             }

@@ -329,6 +331,8 @@ namespace HandBrake.ApplicationServices.Utilities
                     return "theora";

                 case VideoEncoder.X265:

                     return "x265";

+                case VideoEncoder.VP8:

+                    return "VP8";

                 default:

                     return "x264";

             }

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index a4197fdf9..8fe7cd3ac 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -15,11 +15,8 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.Globalization;

     using System.IO;

 

-    using Caliburn.Micro;

-

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

-    using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.Interop.Model.Encoding;

     using HandBrake.Interop.Model.Encoding.x264;

     using HandBrake.Interop.Model.Encoding.x265;

@@ -433,6 +430,9 @@ namespace HandBrake.ApplicationServices.Utilities
                 case VideoEncoder.Theora:

                     query += " -e theora";

                     break;

+                case VideoEncoder.VP8:

+                    query += " -e VP8";

+                    break;

                 default:

                     query += " -e x264";

                     break;

@@ -448,23 +448,7 @@ namespace HandBrake.ApplicationServices.Utilities
                         query += string.Format(" -b {0}", task.VideoBitrate.Value);

                     break;

                 case VideoEncodeRateType.ConstantQuality:

-                    switch (task.VideoEncoder)

-                    {

-                        case VideoEncoder.FFMpeg:

-                        case VideoEncoder.FFMpeg2:

-                            query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));

-                            break;

-                        case VideoEncoder.X264:

-                        case VideoEncoder.QuickSync:

-                            query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));

-                            break;

-                        case VideoEncoder.Theora:

-                            query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));

-                            break;

-                        case VideoEncoder.X265:

-                            query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));

-                            break;

-                    }

+                    query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));

                     break;

             }