[61169] trunk/dports/audio/mpeg4ip
jmr at macports.org
jmr at macports.org
Thu Dec 3 12:08:11 PST 2009
Revision: 61169
http://trac.macports.org/changeset/61169
Author: jmr at macports.org
Date: 2009-12-03 12:08:08 -0800 (Thu, 03 Dec 2009)
Log Message:
-----------
mpeg4ip: restore port and update for 10.6 (#22626)
Modified Paths:
--------------
trunk/dports/audio/mpeg4ip/Portfile
Added Paths:
-----------
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-include-globals_hpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-include-vlc_hpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_decoder_vopsedec_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_tps_bfshape_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_tps_enhcbuf_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-tools_entropy_bitstrm_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_basic_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_svd_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_typeapi_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_yuvac_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_yuvai_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_computePSNR_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_read_image_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_seg_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_vtcdec_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_vtcenc_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_wavelet_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_write_image_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_BinArCodec_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_ShapeDecoding_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_ShapeEncoding_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_wavelet_download_filter_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ac_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_bitpack_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscanUtil_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscan_dec_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscan_enc_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_QMInit_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_QMUtils_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_decQM_cpp.diff
trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_encQM_cpp.diff
Modified: trunk/dports/audio/mpeg4ip/Portfile
===================================================================
--- trunk/dports/audio/mpeg4ip/Portfile 2009-12-03 19:54:18 UTC (rev 61168)
+++ trunk/dports/audio/mpeg4ip/Portfile 2009-12-03 20:08:08 UTC (rev 61169)
@@ -5,21 +5,99 @@
name mpeg4ip
version 1.5.0.1
-revision 2
-categories audio
+revision 3
+categories multimedia
platforms darwin
-maintainers nomaintainer
+maintainers orthogonalspace.ca:reid
homepage http://mpeg4ip.sf.net/
-description stub package. now installed with the mp4v2 port.
+description Mpeg4 library and tools from mpeg4ip
-long_description ${description}
+long_description \
+ The MPEG4IP project provides a standards-based system for encoding, \
+ streaming, and playing encoded audio, video and text.
-distfiles
+master_sites sourceforge
-build {}
-destroot {
- xinstall -d ${destroot}${prefix}/share/doc/${name}
- system "echo ${description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
+checksums md5 f53b06c62e914ab724bda9d9af041e08 \
+ sha1 1271de695ed65284d9c39aa91bf26c5494603fd3 \
+ rmd160 fee5c21c17a470e6de349e07d233a1eb46b2064a
+
+depends_build port:libtool \
+ port:automake \
+ port:autoconf
+
+depends_lib port:libsdl
+
+depends_run lib:libmp4v2:libmp4v2
+
+patchfiles patch-bootstrap.diff \
+ patch-common-video-iso-mpeg4-include-globals_hpp.diff \
+ patch-common-video-iso-mpeg4-include-vlc_hpp.diff \
+ patch-common-video-iso-mpeg4-src-sys_decoder_vopsedec_cpp.diff \
+ patch-common-video-iso-mpeg4-src-sys_tps_bfshape_cpp.diff \
+ patch-common-video-iso-mpeg4-src-sys_tps_enhcbuf_cpp.diff \
+ patch-common-video-iso-mpeg4-src-tools_entropy_bitstrm_cpp.diff \
+ patch-common-video-iso-mpeg4-src-type_basic_cpp.diff \
+ patch-common-video-iso-mpeg4-src-type_svd_cpp.diff \
+ patch-common-video-iso-mpeg4-src-type_typeapi_cpp.diff \
+ patch-common-video-iso-mpeg4-src-type_yuvac_cpp.diff \
+ patch-common-video-iso-mpeg4-src-type_yuvai_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_main_computePSNR_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_main_read_image_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_main_seg_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_main_vtcdec_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_main_vtcenc_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_main_wavelet_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_main_write_image_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_shape_BinArCodec_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_shape_ShapeDecoding_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_shape_ShapeEncoding_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_wavelet_download_filter_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_zte_ac_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_zte_bitpack_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_zte_ztscanUtil_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_zte_ztscan_dec_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_zte_ztscan_enc_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_ztq_QMInit_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_ztq_QMUtils_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_ztq_decQM_cpp.diff \
+ patch-common-video-iso-mpeg4-src-vtc_ztq_encQM_cpp.diff \
+
+configure.cmd ./bootstrap \
+ --disable-player \
+ --mandir=${prefix}/share/man
+
+post-configure {
+ if {[variant_isset universal]} {
+ reinplace "s|CC -dynamiclib|CC -dynamiclib ${configure.universal_ldflags}|g" ${worksrcpath}/libtool
+ }
}
-use_configure no
-livecheck.type none
+
+#
+# delete files from destroot that conflict with port libmp4v2
+#
+
+post-destroot {
+ file delete -force \
+ ${destroot}${prefix}/bin/mp4art \
+ ${destroot}${prefix}/bin/mp4dump \
+ ${destroot}${prefix}/bin/mp4extract \
+ ${destroot}${prefix}/bin/mp4info \
+ ${destroot}${prefix}/bin/mp4tags \
+ ${destroot}${prefix}/bin/mp4trackdump \
+ ${destroot}${prefix}/include/mp4.h \
+ ${destroot}${prefix}/lib/libmp4v2.a \
+ ${destroot}${prefix}/lib/libmp4v2.dylib \
+ ${destroot}${prefix}/lib/libmp4v2.la \
+ ${destroot}${prefix}/share/man/manm/api.mpt \
+ ${destroot}${prefix}/share/man/man3
+ file mkdir ${destroot}${prefix}/share/man/man3
+}
+
+build.target
+
+#
+# disable livecheck as this code is no longer under development / being maintained.
+#
+
+livecheck.check none
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-include-globals_hpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-include-globals_hpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-include-globals_hpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,51 @@
+--- common/video/iso-mpeg4/include/globals.hpp.orig 2005-05-04 13:55:58.000000000 -0600
++++ common/video/iso-mpeg4/include/globals.hpp 2009-11-19 04:57:22.000000000 -0700
+@@ -82,24 +82,24 @@
+ /* for displaying state information */
+ EXTERN Char *mapStateToText[]
+ #ifdef DEFINE_GLOBALS
+- = {"S_DC", "S_INIT", "S_ZTR", "S_ZTR_D", "S_IZ", "S_VZTR", "S_VAL", "S_LINIT",
+- "S_LZTR", "S_LZTR_D", "S_LVZTR"}
++ = {(char*)"S_DC", (char*)"S_INIT", (char*)"S_ZTR", (char*)"S_ZTR_D", (char*)"S_IZ", (char*)"S_VZTR", (char*)"S_VAL", (char*)"S_LINIT",
++ (char*)"S_LZTR", (char*)"S_LZTR_D", (char*)"S_LVZTR"}
+ #endif
+ ;
+
+ /* for displaying Type information */
+ EXTERN Char *mapTypeToText[]
+ #ifdef DEFINE_GLOBALS
+- = {"IZ", "VAL", "ZTR", "VZTR", "ZTR_D", "VLEAF", "ZLEAF",
+- "UNTYPED"}
++ = {(char*)"IZ", (char*)"VAL", (char*)"ZTR", (char*)"VZTR", (char*)"ZTR_D", (char*)"VLEAF", (char*)"ZLEAF",
++ (char*)"UNTYPED"}
+ #endif
+ ;
+
+ /* for displaying arithmetic probability model information */
+ EXTERN Char *mapArithModelToText[]
+ #ifdef DEFINE_GLOBALS
+-= {"ACM_NONE", "ACM_SKIP", "ACM_ROOT", "ACM_VALZ", "ACM_VALNZ", "ACM_RESID",
+- "ACM_DC"}
++= {(char*)"ACM_NONE", (char*)"ACM_SKIP", (char*)"ACM_ROOT", (char*)"ACM_VALZ", (char*)"ACM_VALNZ", (char*)"ACM_RESID",
++ (char*)"ACM_DC"}
+ #endif
+ ;
+
+@@ -115,7 +115,7 @@
+ the encoding phase is written. */
+ EXTERN Char *mapFileEnc
+ #ifdef DEFINE_GLOBALS
+-="mapEnc"
++=(char*)"mapEnc"
+ #endif
+ ;
+
+@@ -123,7 +123,7 @@
+ the decoding phase is written. */
+ EXTERN Char *mapFileDec
+ #ifdef DEFINE_GLOBALS
+-="mapDec"
++=(char*)"mapDec"
+ #endif
+ ;
+
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-include-vlc_hpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-include-vlc_hpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-include-vlc_hpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,621 @@
+--- common/video/iso-mpeg4/include/vlc.hpp.orig 2005-05-04 13:55:58.000000000 -0600
++++ common/video/iso-mpeg4/include/vlc.hpp 2009-11-19 00:44:04.000000000 -0700
+@@ -42,368 +42,368 @@
+
+
+ static VlcTable g_rgVlcDCT[] = {
+-{0,"10"}, {1,"1111"}, {2,"010101"}, {3,"0010111"}, {4,"00011111"},
+-{5,"000100101"}, {6,"000100100"}, {7,"0000100001"}, {8,"0000100000"},
+-{9,"00000000111"}, {10,"00000000110"}, {11,"00000100000"}, {12,"110"},
+-{13,"010100"}, {14,"00011110"}, {15,"0000001111"}, {16,"00000100001"},
+-{17,"000001010000"}, {18,"1110"}, {19,"00011101"}, {20,"0000001110"},
+-{21,"000001010001"}, {22,"01101"}, {23,"000100011"},
+-{24,"0000001101"}, {25,"01100"}, {26,"000100010"},
+-{27,"000001010010"}, {28,"01011"}, {29,"0000001100"},
+-{30,"000001010011"}, {31,"010011"}, {32,"0000001011"},
+-{33,"000001010100"}, {34,"010010"}, {35,"0000001010"}, {36,"010001"},
+-{37,"0000001001"}, {38,"010000"}, {39,"0000001000"}, {40,"0010110"},
+-{41,"000001010101"}, {42,"0010101"}, {43,"0010100"}, {44,"00011100"},
+-{45,"00011011"}, {46,"000100001"}, {47,"000100000"}, {48,"000011111"},
+-{49,"000011110"}, {50,"000011101"}, {51,"000011100"},
+-{52,"000011011"}, {53,"000011010"}, {54,"00000100010"},
+-{55,"00000100011"}, {56,"000001010110"}, {57,"000001010111"},
+-{58,"0111"}, {59,"000011001"}, {60,"00000000101"}, {61,"001111"},
+-{62,"00000000100"}, {63,"001110"}, {64,"001101"}, {65,"001100"},
+-{66,"0010011"}, {67,"0010010"}, {68,"0010001"}, {69,"0010000"},
+-{70,"00011010"}, {71,"00011001"}, {72,"00011000"}, {73,"00010111"},
+-{74,"00010110"}, {75,"00010101"}, {76,"00010100"}, {77,"00010011"},
+-{78,"000011000"}, {79,"000010111"}, {80,"000010110"},
+-{81,"000010101"}, {82,"000010100"}, {83,"000010011"},
+-{84,"000010010"}, {85,"000010001"}, {86,"0000000111"},
+-{87,"0000000110"}, {88,"0000000101"}, {89,"0000000100"},
+-{90,"00000100100"}, {91,"00000100101"}, {92,"00000100110"},
+-{93,"00000100111"}, {94,"000001011000"}, {95,"000001011001"},
+-{96,"000001011010"}, {97,"000001011011"}, {98,"000001011100"},
+-{99,"000001011101"}, {100,"000001011110"}, {101,"000001011111"},
+-{102,"0000011"},
++{0,(char*)"10"}, {1,(char*)"1111"}, {2,(char*)"010101"}, {3,(char*)"0010111"}, {4,(char*)"00011111"},
++{5,(char*)"000100101"}, {6,(char*)"000100100"}, {7,(char*)"0000100001"}, {8,(char*)"0000100000"},
++{9,(char*)"00000000111"}, {10,(char*)"00000000110"}, {11,(char*)"00000100000"}, {12,(char*)"110"},
++{13,(char*)"010100"}, {14,(char*)"00011110"}, {15,(char*)"0000001111"}, {16,(char*)"00000100001"},
++{17,(char*)"000001010000"}, {18,(char*)"1110"}, {19,(char*)"00011101"}, {20,(char*)"0000001110"},
++{21,(char*)"000001010001"}, {22,(char*)"01101"}, {23,(char*)"000100011"},
++{24,(char*)"0000001101"}, {25,(char*)"01100"}, {26,(char*)"000100010"},
++{27,(char*)"000001010010"}, {28,(char*)"01011"}, {29,(char*)"0000001100"},
++{30,(char*)"000001010011"}, {31,(char*)"010011"}, {32,(char*)"0000001011"},
++{33,(char*)"000001010100"}, {34,(char*)"010010"}, {35,(char*)"0000001010"}, {36,(char*)"010001"},
++{37,(char*)"0000001001"}, {38,(char*)"010000"}, {39,(char*)"0000001000"}, {40,(char*)"0010110"},
++{41,(char*)"000001010101"}, {42,(char*)"0010101"}, {43,(char*)"0010100"}, {44,(char*)"00011100"},
++{45,(char*)"00011011"}, {46,(char*)"000100001"}, {47,(char*)"000100000"}, {48,(char*)"000011111"},
++{49,(char*)"000011110"}, {50,(char*)"000011101"}, {51,(char*)"000011100"},
++{52,(char*)"000011011"}, {53,(char*)"000011010"}, {54,(char*)"00000100010"},
++{55,(char*)"00000100011"}, {56,(char*)"000001010110"}, {57,(char*)"000001010111"},
++{58,(char*)"0111"}, {59,(char*)"000011001"}, {60,(char*)"00000000101"}, {61,(char*)"001111"},
++{62,(char*)"00000000100"}, {63,(char*)"001110"}, {64,(char*)"001101"}, {65,(char*)"001100"},
++{66,(char*)"0010011"}, {67,(char*)"0010010"}, {68,(char*)"0010001"}, {69,(char*)"0010000"},
++{70,(char*)"00011010"}, {71,(char*)"00011001"}, {72,(char*)"00011000"}, {73,(char*)"00010111"},
++{74,(char*)"00010110"}, {75,(char*)"00010101"}, {76,(char*)"00010100"}, {77,(char*)"00010011"},
++{78,(char*)"000011000"}, {79,(char*)"000010111"}, {80,(char*)"000010110"},
++{81,(char*)"000010101"}, {82,(char*)"000010100"}, {83,(char*)"000010011"},
++{84,(char*)"000010010"}, {85,(char*)"000010001"}, {86,(char*)"0000000111"},
++{87,(char*)"0000000110"}, {88,(char*)"0000000101"}, {89,(char*)"0000000100"},
++{90,(char*)"00000100100"}, {91,(char*)"00000100101"}, {92,(char*)"00000100110"},
++{93,(char*)"00000100111"}, {94,(char*)"000001011000"}, {95,(char*)"000001011001"},
++{96,(char*)"000001011010"}, {97,(char*)"000001011011"}, {98,(char*)"000001011100"},
++{99,(char*)"000001011101"}, {100,(char*)"000001011110"}, {101,(char*)"000001011111"},
++{102,(char*)"0000011"},
+ {103,NULL}
+ };
+
+ static VlcTable g_rgVlcDCTIntra[] = {
+-{0,"10"}, {1,"1111"}, {2,"010101"}, {3,"0010111"}, {4,"00011111"},
+-{5,"000100101"}, {6,"000100100"}, {7,"0000100001"}, {8,"0000100000"},
+-{9,"00000000111"}, {10,"00000000110"}, {11,"00000100000"}, {12,"110"},
+-{13,"010100"}, {14,"00011110"}, {15,"0000001111"}, {16,"00000100001"},
+-{17,"000001010000"}, {18,"1110"}, {19,"00011101"}, {20,"0000001110"},
+-{21,"000001010001"}, {22,"01101"}, {23,"000100011"},
+-{24,"0000001101"}, {25,"01100"}, {26,"000100010"},
+-{27,"000001010010"}, {28,"01011"}, {29,"0000001100"},
+-{30,"000001010011"}, {31,"010011"}, {32,"0000001011"},
+-{33,"000001010100"}, {34,"010010"}, {35,"0000001010"}, {36,"010001"},
+-{37,"0000001001"}, {38,"010000"}, {39,"0000001000"}, {40,"0010110"},
+-{41,"000001010101"}, {42,"0010101"}, {43,"0010100"}, {44,"00011100"},
+-{45,"00011011"}, {46,"000100001"}, {47,"000100000"}, {48,"000011111"},
+-{49,"000011110"}, {50,"000011101"}, {51,"000011100"},
+-{52,"000011011"}, {53,"000011010"}, {54,"00000100010"},
+-{55,"00000100011"}, {56,"000001010110"}, {57,"000001010111"},
+-{58,"0111"}, {59,"000011001"}, {60,"00000000101"}, {61,"001111"},
+-{62,"00000000100"}, {63,"001110"}, {64,"001101"}, {65,"001100"},
+-{66,"0010011"}, {67,"0010010"}, {68,"0010001"}, {69,"0010000"},
+-{70,"00011010"}, {71,"00011001"}, {72,"00011000"}, {73,"00010111"},
+-{74,"00010110"}, {75,"00010101"}, {76,"00010100"}, {77,"00010011"},
+-{78,"000011000"}, {79,"000010111"}, {80,"000010110"},
+-{81,"000010101"}, {82,"000010100"}, {83,"000010011"},
+-{84,"000010010"}, {85,"000010001"}, {86,"0000000111"},
+-{87,"0000000110"}, {88,"0000000101"}, {89,"0000000100"},
+-{90,"00000100100"}, {91,"00000100101"}, {92,"00000100110"},
+-{93,"00000100111"}, {94,"000001011000"}, {95,"000001011001"},
+-{96,"000001011010"}, {97,"000001011011"}, {98,"000001011100"},
+-{99,"000001011101"}, {100,"000001011110"}, {101,"000001011111"},
+-{102,"0000011"},
++{0,(char*)"10"}, {1,(char*)"1111"}, {2,(char*)"010101"}, {3,(char*)"0010111"}, {4,(char*)"00011111"},
++{5,(char*)"000100101"}, {6,(char*)"000100100"}, {7,(char*)"0000100001"}, {8,(char*)"0000100000"},
++{9,(char*)"00000000111"}, {10,(char*)"00000000110"}, {11,(char*)"00000100000"}, {12,(char*)"110"},
++{13,(char*)"010100"}, {14,(char*)"00011110"}, {15,(char*)"0000001111"}, {16,(char*)"00000100001"},
++{17,(char*)"000001010000"}, {18,(char*)"1110"}, {19,(char*)"00011101"}, {20,(char*)"0000001110"},
++{21,(char*)"000001010001"}, {22,(char*)"01101"}, {23,(char*)"000100011"},
++{24,(char*)"0000001101"}, {25,(char*)"01100"}, {26,(char*)"000100010"},
++{27,(char*)"000001010010"}, {28,(char*)"01011"}, {29,(char*)"0000001100"},
++{30,(char*)"000001010011"}, {31,(char*)"010011"}, {32,(char*)"0000001011"},
++{33,(char*)"000001010100"}, {34,(char*)"010010"}, {35,(char*)"0000001010"}, {36,(char*)"010001"},
++{37,(char*)"0000001001"}, {38,(char*)"010000"}, {39,(char*)"0000001000"}, {40,(char*)"0010110"},
++{41,(char*)"000001010101"}, {42,(char*)"0010101"}, {43,(char*)"0010100"}, {44,(char*)"00011100"},
++{45,(char*)"00011011"}, {46,(char*)"000100001"}, {47,(char*)"000100000"}, {48,(char*)"000011111"},
++{49,(char*)"000011110"}, {50,(char*)"000011101"}, {51,(char*)"000011100"},
++{52,(char*)"000011011"}, {53,(char*)"000011010"}, {54,(char*)"00000100010"},
++{55,(char*)"00000100011"}, {56,(char*)"000001010110"}, {57,(char*)"000001010111"},
++{58,(char*)"0111"}, {59,(char*)"000011001"}, {60,(char*)"00000000101"}, {61,(char*)"001111"},
++{62,(char*)"00000000100"}, {63,(char*)"001110"}, {64,(char*)"001101"}, {65,(char*)"001100"},
++{66,(char*)"0010011"}, {67,(char*)"0010010"}, {68,(char*)"0010001"}, {69,(char*)"0010000"},
++{70,(char*)"00011010"}, {71,(char*)"00011001"}, {72,(char*)"00011000"}, {73,(char*)"00010111"},
++{74,(char*)"00010110"}, {75,(char*)"00010101"}, {76,(char*)"00010100"}, {77,(char*)"00010011"},
++{78,(char*)"000011000"}, {79,(char*)"000010111"}, {80,(char*)"000010110"},
++{81,(char*)"000010101"}, {82,(char*)"000010100"}, {83,(char*)"000010011"},
++{84,(char*)"000010010"}, {85,(char*)"000010001"}, {86,(char*)"0000000111"},
++{87,(char*)"0000000110"}, {88,(char*)"0000000101"}, {89,(char*)"0000000100"},
++{90,(char*)"00000100100"}, {91,(char*)"00000100101"}, {92,(char*)"00000100110"},
++{93,(char*)"00000100111"}, {94,(char*)"000001011000"}, {95,(char*)"000001011001"},
++{96,(char*)"000001011010"}, {97,(char*)"000001011011"}, {98,(char*)"000001011100"},
++{99,(char*)"000001011101"}, {100,(char*)"000001011110"}, {101,(char*)"000001011111"},
++{102,(char*)"0000011"},
+ {103,NULL}
+ };
+
+ static VlcTable g_rgVlcDCTRVLC[] = {
+-{0,"110"}, {1,"0001"}, {2,"00100"}, {3,"0011100"}, {4,"00111100"},
+-{5,"00111101"}, {6,"001111100"}, {7,"0011111100"}, {8,"0011111101"},
+-{9,"00111111100"}, {10,"00111111101"}, {11,"001111111100"},
+-{12,"0011111111100"}, {13,"0011111111101"}, {14,"0101111111100"},
+-{15,"0101111111101"}, {16,"00111111111100"}, {17,"00111111111101"},
+-{18,"001111111111100"}, {19,"111"}, {20,"001100"}, {21,"01011100"},
+-{22,"001111101"}, {23,"0101111100"}, {24,"01011111100"},
+-{25,"001111111101"}, {26,"0110111111100"}, {27,"01011111111100"},
+-{28,"01011111111101"}, {29,"1010"}, {30,"0011101"}, {31,"010111100"},
+-{32,"01011111101"}, {33,"010111111100"}, {34,"01101111111100"},
+-{35,"01101111111101"}, {36,"00101"}, {37,"01011101"},
+-{38,"0101111101"}, {39,"010111111101"}, {40,"0110111111101"},
+-{41,"01110111111100"}, {42,"001111111111101"}, {43,"01000"},
+-{44,"01101100"}, {45,"01101111100"}, {46,"0111011111100"},
+-{47,"010111111111100"}, {48,"01001"}, {49,"010111101"},
+-{50,"01101111101"}, {51,"0111011111101"}, {52,"001101"},
+-{53,"0110111100"}, {54,"011011111100"}, {55,"01110111111101"},
+-{56,"010100"}, {57,"0110111101"}, {58,"011011111101"},
+-{59,"010111111111101"}, {60,"010101"}, {61,"0111011100"},
+-{62,"0111101111100"}, {63,"0101100"}, {64,"0111011101"},
+-{65,"01111011111100"}, {66,"0101101"}, {67,"01110111100"},
+-{68,"0110100"}, {69,"011101111100"}, {70,"01101101"},
+-{71,"0111101111101"}, {72,"01110100"}, {73,"01111011111101"},
+-{74,"01110101"}, {75,"01111101111100"}, {76,"011011100"},
+-{77,"01111101111101"}, {78,"011011101"}, {79,"01111110111100"},
+-{80,"011101100"}, {81,"011011111111100"}, {82,"0111101100"},
+-{83,"0111101101"}, {84,"0111110100"}, {85,"01110111101"},
+-{86,"01111011100"}, {87,"01111011101"}, {88,"01111101100"},
+-{89,"01111101101"}, {90,"01111110100"}, {91,"011101111101"},
+-{92,"011110111100"}, {93,"011110111101"}, {94,"0111110111100"},
+-{95,"0111110111101"}, {96,"0111111011100"}, {97,"0111111011101"},
+-{98,"01111110111101"}, {99,"01111111011100"}, {100,"01111111011101"},
+-{101,"011011111111101"}, {102,"011101111111100"}, {103,"1011"},
+-{104,"01111000"}, {105,"01111110101"}, {106,"0111111101100"},
+-{107,"01111111101100"}, {108,"10010"}, {109,"011101101"},
+-{110,"011111011100"}, {111,"01111111101101"}, {112,"011101111111101"},
+-{113,"10011"}, {114,"01111111000"}, {115,"011110111111100"},
+-{116,"011000"}, {117,"011111011101"}, {118,"011001"},
+-{119,"011111101100"}, {120,"100010"}, {121,"0111111101101"},
+-{122,"100011"}, {123,"0111111110100"}, {124,"0110101"},
+-{125,"0111111110101"}, {126,"0111000"}, {127,"0111111111000"},
+-{128,"0111001"}, {129,"0111111111001"}, {130,"1000010"},
+-{131,"01111111110100"}, {132,"1000011"}, {133,"01111111110101"},
+-{134,"01111001"}, {135,"01111111111000"}, {136,"10000010"},
+-{137,"011110111111101"}, {138,"10000011"}, {139,"011110100"},
+-{140,"011110101"}, {141,"011111000"}, {142,"011111001"},
+-{143,"100000010"}, {144,"100000011"}, {145,"0111110101"},
+-{146,"0111111000"}, {147,"0111111001"}, {148,"1000000010"},
+-{149,"1000000011"}, {150,"01111111001"}, {151,"10000000010"},
+-{152,"10000000011"}, {153,"011111101101"}, {154,"011111110100"},
+-{155,"011111110101"}, {156,"011111111000"}, {157,"011111111001"},
+-{158,"100000000010"}, {159,"100000000011"}, {160,"1000000000010"},
+-{161,"1000000000011"}, {162,"01111111111001"}, {163,"10000000000010"},
+-{164,"10000000000011"}, {165,"011111011111100"},
+-{166,"011111011111101"}, {167,"011111101111100"},
+-{168,"011111101111101"}, {169,"0000"},
++{0,(char*)"110"}, {1,(char*)"0001"}, {2,(char*)"00100"}, {3,(char*)"0011100"}, {4,(char*)"00111100"},
++{5,(char*)"00111101"}, {6,(char*)"001111100"}, {7,(char*)"0011111100"}, {8,(char*)"0011111101"},
++{9,(char*)"00111111100"}, {10,(char*)"00111111101"}, {11,(char*)"001111111100"},
++{12,(char*)"0011111111100"}, {13,(char*)"0011111111101"}, {14,(char*)"0101111111100"},
++{15,(char*)"0101111111101"}, {16,(char*)"00111111111100"}, {17,(char*)"00111111111101"},
++{18,(char*)"001111111111100"}, {19,(char*)"111"}, {20,(char*)"001100"}, {21,(char*)"01011100"},
++{22,(char*)"001111101"}, {23,(char*)"0101111100"}, {24,(char*)"01011111100"},
++{25,(char*)"001111111101"}, {26,(char*)"0110111111100"}, {27,(char*)"01011111111100"},
++{28,(char*)"01011111111101"}, {29,(char*)"1010"}, {30,(char*)"0011101"}, {31,(char*)"010111100"},
++{32,(char*)"01011111101"}, {33,(char*)"010111111100"}, {34,(char*)"01101111111100"},
++{35,(char*)"01101111111101"}, {36,(char*)"00101"}, {37,(char*)"01011101"},
++{38,(char*)"0101111101"}, {39,(char*)"010111111101"}, {40,(char*)"0110111111101"},
++{41,(char*)"01110111111100"}, {42,(char*)"001111111111101"}, {43,(char*)"01000"},
++{44,(char*)"01101100"}, {45,(char*)"01101111100"}, {46,(char*)"0111011111100"},
++{47,(char*)"010111111111100"}, {48,(char*)"01001"}, {49,(char*)"010111101"},
++{50,(char*)"01101111101"}, {51,(char*)"0111011111101"}, {52,(char*)"001101"},
++{53,(char*)"0110111100"}, {54,(char*)"011011111100"}, {55,(char*)"01110111111101"},
++{56,(char*)"010100"}, {57,(char*)"0110111101"}, {58,(char*)"011011111101"},
++{59,(char*)"010111111111101"}, {60,(char*)"010101"}, {61,(char*)"0111011100"},
++{62,(char*)"0111101111100"}, {63,(char*)"0101100"}, {64,(char*)"0111011101"},
++{65,(char*)"01111011111100"}, {66,(char*)"0101101"}, {67,(char*)"01110111100"},
++{68,(char*)"0110100"}, {69,(char*)"011101111100"}, {70,(char*)"01101101"},
++{71,(char*)"0111101111101"}, {72,(char*)"01110100"}, {73,(char*)"01111011111101"},
++{74,(char*)"01110101"}, {75,(char*)"01111101111100"}, {76,(char*)"011011100"},
++{77,(char*)"01111101111101"}, {78,(char*)"011011101"}, {79,(char*)"01111110111100"},
++{80,(char*)"011101100"}, {81,(char*)"011011111111100"}, {82,(char*)"0111101100"},
++{83,(char*)"0111101101"}, {84,(char*)"0111110100"}, {85,(char*)"01110111101"},
++{86,(char*)"01111011100"}, {87,(char*)"01111011101"}, {88,(char*)"01111101100"},
++{89,(char*)"01111101101"}, {90,(char*)"01111110100"}, {91,(char*)"011101111101"},
++{92,(char*)"011110111100"}, {93,(char*)"011110111101"}, {94,(char*)"0111110111100"},
++{95,(char*)"0111110111101"}, {96,(char*)"0111111011100"}, {97,(char*)"0111111011101"},
++{98,(char*)"01111110111101"}, {99,(char*)"01111111011100"}, {100,(char*)"01111111011101"},
++{101,(char*)"011011111111101"}, {102,(char*)"011101111111100"}, {103,(char*)"1011"},
++{104,(char*)"01111000"}, {105,(char*)"01111110101"}, {106,(char*)"0111111101100"},
++{107,(char*)"01111111101100"}, {108,(char*)"10010"}, {109,(char*)"011101101"},
++{110,(char*)"011111011100"}, {111,(char*)"01111111101101"}, {112,(char*)"011101111111101"},
++{113,(char*)"10011"}, {114,(char*)"01111111000"}, {115,(char*)"011110111111100"},
++{116,(char*)"011000"}, {117,(char*)"011111011101"}, {118,(char*)"011001"},
++{119,(char*)"011111101100"}, {120,(char*)"100010"}, {121,(char*)"0111111101101"},
++{122,(char*)"100011"}, {123,(char*)"0111111110100"}, {124,(char*)"0110101"},
++{125,(char*)"0111111110101"}, {126,(char*)"0111000"}, {127,(char*)"0111111111000"},
++{128,(char*)"0111001"}, {129,(char*)"0111111111001"}, {130,(char*)"1000010"},
++{131,(char*)"01111111110100"}, {132,(char*)"1000011"}, {133,(char*)"01111111110101"},
++{134,(char*)"01111001"}, {135,(char*)"01111111111000"}, {136,(char*)"10000010"},
++{137,(char*)"011110111111101"}, {138,(char*)"10000011"}, {139,(char*)"011110100"},
++{140,(char*)"011110101"}, {141,(char*)"011111000"}, {142,(char*)"011111001"},
++{143,(char*)"100000010"}, {144,(char*)"100000011"}, {145,(char*)"0111110101"},
++{146,(char*)"0111111000"}, {147,(char*)"0111111001"}, {148,(char*)"1000000010"},
++{149,(char*)"1000000011"}, {150,(char*)"01111111001"}, {151,(char*)"10000000010"},
++{152,(char*)"10000000011"}, {153,(char*)"011111101101"}, {154,(char*)"011111110100"},
++{155,(char*)"011111110101"}, {156,(char*)"011111111000"}, {157,(char*)"011111111001"},
++{158,(char*)"100000000010"}, {159,(char*)"100000000011"}, {160,(char*)"1000000000010"},
++{161,(char*)"1000000000011"}, {162,(char*)"01111111111001"}, {163,(char*)"10000000000010"},
++{164,(char*)"10000000000011"}, {165,(char*)"011111011111100"},
++{166,(char*)"011111011111101"}, {167,(char*)"011111101111100"},
++{168,(char*)"011111101111101"}, {169,(char*)"0000"},
+ {170,NULL}
+ };
+
+ static VlcTable g_rgVlcDCTIntraRVLC[] = {
+
+-{0,"110"}, {1,"111"}, {2,"1010"}, {3,"01001"}, {4,"010100"},
+-{5,"010101"}, {6,"0110100"}, {7,"01110100"}, {8,"01110101"},
+-{9,"011011101"}, {10,"011101100"}, {11,"0111101100"},
+-{12,"0111101101"}, {13,"0111110100"}, {14,"01111101100"},
+-{15,"01111101101"}, {16,"01111110100"}, {17,"011101111101"},
+-{18,"011110111100"}, {19,"0111110111101"}, {20,"0111111011100"},
+-{21,"011110111101"}, {22,"0111111011101"}, {23,"01111110111101"},
+-{24,"01111111011100"}, {25,"01111111011101"}, {26,"001111111111100"},
+-{27,"0001"}, {28,"01000"}, {29,"0101101"}, {30,"01101100"},
+-{31,"01101101"}, {32,"011011100"}, {33,"0111011101"},
+-{34,"01111011100"}, {35,"01111011101"}, {36,"011101111100"},
+-{37,"0111110111100"}, {38,"01111101111101"}, {39,"01111110111100"},
+-{40,"00100"}, {41,"0101100"}, {42,"010111100"}, {43,"0111011100"},
+-{44,"01110111100"}, {45,"01110111101"}, {46,"0111011111101"},
+-{47,"0111101111100"}, {48,"0111101111101"}, {49,"01111011111101"},
+-{50,"01111101111100"}, {51,"00101"}, {52,"01011100"},
+-{53,"010111101"}, {54,"01101111101"}, {55,"011011111100"},
+-{56,"0111011111100"}, {57,"01110111111101"}, {58,"01111011111100"},
+-{59,"001111111111101"}, {60,"001100"}, {61,"01011101"},
+-{62,"0110111101"}, {63,"001111111101"}, {64,"011011111101"},
+-{65,"01101111111101"}, {66,"001101"}, {67,"001111101"},
+-{68,"01011111100"}, {69,"010111111100"}, {70,"01101111111100"},
+-{71,"01110111111100"}, {72,"0011100"}, {73,"0101111100"},
+-{74,"01011111101"}, {75,"010111111101"}, {76,"010111111111100"},
+-{77,"0011101"}, {78,"0101111101"}, {79,"01101111100"},
+-{80,"0110111111101"}, {81,"010111111111101"}, {82,"00111100"},
+-{83,"0110111100"}, {84,"0101111111101"}, {85,"01011111111101"},
+-{86,"00111101"}, {87,"00111111101"}, {88,"0110111111100"},
+-{89,"011011111111100"}, {90,"001111100"}, {91,"001111111100"},
+-{92,"0011111100"}, {93,"0101111111100"}, {94,"0011111101"},
+-{95,"011011111111101"}, {96,"00111111100"}, {97,"0011111111100"},
+-{98,"0011111111101"}, {99,"00111111111100"}, {100,"00111111111101"},
+-{101,"01011111111100"}, {102,"011101111111100"}, {103,"1011"},
+-{104,"01111000"}, {105,"01111110101"}, {106,"0111111101100"},
+-{107,"01111111101100"}, {108,"10010"}, {109,"011101101"},
+-{110,"011111011100"}, {111,"01111111101101"}, {112,"011101111111101"},
+-{113,"10011"}, {114,"01111111000"}, {115,"011110111111100"},
+-{116,"011000"}, {117,"011111011101"}, {118,"011001"},
+-{119,"011111101100"}, {120,"100010"}, {121,"0111111101101"},
+-{122,"100011"}, {123,"0111111110100"}, {124,"0110101"},
+-{125,"0111111110101"}, {126,"0111000"}, {127,"0111111111000"},
+-{128,"0111001"}, {129,"0111111111001"}, {130,"1000010"},
+-{131,"01111111110100"}, {132,"1000011"}, {133,"01111111110101"},
+-{134,"01111001"}, {135,"01111111111000"}, {136,"10000010"},
+-{137,"011110111111101"}, {138,"10000011"}, {139,"011110100"},
+-{140,"011110101"}, {141,"011111000"}, {142,"011111001"},
+-{143,"100000010"}, {144,"100000011"}, {145,"0111110101"},
+-{146,"0111111000"}, {147,"0111111001"}, {148,"1000000010"},
+-{149,"1000000011"}, {150,"01111111001"}, {151,"10000000010"},
+-{152,"10000000011"}, {153,"011111101101"}, {154,"011111110100"},
+-{155,"011111110101"}, {156,"011111111000"}, {157,"011111111001"},
+-{158,"100000000010"}, {159,"100000000011"}, {160,"1000000000010"},
+-{161,"1000000000011"}, {162,"01111111111001"}, {163,"10000000000010"},
+-{164,"10000000000011"}, {165,"011111011111100"},
+-{166,"011111011111101"}, {167,"011111101111100"},
+-{168,"011111101111101"}, {169,"0000"},
++{0,(char*)"110"}, {1,(char*)"111"}, {2,(char*)"1010"}, {3,(char*)"01001"}, {4,(char*)"010100"},
++{5,(char*)"010101"}, {6,(char*)"0110100"}, {7,(char*)"01110100"}, {8,(char*)"01110101"},
++{9,(char*)"011011101"}, {10,(char*)"011101100"}, {11,(char*)"0111101100"},
++{12,(char*)"0111101101"}, {13,(char*)"0111110100"}, {14,(char*)"01111101100"},
++{15,(char*)"01111101101"}, {16,(char*)"01111110100"}, {17,(char*)"011101111101"},
++{18,(char*)"011110111100"}, {19,(char*)"0111110111101"}, {20,(char*)"0111111011100"},
++{21,(char*)"011110111101"}, {22,(char*)"0111111011101"}, {23,(char*)"01111110111101"},
++{24,(char*)"01111111011100"}, {25,(char*)"01111111011101"}, {26,(char*)"001111111111100"},
++{27,(char*)"0001"}, {28,(char*)"01000"}, {29,(char*)"0101101"}, {30,(char*)"01101100"},
++{31,(char*)"01101101"}, {32,(char*)"011011100"}, {33,(char*)"0111011101"},
++{34,(char*)"01111011100"}, {35,(char*)"01111011101"}, {36,(char*)"011101111100"},
++{37,(char*)"0111110111100"}, {38,(char*)"01111101111101"}, {39,(char*)"01111110111100"},
++{40,(char*)"00100"}, {41,(char*)"0101100"}, {42,(char*)"010111100"}, {43,(char*)"0111011100"},
++{44,(char*)"01110111100"}, {45,(char*)"01110111101"}, {46,(char*)"0111011111101"},
++{47,(char*)"0111101111100"}, {48,(char*)"0111101111101"}, {49,(char*)"01111011111101"},
++{50,(char*)"01111101111100"}, {51,(char*)"00101"}, {52,(char*)"01011100"},
++{53,(char*)"010111101"}, {54,(char*)"01101111101"}, {55,(char*)"011011111100"},
++{56,(char*)"0111011111100"}, {57,(char*)"01110111111101"}, {58,(char*)"01111011111100"},
++{59,(char*)"001111111111101"}, {60,(char*)"001100"}, {61,(char*)"01011101"},
++{62,(char*)"0110111101"}, {63,(char*)"001111111101"}, {64,(char*)"011011111101"},
++{65,(char*)"01101111111101"}, {66,(char*)"001101"}, {67,(char*)"001111101"},
++{68,(char*)"01011111100"}, {69,(char*)"010111111100"}, {70,(char*)"01101111111100"},
++{71,(char*)"01110111111100"}, {72,(char*)"0011100"}, {73,(char*)"0101111100"},
++{74,(char*)"01011111101"}, {75,(char*)"010111111101"}, {76,(char*)"010111111111100"},
++{77,(char*)"0011101"}, {78,(char*)"0101111101"}, {79,(char*)"01101111100"},
++{80,(char*)"0110111111101"}, {81,(char*)"010111111111101"}, {82,(char*)"00111100"},
++{83,(char*)"0110111100"}, {84,(char*)"0101111111101"}, {85,(char*)"01011111111101"},
++{86,(char*)"00111101"}, {87,(char*)"00111111101"}, {88,(char*)"0110111111100"},
++{89,(char*)"011011111111100"}, {90,(char*)"001111100"}, {91,(char*)"001111111100"},
++{92,(char*)"0011111100"}, {93,(char*)"0101111111100"}, {94,(char*)"0011111101"},
++{95,(char*)"011011111111101"}, {96,(char*)"00111111100"}, {97,(char*)"0011111111100"},
++{98,(char*)"0011111111101"}, {99,(char*)"00111111111100"}, {100,(char*)"00111111111101"},
++{101,(char*)"01011111111100"}, {102,(char*)"011101111111100"}, {103,(char*)"1011"},
++{104,(char*)"01111000"}, {105,(char*)"01111110101"}, {106,(char*)"0111111101100"},
++{107,(char*)"01111111101100"}, {108,(char*)"10010"}, {109,(char*)"011101101"},
++{110,(char*)"011111011100"}, {111,(char*)"01111111101101"}, {112,(char*)"011101111111101"},
++{113,(char*)"10011"}, {114,(char*)"01111111000"}, {115,(char*)"011110111111100"},
++{116,(char*)"011000"}, {117,(char*)"011111011101"}, {118,(char*)"011001"},
++{119,(char*)"011111101100"}, {120,(char*)"100010"}, {121,(char*)"0111111101101"},
++{122,(char*)"100011"}, {123,(char*)"0111111110100"}, {124,(char*)"0110101"},
++{125,(char*)"0111111110101"}, {126,(char*)"0111000"}, {127,(char*)"0111111111000"},
++{128,(char*)"0111001"}, {129,(char*)"0111111111001"}, {130,(char*)"1000010"},
++{131,(char*)"01111111110100"}, {132,(char*)"1000011"}, {133,(char*)"01111111110101"},
++{134,(char*)"01111001"}, {135,(char*)"01111111111000"}, {136,(char*)"10000010"},
++{137,(char*)"011110111111101"}, {138,(char*)"10000011"}, {139,(char*)"011110100"},
++{140,(char*)"011110101"}, {141,(char*)"011111000"}, {142,(char*)"011111001"},
++{143,(char*)"100000010"}, {144,(char*)"100000011"}, {145,(char*)"0111110101"},
++{146,(char*)"0111111000"}, {147,(char*)"0111111001"}, {148,(char*)"1000000010"},
++{149,(char*)"1000000011"}, {150,(char*)"01111111001"}, {151,(char*)"10000000010"},
++{152,(char*)"10000000011"}, {153,(char*)"011111101101"}, {154,(char*)"011111110100"},
++{155,(char*)"011111110101"}, {156,(char*)"011111111000"}, {157,(char*)"011111111001"},
++{158,(char*)"100000000010"}, {159,(char*)"100000000011"}, {160,(char*)"1000000000010"},
++{161,(char*)"1000000000011"}, {162,(char*)"01111111111001"}, {163,(char*)"10000000000010"},
++{164,(char*)"10000000000011"}, {165,(char*)"011111011111100"},
++{166,(char*)"011111011111101"}, {167,(char*)"011111101111100"},
++{168,(char*)"011111101111101"}, {169,(char*)"0000"},
+ {170,NULL}
+ };
+
+ static VlcTable g_rgVlcMV[] = {
+-{0,"0000000000101"}, {1,"0000000000111"}, {2,"000000000101"},
+-{3,"000000000111"}, {4,"000000001001"}, {5,"000000001011"},
+-{6,"000000001101"}, {7,"000000001111"}, {8,"00000001001"},
+-{9,"00000001011"}, {10,"00000001101"}, {11,"00000001111"},
+-{12,"00000010001"}, {13,"00000010011"}, {14,"00000010101"},
+-{15,"00000010111"}, {16,"00000011001"}, {17,"00000011011"},
+-{18,"00000011101"}, {19,"00000011111"}, {20,"00000100001"},
+-{21,"00000100011"}, {22,"0000010011"}, {23,"0000010101"},
+-{24,"0000010111"}, {25,"00000111"}, {26,"00001001"}, {27,"00001011"},
+-{28,"0000111"}, {29,"00011"}, {30,"0011"}, {31,"011"}, {32,"1"},
+-{33,"010"}, {34,"0010"}, {35,"00010"}, {36,"0000110"},
+-{37,"00001010"}, {38,"00001000"}, {39,"00000110"}, {40,"0000010110"},
+-{41,"0000010100"}, {42,"0000010010"}, {43,"00000100010"},
+-{44,"00000100000"}, {45,"00000011110"}, {46,"00000011100"},
+-{47,"00000011010"}, {48,"00000011000"}, {49,"00000010110"},
+-{50,"00000010100"}, {51,"00000010010"}, {52,"00000010000"},
+-{53,"00000001110"}, {54,"00000001100"}, {55,"00000001010"},
+-{56,"00000001000"}, {57,"000000001110"}, {58,"000000001100"},
+-{59,"000000001010"}, {60,"000000001000"}, {61,"000000000110"},
+-{62,"000000000100"}, {63,"0000000000110"}, {64,"0000000000100"},
++{0,(char*)"0000000000101"}, {1,(char*)"0000000000111"}, {2,(char*)"000000000101"},
++{3,(char*)"000000000111"}, {4,(char*)"000000001001"}, {5,(char*)"000000001011"},
++{6,(char*)"000000001101"}, {7,(char*)"000000001111"}, {8,(char*)"00000001001"},
++{9,(char*)"00000001011"}, {10,(char*)"00000001101"}, {11,(char*)"00000001111"},
++{12,(char*)"00000010001"}, {13,(char*)"00000010011"}, {14,(char*)"00000010101"},
++{15,(char*)"00000010111"}, {16,(char*)"00000011001"}, {17,(char*)"00000011011"},
++{18,(char*)"00000011101"}, {19,(char*)"00000011111"}, {20,(char*)"00000100001"},
++{21,(char*)"00000100011"}, {22,(char*)"0000010011"}, {23,(char*)"0000010101"},
++{24,(char*)"0000010111"}, {25,(char*)"00000111"}, {26,(char*)"00001001"}, {27,(char*)"00001011"},
++{28,(char*)"0000111"}, {29,(char*)"00011"}, {30,(char*)"0011"}, {31,(char*)"011"}, {32,(char*)"1"},
++{33,(char*)"010"}, {34,(char*)"0010"}, {35,(char*)"00010"}, {36,(char*)"0000110"},
++{37,(char*)"00001010"}, {38,(char*)"00001000"}, {39,(char*)"00000110"}, {40,(char*)"0000010110"},
++{41,(char*)"0000010100"}, {42,(char*)"0000010010"}, {43,(char*)"00000100010"},
++{44,(char*)"00000100000"}, {45,(char*)"00000011110"}, {46,(char*)"00000011100"},
++{47,(char*)"00000011010"}, {48,(char*)"00000011000"}, {49,(char*)"00000010110"},
++{50,(char*)"00000010100"}, {51,(char*)"00000010010"}, {52,(char*)"00000010000"},
++{53,(char*)"00000001110"}, {54,(char*)"00000001100"}, {55,(char*)"00000001010"},
++{56,(char*)"00000001000"}, {57,(char*)"000000001110"}, {58,(char*)"000000001100"},
++{59,(char*)"000000001010"}, {60,(char*)"000000001000"}, {61,(char*)"000000000110"},
++{62,(char*)"000000000100"}, {63,(char*)"0000000000110"}, {64,(char*)"0000000000100"},
+ {65,NULL}
+ };
+
+ static VlcTable g_rgVlcMCBPCintra[] = {
+-{0,"1"}, {1,"001"}, {2,"010"}, {3,"011"}, {4,"0001"}, {5,"000001"},
+-{6,"000010"}, {7,"000011"}, {8,"000000001"},
++{0,(char*)"1"}, {1,(char*)"001"}, {2,(char*)"010"}, {3,(char*)"011"}, {4,(char*)"0001"}, {5,(char*)"000001"},
++{6,(char*)"000010"}, {7,(char*)"000011"}, {8,(char*)"000000001"},
+ {9,NULL}
+ };
+
+ static VlcTable g_rgVlcMCBPCinter[] = {
+-{0,"1"}, {1,"0011"}, {2,"0010"}, {3,"000101"}, {4,"011"},
+-{5,"0000111"}, {6,"0000110"}, {7,"000000101"}, {8,"010"},
+-{9,"0000101"}, {10,"0000100"}, {11,"00000101"}, {12,"00011"},
+-{13,"00000100"}, {14,"00000011"}, {15,"0000011"}, {16,"000100"},
+-{17,"000000100"}, {18,"000000011"}, {19,"000000010"},
+-{20,"000000001"},
++{0,(char*)"1"}, {1,(char*)"0011"}, {2,(char*)"0010"}, {3,(char*)"000101"}, {4,(char*)"011"},
++{5,(char*)"0000111"}, {6,(char*)"0000110"}, {7,(char*)"000000101"}, {8,(char*)"010"},
++{9,(char*)"0000101"}, {10,(char*)"0000100"}, {11,(char*)"00000101"}, {12,(char*)"00011"},
++{13,(char*)"00000100"}, {14,(char*)"00000011"}, {15,(char*)"0000011"}, {16,(char*)"000100"},
++{17,(char*)"000000100"}, {18,(char*)"000000011"}, {19,(char*)"000000010"},
++{20,(char*)"000000001"},
+ {21,NULL}
+ };
+
+ static VlcTable g_rgVlcCBPY[] = {
+-{0,"0011"}, {1,"00101"}, {2,"00100"}, {3,"1001"}, {4,"00011"},
+-{5,"0111"}, {6,"000010"}, {7,"1011"}, {8,"00010"}, {9,"000011"},
+-{10,"0101"}, {11,"1010"}, {12,"0100"}, {13,"1000"}, {14,"0110"},
+-{15,"11"}, {16,"000000"}, {17,"000001"},
++{0,(char*)"0011"}, {1,(char*)"00101"}, {2,(char*)"00100"}, {3,(char*)"1001"}, {4,(char*)"00011"},
++{5,(char*)"0111"}, {6,(char*)"000010"}, {7,(char*)"1011"}, {8,(char*)"00010"}, {9,(char*)"000011"},
++{10,(char*)"0101"}, {11,(char*)"1010"}, {12,(char*)"0100"}, {13,(char*)"1000"}, {14,(char*)"0110"},
++{15,(char*)"11"}, {16,(char*)"000000"}, {17,(char*)"000001"},
+ {18,NULL}
+ };
+
+ static VlcTable g_rgVlcCBPY1[] = {
+-{0,"01"}, {1,"1"},
++{0,(char*)"01"}, {1,(char*)"1"},
+ {2,NULL}
+ };
+
+ static VlcTable g_rgVlcCBPY2[] = {
+-{0,"0001"}, {1,"001"}, {2,"01"}, {3,"1"},
++{0,(char*)"0001"}, {1,(char*)"001"}, {2,(char*)"01"}, {3,(char*)"1"},
+ {4,NULL}
+ };
+
+ static VlcTable g_rgVlcCBPY3[] = {
+-{0,"011"}, {1,"000001"},
+-{2,"00001"}, {3,"010"}, {4,"00010"}, {5,"00011"}, {6,"001"}, {7,"1"},
++{0,(char*)"011"}, {1,(char*)"000001"},
++{2,(char*)"00001"}, {3,(char*)"010"}, {4,(char*)"00010"}, {5,(char*)"00011"}, {6,(char*)"001"}, {7,(char*)"1"},
+ {8,NULL}
+ };
+
+ static VlcTable g_rgVlcIntraDCy[] = {
+-{0,"011"}, {1,"11"}, {2,"10"},
+-{3,"010"}, {4,"001"}, {5,"0001"}, {6,"00001"}, {7,"000001"},
+-{8,"0000001"}, {9,"00000001"}, {10,"000000001"}, {11,"0000000001"},
+-{12,"00000000001"},
++{0,(char*)"011"}, {1,(char*)"11"}, {2,(char*)"10"},
++{3,(char*)"010"}, {4,(char*)"001"}, {5,(char*)"0001"}, {6,(char*)"00001"}, {7,(char*)"000001"},
++{8,(char*)"0000001"}, {9,(char*)"00000001"}, {10,(char*)"000000001"}, {11,(char*)"0000000001"},
++{12,(char*)"00000000001"},
+ {13,NULL}
+ };
+
+ static VlcTable g_rgVlcIntraDCc[] = {
+-{0,"11"}, {1,"10"}, {2,"01"}, {3,"001"}, {4,"0001"}, {5,"00001"},
+-{6,"000001"}, {7,"0000001"}, {8,"00000001"}, {9,"000000001"},
+-{10,"0000000001"}, {11,"00000000001"}, {12,"000000000001"},
++{0,(char*)"11"}, {1,(char*)"10"}, {2,(char*)"01"}, {3,(char*)"001"}, {4,(char*)"0001"}, {5,(char*)"00001"},
++{6,(char*)"000001"}, {7,(char*)"0000001"}, {8,(char*)"00000001"}, {9,(char*)"000000001"},
++{10,(char*)"0000000001"}, {11,(char*)"00000000001"}, {12,(char*)"000000000001"},
+ {13,NULL}
+ };
+
+ static VlcTable g_rgVlcMbTypeBVOP[] = {
+-{0,"1"}, {1,"01"}, {2,"001"}, {3,"0001"},
++{0,(char*)"1"}, {1,(char*)"01"}, {2,(char*)"001"}, {3,(char*)"0001"},
+ {4,NULL}
+ };
+
+ static VlcTable g_rgVlcWrpPnt[] = {
+-{0,"00"}, {1,"010"}, {2,"011"}, {3,"100"}, {4,"101"}, {5,"110"},
+-{6,"1110"}, {7,"11110"}, {8,"111110"}, {9,"1111110"}, {10,"11111110"},
+-{11,"111111110"}, {12,"1111111110"}, {13,"11111111110"},
+-{14,"111111111110"},
++{0,(char*)"00"}, {1,(char*)"010"}, {2,(char*)"011"}, {3,(char*)"100"}, {4,(char*)"101"}, {5,(char*)"110"},
++{6,(char*)"1110"}, {7,(char*)"11110"}, {8,(char*)"111110"}, {9,(char*)"1111110"}, {10,(char*)"11111110"},
++{11,(char*)"111111110"}, {12,(char*)"1111111110"}, {13,(char*)"11111111110"},
++{14,(char*)"111111111110"},
+ {15,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeMode0[] = {
+-{0,"1"}, {1,"000001"}, {2,"01"}, {3,"0000001"}, {4,"00001"},
+-{5,"0001"}, {6,"001"},
++{0,(char*)"1"}, {1,(char*)"000001"}, {2,(char*)"01"}, {3,(char*)"0000001"}, {4,(char*)"00001"},
++{5,(char*)"0001"}, {6,(char*)"001"},
+ {7,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeMode1[] = {
+-{0,"000001"}, {1,"001"}, {2,"01"}, {3,"0000001"}, {4,"00001"},
+-{5,"1"}, {6,"0001"},
++{0,(char*)"000001"}, {1,(char*)"001"}, {2,(char*)"01"}, {3,(char*)"0000001"}, {4,(char*)"00001"},
++{5,(char*)"1"}, {6,(char*)"0001"},
+ {7,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeMode2[] = {
+-{0,"0001"}, {1,"00001"}, {2,"1"}, {3,"000001"}, {4,"010"}, {5,"011"},
+-{6,"001"},
++{0,(char*)"0001"}, {1,(char*)"00001"}, {2,(char*)"1"}, {3,(char*)"000001"}, {4,(char*)"010"}, {5,(char*)"011"},
++{6,(char*)"001"},
+ {7,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeMode3[] = {
+-{0,"00001"}, {1,"000001"}, {2,"001"}, {3,"11"}, {4,"10"}, {5,"01"},
+-{6,"0001"},
++{0,(char*)"00001"}, {1,(char*)"000001"}, {2,(char*)"001"}, {3,(char*)"11"}, {4,(char*)"10"}, {5,(char*)"01"},
++{6,(char*)"0001"},
+ {7,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeMode4[] = {
+-{0,"00001"}, {1,"000001"}, {2,"01"}, {3,"10"}, {4,"11"}, {5,"001"},
+-{6,"0001"},
++{0,(char*)"00001"}, {1,(char*)"000001"}, {2,(char*)"01"}, {3,(char*)"10"}, {4,(char*)"11"}, {5,(char*)"001"},
++{6,(char*)"0001"},
+ {7,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeMode5[] = {
+-{0,"00001"}, {1,"000001"}, {2,"0001"}, {3,"0010"}, {4,"0011"},
+-{5,"1"}, {6,"01"},
++{0,(char*)"00001"}, {1,(char*)"000001"}, {2,(char*)"0001"}, {3,(char*)"0010"}, {4,(char*)"0011"},
++{5,(char*)"1"}, {6,(char*)"01"},
+ {7,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeMode6[] = {
+-{0,"00001"}, {1,"000001"}, {2,"001"}, {3,"0000001"}, {4,"0001"},
+-{5,"01"}, {6,"1"},
++{0,(char*)"00001"}, {1,(char*)"000001"}, {2,(char*)"001"}, {3,(char*)"0000001"}, {4,(char*)"0001"},
++{5,(char*)"01"}, {6,(char*)"1"},
+ {7,NULL}
+ };
+
+ //OBSS_SAIT_991015
+ static VlcTable g_rgVlcShapeSSModeInter0[] = {
+-{0,"1"}, {1,"01"}, {2,"001"}, {3,"000"}, {4,NULL}
++{0,(char*)"1"}, {1,(char*)"01"}, {2,(char*)"001"}, {3,(char*)"000"}, {4,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeSSModeInter1[] = {
+-{0,"110"}, {1,"0"}, {2,"10"}, {3,"111"}, {4,NULL}
++{0,(char*)"110"}, {1,(char*)"0"}, {2,(char*)"10"}, {3,(char*)"111"}, {4,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeSSModeInter2[] = {
+-{0,"001"}, {1,"01"}, {2,"1"}, {3,"000"}, {4,NULL}
++{0,(char*)"001"}, {1,(char*)"01"}, {2,(char*)"1"}, {3,(char*)"000"}, {4,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeSSModeInter3[] = {
+-{0,"110"}, {1,"0"}, {2,"111"}, {3,"10"}, {4,NULL}
++{0,(char*)"110"}, {1,(char*)"0"}, {2,(char*)"111"}, {3,(char*)"10"}, {4,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeSSModeIntra0[] = {
+-{0,"1"}, {1,"01"}, {2,NULL}
++{0,(char*)"1"}, {1,(char*)"01"}, {2,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeSSModeIntra1[] = {
+-{0,"01"}, {1,"1"}, {2,NULL}
++{0,(char*)"01"}, {1,(char*)"1"}, {2,NULL}
+ };
+ //~OBSS_SAIT_991015
+
+ static VlcTable g_rgVlcShapeMV1[] = {
+-{0,"0"}, {1,"10"}, {2,"110"}, {3,"1110"}, {4,"11110"}, {5,"111110"},
+-{6,"1111110"}, {7,"11111110"}, {8,"111111110"}, {9,"1111111110"},
+-{10,"11111111110"}, {11,"111111111110"}, {12,"1111111111110"},
+-{13,"11111111111110"}, {14,"111111111111110"},
+-{15,"1111111111111110"}, {16,"11111111111111110"},
++{0,(char*)"0"}, {1,(char*)"10"}, {2,(char*)"110"}, {3,(char*)"1110"}, {4,(char*)"11110"}, {5,(char*)"111110"},
++{6,(char*)"1111110"}, {7,(char*)"11111110"}, {8,(char*)"111111110"}, {9,(char*)"1111111110"},
++{10,(char*)"11111111110"}, {11,(char*)"111111111110"}, {12,(char*)"1111111111110"},
++{13,(char*)"11111111111110"}, {14,(char*)"111111111111110"},
++{15,(char*)"1111111111111110"}, {16,(char*)"11111111111111110"},
+ {17,NULL}
+ };
+
+ static VlcTable g_rgVlcShapeMV2[] = {
+-{0,"0"}, {1,"10"}, {2,"110"}, {3,"1110"}, {4,"11110"}, {5,"111110"},
+-{6,"1111110"}, {7,"11111110"}, {8,"111111110"}, {9,"1111111110"},
+-{10,"11111111110"}, {11,"111111111110"}, {12,"1111111111110"},
+-{13,"11111111111110"}, {14,"111111111111110"},
+-{15,"1111111111111110"},
++{0,(char*)"0"}, {1,(char*)"10"}, {2,(char*)"110"}, {3,(char*)"1110"}, {4,(char*)"11110"}, {5,(char*)"111110"},
++{6,(char*)"1111110"}, {7,(char*)"11111110"}, {8,(char*)"111111110"}, {9,(char*)"1111111110"},
++{10,(char*)"11111111110"}, {11,(char*)"111111111110"}, {12,(char*)"1111111111110"},
++{13,(char*)"11111111111110"}, {14,(char*)"111111111111110"},
++{15,(char*)"1111111111111110"},
+ {16,NULL}
+ };
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_decoder_vopsedec_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_decoder_vopsedec_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_decoder_vopsedec_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,74 @@
+--- common/video/iso-mpeg4/src/sys_decoder_vopsedec.cpp.orig 2005-06-17 14:07:56.000000000 -0600
++++ common/video/iso-mpeg4/src/sys_decoder_vopsedec.cpp 2009-11-17 18:50:55.000000000 -0700
+@@ -374,7 +374,7 @@
+ #endif
+ m_pistrm = open(pchStrFile, O_RDONLY);
+ if(m_pistrm < 0)
+- fatal_error("Can't open bitstream file");
++ fatal_error((char *)"Can't open bitstream file");
+ #if 0
+ }
+ else {
+@@ -602,7 +602,7 @@
+ m_iNumBitsTimeIncr,
+ iDisplayWidth,
+ iDisplayHeight,
+- "",
++ (char *)"",
+ m_volmd.bNewpredSegmentType,
+ m_volmd.fAUsage,
+ m_volmd.bShapeOnly,
+@@ -1496,7 +1496,7 @@
+ m_volmd.bInterCAE ||
+ m_volmd.bNoUpdate ||
+ m_volmd.bUpsampling)) {
+- fatal_error("Shape complexity estimation is enabled,\nbut no corresponding flag is enabled.");
++ fatal_error((char *)"Shape complexity estimation is enabled,\nbut no corresponding flag is enabled.");
+ }
+ }
+ else
+@@ -1520,7 +1520,7 @@
+ m_volmd.bInterBlocks ||
+ m_volmd.bInter4vBlocks ||
+ m_volmd.bNotCodedBlocks)) {
+- fatal_error("Texture complexity estimation set 1 is enabled,\nbut no corresponding flag is enabled.");
++ fatal_error((char *)"Texture complexity estimation set 1 is enabled,\nbut no corresponding flag is enabled.");
+ }
+ }
+ else
+@@ -1542,7 +1542,7 @@
+ m_volmd.bDCTLines ||
+ m_volmd.bVLCSymbols ||
+ m_volmd.bVLCBits)) {
+- fatal_error("Texture complexity estimation set 2 is enabled,\nbut no corresponding flag is enabled.");
++ fatal_error((char *)"Texture complexity estimation set 2 is enabled,\nbut no corresponding flag is enabled.");
+ }
+ }
+ else
+@@ -1565,7 +1565,7 @@
+ m_volmd.bForwBackMCQ ||
+ m_volmd.bHalfpel2 ||
+ m_volmd.bHalfpel4)) {
+- fatal_error("Motion complexity estimation is enabled,\nbut no corresponding flag is enabled.");
++ fatal_error((char *)"Motion complexity estimation is enabled,\nbut no corresponding flag is enabled.");
+ }
+ }
+ else
+@@ -1587,7 +1587,7 @@
+ m_volmd.bQuarterpel = m_pbitstrmIn -> getBits (1);
+ if (!(m_volmd.bSadct ||
+ m_volmd.bQuarterpel)) {
+- fatal_error("Version 2 complexity estimation is enabled,\nbut no corresponding flag is enabled.");
++ fatal_error((char *)"Version 2 complexity estimation is enabled,\nbut no corresponding flag is enabled.");
+ }
+ }
+ else
+@@ -1608,7 +1608,7 @@
+ m_volmd.bTextureComplexityEstimationSet2Disable &&
+ m_volmd.bMotionCompensationComplexityDisable &&
+ m_volmd.bVersion2ComplexityEstimationDisable) {
+- fatal_error("Complexity estimation is enabled,\nbut no correponding flag is enabled.");
++ fatal_error((char *)"Complexity estimation is enabled,\nbut no correponding flag is enabled.");
+ }
+ // END: Complexity Estimation syntax support - Update version 2
+ }
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_tps_bfshape_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_tps_bfshape_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_tps_bfshape_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,22 @@
+--- common/video/iso-mpeg4/src/sys_tps_bfshape.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/sys_tps_bfshape.cpp 2009-11-18 23:22:29.000000000 -0700
+@@ -69,6 +69,19 @@
+ #define new DEBUG_NEW
+ #endif // __MFC_
+
++Void set_modes(VOLMode*, VOPMode*);
++Void write420_sep(Int, char*, PixelC*, PixelC*, PixelC*, Int, Int);
++Void write420_jnt(FILE*, PixelC*, PixelC*, PixelC*, Int, Int);
++Void write420_jnt_withMask(FILE*, PixelC*, PixelC*, PixelC*, PixelC*, PixelC*, Int, Int);
++Void write_seg_test(Int, char*, PixelC*, Int, Int);
++Void bg_comp_each(PixelC*, PixelC*, PixelC*, PixelC*, PixelC*, PixelC*, Int, Int, Int, Int, Int, Int);
++Void bg_comp_each(PixelC*, PixelC*, PixelC*, PixelC*, Int, Int, Int, CRct);
++Void bg_comp_each_mode3(PixelC*, PixelC*, PixelC*, PixelC*, Int, Int, Int, CRct);
++Void inv_convertYuv(const CVOPU8YUVBA*, PixelC*, PixelC*, PixelC*, Int, Int);
++Void convertYuv(const CVOPU8YUVBA*, PixelC*, PixelC*, PixelC*, Int, Int);
++Void convertSeg(const CVOPU8YUVBA*, PixelC*, PixelC*, Int, Int, Int, Int, Int, Int);
++Void pre_pad(PixelC*, PixelC*, int, int);
++
+ Int QMatrix [BLOCK_SQUARE_SIZE] = {
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_tps_enhcbuf_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_tps_enhcbuf_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-sys_tps_enhcbuf_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,24 @@
+--- common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp 2009-11-18 20:22:28.000000000 -0700
+@@ -46,6 +46,21 @@
+ #include "vopses.hpp"
+ #include "tps_enhcbuf.hpp"
+
++
++Void set_modes(VOLMode*, VOPMode*);
++Void write420_sep(Int, char*, PixelC*, PixelC*, PixelC*, Int, Int);
++Void write420_jnt(FILE*, PixelC*, PixelC*, PixelC*, Int, Int);
++Void write420_jnt_withMask(FILE*, PixelC*, PixelC*, PixelC*, PixelC*, PixelC*, Int, Int);
++Void write_seg_test(Int, char*, PixelC*, Int, Int);
++Void bg_comp_each(PixelC*, PixelC*, PixelC*, PixelC*, PixelC*, PixelC*, Int, Int, Int, Int, Int, Int);
++Void bg_comp_each(PixelC*, PixelC*, PixelC*, PixelC*, Int, Int, Int, CRct);
++Void bg_comp_each_mode3(PixelC*, PixelC*, PixelC*, PixelC*, Int, Int, Int, CRct);
++Void inv_convertYuv(const CVOPU8YUVBA*, PixelC*, PixelC*, PixelC*, Int, Int);
++Void convertYuv(const CVOPU8YUVBA*, PixelC*, PixelC*, PixelC*, Int, Int);
++Void convertSeg(const CVOPU8YUVBA*, PixelC*, PixelC*, Int, Int, Int, Int, Int, Int);
++Void pre_pad(PixelC*, PixelC*, int, int);
++
++
+ CEnhcBuffer::CEnhcBuffer(Int iSessionWidth, Int iSessionHeight)
+ {
+ Int iNumMBX = iSessionWidth / MB_SIZE;
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-tools_entropy_bitstrm_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-tools_entropy_bitstrm_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-tools_entropy_bitstrm_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,12 @@
+--- common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp.orig 2005-09-08 16:02:55.000000000 -0600
++++ common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp 2009-11-18 23:28:07.000000000 -0700
+@@ -60,6 +60,9 @@
+ #define new DEBUG_NEW
+ #endif // __MFC_
+
++UInt getbit(UInt, UInt, UInt);
++Void print_bit(UInt, UInt, UInt);
++
+ UInt getbit (UInt data, UInt position, UInt num) // get the num-bit field of x starting from position p
+ {
+ return ((data >> (position + 1 - num)) & ~(~0 << num));
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_basic_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_basic_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_basic_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,18 @@
+--- common/video/iso-mpeg4/src/type_basic.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/type_basic.cpp 2009-11-19 00:56:11.000000000 -0700
+@@ -317,13 +317,13 @@
+ iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
+ }
+
+-Void CMotionVector::setToZero (Void)
++Void CMotionVector::setToZero ()
+ {
+ memset (this, 0, sizeof (*this));
+ }
+
+ // RRV insertion
+-Void CMotionVector::scaleup (Void)
++Void CMotionVector::scaleup ()
+ {
+ if(m_vctTrueHalfPel.x == 0){
+ m_vctTrueHalfPel_x2.x = 0;
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_svd_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_svd_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_svd_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,12 @@
+--- common/video/iso-mpeg4/src/type_svd.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/type_svd.cpp 2009-11-19 01:01:35.000000000 -0700
+@@ -52,6 +52,9 @@
+
+ #define irowNull (-1)
+
++Int FSolveLinEq(Double*, Double*, Int);
++Double* linearLS(Double**, Double*, UInt, UInt);
++
+ __inline static void SwapRow(Double *rgcoeff, Double *rgrhs, Int crow,
+ Int irow1, Int irow2);
+ __inline static void EliminateColumn(Double *rgcoeff, Double *rgrhs, Int crow,
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_typeapi_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_typeapi_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_typeapi_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,11 @@
+--- common/video/iso-mpeg4/src/type_typeapi.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/type_typeapi.cpp 2009-11-19 01:07:06.000000000 -0700
+@@ -52,6 +52,8 @@
+ #define new DEBUG_NEW
+ #endif // __MFC_
+
++Double dist(Double, Double, Double, Double);
++
+ // handy functions
+ Int nint (Double x) // returns nearest integer to x, analog of FORTRAN NINT
+ {
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_yuvac_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_yuvac_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_yuvac_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,11 @@
+--- common/video/iso-mpeg4/src/type_yuvac.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/type_yuvac.cpp 2009-11-19 01:12:18.000000000 -0700
+@@ -51,6 +51,8 @@
+ #define new DEBUG_NEW
+ #endif // __MFC_
+
++Void overlayMB(CIntImage*, const CIntImage*, const CIntImage*);
++
+ CVOPU8YUVBA::~CVOPU8YUVBA ()
+ {
+ delete m_puciY;
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_yuvai_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_yuvai_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-type_yuvai_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,10 @@
+--- common/video/iso-mpeg4/src/type_yuvai.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/type_yuvai.cpp 2009-11-19 01:17:22.000000000 -0700
+@@ -48,6 +48,7 @@
+ #define new DEBUG_NEW
+ #endif // __MFC_
+
++Void overlayMB(CIntImage*, const CIntImage*, const CIntImage*);
+
+ CVOPIntYUVBA::~CVOPIntYUVBA ()
+ {
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_computePSNR_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_computePSNR_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_computePSNR_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,54 @@
+--- common/video/iso-mpeg4/src/vtc_main_computePSNR.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_main_computePSNR.cpp 2009-11-19 01:24:57.000000000 -0700
+@@ -154,39 +154,39 @@
+ if (stat)
+ {
+ if (infSNR_l==0)
+- noteStat("\nPSNR_Y: %.4f dB\n",SNR_l);
++ noteStat((char*)"\nPSNR_Y: %.4f dB\n",SNR_l);
+ else
+- noteStat("\nPSNR_Y: +INF dB\n");
++ noteStat((char*)"\nPSNR_Y: +INF dB\n");
+
+ if (colors == 3) {
+ if (infSNR_Cb==0)
+- noteStat("PSNR_U: %.4f dB\n",SNR_Cb);
++ noteStat((char*)"PSNR_U: %.4f dB\n",SNR_Cb);
+ else
+- noteStat("PSNR_U: +INF dB\n");
++ noteStat((char*)"PSNR_U: +INF dB\n");
+
+ if (infSNR_Cr==0)
+- noteStat("PSNR_V: %.4f dB\n",SNR_Cr);
++ noteStat((char*)"PSNR_V: %.4f dB\n",SNR_Cr);
+ else
+- noteStat("PSNR_V: +INF dB\n");
++ noteStat((char*)"PSNR_V: +INF dB\n");
+ }
+ }
+ else
+ {
+ if (infSNR_l==0)
+- noteProgress("\nPSNR_Y: %.4f dB",SNR_l);
++ noteProgress((char*)"\nPSNR_Y: %.4f dB",SNR_l);
+ else
+- noteProgress("\nPSNR_Y: +INF dB");
++ noteProgress((char*)"\nPSNR_Y: +INF dB");
+
+ if (colors == 3) {
+ if (infSNR_Cb==0)
+- noteProgress("PSNR_U: %.4f dB",SNR_Cb);
++ noteProgress((char*)"PSNR_U: %.4f dB",SNR_Cb);
+ else
+- noteProgress("PSNR_U: +INF dB");
++ noteProgress((char*)"PSNR_U: +INF dB");
+
+ if (infSNR_Cr==0)
+- noteProgress("PSNR_V: %.4f dB",SNR_Cr);
++ noteProgress((char*)"PSNR_V: %.4f dB",SNR_Cr);
+ else
+- noteProgress("PSNR_V: +INF dB");
++ noteProgress((char*)"PSNR_V: +INF dB");
+ }
+ }
+ }
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_read_image_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_read_image_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_read_image_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,38 @@
+--- common/video/iso-mpeg4/src/vtc_main_read_image.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_main_read_image.cpp 2009-11-19 01:27:34.000000000 -0700
+@@ -176,7 +176,7 @@
+ mzte_codec.m_ImageOrg = mzte_codec.m_Image;
+
+ if ((img = (PICTURE *)malloc(sizeof(PICTURE)*img_colors))==NULL)
+- errorHandler("error allocating memory \n");
++ errorHandler((char*)"error allocating memory \n");
+
+ img[0].width = tile_width;
+ img[0].height = tile_height;
+@@ -189,14 +189,14 @@
+
+ if ((img[0].data=(Void *)
+ malloc(sizeof(UChar)*tile_width*tile_height*wordsize)) == NULL)
+- errorHandler("Couldn't allocate memory to image->Y->data\n");
++ errorHandler((char*)"Couldn't allocate memory to image->Y->data\n");
+ if (img_colors != MONO) { /* SL: only for color image */
+ if ((img[1].data = (Void *)
+ malloc(sizeof(UChar)*img_cwidth*img_cheight*wordsize))==NULL)
+- errorHandler("Couldn't allocate memory to image->U->data\n");
++ errorHandler((char*)"Couldn't allocate memory to image->U->data\n");
+ if ((img[2].data = (Void *)
+ malloc(sizeof(UChar)*img_cwidth*img_cheight*wordsize))==NULL)
+- errorHandler("Couldn't allocate memory to image->V->data\n");
++ errorHandler((char*)"Couldn't allocate memory to image->V->data\n");
+ }
+
+ // FPDAM begin: modified by Sharp
+@@ -212,7 +212,7 @@
+ if(col==0) {
+ img[col].mask = (UChar *)malloc(sizeof(UChar)*tile_width*tile_height);
+ if (img[col].mask == NULL)
+- errorHandler("error allocating memory \n");
++ errorHandler((char*)"error allocating memory \n");
+ memset(img[col].mask, 1, sizeof(UChar)*tile_width*tile_height);
+ } else {
+ img[col].mask=NULL;
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_seg_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_seg_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_seg_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,99 @@
+--- common/video/iso-mpeg4/src/vtc_main_seg.cpp.orig 2006-04-05 12:27:30.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_main_seg.cpp 2009-11-19 01:35:42.000000000 -0700
+@@ -95,13 +95,13 @@
+ inmask = (UChar *)malloc(sizeof(UChar)*seg_size);
+
+ if(inmask==NULL)
+- errorHandler("Couldn't allocate memory to image mask\n");
++ errorHandler((char*)"Couldn't allocate memory to image mask\n");
+
+ /* Read image */
+ if ((status=fread(inmask, sizeof(UChar), seg_size,
+ infptr))
+ != seg_size)
+- errorHandler("Error in reading image file: %s\n",seg_path);
++ errorHandler((char*)"Error in reading image file: %s\n",seg_path);
+ fclose(infptr);
+
+ MyImage[0].mask = inmask;
+@@ -250,7 +250,7 @@
+ nLevels[col]);
+
+ if (ret!=DWT_OK)
+- errorHandler("DWT Error code = %d\n", ret);
++ errorHandler((char*)"DWT Error code = %d\n", ret);
+ if (usemask) free(inmask[col]);
+ }
+ else {
+@@ -265,7 +265,7 @@
+ width[col], height[col], origin_x[col], origin_y[col], 0);
+
+ if (ret!=DWT_OK)
+- errorHandler("DWT Error code = %d\n", ret);
++ errorHandler((char*)"DWT Error code = %d\n", ret);
+ if(col==0) {
+ if(usemask) { /* do shape quantization */
+ QuantizeShape(outmask[0], width[0], height[0], alphaTH);
+@@ -339,7 +339,7 @@
+ Shape,
+ nLevels[col]);
+ if (ret!=DWT_OK)
+- errorHandler("DWT Error code = %d\n", ret);
++ errorHandler((char*)"DWT Error code = %d\n", ret);
+ if (usemask) free(inmask[col]);
+ }
+ else {
+@@ -354,7 +354,7 @@
+ width[col], height[col], origin_x[col], origin_y[col], 0);
+
+ if (ret!=DWT_OK)
+- errorHandler("DWT Error code = %d\n", ret);
++ errorHandler((char*)"DWT Error code = %d\n", ret);
+ if(col==0) {
+ if(usemask) { /* do shape quantization */
+ QuantizeShape(outmask[0], width[0], height[0], alphaTH);
+@@ -452,7 +452,7 @@
+ if(col==0) { /* get decoded shape of Y */
+ outmask[col] = MyImage[col].mask =(UChar *)malloc(sizeof(UChar)*Width[col]*Height[col]);
+ if(outmask[col]==NULL)
+- errorHandler("Couldn't allocate memory to image\n");
++ errorHandler((char*)"Couldn't allocate memory to image\n");
+ if (usemask) {
+ /* ShapeDeCoding(outmask[0], Width[0], Height[0]); */
+ ShapeDeCoding(outmask[0], Width[0], Height[0],
+@@ -470,7 +470,7 @@
+ if((Width[0] &((1<<wvtDecompLev)-1))!=0 || (Height[0] &((1<<wvtDecompLev)-1))!=0 ) {
+ ret=ExtendMaskBox(outmask[0], &tempmask, Width[0], Height[0], Nx[0], Ny[0], &width[0], &height[0], nLevels[0]);
+ if (ret!=DWT_OK)
+- errorHandler("ExtendMaskBox: DWT Error code = %d\n", ret);
++ errorHandler((char*)"ExtendMaskBox: DWT Error code = %d\n", ret);
+ free(outmask[0]);
+ outmask[0]=tempmask;
+ }
+@@ -531,7 +531,7 @@
+ MyImage[col].mask
+ =(UChar *)malloc(sizeof(UChar)*Width[col]*Height[col]);
+ if (MyImage[col].mask==NULL)
+- errorHandler("Couldn't allocate memory to image\n");
++ errorHandler((char*)"Couldn't allocate memory to image\n");
+ for (i=0; i<Width[col]*Height[col]; i++)
+ MyImage[col].mask[i] = DWT_IN;
+ }
+@@ -577,7 +577,7 @@
+ MyImage[col].mask
+ =(UChar *)malloc(sizeof(UChar)*Width[col]*Height[col]);
+ if (MyImage[col].mask==NULL)
+- errorHandler("Couldn't allocate memory to image\n");
++ errorHandler((char*)"Couldn't allocate memory to image\n");
+ for (i=0; i<Width[col]*Height[col]; i++)
+ MyImage[col].mask[i] = DWT_IN;
+ }
+@@ -943,7 +943,7 @@
+ *target_levels=0; /* ??? */
+ break;
+ default:
+- errorHandler("Wrong texture_object_layer_start_code.");
++ errorHandler((char*)"Wrong texture_object_layer_start_code.");
+ }
+ }
+ else {
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_vtcdec_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_vtcdec_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_vtcdec_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,508 @@
+--- common/video/iso-mpeg4/src/vtc_main_vtcdec.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_main_vtcdec.cpp 2009-11-19 02:31:58.000000000 -0700
+@@ -174,9 +174,9 @@
+
+ get_err_resilience_header();
+ if (TU_first != 0)
+- errorHandler("Reading incorrect TU_first in the first packet.\n");
++ errorHandler((char*)"Reading incorrect TU_first in the first packet.\n");
+ if (get_X_bits(1) != 1)
+- errorHandler("Reading incorrect HEC in the first packet.\n");
++ errorHandler((char*)"Reading incorrect HEC in the first packet.\n");
+
+ if (mzte_codec.m_iScanDirection==1) /* BB */
+ ;
+@@ -209,7 +209,7 @@
+
+ still_texture_object_start_code = get_X_bits(32);
+ if (still_texture_object_start_code != STILL_TEXTURE_OBJECT_START_CODE)
+- errorHandler("Wrong texture_object_layer_start_code.");
++ errorHandler((char*)"Wrong texture_object_layer_start_code.");
+
+ texture_object_id = get_X_bits(16);
+ marker_bit = get_X_bits(1);
+@@ -278,7 +278,7 @@
+ // hjlee 0901
+ filters = (FILTER **)malloc(sizeof(FILTER *)*mzte_codec.m_iWvtDecmpLev);
+ if(filters==NULL)
+- errorHandler("Memory allocation error\n");
++ errorHandler((char*)"Memory allocation error\n");
+ if (wavelet_download == 1) {
+ mzte_codec.m_iWvtUniform=wavelet_uniform = get_X_bits(1);
+ if(wavelet_uniform) {
+@@ -331,7 +331,7 @@
+
+ /* decode the shape info from bitstream */
+ if(mzte_codec.m_iAlphaChannel)
+- noteProgress("Decoding Shape Information...");
++ noteProgress((char*)"Decoding Shape Information...");
+ *Image = (PICTURE *)malloc(sizeof(PICTURE)*3);
+
+
+@@ -358,7 +358,7 @@
+
+ still_texture_object_start_code = get_X_bits(32);
+ if (still_texture_object_start_code != STILL_TEXTURE_OBJECT_START_CODE)
+- errorHandler("Wrong texture_object_layer_start_code.");
++ errorHandler((char*)"Wrong texture_object_layer_start_code.");
+ h_size += 32;
+
+ mzte_codec.m_tiling_disable = get_X_bits(1);
+@@ -511,7 +511,7 @@
+ // hjlee 0901
+ filters = (FILTER **)malloc(sizeof(FILTER *)*mzte_codec.m_iWvtDecmpLev);
+ if(filters==NULL)
+- errorHandler("Memory allocation error\n");
++ errorHandler((char*)"Memory allocation error\n");
+ if (wavelet_download == 1) {
+ mzte_codec.m_iWvtUniform=wavelet_uniform = get_X_bits(1);
+ h_size += 1; // added by Sharp (99/2/16)
+@@ -619,7 +619,7 @@
+
+ /* decode the shape info from bitstream */
+ if(mzte_codec.m_iAlphaChannel)
+- noteProgress("Decoding Shape Information...");
++ noteProgress((char*)"Decoding Shape Information...");
+ *Image = (PICTURE *)malloc(sizeof(PICTURE)*3);
+ //begin: added by SL @Sarnoff (03/03/99)
+ mzte_codec.m_iTargetSpatialLev = MIN(mzte_codec.m_iSpatialLev, mzte_codec.m_iTargetSpatialLev);
+@@ -643,7 +643,7 @@
+ filters); //modified by SL @Sarnoff (03/03/99)
+ //begin: added by SL @Sarnoff (03/03/99)
+ if(target_shape_layer > target_spatial_layer) {
+- noteWarning("Shape has less spatial layers than target,\n forced to use shape spatial layers.\n");
++ noteWarning((char*)"Shape has less spatial layers than target,\n forced to use shape spatial layers.\n");
+ if(mzte_codec.m_iQuantType == 2) {
+ for(i=0;i< mzte_codec.m_iSpatialLev;i++) {
+ if( mzte_codec.m_lastWvtDecompInSpaLayer[i][0] > mzte_codec.m_iWvtDecmpLev -1 - target_shape_layer){
+@@ -733,7 +733,7 @@
+ {
+ Int col, err;
+
+- noteProgress("Decoding DC coefficients....");
++ noteProgress((char*)"Decoding DC coefficients....");
+ for (col=0; col<mzte_codec.m_iColors; col++)
+ {
+ /* initilize all wavelet coefficients */
+@@ -746,7 +746,7 @@
+ /* dequantize DC coefficients */
+ err=decIQuantizeDC(col);
+ }
+- noteProgress("Completed decoding of DC coefficients.");
++ noteProgress((char*)"Completed decoding of DC coefficients.");
+ }
+
+
+@@ -768,14 +768,14 @@
+ }
+
+ for (col=0; col<mzte_codec.m_iColors; col++){
+- noteProgress("Single-Quant Mode (Band by Band) - Spatial %d, SNR 0, "\
++ noteProgress((char*)"Single-Quant Mode (Band by Band) - Spatial %d, SNR 0, "\
+ "Color %d",spa_lev,col); fflush(stderr);
+
+ mzte_codec.m_iCurColor = col;
+ if(spa_lev !=0 || col == 0){
+ wavelet_higher_bands_decode_SQ_band(col);
+ if(decIQuantizeAC_spa(spa_lev,col))
+- errorHandler("decIQuantizeAC_spa");
++ errorHandler((char*)"decIQuantizeAC_spa");
+ }
+ }
+
+@@ -807,12 +807,12 @@
+ texture_spatial_layer_start_code = get_X_bits(32);
+ if (texture_spatial_layer_start_code !=
+ TEXTURE_SPATIAL_LAYER_START_CODE)
+- errorHandler("Wrong texture_spatial_layer_start_code %x.",
++ errorHandler((char*)"Wrong texture_spatial_layer_start_code %x.",
+ texture_spatial_layer_start_code);
+
+ texture_spatial_layer_id = get_X_bits(5);
+ if (texture_spatial_layer_id != spa_lev)
+- errorHandler("Incorrect texture_spatial_layer_id");
++ errorHandler((char*)"Incorrect texture_spatial_layer_id");
+ mzte_codec.m_SPlayer[0].SNR_scalability_levels = 1;
+
+ TextureSpatialLayerSQNSC_dec(spa_lev);
+@@ -828,7 +828,7 @@
+ Int col, err, spa_lev;
+ SNR_IMAGE *snr_image;
+
+- noteProgress("Decoding AC coefficients - Single-Quant Mode....");
++ noteProgress((char*)"Decoding AC coefficients - Single-Quant Mode....");
+
+ /* added for compatability with MQ spatial layer flexability - ph 7/16 */
+ setSpatialLayerDimsSQ(0); // hjlee 0901
+@@ -845,7 +845,7 @@
+
+ /* initialize AC coefficient info */
+ if ((err=ztqInitAC(1, col)))
+- errorHandler("ztqInitAC");
++ errorHandler((char*)"ztqInitAC");
+
+ snr_image=&(mzte_codec.m_SPlayer[col].SNRlayer.snr_image);
+ }
+@@ -867,7 +867,7 @@
+ {
+ /* Inverse quantize AC coefficients */
+ if ((err=decIQuantizeAC(col)))
+- errorHandler("decIQuantizeAC");
++ errorHandler((char*)"decIQuantizeAC");
+ }
+
+ }
+@@ -902,7 +902,7 @@
+ }
+ }
+
+- noteProgress("Completed decoding AC coefficients - Single-Quant Mode.");
++ noteProgress((char*)"Completed decoding AC coefficients - Single-Quant Mode.");
+ }
+
+
+@@ -915,16 +915,16 @@
+ mzte_codec.m_iCurSpatialLev=spa_lev;
+
+ if(mzte_codec.m_bStartCodeEnable){
+- noteProgress("Decoding Multi-Quant Mode Layer with SNR start code....");
++ noteProgress((char*)"Decoding Multi-Quant Mode Layer with SNR start code....");
+ /* header info */
+ if(get_X_bits(32) != texture_snr_layer_start_code)
+- errorHandler("Error in decoding texture_snr_layer_start_code");
++ errorHandler((char*)"Error in decoding texture_snr_layer_start_code");
+ texture_snr_layer_id=get_X_bits(5);
+ }
+ else
+- noteProgress("Decoding Multi-Quant Mode Layer without SNR start code....");
++ noteProgress((char*)"Decoding Multi-Quant Mode Layer without SNR start code....");
+
+- noteProgress("Multi-Quant Mode - Spatial %d, SNR %d", spa_lev,snr_lev);
++ noteProgress((char*)"Multi-Quant Mode - Spatial %d, SNR %d", spa_lev,snr_lev);
+
+ for(col=0;
+ col < NCOL;
+@@ -941,7 +941,7 @@
+ Get_Quant_and_Max(snr_image,spa_lev,col); // hjlee 0901
+
+ updateResidMaxAndAssignSkips(col);
+- noteDebug("resid_max=%d\n",snr_image->residual_max);
++ noteDebug((char*)"resid_max=%d\n",snr_image->residual_max);
+ }
+
+ wavelet_higher_bands_decode_MQ(mzte_codec.m_iScanDirection);
+@@ -955,15 +955,15 @@
+
+ /* quantize and mark zerotree structure for AC coefficients */
+ if (decIQuantizeAC(col))
+- errorHandler("decQuantizeAndMarkAC");
++ errorHandler((char*)"decQuantizeAndMarkAC");
+
+- noteDebug("max_root=%d max_valz=%d max_valnz=%d max_resi=%d",
++ noteDebug((char*)"max_root=%d max_valz=%d max_valnz=%d max_resi=%d",
+ ROOT_MAX(col),VALZ_MAX(col),VALNZ_MAX(col),
+ RESID_MAX(col));
+
+ /* Update states of ac coefficients */
+ if (decUpdateStateAC(col))
+- errorHandler("decUpdateStateAC");
++ errorHandler((char*)"decUpdateStateAC");
+ }
+ }
+
+@@ -989,27 +989,27 @@
+
+ /*------- AC: Initialize QList Structure -------*/
+ if ((err=ztqQListInit()))
+- errorHandler("Allocating memory for QList information.");
++ errorHandler((char*)"Allocating memory for QList information.");
+
+ // hjlee 0901
+ /* Initialize coeffs */
+ setSpatialLevelAndDimensions(0,0);
+ if ((err=ztqInitAC(1,0)))
+- errorHandler("ztqInitAC");
++ errorHandler((char*)"ztqInitAC");
+
+ if (mzte_codec.m_lastWvtDecompInSpaLayer[0][1]<0)
+ setSpatialLevelAndDimensions(1,1);
+ else
+ setSpatialLevelAndDimensions(0,1);
+ if ((err=ztqInitAC(1,1)))
+- errorHandler("ztqInitAC");
++ errorHandler((char*)"ztqInitAC");
+
+ if (mzte_codec.m_lastWvtDecompInSpaLayer[0][2]<0)
+ setSpatialLevelAndDimensions(1,2);
+ else
+ setSpatialLevelAndDimensions(0,2);
+ if ((err=ztqInitAC(1,2)))
+- errorHandler("ztqInitAC");
++ errorHandler((char*)"ztqInitAC");
+
+
+ /* Loop through spatial layers */
+@@ -1067,7 +1067,7 @@
+ mzte_codec.m_iCurSpatialLev,mzte_codec.m_iCurSNRLev);
+ #endif
+ if ((bitfile=fopen(fname,"rb"))==NULL)
+- errorHandler("Can't open file '%s' for reading.",fname);
++ errorHandler((char*)"Can't open file '%s' for reading.",fname);
+
+ /* initialize the buffer */
+ init_bit_packing_fp(bitfile,1);
+@@ -1080,12 +1080,12 @@
+ texture_spatial_layer_start_code = get_X_bits(32);
+ if (texture_spatial_layer_start_code !=
+ TEXTURE_SPATIAL_LAYER_START_CODE)
+- errorHandler("Wrong texture_spatial_layer_start_code3 %x.",
++ errorHandler((char*)"Wrong texture_spatial_layer_start_code3 %x.",
+ texture_spatial_layer_start_code);
+
+ texture_spatial_layer_id = get_X_bits(5);
+ if(texture_spatial_layer_id !=spa_lev)
+- errorHandler("Incorrect texture_spatial_layer_id");
++ errorHandler((char*)"Incorrect texture_spatial_layer_id");
+ snr_scalability_levels = get_X_bits(5);
+ mzte_codec.m_SPlayer[0].SNR_scalability_levels =
+ snr_scalability_levels;
+@@ -1135,7 +1135,7 @@
+
+ /*------- DC: Open and initialize bitstream file -------*/
+ if ((bitfile=fopen(m_cInBitsFile,"rb"))==NULL)
+- errorHandler("Can't open file '%s' for reading.",m_cInBitsFile);
++ errorHandler((char*)"Can't open file '%s' for reading.",m_cInBitsFile);
+
+ /* initialize variables */
+ init_bit_packing_fp(bitfile,1);
+@@ -1145,7 +1145,7 @@
+ wvtfilter = *pwvtfilter; // hjlee 0901
+
+ /*--------------- CREATE DATA STRUCTURES -----------------*/
+- noteDetail("Creating and initializing data structures....");
++ noteDetail((char*)"Creating and initializing data structures....");
+ mzte_codec.m_iColors = 3;
+ mzte_codec.m_iBitDepth = 8;
+ usemask = mzte_codec.m_iAlphaChannel = 0;
+@@ -1190,7 +1190,7 @@
+
+
+ }
+- noteDetail("Completed creating and initializing data structures.");
++ noteDetail((char*)"Completed creating and initializing data structures.");
+
+ mzte_codec.m_iDCHeight = mzte_codec.m_iHeight >> mzte_codec.m_iWvtDecmpLev;
+ mzte_codec.m_iDCWidth = mzte_codec.m_iWidth >> mzte_codec.m_iWvtDecmpLev;
+@@ -1222,7 +1222,7 @@
+ Width[col], Height[col],
+ nLevels[col], &(wvtfilter[col==0?0:1]));
+ if (ret!= DWT_OK)
+- errorHandler("DWT Error Code %d\n", ret);
++ errorHandler((char*)"DWT Error Code %d\n", ret);
+
+ for (k=0,y=0; y<Height[col]; y++)
+ for (x=0; x<Width[col]; x++)
+@@ -1233,7 +1233,7 @@
+
+
+ if (target_spatial_levels<=0 || target_snr_levels<= 0)
+- errorHandler("Neither target_spatial_levels nor target_snr_levels" \
++ errorHandler((char*)"Neither target_spatial_levels nor target_snr_levels" \
+ "can be zero");
+
+ /*------- DC: Decode and inverse quantize all color components -------*/
+@@ -1351,7 +1351,7 @@
+ wvtfilter = *pwvtfilter; // hjlee 0901
+
+ /*--------------- CREATE DATA STRUCTURES -----------------*/
+- noteDetail("Creating and initializing data structures....");
++ noteDetail((char*)"Creating and initializing data structures....");
+ mzte_codec.m_iColors = 3;
+ mzte_codec.m_iBitDepth = 8;
+ usemask = mzte_codec.m_iAlphaChannel;//= 0; // modified by SL at Sarnoff (03/03/99)
+@@ -1394,7 +1394,7 @@
+
+ }
+ }
+- noteDetail("Completed creating and initializing data structures.");
++ noteDetail((char*)"Completed creating and initializing data structures.");
+ } // added by Sharp (99/2/16)
+
+ mzte_codec.m_iDCHeight = mzte_codec.m_iHeight >> mzte_codec.m_iWvtDecmpLev;
+@@ -1427,7 +1427,7 @@
+ Width[col], Height[col],
+ nLevels[col], &(wvtfilter[col==0?0:1]));
+ if (ret!= DWT_OK)
+- errorHandler("DWT Error Code %d\n", ret);
++ errorHandler((char*)"DWT Error Code %d\n", ret);
+
+ for (k=0,y=0; y<Height[col]; y++)
+ for (x=0; x<Width[col]; x++)
+@@ -1438,7 +1438,7 @@
+
+
+ if (target_spatial_levels<=0 || target_snr_levels<= 0)
+- errorHandler("Neither target_spatial_levels nor target_snr_levels" \
++ errorHandler((char*)"Neither target_spatial_levels nor target_snr_levels" \
+ "can be zero");
+
+ /*------- DC: Decode and inverse quantize all color components -------*/
+@@ -1529,7 +1529,7 @@
+
+ }
+ }
+- noteDetail("Completed creating and initializing data structures.");
++ noteDetail((char*)"Completed creating and initializing data structures.");
+ } // added by Sharp (99/2/16)
+
+ if (mzte_codec.m_iSingleBitFile==0){
+@@ -1568,7 +1568,7 @@
+ Int MinLevel = 0, TileX = 0, TileY = 0;
+ // end: added by Sharp (99/5/10)
+
+- noteProgress("\n----- MPEG-4 Visual Texture Coding: Decoding -----\n");
++ noteProgress((char*)"\n----- MPEG-4 Visual Texture Coding: Decoding -----\n");
+
+ mzte_codec.m_visual_object_verid = 2; //VERSION; // This value is set to 2 tentatively
+
+@@ -1581,7 +1581,7 @@
+
+ if ( mzte_codec.m_visual_object_verid != 1 ){
+
+- noteProgress("Version 2 bitstream\n");
++ noteProgress((char*)"Version 2 bitstream\n");
+
+ //Added by Sarnoff for error resilience, 3/5/99
+ if(!mzte_codec.m_usErrResiDisable)
+@@ -1612,7 +1612,7 @@
+
+ // begin: added by Sharp (99/2/16)
+ if ((bitfile=fopen(m_cInBitsFile,"rb"))==NULL)
+- errorHandler("Can't open file '%s' for reading.",m_cInBitsFile);
++ errorHandler((char*)"Can't open file '%s' for reading.",m_cInBitsFile);
+
+ /* initialize variables */
+ init_bit_packing_fp(bitfile,1);
+@@ -1751,7 +1751,7 @@
+ // begin: added by Sharp (99/4/7)
+ if ( mzte_codec.m_tiling_disable == 0 ){
+ if ( mzte_codec.m_tiling_jump_table_enable == 1 ){
+- noteProgress("Jump to %d", jump_table[ii]);
++ noteProgress((char*)"Jump to %d", jump_table[ii]);
+ relative_jump(jump_table[ii]);
+ } else
+ search_tile(decode_tile_id[ii]);
+@@ -1772,7 +1772,7 @@
+ mzte_codec.m_iTargetSNRLev, &wvtfilter, (mzte_codec.m_tiling_disable?ii:decode_tile_id[ii]), ii, bitfile, &table, Image); //modified by SL 03/03/99 // FPDAM : added by SAIT (99/09/03)
+
+ // begin: added by Sharp (99/5/10)
+- noteProgress("\nInverse Wavelet Transform....");
++ noteProgress((char*)"\nInverse Wavelet Transform....");
+ if ( mzte_codec.m_tiling_disable == 0 )
+ { // FPDAM : added by SAIT
+ if ( !mzte_codec.m_iAlphaChannel || mzte_codec.m_iTextureTileType != TRANSP_TILE) // FPDAM modified by Sharp
+@@ -1780,7 +1780,7 @@
+ } // FPDAM : added by SAIT
+ else
+ perform_IDWT(wvtfilter, m_cRecImageFile); // hjlee 0901
+- noteProgress("Completed inverse wavelet transform.");
++ noteProgress((char*)"Completed inverse wavelet transform.");
+ // end: added by Sharp (99/5/10)
+
+ // begin: added by Sharp (99/4/7)
+@@ -1836,7 +1836,7 @@
+ // noteProgress("Completed inverse wavelet transform.");
+ // end: deleted by Sharp (99/5/10)
+
+- noteDetail("Freeing up decoding data structures....");
++ noteDetail((char*)"Freeing up decoding data structures....");
+ /*----- free up coeff data structure -----*/
+ for (col=0; col<mzte_codec.m_iColors; col++) {
+ if (mzte_codec.m_SPlayer[col].coeffinfo[0] != NULL)
+@@ -1846,12 +1846,12 @@
+ delete (mzte_codec.m_SPlayer[col].coeffinfo);
+ mzte_codec.m_SPlayer[col].coeffinfo = NULL;
+ }
+- noteDetail("Completed freeing up decoding data structures.");
++ noteDetail((char*)"Completed freeing up decoding data structures.");
+
+ }
+ else { // version 1 code is copied from here
+
+- noteProgress("Version 1 bitstream\n");
++ noteProgress((char*)"Version 1 bitstream\n");
+
+ strcpy(m_cInBitsFile, InBitsFile);
+ strcpy(m_cRecImageFile, RecImageFile);
+@@ -1877,11 +1877,11 @@
+
+ /* DISCRETE INVERSE WAVELET TRANSFORM */
+
+- noteProgress("\nInverse Wavelet Transform....");
++ noteProgress((char*)"\nInverse Wavelet Transform....");
+ perform_IDWT(wvtfilter, m_cRecImageFile); // hjlee 0901
+- noteProgress("Completed inverse wavelet transform.");
++ noteProgress((char*)"Completed inverse wavelet transform.");
+
+- noteDetail("Freeing up decoding data structures....");
++ noteDetail((char*)"Freeing up decoding data structures....");
+ /*----- free up coeff data structure -----*/
+ for (col=0; col<mzte_codec.m_iColors; col++) {
+ if (mzte_codec.m_SPlayer[col].coeffinfo[0] != NULL)
+@@ -1891,11 +1891,11 @@
+ delete (mzte_codec.m_SPlayer[col].coeffinfo);
+ mzte_codec.m_SPlayer[col].coeffinfo = NULL;
+ }
+- noteDetail("Completed freeing up decoding data structures.");
++ noteDetail((char*)"Completed freeing up decoding data structures.");
+
+ }
+
+- noteProgress("\n----- Decoding Completed. -----\n");
++ noteProgress((char*)"\n----- Decoding Completed. -----\n");
+ }
+
+ // begin: added by Sharp (99/2/16)
+@@ -2039,10 +2039,10 @@
+ if ( mzte_codec.m_tiling_disable == 0 ){
+ still_tile_start_code = get_X_bits(32);
+ if (still_tile_start_code != TEXTURE_TILE_START_CODE)
+- errorHandler("Wrong texture_tile_start_code.");
++ errorHandler((char*)"Wrong texture_tile_start_code.");
+
+ tile_id = get_X_bits(16);
+- noteProgress("Current Tile ID is '%d'\n", tile_id);
++ noteProgress((char*)"Current Tile ID is '%d'\n", tile_id);
+ if ( mzte_codec.m_extension_type == 1 ){
+ ref_tile_id1 = get_X_bits(16);
+ ref_tile_id2 = get_X_bits(16);
+@@ -2059,7 +2059,7 @@
+ fprintf(stderr,"..............texture_tile_type=%d\n",mzte_codec.m_iTextureTileType);
+ #endif
+
+- noteProgress("Decoding Tile Shape Information...");
++ noteProgress((char*)"Decoding Tile Shape Information...");
+ }
+
+ if ( count == 0 ){
+@@ -2076,9 +2076,9 @@
+ w = mzte_codec.m_iWidth >> (col>0 ? 1 : 0);
+
+ if ((picptr[col].data = (unsigned char *)malloc(sizeof(unsigned char)*h*w)) == NULL )
+- errorHandler("Couldn't allocate memory to image data\n");
++ errorHandler((char*)"Couldn't allocate memory to image data\n");
+ if ((picptr[col].mask = (unsigned char *)malloc(sizeof(unsigned char)*h*w)) == NULL )
+- errorHandler("Couldn't allocate memory to image data\n");
++ errorHandler((char*)"Couldn't allocate memory to image data\n");
+ }
+
+ *Image = picptr;
+@@ -2109,7 +2109,7 @@
+ wvtfilter);
+
+ if(target_shape_layer > target_spatial_layer) {
+- noteWarning("Shape has less spatial layers than target,\n forced to use shape spatial layers.\n");
++ noteWarning((char*)"Shape has less spatial layers than target,\n forced to use shape spatial layers.\n");
+ if(mzte_codec.m_iQuantType == 2) {
+ for(i=0;i< mzte_codec.m_iSpatialLev;i++) {
+ if( mzte_codec.m_lastWvtDecompInSpaLayer[i][0] > mzte_codec.m_iWvtDecmpLev -1 - target_shape_layer){
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_vtcenc_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_vtcenc_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_vtcenc_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,321 @@
+--- common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp 2009-11-19 02:54:25.000000000 -0700
+@@ -379,7 +379,7 @@
+ emit_bits((UShort)MARKER_BIT, 1); /* marker_bit */
+ emit_bits((UShort)mzte_codec.m_iHeight, 15); /* object_height */
+ emit_bits((UShort)MARKER_BIT, 1); /* marker_bit */
+- noteProgress("Merge Shape Bitstream ....");
++ noteProgress((char*)"Merge Shape Bitstream ....");
+ // MergeShapeBitstream();
+ }
+ }
+@@ -582,7 +582,7 @@
+ if ( mzte_codec.m_tiling_disable == 1 && SkipShape == 0 ){ // @@@@@@@
+ // FPDAM end: added by Sharp
+ //begin: added by SL at Sarnoff (03/03/99)
+- noteProgress("Encoding Shape Bitstream ....");
++ noteProgress((char*)"Encoding Shape Bitstream ....");
+ ShapeEnCoding(mzte_codec.m_Image[0].mask, mzte_codec.m_iWidth, mzte_codec.m_iHeight,
+ mzte_codec.m_iWvtDecmpLev,
+ mzte_codec.m_iSTOConstAlpha,
+@@ -664,7 +664,7 @@
+ {
+ Int col, err;
+
+- noteProgress("Encoding DC coefficients....");
++ noteProgress((char*)"Encoding DC coefficients....");
+
+ for (col=0; col<mzte_codec.m_iColors; col++)
+ {
+@@ -673,11 +673,11 @@
+
+ /* initialize DC coefficient info */
+ if ((err=ztqInitDC(0, col)))
+- errorHandler("ztqInitDC");
++ errorHandler((char*)"ztqInitDC");
+
+ /* quantize DC coefficients */
+ if ((err=encQuantizeDC(col)))
+- errorHandler("encQuantizeDC");
++ errorHandler((char*)"encQuantizeDC");
+
+ /* losslessly encoding DC coefficients */
+ wavelet_dc_encode(col);
+@@ -685,7 +685,7 @@
+ // writeStats();
+ }
+
+- noteProgress("Completed encoding DC coefficients.");
++ noteProgress((char*)"Completed encoding DC coefficients.");
+ }
+
+ /**********************************************************/
+@@ -702,7 +702,7 @@
+ Put_Quant_and_Max_SQBB(snr_image, spa_lev, col);
+ }
+ for (col=0; col<mzte_codec.m_iColors; col++) {
+- noteProgress("Single-Quant Mode (Band by Band) - Spatial %d, SNR 0, "\
++ noteProgress((char*)"Single-Quant Mode (Band by Band) - Spatial %d, SNR 0, "\
+ "Color %d",spa_lev,col);
+
+ mzte_codec.m_iCurColor = col;
+@@ -754,7 +754,7 @@
+ SNR_IMAGE *snr_image;
+
+
+- noteProgress("Encoding AC coefficients - Single-Quant Mode....");
++ noteProgress((char*)"Encoding AC coefficients - Single-Quant Mode....");
+
+ /*------- AC: Set spatial and SNR levels to zero -------*/
+ mzte_codec.m_iCurSpatialLev = 0;
+@@ -776,11 +776,11 @@
+
+ /* initialize AC coefficient info for each color component */
+ if ((err=ztqInitAC(0, col)))
+- errorHandler("ztqInitAC");
++ errorHandler((char*)"ztqInitAC");
+
+ /* quantize and mark zerotree structure for AC coefficients */
+ if ((err=encQuantizeAndMarkAC(col)))
+- errorHandler("encQuantizeAndMarkAC");
++ errorHandler((char*)"encQuantizeAndMarkAC");
+ }
+
+
+@@ -831,7 +831,7 @@
+ /*mzte_codec.m_iTargetSpatialLev = 1;
+ mzte_codec.m_iTargetSNRLev = 1; */ //deleted by SL at Sarnoff (03/03/99)
+
+- noteProgress("Completed encoding AC coefficients - Single-Quant Mode.");
++ noteProgress((char*)"Completed encoding AC coefficients - Single-Quant Mode.");
+ }
+
+
+@@ -845,22 +845,22 @@
+ static Int texture_snr_layer_id=0;
+
+ if(mzte_codec.m_bStartCodeEnable){
+- noteProgress("Encoding Multi-Quant Mode Layer with SNR start code....");
++ noteProgress((char*)"Encoding Multi-Quant Mode Layer with SNR start code....");
+ /* header */
+ emit_bits((UShort)texture_snr_layer_start_code>>16,16);
+ emit_bits((UShort)texture_snr_layer_start_code,16);
+ emit_bits((UShort)texture_snr_layer_id++,5);
+ }
+ else
+- noteProgress("Encoding Multi-Quant Mode Layer without SNR start code....");
++ noteProgress((char*)"Encoding Multi-Quant Mode Layer without SNR start code....");
+
+- noteProgress("Multi-Quant Mode - Spatial %d, SNR %d", spa_lev,snr_lev);
++ noteProgress((char*)"Multi-Quant Mode - Spatial %d, SNR %d", spa_lev,snr_lev);
+
+ for(col=0;
+ col < NCOL;
+ col++)
+ {
+- noteDetail("width=%d height=%d",mzte_codec.m_SPlayer[col].width,
++ noteDetail((char*)"width=%d height=%d",mzte_codec.m_SPlayer[col].width,
+ mzte_codec.m_SPlayer[col].height);
+
+ /* Set global color variable */
+@@ -869,7 +869,7 @@
+ /* Set quant value */
+ snr_image=&(mzte_codec.m_SPlayer[col].SNRlayer.snr_image);
+ snr_image->quant = mzte_codec.m_Qinfo[col][spa_lev].Quant[snr_lev];
+- noteDebug("AC quant=%d",
++ noteDebug((char*)"AC quant=%d",
+ mzte_codec.m_Qinfo[col][spa_lev].Quant[snr_lev]);
+
+ /* initialization of spatial dimensions for each color component */
+@@ -879,11 +879,11 @@
+ /* get maximum residual value - this one is derived from user Q inputs not
+ actual values. Also assign skip modes. */
+ updateResidMaxAndAssignSkips(col);
+- noteDebug("resid_max=%d\n",snr_image->residual_max);
++ noteDebug((char*)"resid_max=%d\n",snr_image->residual_max);
+
+ /* quantize and mark zerotree structure for AC coefficients */
+ if (encQuantizeAndMarkAC(col))
+- errorHandler("encQuantizeAndMarkAC");
++ errorHandler((char*)"encQuantizeAndMarkAC");
+
+ // Put_Quant_and_Max(snr_image); // hjlee 0901
+ Put_Quant_and_Max(snr_image,spa_lev,col); // hjlee 0901
+@@ -900,7 +900,7 @@
+
+ /* Update states of AC coefficients */
+ if (encUpdateStateAC(mzte_codec.m_iCurColor))
+- errorHandler("encUpdateStateAC");
++ errorHandler((char*)"encUpdateStateAC");
+ }
+ }
+
+@@ -914,12 +914,12 @@
+ // hjlee 0901
+ /*------- AC: Initialize QList Structure -------*/
+ if ((err=ztqQListInit()))
+- errorHandler("Allocating memory for QList information.");
++ errorHandler((char*)"Allocating memory for QList information.");
+
+ /* Initialize coeffs */
+ setSpatialLevelAndDimensions(0,0);
+ if ((err=ztqInitAC(0,0)))
+- errorHandler("ztqInitAC");
++ errorHandler((char*)"ztqInitAC");
+
+ if (mzte_codec.m_iColors > 1)
+ {
+@@ -928,7 +928,7 @@
+ else
+ setSpatialLevelAndDimensions(0,1);
+ if ((err=ztqInitAC(0,1)))
+- errorHandler("ztqInitAC");
++ errorHandler((char*)"ztqInitAC");
+ }
+ if (mzte_codec.m_iColors > 2)
+ {
+@@ -937,7 +937,7 @@
+ else
+ setSpatialLevelAndDimensions(0,2);
+ if ((err=ztqInitAC(0,2)))
+- errorHandler("ztqInitAC");
++ errorHandler((char*)"ztqInitAC");
+ }
+
+
+@@ -993,7 +993,7 @@
+ #endif
+ abort();
+ if ((bitfile=fopen(fname,"wb"))==NULL)
+- errorHandler("Can't open file '%s' for writing.",fname);
++ errorHandler((char*)"Can't open file '%s' for writing.",fname);
+ }
+
+ /* initialize the buffer */
+@@ -1129,7 +1129,7 @@
+
+ /*------- DC: Open and initialize bitstream file -------*/
+ if ((bitfile=fopen(mzte_codec.m_cBitFile,"wb"))==NULL)
+- errorHandler("Can't open file '%s' for writing.",
++ errorHandler((char*)"Can't open file '%s' for writing.",
+ mzte_codec.m_cBitFile);
+
+ /* for PEZW, always enabled */
+@@ -1213,7 +1213,7 @@
+ anafilter = (FILTER **) malloc(sizeof(FILTER *)*mzte_codec.m_iWvtDecmpLev);
+ synfilter = (FILTER **) malloc(sizeof(FILTER *)*mzte_codec.m_iWvtDecmpLev);
+ if(anafilter == NULL || synfilter == NULL)
+- errorHandler("Error allocating memory for filters\n");
++ errorHandler((char*)"Error allocating memory for filters\n");
+ for(i=0;i<mzte_codec.m_iWvtDecmpLev; i++) {
+ choose_wavelet_filter(&(anafilter[i]),
+ &(synfilter[mzte_codec.m_iWvtDecmpLev-1-i]),
+@@ -1364,7 +1364,7 @@
+ // fprintf(stdout,"Coeffinfo memory allocation done!\n");
+ /*------- DC: Open and initialize bitstream file -------*/
+ if ((bitfile=fopen(mzte_codec.m_cBitFile,"wb"))==NULL)
+- errorHandler("Can't open file '%s' for writing.", mzte_codec.m_cBitFile);
++ errorHandler((char*)"Can't open file '%s' for writing.", mzte_codec.m_cBitFile);
+ init_bit_packing_fp(bitfile,1);
+ tile_table_pos = header_Enc(synfilter);
+ // @@@@@@@@@@
+@@ -1393,7 +1393,7 @@
+
+ if ( iTile != 0 ){
+ if ((bitfile=fopen(mzte_codec.m_cBitFile,"ab"))==NULL)
+- errorHandler("Can't open file '%s' for writing.",mzte_codec.m_cBitFile);
++ errorHandler((char*)"Can't open file '%s' for writing.",mzte_codec.m_cBitFile);
+ fseek(bitfile,0,SEEK_END);
+ init_bit_packing_fp(bitfile,1);
+ }
+@@ -1415,7 +1415,7 @@
+ // end: added by Sharp (99/2/16)
+
+ /* DISCRETE WAVELET TRANSFORM */
+- noteProgress("Wavelet Transform....");
++ noteProgress((char*)"Wavelet Transform....");
+
+
+ // begin: modified by Sharp (99/5/10)
+@@ -1435,7 +1435,7 @@
+
+ // choose_wavelet_filter(&anafilter, &synfilter, mzte_codec.m_iWvtType); // hjlee 0901
+ // perform_DWT(anafilter); deleted by Sharp (99/2/16)
+- noteProgress("Completed wavelet transform.");
++ noteProgress((char*)"Completed wavelet transform.");
+
+ // begin: added by Sharp (99/4/7)
+ if ( mzte_codec.m_tiling_disable == 0 ){
+@@ -1534,7 +1534,7 @@
+
+ // end: added by Sharp (99/2/16)
+ /*----- free up coeff data structure -----*/
+- noteDetail("Freeing up encoding data structures....");
++ noteDetail((char*)"Freeing up encoding data structures....");
+ for (col=0; col<mzte_codec.m_iColors; col++) {
+ // begin: added by Sharp (99/2/16)
+ /* delete */ free (mzte_codec.m_Image[col].data);
+@@ -1560,9 +1560,9 @@
+ delete anafilter;
+ delete synfilter;
+ // end: added by Sharp (99/3/29)
+- noteDetail("Completed freeing up encoding data structures.");
++ noteDetail((char*)"Completed freeing up encoding data structures.");
+
+- noteProgress("\n----- Encoding Completed. -----\n");
++ noteProgress((char*)"\n----- Encoding Completed. -----\n");
+ }
+ else { /* this part should be copyed from VERSION 1 FCD software later */
+
+@@ -1573,7 +1573,7 @@
+ anafilter = (FILTER **) malloc(sizeof(FILTER *)*mzte_codec.m_iWvtDecmpLev);
+ synfilter = (FILTER **) malloc(sizeof(FILTER *)*mzte_codec.m_iWvtDecmpLev);
+ if(anafilter == NULL || synfilter == NULL)
+- errorHandler("Error allocating memory for filters\n");
++ errorHandler((char*)"Error allocating memory for filters\n");
+ for(i=0;i<mzte_codec.m_iWvtDecmpLev; i++) {
+ choose_wavelet_filter(&(anafilter[i]),
+ &(synfilter[mzte_codec.m_iWvtDecmpLev-1-i]),
+@@ -1651,18 +1651,18 @@
+ // fprintf(stdout,"Coeffinfo memory allocation done!\n");
+
+ /* DISCRETE WAVELET TRANSFORM */
+- noteProgress("Wavelet Transform....");
++ noteProgress((char*)"Wavelet Transform....");
+
+
+
+ // choose_wavelet_filter(&anafilter, &synfilter, mzte_codec.m_iWvtType); // hjlee 0901
+ perform_DWT(anafilter);
+- noteProgress("Completed wavelet transform.");
++ noteProgress((char*)"Completed wavelet transform.");
+
+ TextureObjectLayer_enc_V1(synfilter);
+
+ /*----- free up coeff data structure -----*/
+- noteDetail("Freeing up encoding data structures....");
++ noteDetail((char*)"Freeing up encoding data structures....");
+ for (col=0; col<mzte_codec.m_iColors; col++) {
+ if (mzte_codec.m_SPlayer[col].coeffinfo[0] != NULL)
+ delete (mzte_codec.m_SPlayer[col].coeffinfo[0]);
+@@ -1671,9 +1671,9 @@
+ delete (mzte_codec.m_SPlayer[col].coeffinfo);
+ mzte_codec.m_SPlayer[col].coeffinfo = NULL;
+ }
+- noteDetail("Completed freeing up encoding data structures.");
++ noteDetail((char*)"Completed freeing up encoding data structures.");
+
+- noteProgress("\n----- Encoding Completed. -----\n");
++ noteProgress((char*)"\n----- Encoding Completed. -----\n");
+
+ }
+ }
+@@ -1739,7 +1739,7 @@
+ }
+
+ if ( mzte_codec.m_iAlphaChannel && mzte_codec.m_iTextureTileType == BOUNDA_TILE ){
+- noteProgress("Encoding Tile Shape Bitstream ....");
++ noteProgress((char*)"Encoding Tile Shape Bitstream ....");
+ ShapeEnCoding(mzte_codec.m_Image[0].mask, mzte_codec.m_iWidth, mzte_codec.m_iHeight,
+ mzte_codec.m_iWvtDecmpLev,
+ mzte_codec.m_iSTOConstAlpha,
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_wavelet_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_wavelet_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_wavelet_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,178 @@
+--- common/video/iso-mpeg4/src/vtc_main_wavelet.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_main_wavelet.cpp 2009-11-19 03:07:44.000000000 -0700
+@@ -125,7 +125,7 @@
+ *synfilter=&wav97Syn;
+ return;
+ default:
+- errorHandler("Filter type %d is not available.",type);
++ errorHandler((char*)"Filter type %d is not available.",type);
+ }
+ }
+
+@@ -171,10 +171,10 @@
+
+ if ((outcoeff[col] =
+ (Int *)malloc(sizeof(Int)*width[col]*height[col]))==NULL)
+- errorHandler("Memory error: outcoeff\n");
++ errorHandler((char*)"Memory error: outcoeff\n");
+ if ((outmask[col] =
+ (UChar *)malloc(sizeof(Char)*width[col]*height[col]))==NULL)
+- errorHandler("Memory error: outmask\n");
++ errorHandler((char*)"Memory error: outmask\n");
+
+ ret = do_DWT(inimage[col], inmask[col], width[col], height[col],
+ nLevels[col], 0, &(wvtfilter[col==0?0:1]),
+@@ -182,7 +182,7 @@
+
+
+ if (ret!=DWT_OK)
+- errorHandler("DWT Error Code %d\n", ret);
++ errorHandler((char*)"DWT Error Code %d\n", ret);
+
+ mzte_codec.m_iMean[col] = RemoveDCMean(outcoeff[col], outmask[col],
+ width[col], height[col], nLevels[col]);
+@@ -250,11 +250,11 @@
+
+ if ((inmask[col]=(UChar *)malloc(sizeof(UChar)*
+ Width[col]*Height[col]))==NULL)
+- errorHandler("Memory Failed\n");
++ errorHandler((char*)"Memory Failed\n");
+
+ if ((incoeff[col] = (Int *)malloc(sizeof(Int)*
+ Width[col]*Height[col]))==NULL)
+- errorHandler("Memory Failed\n");
++ errorHandler((char*)"Memory Failed\n");
+
+
+ /* copy dequantized coefficients to incoeff */
+@@ -275,11 +275,11 @@
+
+ if ((outmask[col] = (UChar *)malloc(sizeof(UChar)*
+ Width[col]*Height[col]))==NULL)
+- errorHandler("Memory Failed\n");
++ errorHandler((char*)"Memory Failed\n");
+
+ if ((outimage[col] = (UChar *)malloc(sizeof(UChar)*
+ Width[col]*Height[col]))==NULL)
+- errorHandler("Memory Failed\n");
++ errorHandler((char*)"Memory Failed\n");
+
+ if(mzte_codec.m_iQuantType==2) {
+ Int target_spatial_levels;
+@@ -299,7 +299,7 @@
+ nLevels[col], MinLevel, 0 /* byte */,
+ &(wvtfilter[col==0?0:1]), outimage[col], outmask[col], 0, fullsize );
+ if (ret!=DWT_OK)
+- errorHandler("DWT Error Code %d\n", ret);
++ errorHandler((char*)"DWT Error Code %d\n", ret);
+ free(incoeff[col]);
+ free(inmask[col]);
+ } /* col */
+@@ -449,25 +449,25 @@
+ /* memory allocation */
+ if (wordsize == 1) {
+ if ((inimage = (UChar *)malloc(sizeof(UChar)*TileWidth*3*TileHeight*3))==NULL)
+- errorHandler("Memory error: inimage\n");
++ errorHandler((char*)"Memory error: inimage\n");
+ } else {
+ if ((inimage = (UShort *)malloc(sizeof(UShort)*TileWidth*3*TileHeight*3))==NULL)
+- errorHandler("Memory error: inimage\n");
++ errorHandler((char*)"Memory error: inimage\n");
+ }
+ if ((inmask = (UChar *)malloc(sizeof(UChar)*TileWidth*3*TileHeight*3))==NULL)
+- errorHandler("Memory error: inmask\n");
++ errorHandler((char*)"Memory error: inmask\n");
+ memset(inmask, 1, sizeof(UChar)*TileWidth*3*TileHeight*3);
+
+ if ((outcoeff = (DATA *)malloc(sizeof(DATA)*TileWidth*3*TileHeight*3))==NULL)
+- errorHandler("Memory error: outcoeff\n");
++ errorHandler((char*)"Memory error: outcoeff\n");
+ if ((outmask = (UChar *)malloc(sizeof(Char)*TileWidth*3*TileHeight*3))==NULL)
+- errorHandler("Memory error: outmask\n");
++ errorHandler((char*)"Memory error: outmask\n");
+ memset(outmask,1, sizeof(UChar)*TileWidth*3*TileHeight*3);
+
+ if ((workcoeff = (DATA *)malloc(sizeof(DATA)*TileWidth*3*TileHeight*3))==NULL)
+- errorHandler("Memory error: workcoeff\n");
++ errorHandler((char*)"Memory error: workcoeff\n");
+ if ((workmask = (UChar *)malloc(sizeof(Char)*TileWidth*3*TileHeight*3))==NULL)
+- errorHandler("Memory error: workmask\n");
++ errorHandler((char*)"Memory error: workmask\n");
+
+ for (col=0; col<mzte_codec.m_iColors; col++) {
+ orgWidth = SrcImg[col].width;
+@@ -536,7 +536,7 @@
+ }
+ ret = do_DWT(inimage, inmask, width, height, nLevels, 0, wvtfilter, workcoeff, workmask);
+ if (ret!=DWT_OK)
+- errorHandler("DWT Error Code %d\n", ret);
++ errorHandler((char*)"DWT Error Code %d\n", ret);
+
+
+ for(level=1;level<=nLevels;level++) {
+@@ -629,11 +629,11 @@
+
+ if ((inmask[col]=(UChar *)malloc(sizeof(UChar)*
+ Width[col]*Height[col]))==NULL)
+- errorHandler("Memory Failed\n");
++ errorHandler((char*)"Memory Failed\n");
+
+ if ((incoeff[col] = (Int *)malloc(sizeof(Int)*
+ Width[col]*Height[col]))==NULL)
+- errorHandler("Memory Failed\n");
++ errorHandler((char*)"Memory Failed\n");
+
+
+ /* copy dequantized coefficients to incoeff */
+@@ -654,11 +654,11 @@
+
+ if ((outmask[col] = (UChar *)malloc(sizeof(UChar)*
+ Width[col]*Height[col]))==NULL)
+- errorHandler("Memory Failed\n");
++ errorHandler((char*)"Memory Failed\n");
+
+ if ((outimage[col] = (UChar *)malloc(sizeof(UChar)*
+ Width[col]*Height[col]))==NULL)
+- errorHandler("Memory Failed\n");
++ errorHandler((char*)"Memory Failed\n");
+
+ if(mzte_codec.m_iQuantType==2) {
+ Int target_spatial_levels;
+@@ -678,13 +678,13 @@
+ nLevels[col], MinLevel, 0 /* byte */,
+ &(wvtfilter[col==0?0:1]), outimage[col], outmask[col], 0, fullsize );
+ if (ret!=DWT_OK)
+- errorHandler("DWT Error Code %d\n", ret);
++ errorHandler((char*)"DWT Error Code %d\n", ret);
+ free(incoeff[col]);
+ free(inmask[col]);
+ } /* col */
+
+
+- noteProgress("Copying reconstructed image ...");
++ noteProgress((char*)"Copying reconstructed image ...");
+
+ /* printf("%d %d\n", mzte_codec.m_display_width, mzte_codec.m_display_height);*/
+ // FPDAM begin : modified by Sharp
+@@ -791,10 +791,10 @@
+
+
+ if ((outmask[col] = (UChar *)malloc(sizeof(UChar)* Width[col]*Height[col]))==NULL)
+- errorHandler("Memory Failed\n");
++ errorHandler((char*)"Memory Failed\n");
+
+ if ((outimage[col] = (UChar *)malloc(sizeof(UChar)* Width[col]*Height[col]))==NULL)
+- errorHandler("Memory Failed\n");
++ errorHandler((char*)"Memory Failed\n");
+
+ memset(outimage[col],0,sizeof(UChar)*Width[col]*Height[col]);
+
+@@ -835,7 +835,7 @@
+ }
+
+ if (ret!=DWT_OK)
+- errorHandler("DWT Error Code %d\n", ret);
++ errorHandler((char*)"DWT Error Code %d\n", ret);
+
+ } /* col */
+
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_write_image_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_write_image_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_main_write_image_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,67 @@
+--- common/video/iso-mpeg4/src/vtc_main_write_image.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_main_write_image.cpp 2009-11-19 03:13:56.000000000 -0700
+@@ -127,7 +127,7 @@
+ }
+ }
+ }
+- if(count==0) errorHandler("Impossible case occured, check program\n") ; /* impossible! no chroma available for this pixel ignore it */
++ if(count==0) errorHandler((char*)"Impossible case occured, check program\n") ; /* impossible! no chroma available for this pixel ignore it */
+ else {
+ for(col=1; col< colors; col++) {
+ outmask[col][(i>>1)*(Width[col]>>l)+(j>>1)] = DWT_IN;
+@@ -165,16 +165,16 @@
+ origin_x[col]>>l, origin_y[col]>>l, 0,
+ (usemask)?(STO_const_alpha?STO_const_alpha_value:MASK_VAL):RECTANGULAR,(col==0)?0:127);
+ if(ret!= DWT_OK)
+- errorHandler("DWT Error code %d", ret);
++ errorHandler((char*)"DWT Error code %d", ret);
+
+ ptr = recimage[col];
+ w = rwidth[col];
+ h = rheight[col];
+ if ( col == 0 )
+- noteProgress("Writing the reconstruction image: '%s(%dx%d)'",recImgFile,w,h);
++ noteProgress((char*)"Writing the reconstruction image: '%s(%dx%d)'",recImgFile,w,h);
+ for (i=0; i<h; i++) {
+ if ((status = fwrite((UChar *)ptr, sizeof(Char), w, outfptr)) != w)
+- errorHandler("Error in writing image file.");
++ errorHandler((char*)"Error in writing image file.");
+
+ ptr += w;
+ }
+@@ -183,7 +183,7 @@
+ ptr = recmask[col];
+ for (i=0; i<h; i++) {
+ if ((status = fwrite((UChar *)ptr, sizeof(Char), w, maskfptr)) != w)
+- errorHandler("Error in writing image file.");
++ errorHandler((char*)"Error in writing image file.");
+ ptr += w;
+ }
+ }
+@@ -273,7 +273,7 @@
+ }
+ }
+ }
+- if(count==0) errorHandler("Impossible case occured, check program\n") ; /* impossible! no chroma available for this pixel ignore it */
++ if(count==0) errorHandler((char*)"Impossible case occured, check program\n") ; /* impossible! no chroma available for this pixel ignore it */
+ else {
+ for(col=1; col< colors; col++) {
+ outmask[col][(i>>1)*(Width[col]>>l)+(j>>1)] = DWT_IN;
+@@ -317,7 +317,7 @@
+ // FPDAM begin: modified by Sharp
+
+ if(ret!= DWT_OK)
+- errorHandler("DWT Error code %d", ret);
++ errorHandler((char*)"DWT Error code %d", ret);
+
+ ptr = recimage[col];
+ w = rwidth[col];
+@@ -379,7 +379,7 @@
+
+ fp = fopen(recImgFile, "w");
+
+- noteProgress("Writing reconstructed image '%s'(%dx%d) ...",recImgFile, dWidth[0], dHeight[0]);
++ noteProgress((char*)"Writing reconstructed image '%s'(%dx%d) ...",recImgFile, dWidth[0], dHeight[0]);
+ for ( col=0; col<mzte_codec.m_iColors; col++ )
+ fwrite(frm[col], 1, dWidth[col]*dHeight[col], fp);
+ fclose(fp);
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_BinArCodec_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_BinArCodec_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_BinArCodec_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,20 @@
+--- common/video/iso-mpeg4/src/vtc_shape_BinArCodec.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_shape_BinArCodec.cpp 2009-11-19 03:19:21.000000000 -0700
+@@ -113,7 +113,7 @@
+ rLPS = ((coder -> R) >> 16) * cLPS;
+ if(c0 == 0 || c0==65536) return;
+ else if(c0==65537)
+- errorHandler("Impossible context occured\n");
++ errorHandler((char*)"Impossible context occured\n");
+ if (bit == LPS) {
+ coder -> L += coder->R - rLPS;
+ coder -> R = rLPS;
+@@ -272,7 +272,7 @@
+ if(c0 == 0) return (1);
+ else if(c0==65536) return(0);
+ else if(c0==65537)
+- errorHandler("Impossible context occured\n");
++ errorHandler((char*)"Impossible context occured\n");
+ rLPS = (decoder -> R >> 16) * cLPS;
+ if ( (decoder -> V - decoder -> L) >= (decoder -> R - rLPS) ) {
+ bit = LPS;
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_ShapeDecoding_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_ShapeDecoding_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_ShapeDecoding_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,74 @@
+--- common/video/iso-mpeg4/src/vtc_shape_ShapeDecoding.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_shape_ShapeDecoding.cpp 2009-11-19 03:25:29.000000000 -0700
+@@ -99,7 +99,7 @@
+ recmask = (UChar *)
+ malloc(coded_width*coded_height*sizeof(UChar));
+ if(outmask == NULL || recmask == NULL) {
+- errorHandler("Memory allocation failed\n");
++ errorHandler((char*)"Memory allocation failed\n");
+ }
+
+ #if 1
+@@ -112,7 +112,7 @@
+ if(!startCodeEnable) {
+ codedLevels = GetBitsFromStream_Still(4);
+ if(GetBitsFromStream_Still(1)!=MARKER_BIT)
+- errorHandler("Incorrect Marker bit in shape enhanced layer decoding.\n");
++ errorHandler((char*)"Incorrect Marker bit in shape enhanced layer decoding.\n");
+ /* if(*targetLevel < levels-codedLevels ) */
+ *targetLevel = levels-codedLevels;
+ }
+@@ -144,7 +144,7 @@
+ /* errorHandler("Error in retrieving TEXTURE_SPATIAL_START_CODE\n"); */
+ GetBitsFromStream_Still(5);
+ if(GetBitsFromStream_Still(1)!= MARKER_BIT)
+- errorHandler("Incorrect Marker bit in the end of Shape Bitstream\n");
++ errorHandler((char*)"Incorrect Marker bit in the end of Shape Bitstream\n");
+ }
+ // FPDAM begin: deleted by Sharp
+ /*
+@@ -183,7 +183,7 @@
+ *constAlphaValue = (UChar) GetBitsFromStream_Still(8);
+ // *shapeScalable = GetBitsFromStream_Still(1); // FPDAM : deleted by Sharp
+ if(GetBitsFromStream_Still(1)!=MARKER_BIT)
+- errorHandler("Incorrect Marker bit in header decoding.\n");
++ errorHandler((char*)"Incorrect Marker bit in header decoding.\n");
+ return(0);
+
+ }
+@@ -201,7 +201,7 @@
+ ShapeBaseDeCoding(outmask, w, h, change_CR_disable);
+
+ if(GetBitsFromStream_Still(1)!=MARKER_BIT)
+- errorHandler("Incorrect Marker bit in shape base layer decoding.\n");
++ errorHandler((char*)"Incorrect Marker bit in shape base layer decoding.\n");
+ return(0);
+ }
+
+@@ -224,7 +224,7 @@
+ GetBitsFromStream_Still(32);
+ GetBitsFromStream_Still(5);
+ if(GetBitsFromStream_Still(1)!=MARKER_BIT)
+- errorHandler("Incorrect Marker bit in shape enhanced layer decoding.\n");
++ errorHandler((char*)"Incorrect Marker bit in shape enhanced layer decoding.\n");
+ }
+
+ w = (coded_width >>k);
+@@ -236,7 +236,7 @@
+ half_mask = (UChar *) calloc(w*h2, sizeof(UChar));
+ cur_mask = (UChar *) calloc(w2*h2, sizeof(UChar));
+ if(low_mask==NULL || cur_mask==NULL || half_mask==NULL){
+- errorHandler("memory alloc. error: spa_mask!\n");
++ errorHandler((char*)"memory alloc. error: spa_mask!\n");
+ }
+
+ for(l=0;l<h;l++){
+@@ -248,7 +248,7 @@
+ ShapeEnhDeCoding(low_mask, half_mask, cur_mask, w2, h2, filter);
+
+ if(GetBitsFromStream_Still(1)!=MARKER_BIT)
+- errorHandler("Incorrect Marker bit in shape enhanced layer decoding.\n");
++ errorHandler((char*)"Incorrect Marker bit in shape enhanced layer decoding.\n");
+
+ for(l=0;l<h2;l++){
+ for(m=0; m<w2;m++){
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_ShapeEncoding_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_ShapeEncoding_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_shape_ShapeEncoding_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,47 @@
+--- common/video/iso-mpeg4/src/vtc_shape_ShapeEncoding.cpp.orig 2005-05-04 13:56:00.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_shape_ShapeEncoding.cpp 2009-11-19 03:31:37.000000000 -0700
+@@ -97,7 +97,7 @@
+ recmask = (UChar *)
+ malloc(coded_width*coded_height*sizeof(UChar));
+ if(outmask == NULL || recmask == NULL ) {
+- errorHandler("Memory allocation failed\n");
++ errorHandler((char*)"Memory allocation failed\n");
+ }
+
+ memset(recmask, 0, coded_width*coded_height);
+@@ -181,7 +181,7 @@
+
+ inmask =(UChar *) malloc(sizeof(UChar)*w*h);
+ if(inmask == (UChar *)NULL) {
+- errorHandler("Memory allocation failed\n");
++ errorHandler((char*)"Memory allocation failed\n");
+ }
+ /* low low band context */
+ for(l=0; l<h; l++) {
+@@ -223,7 +223,7 @@
+ half_mask = (UChar *) calloc(w*h2, sizeof(UChar));
+ cur_mask = (UChar *) calloc(w2*h2, sizeof(UChar));
+ if(low_mask==NULL || cur_mask==NULL || half_mask==NULL){
+- errorHandler("memory alloc. error: spa_mask!\n");
++ errorHandler((char*)"memory alloc. error: spa_mask!\n");
+ }
+
+ for(l=0;l<h;l++){
+@@ -249,7 +249,7 @@
+ #endif
+ /* vertical first */
+ if((ret=SynthesizeMaskHalfLevel(outmask, coded_width, coded_height, k, filter, DWT_NONZERO_HIGH, DWT_VERTICAL))!=0) {
+- errorHandler("Error Code=%d\n", ret);
++ errorHandler((char*)"Error Code=%d\n", ret);
+ }
+
+ for(l=0;l<h2;l++){
+@@ -259,7 +259,7 @@
+ }
+
+ if((ret=SynthesizeMaskHalfLevel(outmask, coded_width, coded_height, k, filter, DWT_NONZERO_HIGH, DWT_HORIZONTAL))!=0) {
+- errorHandler("Error Code=%d\n", ret);
++ errorHandler((char*)"Error Code=%d\n", ret);
+ }
+
+ for(l=0;l<h2;l++){
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_wavelet_download_filter_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_wavelet_download_filter_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_wavelet_download_filter_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,94 @@
+--- common/video/iso-mpeg4/src/vtc_wavelet_download_filter.cpp.orig 2006-04-05 12:27:30.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_wavelet_download_filter.cpp 2009-11-19 03:41:52.000000000 -0700
+@@ -85,7 +85,7 @@
+ Void CVTCCommon::check_marker(Int marker_bit)
+ {
+ if(marker_bit != MARKER_BIT)
+- errorHandler("Error in download wavelet filters\n");
++ errorHandler((char*)"Error in download wavelet filters\n");
+ }
+
+
+@@ -104,22 +104,22 @@
+ if(filter->DWT_Type == 0){
+ if(((Short*)filter->LPCoeff)[i] !=
+ ((Short*)filter->LPCoeff)[filter->LPLength-i-1])
+- errorHandler("Lowpass filter is not symmetric.\n");
++ errorHandler((char*)"Lowpass filter is not symmetric.\n");
+ }
+ else
+ if(((double*)filter->LPCoeff)[i] !=
+ ((double*)filter->LPCoeff)[filter->LPLength-i-1])
+- errorHandler("Lowpass filter is not symmetric.\n");
++ errorHandler((char*)"Lowpass filter is not symmetric.\n");
+
+
+ /* -------- check highpass filter ---------- */
+ half=filter->HPLength>>1;
+ /* check for error */
+ if(half<<1==filter->HPLength && filter->DWT_Class==DWT_ODD_SYMMETRIC)
+- errorHandler("Lowpass filter has odd taps, while highpass filter has even"\
++ errorHandler((char*)"Lowpass filter has odd taps, while highpass filter has even"\
+ " taps->\n");
+ if(half<<1!=filter->HPLength && filter->DWT_Class==DWT_EVEN_SYMMETRIC)
+- errorHandler("Lowpass filter has even taps, while highpass filter has odd"\
++ errorHandler((char*)"Lowpass filter has even taps, while highpass filter has odd"\
+ " taps.\n");
+
+ if(filter->DWT_Class==DWT_ODD_SYMMETRIC){ /* ODD_SYMMETRIC, symmetric */
+@@ -127,24 +127,24 @@
+ if(filter->DWT_Type == 0){
+ if(((Short*)filter->HPCoeff)[i] !=
+ ((Short*)filter->HPCoeff)[filter->HPLength-i-1])
+- errorHandler("Highpass filter is not symmetric.\n");
++ errorHandler((char*)"Highpass filter is not symmetric.\n");
+ }
+ else
+ if(((double*)filter->HPCoeff)[i] !=
+ ((double*)filter->HPCoeff)[filter->HPLength-i-1])
+- errorHandler("Highpass filter is not symmetric.\n");
++ errorHandler((char*)"Highpass filter is not symmetric.\n");
+ }
+ else{ /* EVEN_SYMMETRIC, antisymmetric */
+ for(i=0;i<half;i++)
+ if(filter->DWT_Type == 0){
+ if(((Short*)filter->HPCoeff)[i] !=-
+ ((Short*)filter->HPCoeff)[filter->HPLength-i-1])
+- errorHandler("Highpass filter is not antisymmetric.\n");
++ errorHandler((char*)"Highpass filter is not antisymmetric.\n");
+ }
+ else
+ if(((double*)filter->HPCoeff)[i] !=-
+ ((double*)filter->HPCoeff)[filter->HPLength-i-1])
+- errorHandler("Highpass filter is not antisymmetric.\n");
++ errorHandler((char*)"Highpass filter is not antisymmetric.\n");
+ }
+
+ }
+@@ -222,7 +222,7 @@
+ /* hjlee 0901 */
+ filter = (FILTER *)malloc(sizeof(FILTER));
+ if(filter == NULL)
+- errorHandler("Memory allocation error\n");
++ errorHandler((char*)"Memory allocation error\n");
+ filter->DWT_Type = (type ==0)? DWT_INT_TYPE: DWT_DBL_TYPE;
+
+
+@@ -236,7 +236,7 @@
+ LPS=(Short *)malloc(sizeof(Short)*filter->LPLength);
+ HPS=(Short *)malloc(sizeof(Short)*filter->HPLength);
+ if(LPS==NULL || HPS==NULL)
+- errorHandler("Cannot allocate memory to download wavelet filters\n");
++ errorHandler((char*)"Cannot allocate memory to download wavelet filters\n");
+ filter->LPCoeff=LPS;
+ filter->HPCoeff=HPS;
+ }
+@@ -244,7 +244,7 @@
+ LPD=(double *)malloc(sizeof(double)*filter->LPLength);
+ HPD=(double *)malloc(sizeof(double)*filter->HPLength);
+ if(LPD==NULL || HPD==NULL)
+- errorHandler("Cannot allocate memory to download wavelet filters\n");
++ errorHandler((char*)"Cannot allocate memory to download wavelet filters\n");
+ filter->LPCoeff=LPD;
+ filter->HPCoeff=HPD;
+ }
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ac_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ac_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ac_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,80 @@
+--- common/video/iso-mpeg4/src/vtc_zte_ac.cpp.orig 2005-05-04 13:56:01.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_zte_ac.cpp 2009-11-19 03:56:59.000000000 -0700
+@@ -157,7 +157,7 @@
+ (ace->bitCount)++;
+ if (!(ace->bitsLeft)) {
+ if (!(ace->bitstream))
+- errorHandler("Failure to allocate space for array Bitstream " \
++ errorHandler((char*)"Failure to allocate space for array Bitstream " \
+ "in ac_encoder structure");
+ switch (flag=(ace->bitstreamLength>=MAX_BUFFER)) {
+ case 1:
+@@ -208,7 +208,7 @@
+ ace->bitstreamLength = 0;
+ ace->bitstream=(BYTETYPE *)malloc((MAX_BUFFER+10)*sizeof(BYTETYPE));
+ if (ace->bitstream == NULL)
+- errorHandler("can't allocate memory for ace->bitstream");
++ errorHandler((char*)"can't allocate memory for ace->bitstream");
+ // assert((ace->bitstream=(BYTETYPE *)malloc((MAX_BUFFER+10)*sizeof(BYTETYPE))));
+ zeroStrLen=0;
+
+@@ -271,7 +271,7 @@
+ register long bitCount;
+ //static int count=0;
+ if (sym<0 || sym>=acm->nsym)
+- errorHandler("Invalid symbol passed to mzte_ac_encode_symbol " \
++ errorHandler((char*)"Invalid symbol passed to mzte_ac_encode_symbol " \
+ "(sym=%d while nsym=%d)",
+ sym,acm->nsym);
+
+@@ -340,7 +340,7 @@
+ zeroStrLen+=(!t)?1:-zeroStrLen;
+ if(zeroStrLen==STUFFING_CNT) {
+ if (!mzte_input_bit(acd))
+- errorHandler("Error in decoding stuffing bits " \
++ errorHandler((char*)"Error in decoding stuffing bits " \
+ "(must be 1 after %d 0's)",STUFFING_CNT);
+ zeroStrLen=0;
+ }
+@@ -363,7 +363,7 @@
+
+ /* remove first stuffing bit */
+ if(!get_X_bits(1))
+- errorHandler("Error in extracting the stuffing bit at the\n"\
++ errorHandler((char*)"Error in extracting the stuffing bit at the\n"\
+ "beginning of arithmetic decoding"\
+ "refer mzte_encoder_init in ac.c)");
+
+@@ -392,7 +392,7 @@
+ restore_arithmetic_offset(acd->bitsLeft);
+ acd->bitCount += acd->bitsLeft;
+ if ((acd->bitCount)%8)
+- errorHandler("Did not get alignment in arithmetic decoding");
++ errorHandler((char*)"Did not get alignment in arithmetic decoding");
+ }
+
+ Int CVTCDecoder::mzte_ac_decode_symbol(ac_decoder *acd,ac_model *acm)
+@@ -457,12 +457,12 @@
+ acm->adapt = adapt;
+
+ if ((acm->freq=(UShort *)malloc(nsym*sizeof(UShort)))==NULL)
+- errorHandler("Can't allocate %d bytes for acm->freq in " \
++ errorHandler((char*)"Can't allocate %d bytes for acm->freq in " \
+ "mzte_ac_model_init.",
+ nsym*sizeof(UShort));
+
+ if ((acm->cfreq=(UShort *) malloc((nsym+1)*sizeof(UShort)))==NULL)
+- errorHandler("Can't allocate %d bytes for acm->cfreq in " \
++ errorHandler((char*)"Can't allocate %d bytes for acm->cfreq in " \
+ "mzte_ac_model_init.",
+ (nsym+1)*sizeof(UShort));
+
+@@ -484,7 +484,7 @@
+ }
+ }
+ if (acm->cfreq[0] > acm->Max_frequency)
+- errorHandler("error in acm->cfreq[0]");
++ errorHandler((char*)"error in acm->cfreq[0]");
+ }
+ else {
+ for (i=0; i < nsym; i++) {
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_bitpack_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_bitpack_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_bitpack_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,29 @@
+--- common/video/iso-mpeg4/src/vtc_zte_bitpack.cpp.orig 2005-05-04 13:56:01.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_zte_bitpack.cpp 2009-11-19 03:50:46.000000000 -0700
+@@ -428,7 +428,7 @@
+
+ /* test if enough bits */
+ if(n>MAXLOOKBITS)
+- errorHandler("LookBitsFromStream() can only return a maximum of "\
++ errorHandler((char*)"LookBitsFromStream() can only return a maximum of "\
+ "%d bits.\n", MAXLOOKBITS);
+
+ if(buffer_length<BUFFER_SIZE-EXTRABYTES)
+@@ -771,7 +771,7 @@
+
+ /* skip error packets,bbc, 6/29/98 */
+ if(RESYNCH_MARKER != get_X_bits(17)){
+- noteWarning("Incorrect resynch marker.");
++ noteWarning((char*)"Incorrect resynch marker.");
+ errSignal=-10;
+ return(TU_max);
+ }
+@@ -885,7 +885,7 @@
+ /* if(nbits>16) */
+ /* errorHandler("Cannot rewind more than 16 bits yet."); */
+ if(bit_num>64)
+- errorHandler("Cannot rewind %d bits. Rewinded bit_num=%d.",nbits,bit_num);
++ errorHandler((char*)"Cannot rewind %d bits. Rewinded bit_num=%d.",nbits,bit_num);
+ }
+
+
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscanUtil_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscanUtil_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscanUtil_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,38 @@
+--- common/video/iso-mpeg4/src/vtc_zte_ztscanUtil.cpp.orig 2005-05-04 13:56:01.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_zte_ztscanUtil.cpp 2009-11-19 04:28:52.000000000 -0700
+@@ -117,7 +117,7 @@
+ {
+ if ((acmBPMag[col][l]
+ =(ac_model *)calloc(WVTDECOMP_NUMBITPLANES(col,l),sizeof(ac_model)))==NULL&& WVTDECOMP_NUMBITPLANES(col,l)!=0) // modified by Sharp (99/5/10)
+- errorHandler("Can't alloc acmBPMag in probModelInitSQ.");
++ errorHandler((char*)"Can't alloc acmBPMag in probModelInitSQ.");
+ for(i=0;i<WVTDECOMP_NUMBITPLANES(col,l);i++)
+ {
+ mzte_ac_model_init(&acmBPMag[col][l][i],2,NULL,ADAPT,1);
+@@ -194,7 +194,7 @@
+ // int jj = mzte_codec.m_SPlayer[col].SNRlayer.snr_image.wvtDecompResNumBitPlanes ;
+ if ((acmBPMag[col][l]
+ =(ac_model *)calloc(WVTDECOMP_NUMBITPLANES(col,l),sizeof(ac_model)))==NULL&& WVTDECOMP_NUMBITPLANES(col,l)!=0) // modified by Sharp (99/5/10)
+- errorHandler("Can't alloc acmBPMag in probModelInitSQ.");
++ errorHandler((char*)"Can't alloc acmBPMag in probModelInitSQ.");
+ for(i=0;i<WVTDECOMP_NUMBITPLANES(col,l);i++)
+ {
+ mzte_ac_model_init(&acmBPMag[col][l][i],2,NULL,ADAPT,1);
+@@ -203,7 +203,7 @@
+
+ if ((acmBPRes[col][l]
+ =(ac_model *)calloc(WVTDECOMP_RES_NUMBITPLANES(col),sizeof(ac_model)))==NULL&& WVTDECOMP_RES_NUMBITPLANES(col) != 0 ) // modified by Sharp (99/5/10)
+- errorHandler("Can't alloc acmBPRes in probModelInitMQ.");
++ errorHandler((char*)"Can't alloc acmBPRes in probModelInitMQ.");
+ for(i=0;i<WVTDECOMP_RES_NUMBITPLANES(col);i++)
+ {
+ mzte_ac_model_init(&acmBPRes[col][l][i],2,NULL,ADAPT,1);
+@@ -522,7 +522,7 @@
+ w-=level_w;
+ break;
+ default:
+- errorHandler("%d is not a choice for subband_loc.",subband_loc);
++ errorHandler((char*)"%d is not a choice for subband_loc.",subband_loc);
+ }
+
+ if(wvt_level<=3)
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscan_dec_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscan_dec_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscan_dec_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,191 @@
+--- common/video/iso-mpeg4/src/vtc_zte_ztscan_dec.cpp.orig 2005-05-04 13:56:01.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_zte_ztscan_dec.cpp 2009-11-19 04:13:55.000000000 -0700
+@@ -242,7 +242,7 @@
+ ********************************************************/
+ Void CVTCDecoder::wavelet_dc_decode(Int c)
+ {
+- noteDetail("Decoding DC (wavelet_dc_decode)....");
++ noteDetail((char*)"Decoding DC (wavelet_dc_decode)....");
+ color=c;
+
+ //Added by Sarnoff for error resilience, 3/5/99
+@@ -270,7 +270,7 @@
+
+ callc_decode();
+ iDC_predict(color);
+- noteDetail("Completed decoding DC.");
++ noteDetail((char*)"Completed decoding DC.");
+
+ }
+
+@@ -318,7 +318,7 @@
+ // 1127
+ numBP = ceilLog2(mzte_codec.m_iMaxDC+1); // modified by Sharp
+ if ((acm_bpdc=(ac_model *)calloc(numBP,sizeof(ac_model)))==NULL)
+- errorHandler("Can't allocate memory for prob model.");
++ errorHandler((char*)"Can't allocate memory for prob model.");
+
+ for (i=0; i<numBP; i++) {
+ acm_bpdc[i].Max_frequency = Bitplane_Max_frequency;
+@@ -462,7 +462,7 @@
+ {
+ SNR_IMAGE *snr_image;
+
+- noteDetail("Encoding AC (wavelet_higher_bands_encode_SQ)....");
++ noteDetail((char*)"Encoding AC (wavelet_higher_bands_encode_SQ)....");
+
+ color=col;
+ snr_image=&(mzte_codec.m_SPlayer[color].SNRlayer.snr_image);
+@@ -488,7 +488,7 @@
+ }
+ //End modified by Sarnoff for error resilience, 3/5/99
+
+- noteDetail("Completed encoding AC.");
++ noteDetail((char*)"Completed encoding AC.");
+ }
+
+
+@@ -662,7 +662,7 @@
+ ********************************************************/
+ Void CVTCDecoder::wavelet_higher_bands_decode_SQ_tree()
+ {
+- noteDetail("Decoding AC band (wavelet_higher_bands_decode_SQ)....");
++ noteDetail((char*)"Decoding AC band (wavelet_higher_bands_decode_SQ)....");
+
+ //Modified by Sarnoff for error resilience, 3/5/99
+ if(mzte_codec.m_usErrResiDisable){
+@@ -692,7 +692,7 @@
+ }
+ //End modified by Sarnoff for error resilience, 3/5/99
+
+- noteDetail("Completed decoding AC band.");
++ noteDetail((char*)"Completed decoding AC band.");
+ }
+
+
+@@ -896,7 +896,7 @@
+ mag_sign_decode_SQ(h,w);
+ break;
+ default:
+- errorHandler("Invalid zerotree symbol in single quant decode");
++ errorHandler((char*)"Invalid zerotree symbol in single quant decode");
+ }
+
+ #if 0
+@@ -970,7 +970,7 @@
+ mag_sign_decode_SQ(h,w);
+ break;
+ default:
+- errorHandler("Invalid zerotree symbol in single quant decode");
++ errorHandler((char*)"Invalid zerotree symbol in single quant decode");
+ }
+ }
+
+@@ -1085,7 +1085,7 @@
+ ********************************************************/
+ Void CVTCDecoder::wavelet_higher_bands_decode_MQ(Int scanDirection)
+ {
+- noteDetail("Decoding AC band (wavelet_higher_bands_decode_MQ)....");
++ noteDetail((char*)"Decoding AC band (wavelet_higher_bands_decode_MQ)....");
+
+ /* init arithmetic coder */
+ mzte_ac_decoder_init(&acd);
+@@ -1168,7 +1168,7 @@
+ {
+ SNR_IMAGE *snr_image;
+
+- noteProgress(" Coding Layer %d, Color %d", layer - (color!=0), color);
++ noteProgress((char*)" Coding Layer %d, Color %d", layer - (color!=0), color);
+
+ ac_h2=acH2;
+ ac_w2=acW2;
+@@ -1310,7 +1310,7 @@
+ coeffinfo[h][w].type=zt_type = czt_type ? VZTR : ZTR;
+ break;
+ default:
+- errorHandler("Invalid state (%d) in multi-quant encoding.",
++ errorHandler((char*)"Invalid state (%d) in multi-quant encoding.",
+ coeffinfo[h][w].state);
+ }
+ #ifdef _SHAPE_
+@@ -1331,7 +1331,7 @@
+ zt_type = coeffinfo[h][w].type = ZTR;
+ break;
+ default:
+- errorHandler("Invalid state (%d) in multi-quant encoding.",
++ errorHandler((char*)"Invalid state (%d) in multi-quant encoding.",
+ coeffinfo[h][w].state);
+ }
+ }
+@@ -1361,7 +1361,7 @@
+ mag_sign_decode_MQ(h,w);
+ break;
+ default:
+- errorHandler("Invalid type in multi quant decoding.");
++ errorHandler((char*)"Invalid type in multi quant decoding.");
+ }
+ }
+
+@@ -1566,7 +1566,7 @@
+ coeffinfo[h][w].type=zt_type = czt_type ? VZTR : ZTR;
+ break;
+ default:
+- errorHandler("Invalid state (%d) in multi-quant encoding.",
++ errorHandler((char*)"Invalid state (%d) in multi-quant encoding.",
+ coeffinfo[h][w].state);
+ }
+ #ifdef _SHAPE_
+@@ -1587,7 +1587,7 @@
+ zt_type = coeffinfo[h][w].type = ZTR;
+ break;
+ default:
+- errorHandler("Invalid state (%d) in multi-quant encoding.",
++ errorHandler((char*)"Invalid state (%d) in multi-quant encoding.",
+ coeffinfo[h][w].state);
+ }
+ }
+@@ -1631,7 +1631,7 @@
+ mag_sign_decode_MQ(h,w);
+ break;
+ default:
+- errorHandler("Invalid type in multi quant decoding.");
++ errorHandler((char*)"Invalid type in multi quant decoding.");
+ }
+ }
+
+@@ -1970,7 +1970,7 @@
+ Void CVTCDecoder::init_arith_decoder_model(Int color)
+ {
+ if(init_ac!=0) /* check for not closed ac coder. bbc, 7/2/98 */
+- errorHandler("didn't close arithmetic decoder before.");
++ errorHandler((char*)"didn't close arithmetic decoder before.");
+ else
+ init_ac=1;
+
+@@ -1997,7 +1997,7 @@
+ init_ac=0;
+
+ if(errSignal ==0)
+- noteProgress(" ==>D found packet at [TU_%d,TU_%d], l=%d bits",TU_first,
++ noteProgress((char*)" ==>D found packet at [TU_%d,TU_%d], l=%d bits",TU_first,
+ TU_last,packet_size-16);
+
+ if(mzte_codec.m_iScanDirection==0){ /* TD */
+@@ -2022,7 +2022,7 @@
+ if(packet_size-16-prev_segs_size<(Int)mzte_codec.m_usSegmentThresh)
+ return 2;
+
+- noteProgress("\tDecode segment marker.");
++ noteProgress((char*)"\tDecode segment marker.");
+
+ prev_segs_size=packet_size-16;
+
+@@ -2111,7 +2111,7 @@
+
+ if(LTU==TU_last){
+ if(errSignal ==0)
+- noteProgress(" ==>D found packet at [TU_%d,TU_%d], l=%d bits",
++ noteProgress((char*)" ==>D found packet at [TU_%d,TU_%d], l=%d bits",
+ TU_first,TU_last,packet_size-16);
+
+ for (i=0; i<numBP; i++)
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscan_enc_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscan_enc_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_zte_ztscan_enc_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,164 @@
+--- common/video/iso-mpeg4/src/vtc_zte_ztscan_enc.cpp.orig 2005-05-04 13:56:01.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_zte_ztscan_enc.cpp 2009-11-19 04:16:11.000000000 -0700
+@@ -243,7 +243,7 @@
+
+ mzte_codec.m_iOffsetDC=offset_dc;
+ mzte_codec.m_iMaxDC=max_dc; /* hjlee */
+- noteDebug("DC pred: offset=%d, max_dc=%d",
++ noteDebug((char*)"DC pred: offset=%d, max_dc=%d",
+ mzte_codec.m_iOffsetDC,mzte_codec.m_iMaxDC);
+
+ for(i=0;i<dc_h;i++) {
+@@ -287,7 +287,7 @@
+ Void CVTCEncoder::wavelet_dc_encode(Int c)
+ {
+
+- noteDetail("Encoding DC (wavelet_dc_encode)....");
++ noteDetail((char*)"Encoding DC (wavelet_dc_encode)....");
+ color=c;
+
+ //Added by Sarnoff for error resilience, 3/5/99
+@@ -307,7 +307,7 @@
+ /* put_param(mzte_codec.m_iMaxDC+mzte_codec.m_iOffsetDC,7); */ /* hjlee */
+ //printf("%d %d %d %d\n", mzte_codec.m_iMean[color],mzte_codec.m_iQDC[color],-mzte_codec.m_iOffsetDC,mzte_codec.m_iMaxDC);
+ cacll_encode();
+- noteDetail("Completed encoding DC.");
++ noteDetail((char*)"Completed encoding DC.");
+
+ }
+
+@@ -353,7 +353,7 @@
+ numBP = ceilLog2(mzte_codec.m_iMaxDC+1); // modified by Sharp (99/2/16)
+ mzte_ac_encoder_init(&ace);
+ if ((acm_bpdc=(ac_model *)calloc(numBP,sizeof(ac_model)))==NULL)
+- errorHandler("Can't allocate memory for prob model.");
++ errorHandler((char*)"Can't allocate memory for prob model.");
+
+ for (i=0; i<numBP; i++) {
+ acm_bpdc[i].Max_frequency = Bitplane_Max_frequency;
+@@ -479,7 +479,7 @@
+ {
+ SNR_IMAGE *snr_image;
+
+- noteDetail("Encoding AC (wavelet_higher_bands_encode_SQ)....");
++ noteDetail((char*)"Encoding AC (wavelet_higher_bands_encode_SQ)....");
+
+ color=col;
+ snr_image=&(mzte_codec.m_SPlayer[color].SNRlayer.snr_image);
+@@ -517,7 +517,7 @@
+ }
+ //End modified by Sarnoff for error resilience, 3/5/99
+
+- noteDetail("Completed encoding AC.");
++ noteDetail((char*)"Completed encoding AC.");
+ }
+
+
+@@ -659,7 +659,7 @@
+ ********************************************************/
+ Void CVTCEncoder::wavelet_higher_bands_encode_SQ_tree() // hjlee 0928
+ {
+- noteDetail("Encoding AC (wavelet_higher_bands_encode_SQ)....");
++ noteDetail((char*)"Encoding AC (wavelet_higher_bands_encode_SQ)....");
+
+ //Modified by Sarnoff for error resilience, 3/5/99
+ if(mzte_codec.m_usErrResiDisable){ //no error resilience case
+@@ -691,7 +691,7 @@
+ }
+ //End modified by Sarnoff for error resilience, 3/5/99
+
+- noteDetail("Completed encoding AC.");
++ noteDetail((char*)"Completed encoding AC.");
+ }
+
+
+@@ -909,7 +909,7 @@
+ mag_sign_encode_SQ(h,w);
+ break;
+ default:
+- errorHandler("invalid zerotree symbol in single quant encode");
++ errorHandler((char*)"invalid zerotree symbol in single quant encode");
+ }
+ }
+
+@@ -987,7 +987,7 @@
+ mag_sign_encode_SQ(h,w);
+ break;
+ default:
+- errorHandler("invalid zerotree symbol in single quant encode");
++ errorHandler((char*)"invalid zerotree symbol in single quant encode");
+ }
+ }
+
+@@ -1109,7 +1109,7 @@
+ ********************************************************/
+ Void CVTCEncoder::wavelet_higher_bands_encode_MQ(Int scanDirection)
+ {
+- noteDetail("Encoding AC (wavelet_higher_bands_encode_MQ)....");
++ noteDetail((char*)"Encoding AC (wavelet_higher_bands_encode_MQ)....");
+
+ /* init arithmetic coder */
+ mzte_ac_encoder_init(&ace);
+@@ -1237,7 +1237,7 @@
+ {
+ SNR_IMAGE *snr_image;
+
+- noteProgress(" Coding Layer %d, Color %d", layer - (color!=0), color);
++ noteProgress((char*)" Coding Layer %d, Color %d", layer - (color!=0), color);
+
+ ac_h2=acH2;
+ ac_w2=acW2;
+@@ -1382,7 +1382,7 @@
+ mzte_ac_encode_symbol(&ace,acm_type[l][CONTEXT_LZTR_D],czt_type);
+ break;
+ default:
+- errorHandler("Invalid state (%d) in multi-quant encoding.",
++ errorHandler((char*)"Invalid state (%d) in multi-quant encoding.",
+ coeffinfo[h][w].state);
+ }
+ }
+@@ -1408,7 +1408,7 @@
+ mag_sign_encode_MQ(h,w);
+ break;
+ default:
+- errorHandler("Invalid type (%d) in multi-quant encoding.", zt_type);
++ errorHandler((char*)"Invalid type (%d) in multi-quant encoding.", zt_type);
+ }
+ }
+
+@@ -1613,7 +1613,7 @@
+ mzte_ac_encode_symbol(&ace,acm_type[l][CONTEXT_LZTR_D],czt_type);
+ break;
+ default:
+- errorHandler("Invalid state (%d) in multi-quant encoding.",
++ errorHandler((char*)"Invalid state (%d) in multi-quant encoding.",
+ coeffinfo[h][w].state);
+ }
+ }
+@@ -1652,7 +1652,7 @@
+ mag_sign_encode_MQ(h,w);
+ break;
+ default:
+- errorHandler("Invalid type in multi quant decoding.");
++ errorHandler((char*)"Invalid type in multi quant decoding.");
+ }
+ }
+
+@@ -1957,7 +1957,7 @@
+ /* ph, 11/13/98 - added color argument for band-by-band */
+ Void CVTCEncoder::close_arith_encoder_model(Int color, Int mode)
+ {
+- noteProgress(" ==>E packet [TU_%d,TU_%d], l=%d bits",TU_first,TU_last,
++ noteProgress((char*)" ==>E packet [TU_%d,TU_%d], l=%d bits",TU_first,TU_last,
+ packet_size+ace.bitCount+ace.followBits);
+
+ if(mzte_codec.m_iScanDirection == 0)
+@@ -2043,7 +2043,7 @@
+
+ if(packet_size+ace.bitCount+ace.followBits>=
+ mzte_codec.m_usPacketThresh){
+- noteProgress(" ==>E packet [TU_%d,TU_%d], l=%d bits",TU_first,TU_last,
++ noteProgress((char*)" ==>E packet [TU_%d,TU_%d], l=%d bits",TU_first,TU_last,
+ packet_size+ace.bitCount+ace.followBits);
+
+ for (i=0; i<numBP; i++)
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_QMInit_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_QMInit_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_QMInit_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,73 @@
+--- common/video/iso-mpeg4/src/vtc_ztq_QMInit.cpp.orig 2005-05-04 13:56:01.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_ztq_QMInit.cpp 2009-11-19 04:42:17.000000000 -0700
+@@ -76,7 +76,7 @@
+ if ((prevQList[i] = (Int *)calloc(mzte_codec.m_iSpatialLev,
+ sizeof(Int)))==NULL)
+ {
+- noteError("Can't allocate memory for prevQList.");
++ noteError((char*)"Can't allocate memory for prevQList.");
+ err = -1;
+ goto ERR;
+ }
+@@ -86,7 +86,7 @@
+ if ((prevQList2[i] = (Int *)calloc(mzte_codec.m_iSpatialLev,
+ sizeof(Int)))==NULL)
+ {
+- noteError("Can't allocate memory for prevQList.");
++ noteError((char*)"Can't allocate memory for prevQList.");
+ err = -1;
+ goto ERR;
+ }
+@@ -96,7 +96,7 @@
+ if ((scaleLev[i] = (Int *)calloc(mzte_codec.m_iSpatialLev,
+ sizeof(Int)))==NULL)
+ {
+- noteError("Can't allocate memory for scaleLev.");
++ noteError((char*)"Can't allocate memory for scaleLev.");
+ err = -1;
+ goto ERR;
+ }
+@@ -168,8 +168,8 @@
+
+ err = 0;
+
+- noteDetail("Initializing DC coefficient information....");
+- noteDebug("DC Dimensions: Width=%d, Height=%d",
++ noteDetail((char*)"Initializing DC coefficient information....");
++ noteDebug((char*)"DC Dimensions: Width=%d, Height=%d",
+ mzte_codec.m_iDCWidth, mzte_codec.m_iDCHeight);
+
+ for (y = 0; y < mzte_codec.m_iDCHeight; ++y)
+@@ -185,7 +185,7 @@
+ COEFF_STATE(x, y, c) = S_DC;
+ }
+
+- noteDetail("Completed initializing of DC coefficient information.");
++ noteDetail((char*)"Completed initializing of DC coefficient information.");
+
+ return err;
+ }
+@@ -231,12 +231,12 @@
+
+ err = 0;
+
+- noteDetail("Initializing AC coefficient information for col %d....",c);
++ noteDetail((char*)"Initializing AC coefficient information for col %d....",c);
+
+ height = mzte_codec.m_iHeight >> (int)(c!=0);
+ width = mzte_codec.m_iWidth >> (int)(c!=0);
+
+- noteDebug("Image: Width=%d, Height=%d", width, height);
++ noteDebug((char*)"Image: Width=%d, Height=%d", width, height);
+
+ for (y = 0; y < height; ++y)
+ for (x = 0; x < width; ++x)
+@@ -263,7 +263,7 @@
+ }
+ }
+
+- noteDetail("Completed Initializing of AC coefficient information.");
++ noteDetail((char*)"Completed Initializing of AC coefficient information.");
+
+ return err;
+ }
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_QMUtils_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_QMUtils_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_QMUtils_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,89 @@
+--- common/video/iso-mpeg4/src/vtc_ztq_QMUtils.cpp.orig 2005-05-04 13:56:01.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_ztq_QMUtils.cpp 2009-11-19 04:49:28.000000000 -0700
+@@ -314,7 +314,7 @@
+ COEFF_STATE(x,y,c) = S_VAL;
+ break;
+ default:
+- errorHandler("updateState: type %d for state %d is invalid.",
++ errorHandler((char*)"updateState: type %d for state %d is invalid.",
+ type, COEFF_STATE(x,y,c));
+ }
+ break;
+@@ -328,7 +328,7 @@
+ COEFF_STATE(x,y,c) = S_VAL;
+ break;
+ default:
+- errorHandler("updateState: type %d for state %d is invalid.",
++ errorHandler((char*)"updateState: type %d for state %d is invalid.",
+ type, COEFF_STATE(x,y,c));
+ }
+ break;
+@@ -342,7 +342,7 @@
+ COEFF_STATE(x,y,c) = S_VAL;
+ break;
+ default:
+- errorHandler("updateState: type %d for state %d is invalid.",
++ errorHandler((char*)"updateState: type %d for state %d is invalid.",
+ type, COEFF_STATE(x,y,c));
+ }
+ break;
+@@ -361,7 +361,7 @@
+ COEFF_STATE(x,y,c) = S_LVZTR;
+ break;
+ default:
+- errorHandler("updateState: type %d for state %d is invalid.",
++ errorHandler((char*)"updateState: type %d for state %d is invalid.",
+ type, COEFF_STATE(x,y,c));
+ }
+ break;
+@@ -370,7 +370,7 @@
+ case S_LVZTR:
+ break;
+ default:
+- errorHandler("updateState: state %d is invalid.", COEFF_STATE(x,y,c));
++ errorHandler((char*)"updateState: state %d is invalid.", COEFF_STATE(x,y,c));
+ }
+ }
+
+@@ -458,7 +458,7 @@
+ Int oldWidth, oldHeight;
+ Int xLeafStart, yLeafStart;
+
+- noteDetail("Updating new coefficients in spatial layer for col %d....",c);
++ noteDetail((char*)"Updating new coefficients in spatial layer for col %d....",c);
+
+ oldWidth = mzte_codec.m_spaLayerWidth[mzte_codec.m_iCurSpatialLev][c]>>1;
+ oldHeight = mzte_codec.m_spaLayerHeight[mzte_codec.m_iCurSpatialLev][c]>>1;
+@@ -486,7 +486,7 @@
+ COEFF_STATE(x,y,c) = S_INIT;
+ break;
+ default:
+- errorHandler("Non-leaf state (%d) for leaf coefficient at"\
++ errorHandler((char*)"Non-leaf state (%d) for leaf coefficient at"\
+ "(x=%d, y=%d).",
+ COEFF_STATE(x, y,c), x, y);
+ }
+@@ -510,7 +510,7 @@
+ COEFF_STATE(x,y,c) = S_INIT;
+ break;
+ default:
+- errorHandler("Non-leaf state (%d) for leaf coefficient at"\
++ errorHandler((char*)"Non-leaf state (%d) for leaf coefficient at"\
+ "(x=%d, y=%d).",
+ COEFF_STATE(x, y,c), x, y);
+ }
+@@ -534,12 +534,12 @@
+ COEFF_STATE(x,y,c) = S_INIT;
+ break;
+ default:
+- errorHandler("Non-leaf state (%d) for leaf coefficient at"\
++ errorHandler((char*)"Non-leaf state (%d) for leaf coefficient at"\
+ "(x=%d, y=%d).",
+ COEFF_STATE(x, y,c), x, y);
+ }
+
+- noteDetail("Completed updating new coefficients in spatial layer.");
++ noteDetail((char*)"Completed updating new coefficients in spatial layer.");
+
+ }
+
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_decQM_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_decQM_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_decQM_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,106 @@
+--- common/video/iso-mpeg4/src/vtc_ztq_decQM.cpp.orig 2005-05-04 13:56:01.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_ztq_decQM.cpp 2009-11-19 04:23:19.000000000 -0700
+@@ -193,7 +193,7 @@
+ err=0;
+
+ /* loop through DC */
+- noteDetail("Inverse Quantizing DC band....");
++ noteDetail((char*)"Inverse Quantizing DC band....");
+ for (x = 0; x < mzte_codec.m_iDCWidth; ++x)
+ for (y = 0; y < mzte_codec.m_iDCHeight; ++y)
+ {
+@@ -202,7 +202,7 @@
+ COEFF_RECVAL(x,y,c) = COEFF_VAL(x,y,c) * mzte_codec.m_iQDC[c];
+ }
+
+- noteDetail("Completed inverse Quantizing DC bands.");
++ noteDetail((char*)"Completed inverse Quantizing DC bands.");
+
+ return err;
+ }
+@@ -243,13 +243,13 @@
+ err=0;
+
+ /* loop through DC */
+- noteDetail("Inverse quantizing AC bands....");
++ noteDetail((char*)"Inverse quantizing AC bands....");
+ for (x = 0; x < mzte_codec.m_iDCWidth; ++x)
+ for (y = 0; y < mzte_codec.m_iDCHeight; ++y)
+ {
+ if ((nc = findChild(x, y, xc, yc,c)) != 3)
+ {
+- noteError("DC band coefficient has %d children instead of 3.", nc);
++ noteError((char*)"DC band coefficient has %d children instead of 3.", nc);
+ exit(-1);
+ }
+
+@@ -258,7 +258,7 @@
+ iQuantizeCoeffs(xc[2], yc[2],c);
+ }
+
+- noteDetail("Completed inverse quantizing of AC bands.");
++ noteDetail((char*)"Completed inverse quantizing of AC bands.");
+
+ return err;
+ }
+@@ -276,7 +276,7 @@
+ err=0;
+
+ /* loop through DC */
+- noteDetail("Inverse quantizing AC bands (difference)....");
++ noteDetail((char*)"Inverse quantizing AC bands (difference)....");
+
+ hend=mzte_codec.m_SPlayer[c].height;
+ wend=mzte_codec.m_SPlayer[c].width;
+@@ -301,7 +301,7 @@
+ for(w=0;w<wend;w++)
+ iQuantizeCoeff(w,h,c);
+
+- noteDetail("Completed inverse quantizing of AC bands.");
++ noteDetail((char*)"Completed inverse quantizing of AC bands.");
+
+ return(err);
+
+@@ -344,13 +344,13 @@
+ err=0;
+
+ /* loop through DC */
+- noteDetail("Updating state of AC bands....");
++ noteDetail((char*)"Updating state of AC bands....");
+ for (x = 0; x < mzte_codec.m_iDCWidth; ++x)
+ for (y = 0; y < mzte_codec.m_iDCHeight; ++y)
+ {
+ if ((nc = findChild(x, y, xc, yc,c)) != 3)
+ {
+- noteError("DC band coefficient has %d children instead of 3.", nc);
++ noteError((char*)"DC band coefficient has %d children instead of 3.", nc);
+ exit(-1);
+ }
+
+@@ -359,7 +359,7 @@
+ updateCoeffAndDescState(xc[2], yc[2], c);
+ }
+
+- noteDetail("Completed updating state of AC bands.");
++ noteDetail((char*)"Completed updating state of AC bands.");
+
+ return err;
+ }
+@@ -399,7 +399,7 @@
+ err=0;
+
+ /* loop through DC */
+- noteDetail("Updating state of AC bands (difference)....");
++ noteDetail((char*)"Updating state of AC bands (difference)....");
+
+ hstart=mzte_codec.m_SPlayer[c].height/2;
+ wstart=mzte_codec.m_SPlayer[c].width/2;
+@@ -414,7 +414,7 @@
+ for(w=0;w<wend;w++)
+ updateCoeffAndDescState(w, h, c);
+
+- noteDetail("Completed updating state of AC bands.");
++ noteDetail((char*)"Completed updating state of AC bands.");
+
+ return err;
+ }
Added: trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_encQM_cpp.diff
===================================================================
--- trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_encQM_cpp.diff (rev 0)
+++ trunk/dports/audio/mpeg4ip/files/patch-common-video-iso-mpeg4-src-vtc_ztq_encQM_cpp.diff 2009-12-03 20:08:08 UTC (rev 61169)
@@ -0,0 +1,77 @@
+--- common/video/iso-mpeg4/src/vtc_ztq_encQM.cpp.orig 2005-05-04 13:56:01.000000000 -0600
++++ common/video/iso-mpeg4/src/vtc_ztq_encQM.cpp 2009-11-19 04:35:41.000000000 -0700
+@@ -233,8 +233,8 @@
+ mzte_codec.m_iMaxDC = 0;
+
+ /* loop through DC */
+- noteDetail("Quantizing DC band....");
+- noteDebug("Qdc=%d",mzte_codec.m_iQDC[c]);
++ noteDetail((char*)"Quantizing DC band....");
++ noteDebug((char*)"Qdc=%d",mzte_codec.m_iQDC[c]);
+ for (x = 0; x < mzte_codec.m_iDCWidth; ++x)
+ for (y = 0; y < mzte_codec.m_iDCHeight; ++y)
+ {
+@@ -256,7 +256,7 @@
+ mzte_codec.m_iMaxDC = COEFF_VAL(x,y,c);
+ }
+
+- noteDetail("Completed quantizing DC bands.");
++ noteDetail((char*)"Completed quantizing DC bands.");
+
+ return err;
+ }
+@@ -308,14 +308,14 @@
+ }
+
+ /* loop through DC */
+- noteDetail("Quantizing and marking AC bands....");
++ noteDetail((char*)"Quantizing and marking AC bands....");
+ ALL_ZERO(c)=1;
+ for (x = 0; x < mzte_codec.m_iDCWidth; ++x)
+ for (y = 0; y < mzte_codec.m_iDCHeight; ++y)
+ {
+ if ((nc = findChild(x, y, xc, yc, c)) != 3)
+ {
+- noteError("DC band coefficient has %d children instead of 3.", nc);
++ noteError((char*)"DC band coefficient has %d children instead of 3.", nc);
+ exit(-1);
+ }
+
+@@ -323,10 +323,10 @@
+ ALL_ZERO(c) *= !quantizeAndMarkCoeffs(xc[1], yc[1], c);
+ ALL_ZERO(c) *= !quantizeAndMarkCoeffs(xc[2], yc[2], c);
+ }
+- noteDetail("Completed quantizing and marking of AC bands.");
++ noteDetail((char*)"Completed quantizing and marking of AC bands.");
+
+ if (ALL_ZERO(c))
+- noteProgress("Note: All coefficients are quantized to zero.");
++ noteProgress((char*)"Note: All coefficients are quantized to zero.");
+
+ return err;
+ }
+@@ -367,13 +367,13 @@
+ err=0;
+
+ /* loop through DC */
+- noteDetail("Updating state of AC bands....");
++ noteDetail((char*)"Updating state of AC bands....");
+ for (x = 0; x < mzte_codec.m_iDCWidth; ++x)
+ for (y = 0; y < mzte_codec.m_iDCHeight; ++y)
+ {
+ if ((nc = findChild(x, y, xc, yc, c)) != 3)
+ {
+- noteError("DC band coefficient has %d children instead of 3.", nc);
++ noteError((char*)"DC band coefficient has %d children instead of 3.", nc);
+ exit(-1);
+ }
+
+@@ -381,7 +381,7 @@
+ updateCoeffAndDescState(xc[1], yc[1], c);
+ updateCoeffAndDescState(xc[2], yc[2], c);
+ }
+- noteDetail("Completed updating state of AC bands.");
++ noteDetail((char*)"Completed updating state of AC bands.");
+
+ return err;
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091203/4560453a/attachment-0001.html>
More information about the macports-changes
mailing list