Part of Slepp's ProjectsPastebinTURLImagebinFilebin
Feedback -- English French German Japanese
Create Upload Newest Tools Donate
Sign In | Create Account

Something
Saturday, February 16th, 2008 at 8:31:28am MST 

  1. Index: test/test.c
  2. ===================================================================
  3. --- test/test.c (revision 1268)
  4. +++ test/test.c (working copy)
  5. @@ -1188,7 +1188,7 @@
  6.       "    -d, --deinterlace       Deinterlace video with yadif/mcdeint filter\n"
  7.       "          <YM:FD:MM:QP>     (default 0:-1:-1:1)\n"
  8.       "           or\n"
  9. -     "          <fast/slow/slower/slowest>\n"           
  10. +     "          <fast/slow/slower>\n"           
  11.       "    -7, --deblock           Deblock video with pp7 filter\n"
  12.       "          <QP:M>            (default 0:2)\n"
  13.       "    -8, --denoise           Denoise video with hqdn3d filter\n"
  14. @@ -1209,7 +1209,7 @@
  15.         
  16.         "### Audio Options-----------------------------------------------------------\n\n"
  17.         "    -E, --aencoder <string> Audio encoder (faac/lame/vorbis/ac3/aac+ac3) \n"
  18. -       "                            ac3 meaning passthrough, ac3+aac meaning an\n"
  19. +       "                            ac3 meaning passthrough, aac+ac3 meaning an\n"
  20.         "                            aac dpl2 mixdown paired with ac3 pass-thru\n"
  21.         "                            (default: guessed)\n"
  22.         "    -B, --ab <kb/s>         Set audio bitrate (default: 128)\n"
  23. @@ -1493,16 +1493,12 @@
  24.                      }
  25.                      else if (!( strcmp( optarg, "slow" ) ))
  26.                      {
  27. -                        deinterlace_opt = "0";
  28. +                        deinterlace_opt = "2";
  29.                      }
  30.                      else if (!( strcmp( optarg, "slower" ) ))
  31.                      {
  32. -                        deinterlace_opt = "2:-1:1";
  33. +                        deinterlace_opt = "0";
  34.                      }
  35. -                    else if (!( strcmp( optarg, "slowest" ) ))
  36. -                    {
  37. -                        deinterlace_opt = "1:-1:1";
  38. -                    }
  39.                      else
  40.                      {
  41.                          deinterlace_opt = strdup( optarg );
  42. Index: macosx/PictureController.mm
  43. ===================================================================
  44. --- macosx/PictureController.mm (revision 1268)
  45. +++ macosx/PictureController.mm (working copy)
  46. @@ -126,7 +126,6 @@
  47.      [fDeinterlacePopUp addItemWithTitle: @"Fast"];
  48.      [fDeinterlacePopUp addItemWithTitle: @"Slow"];
  49.         [fDeinterlacePopUp addItemWithTitle: @"Slower"];
  50. -       [fDeinterlacePopUp addItemWithTitle: @"Slowest"];
  51.      
  52.         /* Set deinterlaces level according to the integer in the main window */
  53.         [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
  54. Index: macosx/Controller.mm
  55. ===================================================================
  56. --- macosx/Controller.mm        (revision 1268)
  57. +++ macosx/Controller.mm        (working copy)
  58. @@ -1611,28 +1611,22 @@
  59.      /* Deinterlace */
  60.      if ([fPictureController deinterlace] == 1)
  61.      {
  62. -        /* Run old deinterlacer by default */
  63. +        /* Run old deinterlacer fd by default */
  64.          hb_filter_deinterlace.settings = "-1";
  65.          hb_list_add( job->filters, &hb_filter_deinterlace );
  66.      }
  67.      else if ([fPictureController deinterlace] == 2)
  68.      {
  69. -        /* Yadif mode 0 (1-pass with spatial deinterlacing.) */
  70. -        hb_filter_deinterlace.settings = "0";
  71. +        /* Yadif mode 0 (without spatial deinterlacing.) */
  72. +        hb_filter_deinterlace.settings = "2";
  73.          hb_list_add( job->filters, &hb_filter_deinterlace );           
  74.      }
  75.      else if ([fPictureController deinterlace] == 3)
  76.      {
  77. -        /* Yadif (1-pass w/o spatial deinterlacing) and Mcdeint */
  78. -        hb_filter_deinterlace.settings = "2:-1:1";
  79. +        /* Yadif (with spatial deinterlacing) */
  80. +        hb_filter_deinterlace.settings = "0";
  81.          hb_list_add( job->filters, &hb_filter_deinterlace );           
  82.      }
  83. -    else if ([fPictureController deinterlace] == 4)
  84. -    {
  85. -        /* Yadif (2-pass w/ spatial deinterlacing) and Mcdeint*/
  86. -        hb_filter_deinterlace.settings = "1:-1:1";
  87. -        hb_list_add( job->filters, &hb_filter_deinterlace );           
  88. -    }
  89.         
  90.         /* Denoise */
  91.         
  92. @@ -2672,10 +2666,6 @@
  93.         {
  94.                [fPicSettingDeinterlace setStringValue: @"Slower"];
  95.         }
  96. -       else if ([fPictureController deinterlace] ==4)
  97. -       {
  98. -              [fPicSettingDeinterlace setStringValue: @"Slowest"];
  99. -       }
  100.         /* Denoise */
  101.         if ([fPictureController denoise] == 0)
  102.         {
  103. @@ -3538,7 +3528,17 @@
  104.                      /* Deinterlace */
  105.                      if ([chosenPreset objectForKey:@"PictureDeinterlace"])
  106.                      {
  107. -                        [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
  108. +                        /* We check to see if the preset used the past fourth "Slowest" deinterlaceing and set that to "Slower
  109. +                        * since we no longer have a fourth "Slowest" deinterlacing due to the mcdeint bug */
  110. +                        if ([[chosenPreset objectForKey:@"PictureDeinterlace"] intValue] == 4)
  111. +                        {
  112. +                            [fPictureController setDeinterlace:3];
  113. +                        }
  114. +                        else
  115. +                        {
  116. +
  117. +                            [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
  118. +                        }
  119.                      }
  120.                      else
  121.                      {
  122. @@ -3596,7 +3596,16 @@
  123.              /* Deinterlace */
  124.              if ([chosenPreset objectForKey:@"PictureDeinterlace"])
  125.              {
  126. -                [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
  127. +                /* We check to see if the preset used the past fourth "Slowest" deinterlaceing and set that to "Slower
  128. +                 * since we no longer have a fourth "Slowest" deinterlacing due to the mcdeint bug */
  129. +                if ([[chosenPreset objectForKey:@"PictureDeinterlace"] intValue] == 4)
  130. +                {
  131. +                    [fPictureController setDeinterlace:3];
  132. +                }
  133. +                else
  134. +                {
  135. +                    [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
  136. +                }
  137.              }
  138.              else
  139.              {

advertising

Update the Post

Either update this post and resubmit it with changes, or make a new post.

You may also comment on this post.

update paste below
details of the post (optional)

Note: Only the paste content is required, though the following information can be useful to others.

Save name / title?

(space separated, optional)



Please note that information posted here will expire by default in one month. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.

worth-right
worth-right
fantasy-obligation