[XviD-devel] xvid_encraw update to help us tracking the hintME bug

Vincent GOMEZ xvid-devel@xvid.org
Wed, 18 Dec 2002 10:44:56 +0100 (MET)


--delim.1d5c
Content-Type: text/plain;
 charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

Hello,

here's a patch against 0.9.0 xvid_encraw that adds support for hinted ME.=
 This should help us debugging core easily as this application can be link=
ed statically with core.

I don't have time to track the bug until this evening, so if someone has =
time to loose :-)

PS: I'll commit that patch tonight extending it to xvid_stat.

--
Edouard Gomez
--delim.1d5c
Content-Type: text/plain; name="patch.txt"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="patch.txt"

LS0tIHh2aWRjb3JlLTAuOS4wLm9yaWcvZXhhbXBsZXMveHZpZF9lbmNyYXcuYwlTdW4gTm92
IDI0IDAxOjUwOjM2IDIwMDIKKysrIHh2aWRjb3JlLTAuOS4wL2V4YW1wbGVzL3h2aWRfZW5j
cmF3LmMJV2VkIERlYyAxOCAxMDoxNzo1NyAyMDAyCkBAIC04MCw2ICs4MCwxMiBAQAogLyog
TWF4aW11bSBudW1iZXIgb2YgZnJhbWVzIHRvIGVuY29kZSAqLwogI2RlZmluZSBBQlNfTUFY
RlJBTUVOUiA5OTk5CiAKKy8qIEhJTlRNT0RFcyAqLworI2RlZmluZSBISU5UX01PREVfTk9O
RSAwCisjZGVmaW5lIEhJTlRfTU9ERV9HRVQgIDEKKyNkZWZpbmUgSElOVF9NT0RFX1NFVCAg
MgorI2RlZmluZSBISU5UX0ZJTEUgImhpbnRzLm12IgorCiBzdGF0aWMgaW50ICAgQVJHX0JJ
VFJBVEUgPSA5MDA7CiBzdGF0aWMgaW50ICAgQVJHX1FVQU5USSA9IDA7CiBzdGF0aWMgaW50
ICAgQVJHX1FVQUxJVFkgPSA2OwpAQCAtOTIsNiArOTgsNyBAQAogc3RhdGljIGludCAgIEFS
R19TQVZFTVBFR1NUUkVBTSA9IDA7CiBzdGF0aWMgaW50ICAgQVJHX09VVFBVVFRZUEUgPSAw
Owogc3RhdGljIGNoYXIgKkFSR19PVVRQVVRGSUxFID0gTlVMTDsKK3N0YXRpYyBpbnQgICBB
UkdfSElOVE1PREUgPSBISU5UX01PREVfTk9ORTsKIHN0YXRpYyBpbnQgICBYRElNID0gMDsK
IHN0YXRpYyBpbnQgICBZRElNID0gMDsKICNkZWZpbmUgSU1BR0VfU0laRSh4LHkpICgoeCkq
KHkpKjMvMikKQEAgLTEzNiw3ICsxNDMsOCBAQAogc3RhdGljIGludCBlbmNfaW5pdChpbnQg
dXNlX2Fzc2VtYmxlcik7CiBzdGF0aWMgaW50IGVuY19zdG9wKCk7CiBzdGF0aWMgaW50IGVu
Y19tYWluKHVuc2lnbmVkIGNoYXIqIGltYWdlLCB1bnNpZ25lZCBjaGFyKiBiaXRzdHJlYW0s
Ci0JCQkJCWludCAqc3RyZWFtbGVuZ3RoLCBpbnQqIGZyYW1ldHlwZSk7CisJCQkJCXVuc2ln
bmVkIGNoYXIgKmhpbnRzX2J1ZmZlciwKKwkJCQkJbG9uZyAqc3RyZWFtbGVuZ3RoLCBsb25n
KiBmcmFtZXR5cGUsIGxvbmcgKmhpbnRzX3NpemUpOwogCiAvKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioKICAqICAgICAgICAgICAgICAgTWFpbiBmdW5jdGlvbgpAQCAtMTQ4LDIyICsxNTYs
MjUgQEAKIAl1bnNpZ25lZCBjaGFyICptcDRfYnVmZmVyID0gTlVMTDsKIAl1bnNpZ25lZCBj
aGFyICppbl9idWZmZXIgPSBOVUxMOwogCXVuc2lnbmVkIGNoYXIgKm91dF9idWZmZXIgPSBO
VUxMOworCXVuc2lnbmVkIGNoYXIgKmhpbnRzX2J1ZmZlciA9IE5VTEw7CiAKIAlkb3VibGUg
ZW5jdGltZTsKIAlkb3VibGUgdG90YWxlbmN0aW1lPTAuOwogICAKIAlsb25nIHRvdGFsc2l6
ZTsKKwlsb25nIGhpbnRzX3NpemU7CiAJaW50IHN0YXR1czsKLQlpbnQgZnJhbWVfdHlwZTsK
LQlpbnQgYmlnZW5kaWFuOworCWxvbmcgZnJhbWVfdHlwZTsKKwlsb25nIGJpZ2VuZGlhbjsK
ICAgCi0JaW50IG00dl9zaXplOworCWxvbmcgbTR2X3NpemU7CiAJaW50IHVzZV9hc3NlbWJs
ZXI9MDsKICAgCiAJY2hhciBmaWxlbmFtZVsyNTZdOwogICAKIAlGSUxFICppbl9maWxlID0g
c3RkaW47CiAJRklMRSAqb3V0X2ZpbGUgPSBOVUxMOworCUZJTEUgKmhpbnRzX2ZpbGUgPSBO
VUxMOwogCiAJcHJpbnRmKCJ4dmlkX2RlY3JhdyAtIHJhdyBtcGVnNCBiaXRzdHJlYW0gZW5j
b2RlciAiKTsKIAlwcmludGYoIndyaXR0ZW4gYnkgQ2hyaXN0b3BoIExhbXBlcnQgMjAwMlxu
XG4iKTsKQEAgLTIyMSw2ICsyMzIsMTAgQEAKIAkJCWkrKzsKIAkJCUFSR19PVVRQVVRUWVBF
ID0gYXRvaShhcmd2W2ldKTsKIAkJfQorCQllbHNlIGlmIChzdHJjbXAoIi1tdiIsIGFyZ3Zb
aV0pID09IDAgJiYgaSA8IGFyZ2MgLSAxICkgeworCQkJaSsrOworCQkJQVJHX0hJTlRNT0RF
ID0gYXRvaShhcmd2W2ldKTsKKwkJfQogCQllbHNlIGlmIChzdHJjbXAoIi1vIiwgYXJndltp
XSkgPT0gMCAmJiBpIDwgYXJnYyAtIDEgKSB7CiAJCQlpKys7CiAJCQlBUkdfT1VUUFVURklM
RSA9IGFyZ3ZbaV07CkBAIC0yNjUsNiArMjgwLDM3IEBACiAJCXJldHVybiAtMTsKIAl9CiAK
KwlpZiAoIEFSR19ISU5UTU9ERSAhPSBISU5UX01PREVfTk9ORSAmJgorCQkgQVJHX0hJTlRN
T0RFICE9IEhJTlRfTU9ERV9HRVQgJiYKKwkJIEFSR19ISU5UTU9ERSAhPSBISU5UX01PREVf
U0VUKQorCQlBUkdfSElOVE1PREUgPSBISU5UX01PREVfTk9ORTsKKworCWlmKCBBUkdfSElO
VE1PREUgIT0gSElOVF9NT0RFX05PTkUpIHsKKwkJY2hhciAqcmlnaHRzID0gInJiIjsKKwor
CQkvKgorCQkgKiBJZiB3ZSBhcmUgZ2V0dGluZyBoaW50cyBmcm9tIGNvcmUsIHdlIHdpbGwg
aGF2ZSB0byB3cml0ZSB0aGVtIHRvCisJCSAqIGhpbnQgZmlsZQorCQkgKi8KKwkJaWYoQVJH
X0hJTlRNT0RFID09IEhJTlRfTU9ERV9HRVQpCisJCQlyaWdodHMgPSAidytiIjsKKworCQkv
KiBPcGVuIHRoZSBoaW50IGZpbGUgKi8KKwkJaGludHNfZmlsZSA9IGZvcGVuKEhJTlRfRklM
RSwgcmlnaHRzKTsKKwkJaWYoaGludHNfZmlsZSA9PSBOVUxMKSB7CisJCQlmcHJpbnRmKHN0
ZGVyciwgIkVycm9yIG9wZW5pbmcgaW5wdXQgZmlsZSAlc1xuIiwgSElOVF9GSUxFKTsKKwkJ
CXJldHVybiAtMTsKKwkJfQorCisJCS8qIEFsbG9jYXRlIGhpbnQgbWVtb3J5IHNwYWNlLCB3
ZSB3aWxsIGJlIHVzaW5nIHJhd2hpbnRzICovCisJCS8qIE5CIDogSG9wZSAxTWIgaXMgZW5v
dWdoICovCisJCWlmKChoaW50c19idWZmZXIgPSBtYWxsb2MoMTAyNCoxMDI0KSkgPT0gTlVM
TCkgeworCQkJZnByaW50ZihzdGRlcnIsICJNZW1vcnkgYWxsb2NhdGlvbiBlcnJvclxuIik7
CisJCQlyZXR1cm4gLTE7CisJCX0KKworCX0KKwogCWlmICggQVJHX0lOUFVURklMRSA9PSBO
VUxMIHx8IHN0cmNtcChBUkdfSU5QVVRGSUxFLCAic3RkaW4iKSA9PSAwKSB7CiAJCWluX2Zp
bGUgPSBzdGRpbjsKIAl9CkBAIC0zNjUsMTEgKzQxMSwyMiBAQAogCQl9CiAKIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKgorICogICAgICAgICAgICAgICAgICAgICAgIFJlYWQgaGludHMg
ZnJvbSBmaWxlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworCQlpZihBUkdfSElOVE1P
REUgPT0gSElOVF9NT0RFX1NFVCkgeworCQkJZnJlYWQoJmhpbnRzX3NpemUsIDEsIHNpemVv
Zihsb25nKSwgaGludHNfZmlsZSk7CisJCQloaW50c19zaXplID0gKCFiaWdlbmRpYW4pP1NX
QVAoaGludHNfc2l6ZSk6aGludHNfc2l6ZTsKKwkJCWZyZWFkKGhpbnRzX2J1ZmZlciwgMSwg
aGludHNfc2l6ZSwgaGludHNfZmlsZSk7CisJCX0KKworLyoqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqCiAgKiAgICAgICAgICAgICAgICAgICAgICAgRW5jb2RlIGFuZCBkZWNvZGUgdGhpcyBm
cmFtZQogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAKIAkJZW5jdGltZSA9IG1zZWNvbmQo
KTsKLQkJc3RhdHVzID0gZW5jX21haW4oaW5fYnVmZmVyLCBtcDRfYnVmZmVyLCAmbTR2X3Np
emUsICZmcmFtZV90eXBlKTsKKwkJc3RhdHVzID0gZW5jX21haW4oaW5fYnVmZmVyLCBtcDRf
YnVmZmVyLCBoaW50c19idWZmZXIsCisJCQkJCQkgICZtNHZfc2l6ZSwgJmZyYW1lX3R5cGUs
ICZoaW50c19zaXplKTsKIAkJZW5jdGltZSA9IG1zZWNvbmQoKSAtIGVuY3RpbWU7CiAKIAkJ
dG90YWxlbmN0aW1lICs9IGVuY3RpbWU7CkBAIC0zNzgsNiArNDM1LDIxIEBACiAJCXByaW50
ZigiRnJhbWUgJTVkOiBpbnRyYSAlMWQsIGVuY3RpbWU9JTYuMWYgbXMsIHNpemU9JTZkYnl0
ZXNcbiIsCiAJCQkgICAoaW50KWZpbGVuciwgKGludClmcmFtZV90eXBlLCAoZmxvYXQpZW5j
dGltZSwgKGludCltNHZfc2l6ZSk7CiAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICog
ICAgICAgICAgICAgICAgICAgICAgIFNhdmUgaGludHMgdG8gZmlsZQorICoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovCisKKwkJaWYoQVJHX0hJTlRNT0RFID09IEhJTlRfTU9ERV9HRVQpIHsK
KwkJCWhpbnRzX3NpemUgPSAoIWJpZ2VuZGlhbik/U1dBUChoaW50c19zaXplKTpoaW50c19z
aXplOworCQkJZndyaXRlKCZoaW50c19zaXplLCAxLCBzaXplb2YobG9uZyksIGhpbnRzX2Zp
bGUpOworCQkJaGludHNfc2l6ZSA9ICghYmlnZW5kaWFuKT9TV0FQKGhpbnRzX3NpemUpOmhp
bnRzX3NpemU7CisJCQlmd3JpdGUoaGludHNfYnVmZmVyLCAxLCBoaW50c19zaXplLCBoaW50
c19maWxlKTsKKwkJfQorCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqICAgICAgICAg
ICAgICAgICAgICAgICBTYXZlIHN0cmVhbSB0byBmaWxlCisgKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8KKwogCQlpZiAoQVJHX1NBVkVNUEVHU1RSRUFNKQogCQl7CiAJCQkvKiBTYXZlIHNp
bmdsZSBmaWxlcyAqLwpAQCAtNDM1LDE0ICs1MDcsMTggQEAKIAkJCWZwcmludGYoc3RkZXJy
LCAiRW5jb3JlIFJFTEVBU0UgcHJvYmxlbSByZXR1cm4gdmFsdWUgJWRcbiIsIHN0YXR1cyk7
CiAJfQogCi0JZmNsb3NlKGluX2ZpbGUpOworCWlmKGluX2ZpbGUpCisJCWZjbG9zZShpbl9m
aWxlKTsKIAlpZihvdXRfZmlsZSkKIAkJZmNsb3NlKG91dF9maWxlKTsKKwlpZihoaW50c19m
aWxlKQorCQlmY2xvc2UoaGludHNfZmlsZSk7CiAKICBmcmVlX2FsbF9tZW1vcnk6CiAJZnJl
ZShvdXRfYnVmZmVyKTsKIAlmcmVlKG1wNF9idWZmZXIpOwogCWZyZWUoaW5fYnVmZmVyKTsK
KwlpZihoaW50c19idWZmZXIpIGZyZWUoaGludHNfYnVmZmVyKTsKIAogCXJldHVybiAwOwog
CkBAIC00OTYsNiArNTcyLDcgQEAKIAlmcHJpbnRmKHN0ZGVyciwgIiAgICAgICAgICAgICAg
ICAgICAgKyBzdHJlYW0ubTR2IHdpdGggLW10IDBcbiIpOwogCWZwcmludGYoc3RkZXJyLCAi
ICAgICAgICAgICAgICAgICAgICArIHN0cmVhbS5tcDR1IHdpdGggLW10IDFcbiIpOwogCWZw
cmludGYoc3RkZXJyLCAiIC1tdCBpbnRlZ2VyICAgIDogb3V0cHV0IHR5cGUgKG00dj0wLCBt
cDR1PTEpXG4iKTsKKwlmcHJpbnRmKHN0ZGVyciwgIiAtbXYgaW50ZWdlciAgICA6IFVzZSBt
b3Rpb24gdmVjdG9yIGhpbnRzIChubyBoaW50cz0wLCBnZXQgaGludHM9MSwgc2V0IGhpbnRz
PTIpXG4iKTsKIAlmcHJpbnRmKHN0ZGVyciwgIiAtaGVscCAgICAgICAgICA6IHByaW50cyB0
aGlzIGhlbHAgbWVzc2FnZVxuIik7CiAJZnByaW50ZihzdGRlcnIsICIgLXF1YW50IGludGVn
ZXIgOiBmaXhlZCBxdWFudGl6ZXIgKGRpc2FibGVzIC1iIHNldHRpbmcpXG4iKTsKIAlmcHJp
bnRmKHN0ZGVyciwgIiAoKiBtZWFucyBkZWZhdWx0KVxuIik7CkBAIC02NDEsNyArNzE4LDgg
QEAKIH0KIAogc3RhdGljIGludCBlbmNfbWFpbih1bnNpZ25lZCBjaGFyKiBpbWFnZSwgdW5z
aWduZWQgY2hhciogYml0c3RyZWFtLAotCQkJCQlpbnQgKnN0cmVhbWxlbmd0aCwgaW50KiBm
cmFtZXR5cGUpCisJCQkJCXVuc2lnbmVkIGNoYXIqIGhpbnRzX2J1ZmZlciwKKwkJCQkJbG9u
ZyAqc3RyZWFtbGVuZ3RoLCBsb25nICpmcmFtZXR5cGUsIGxvbmcgKmhpbnRzX3NpemUpCiB7
CiAJaW50IHhlcnI7CiAKQEAgLTY2Miw4ICs3NDAsMjQgQEAKIAl4ZnJhbWUuZ2VuZXJhbCA9
IGdlbmVyYWxfcHJlc2V0c1tBUkdfUVVBTElUWV07CiAJeGZyYW1lLnF1YW50X2ludHJhX21h
dHJpeCA9IHhmcmFtZS5xdWFudF9pbnRlcl9tYXRyaXggPSBOVUxMOwogCisJeGZyYW1lLmhp
bnQuaGludHN0cmVhbSA9IGhpbnRzX2J1ZmZlcjsKKworCWlmKEFSR19ISU5UTU9ERSA9PSBI
SU5UX01PREVfU0VUKSB7CisJCXhmcmFtZS5oaW50LmhpbnRsZW5ndGggPSAqaGludHNfc2l6
ZTsKKwkJeGZyYW1lLmhpbnQucmF3aGludHMgPSAwOworCQl4ZnJhbWUuZ2VuZXJhbCB8PSBY
VklEX0hJTlRFRE1FX1NFVDsKKwl9CisKKwlpZihBUkdfSElOVE1PREUgPT0gSElOVF9NT0RF
X0dFVCkgeworCQl4ZnJhbWUuaGludC5yYXdoaW50cyA9IDA7CisJCXhmcmFtZS5nZW5lcmFs
IHw9IFhWSURfSElOVEVETUVfR0VUOworCX0KKwogCXhlcnIgPSB4dmlkX2VuY29yZShlbmNf
aGFuZGxlLCBYVklEX0VOQ19FTkNPREUsICZ4ZnJhbWUsICZ4c3RhdHMpOwogCisJaWYoQVJH
X0hJTlRNT0RFID09IEhJTlRfTU9ERV9HRVQpCisJCSpoaW50c19zaXplID0geGZyYW1lLmhp
bnQuaGludGxlbmd0aDsKKwogCS8qCiAJICogVGhpcyBpcyBzdGF0aWN0aWNhbCBkYXRhLCBl
LmcuIGZvciAyLXBhc3MuIElmIHlvdSBhcmUgbm90CiAJICogaW50ZXJlc3RlZCBpbiBhbnkg
b2YgdGhpcywgeW91IGNhbiB1c2UgTlVMTCBpbnN0ZWFkIG9mICZ4c3RhdHMKDQotLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLTI5MzI0NDUwNzc3NDItLQ0K
--delim.1d5c--