projectx/IDCTFast.patch

   1 diff -ru Project-X_0.91.0//noguisources.lst Project-X_0.91.0.new/noguisources.lst
   2 --- Project-X_0.91.0//noguisources.lst  2011-03-27 15:48:48.000000000 +0200
   3 +++ Project-X_0.91.0.new/noguisources.lst       2011-04-09 16:54:28.886676016 +0200
   4 @@ -67,6 +67,7 @@
   5  src/net/sourceforge/dvb/projectx/video/IDCTRefNative.java
   6  src/net/sourceforge/dvb/projectx/video/IDCTSseNative.java
   7  src/net/sourceforge/dvb/projectx/video/MpvDecoder.java
   8 +src/net/sourceforge/dvb/projectx/video/IDCTFast.java
   9  src/net/sourceforge/dvb/projectx/video/Preview.java
  10  src/net/sourceforge/dvb/projectx/video/PreviewObject.java
  11  src/net/sourceforge/dvb/projectx/video/Video.java
  12 Binary files Project-X_0.91.0//ProjectX.jar and Project-X_0.91.0.new/ProjectX.jar differ
  13 diff -ru Project-X_0.91.0//sources.lst Project-X_0.91.0.new/sources.lst
  14 --- Project-X_0.91.0//sources.lst       2011-03-27 15:02:42.000000000 +0200
  15 +++ Project-X_0.91.0.new/sources.lst    2011-04-09 16:54:12.916676017 +0200
  16 @@ -67,6 +67,7 @@
  17  src/net/sourceforge/dvb/projectx/video/IDCTRefNative.java
  18  src/net/sourceforge/dvb/projectx/video/IDCTSseNative.java
  19  src/net/sourceforge/dvb/projectx/video/MpvDecoder.java
  20 +src/net/sourceforge/dvb/projectx/video/IDCTFast.java
  21  src/net/sourceforge/dvb/projectx/video/Preview.java
  22  src/net/sourceforge/dvb/projectx/video/PreviewObject.java
  23  src/net/sourceforge/dvb/projectx/video/Video.java
  24 diff -ru Project-X_0.91.0//src/net/sourceforge/dvb/projectx/video/MpvDecoder.java Project-X_0.91.0.new/src/net/sourceforge/dvb/projectx/video/MpvDecoder.java
  25 --- Project-X_0.91.0//src/net/sourceforge/dvb/projectx/video/MpvDecoder.java    2011-03-27 15:01:38.000000000 +0200
  26 +++ Project-X_0.91.0.new/src/net/sourceforge/dvb/projectx/video/MpvDecoder.java 2011-04-09 16:51:16.936676017 +0200
  27 @@ -74,6 +74,7 @@
  28
  29         private IDCTRefNative idct;
  30         private IDCTSseNative idctsse;
  31 +       private IDCTFast      idctfast;
  32
  33         private int preview_horizontal_size = 512;
  34         private int preview_vertical_size = 288;
  35 @@ -133,14 +134,20 @@
  36         public MpvDecoder()
  37         {
  38                 Arrays.fill(pixels2, 0xFF505050);
  39 +               idctfast = new IDCTFast();
  40
  41                 idct = new IDCTRefNative();
  42                 idctsse = new IDCTSseNative();
  43 +               if (IDCTFast.isLibraryLoaded())
  44 +                   idctfast.init();
  45 +
  46
  47                 if (IDCTRefNative.isLibraryLoaded())
  48                         idct.init();
  49
  50 -               if (IDCTRefNative.isLibraryLoaded() || IDCTSseNative.isLibraryLoaded())
  51 +               if (IDCTFast.isLibraryLoaded()
  52 +                   || IDCTRefNative.isLibraryLoaded()
  53 +                   || IDCTSseNative.isLibraryLoaded())
  54                         acceleration = true;
  55         }
  56
  57 @@ -2394,7 +2401,21 @@
  58                         //form_predictions(bx, by, macroblock_type, motion_type, PMV, motion_vertical_field_select, dmvector);
  59
  60
  61 -               if (IDCTSseNative.isLibraryLoaded() && isAccelerated())
  62 +       if (IDCTFast.isLibraryLoaded() && isAccelerated())
  63 +       {
  64 +               /* copy or add block data into picture */
  65 +               for (comp=0; comp<block_count; comp++)
  66 +               {
  67 +                       /* ISO/IEC 13818-2 section Annex A: inverse DCT */
  68 +                       idctfast.referenceIDCT(block[comp]);
  69 +
  70 +                       /* ISO/IEC 13818-2 section 7.6.8: Adding prediction and coefficient data */
  71 +                       Add_Block(comp, bx, by, dct_type, (macroblock_type[0] & MACROBLOCK_INTRA)==0);
  72 +               }
  73 +       }
  74 +
  75 +
  76 +       else if (IDCTSseNative.isLibraryLoaded() && isAccelerated())
  77                 {
  78                         /* copy or add block data into picture */
  79                         for (comp=0; comp<block_count; comp++)
  80 @@ -3913,4 +3934,4 @@
  81  ///
  82
  83
  84 -}
  85 \ No newline at end of file
  86 +}