[MPlayer-dev-eng] [PATCH] Subtitles sorting

[Salvatore Falco]

    Hi all.

    This small patch is to sort subtitles.
    Some subtitle files I found have unsorted subtitles, with some
subtitles put after (timely) following ones.
    Sorting is done when loading the subtitles from the file, with a
linear search for the position, since we can safetly assume that many,
if not all, subtitles are correctly ordered.
    This patch also supports those subtitle formats, such as ARQ and
Subrip09, which store the end of a subtitle as the beginning of the
following.

    Bye, Salvatore Falco
-------------- next part --------------
LS0tIHN1YnJlYWRlci5jLm9yaWcJVGh1IE5vdiAgNyAwMDo1NDoyMSAyMDAyCisrKyBzdWJyZWFk
ZXIuYwlNb24gTm92IDExIDE3OjU1OjU3IDIwMDIKQEAgLTM1LDYgKzM1LDcgQEAKIAogLyogVXNl
IHRoZSBTVUJfKiBjb25zdGFudCBkZWZpbmVkIGluIHRoZSBoZWFkZXIgZmlsZSAqLwogaW50IHN1
Yl9mb3JtYXQ9U1VCX0lOVkFMSUQ7Cit1bnNpZ25lZCBsb25nIHByZXZpb3VzX3N1Yl9lbmQ7CiAK
IHN0YXRpYyBpbnQgZW9sKGNoYXIgcCkgewogICAgIHJldHVybiAocD09J1xyJyB8fCBwPT0nXG4n
IHx8IHA9PSdcMCcpOwpAQCAtNTEwLDggKzUxMSw2IEBACiAJcmV0dXJuIE5VTEw7IC8vIHdlIHNo
b3VsZCBoYXZlIHJldHVybmVkIGJlZm9yZSBpZiBpdCdzIE9LCiB9CiAKLXN1YnRpdGxlICpwcmV2
aW91c19hcXRfc3ViID0gTlVMTDsKLQogc3VidGl0bGUgKnN1Yl9yZWFkX2xpbmVfYXF0KEZJTEUg
KmZkLHN1YnRpdGxlICpjdXJyZW50KSB7CiAgICAgY2hhciBsaW5lW0xJTkVfTEVOKzFdOwogICAg
IGNoYXIgKm5leHQ7CkBAIC01MjUsMTAgKzUyNCw3IEBACiAJCWJyZWFrOwogICAgIH0KICAgICAK
LSAgICBpZiAocHJldmlvdXNfYXF0X3N1YiAhPSBOVUxMKSAKLQlwcmV2aW91c19hcXRfc3ViLT5l
bmQgPSBjdXJyZW50LT5zdGFydC0xOwotICAgIAotICAgIHByZXZpb3VzX2FxdF9zdWIgPSBjdXJy
ZW50OworICAgIHByZXZpb3VzX3N1Yl9lbmQgPSAoY3VycmVudC0+c3RhcnQpID8gY3VycmVudC0+
c3RhcnQgLSAxIDogMDsgCiAKICAgICBpZiAoIWZnZXRzIChsaW5lLCBMSU5FX0xFTiwgZmQpKQog
CXJldHVybiBOVUxMOwpAQCAtNTQ5LDE2ICs1NDUsMTIgQEAKICAgICBjdXJyZW50LT5saW5lcz1p
KzE7CiAKICAgICBpZiAoKGN1cnJlbnQtPnRleHRbMF09PSIiKSAmJiAoY3VycmVudC0+dGV4dFsx
XT09IiIpKSB7Ci0JLy8gdm9pZCBzdWJ0aXRsZSAtPiBlbmQgb2YgcHJldmlvdXMgbWFya2VkIGFu
ZCBleGl0Ci0JcHJldmlvdXNfYXF0X3N1YiA9IE5VTEw7CiAJcmV0dXJuIE5VTEw7CiAJfQogCiAg
ICAgcmV0dXJuIGN1cnJlbnQ7CiB9CiAKLXN1YnRpdGxlICpwcmV2aW91c19zdWJyaXAwOV9zdWIg
PSBOVUxMOwotCiBzdWJ0aXRsZSAqc3ViX3JlYWRfbGluZV9zdWJyaXAwOShGSUxFICpmZCxzdWJ0
aXRsZSAqY3VycmVudCkgewogICAgIGNoYXIgbGluZVtMSU5FX0xFTisxXTsKICAgICBpbnQgYTEs
YTIsYTM7CkBAIC01NzMsMTYgKzU2NSwxMyBAQAogCQlicmVhazsKICAgICB9CiAgICAgCi0gICAg
aWYgKHByZXZpb3VzX3N1YnJpcDA5X3N1YiAhPSBOVUxMKSAKLQlwcmV2aW91c19zdWJyaXAwOV9z
dWItPmVuZCA9IGN1cnJlbnQtPnN0YXJ0LTE7Ci0gICAgCi0gICAgcHJldmlvdXNfc3VicmlwMDlf
c3ViID0gY3VycmVudDsKKyAgICBjdXJyZW50LT5zdGFydCA9IGExKjM2MDAwMCthMio2MDAwK2Ez
KjEwMDsKKworICAgIHByZXZpb3VzX3N1Yl9lbmQgPSAoY3VycmVudC0+c3RhcnQpID8gY3VycmVu
dC0+c3RhcnQgLSAxIDogMDsgCiAKICAgICBpZiAoIWZnZXRzIChsaW5lLCBMSU5FX0xFTiwgZmQp
KQogCXJldHVybiBOVUxMOwogCi0gICAgY3VycmVudC0+c3RhcnQgPSBhMSozNjAwMDArYTIqNjAw
MCthMyoxMDA7Ci0KICAgICBuZXh0ID0gbGluZSxpPTA7CiAgICAgCiAgICAgY3VycmVudC0+dGV4
dFswXT0iIjsgLy8ganVzdCB0byBiZSBzdXJlIHRoYXQgc3RyaW5nIGlzIGNsZWFyCkBAIC01OTYs
NyArNTg1LDYgQEAKIAogICAgIGlmICgoY3VycmVudC0+dGV4dFswXT09IiIpICYmIChpPT0wKSkg
ewogCS8vIHZvaWQgc3VidGl0bGUgLT4gZW5kIG9mIHByZXZpb3VzIG1hcmtlZCBhbmQgZXhpdAot
CXByZXZpb3VzX3N1YnJpcDA5X3N1YiA9IE5VTEw7CiAJcmV0dXJuIE5VTEw7CiAJfQogCkBAIC05
NzAsNyArOTU4LDcgQEAKIHN1YnRpdGxlKiBzdWJfcmVhZF9maWxlIChjaGFyICpmaWxlbmFtZSwg
ZmxvYXQgZnBzKSB7CiAgICAgRklMRSAqZmQ7CiAgICAgaW50IG5fbWF4LCBuX2ZpcnN0LCBpLCBq
LCBzdWJfZmlyc3QsIHN1Yl9vcmlnOwotICAgIHN1YnRpdGxlICpmaXJzdCwgKnNlY29uZDsKKyAg
ICBzdWJ0aXRsZSAqZmlyc3QsICpzZWNvbmQsICpzdWI7CiAgICAgY2hhciAqZm10bmFtZVtdID0g
eyAibWljcm9kdmQiLCAic3VicmlwIiwgInN1YnZpZXdlciIsICJzYW1pIiwgInZwbGF5ZXIiLAog
CQkJInJ0IiwgInNzYSIsICJkdW5ub3doYXQiLCAibXBzdWIiLCAiYXF0IiwgInN1YnZpZXdlciAy
LjAiLCAic3VicmlwIDAuOSIsICJqYWNvc3ViIiB9OwogICAgIHN1YnRpdGxlICogKCpmdW5jW10p
KEZJTEUgKmZkLHN1YnRpdGxlICpkZXN0KT0gCkBAIC0xMDA3LDE5ICs5OTUsNTYgQEAKICAgICBm
aXJzdD0oc3VidGl0bGUgKiltYWxsb2Mobl9tYXgqc2l6ZW9mKHN1YnRpdGxlKSk7CiAgICAgaWYo
IWZpcnN0KSByZXR1cm4gTlVMTDsKICAgICAKKyAgICBzdWIgPSAoc3VidGl0bGUgKiltYWxsb2Mo
c2l6ZW9mKHN1YnRpdGxlKSk7CisgICAgLy9UaGlzIGlzIHRvIGRlYWwgd2l0aCB0aG9zZSBmb3Jt
YXRzIChBUVQgJiBTdWJyaXApIHdoaWNoIGRlZmluZSB0aGUgZW5kIG9mIGEgc3VidGl0bGUKKyAg
ICAvL2FzIHRoZSBiZWdpbm5pbmcgb2YgdGhlIGZvbGxvd2luZworICAgIHByZXZpb3VzX3N1Yl9l
bmQgPSAwOwogICAgIHdoaWxlKDEpewotICAgICAgICBzdWJ0aXRsZSAqc3ViOwogICAgICAgICBp
ZihzdWJfbnVtPj1uX21heCl7CiAgICAgICAgICAgICBuX21heCs9MTY7CiAgICAgICAgICAgICBm
aXJzdD1yZWFsbG9jKGZpcnN0LG5fbWF4KnNpemVvZihzdWJ0aXRsZSkpOwogICAgICAgICB9Ci0J
c3ViID0gJmZpcnN0W3N1Yl9udW1dOwogCW1lbXNldChzdWIsICdcMCcsIHNpemVvZihzdWJ0aXRs
ZSkpOwogICAgICAgICBzdWI9ZnVuY1tzdWJfZm9ybWF0XShmZCxzdWIpOwogICAgICAgICBpZigh
c3ViKSBicmVhazsgICAvLyBFT0YKICNpZmRlZiBVU0VfSUNPTlYKIAlpZiAoKHN1YiE9RVJSKSAm
JiAoc3ViX3V0ZjggJiAyKSkgc3ViPXN1YmNwX3JlY29kZShzdWIpOwogI2VuZGlmCisJaWYoIXN1
Yl9udW0gfHwgKGZpcnN0W3N1Yl9udW0gLSAxXS5zdGFydCA8PSBzdWItPnN0YXJ0KSl7CisJICAg
IGZpcnN0W3N1Yl9udW1dLnN0YXJ0ID0gc3ViLT5zdGFydDsKKyAgCSAgICBmaXJzdFtzdWJfbnVt
XS5lbmQgICA9IHN1Yi0+ZW5kOworCSAgICBmaXJzdFtzdWJfbnVtXS5saW5lcyA9IHN1Yi0+bGlu
ZXM7CisgIAkgICAgZm9yKGkgPSAwOyBpIDwgc3ViLT5saW5lczsgKytpKXsKKwkJZmlyc3Rbc3Vi
X251bV0udGV4dFtpXSA9IHN1Yi0+dGV4dFtpXTsKKyAgCSAgICB9CisJICAgIGlmIChwcmV2aW91
c19zdWJfZW5kKXsKKyAgCQlmaXJzdFtzdWJfbnVtIC0gMV0uZW5kID0gcHJldmlvdXNfc3ViX2Vu
ZDsKKyAgICAJCXByZXZpb3VzX3N1Yl9lbmQgPSAwOworCSAgICB9CisJfSBlbHNlIHsKKwkgICAg
Zm9yKGogPSBzdWJfbnVtIC0gMTsgaiA+PSAwOyAtLWopeworICAgIAkJZmlyc3RbaiArIDFdLnN0
YXJ0ID0gZmlyc3Rbal0uc3RhcnQ7CisgICAgCQlmaXJzdFtqICsgMV0uZW5kICAgPSBmaXJzdFtq
XS5lbmQ7CisJCWZpcnN0W2ogKyAxXS5saW5lcyA9IGZpcnN0W2pdLmxpbmVzOworICAgIAkJZm9y
KGkgPSAwOyBpIDwgZmlyc3Rbal0ubGluZXM7ICsraSl7CisgICAgICAJCSAgICBmaXJzdFtqICsg
MV0udGV4dFtpXSA9IGZpcnN0W2pdLnRleHRbaV07CisJCX0KKwkJaWYoIWogfHwgKGZpcnN0W2og
LSAxXS5zdGFydCA8PSBzdWItPnN0YXJ0KSl7CisJICAgIAkgICAgZmlyc3Rbal0uc3RhcnQgPSBz
dWItPnN0YXJ0OworCSAgICAJICAgIGZpcnN0W2pdLmVuZCAgID0gc3ViLT5lbmQ7CisJICAgIAkg
ICAgZmlyc3Rbal0ubGluZXMgPSBzdWItPmxpbmVzOworCSAgICAJICAgIGZvcihpID0gMDsgaSA8
IFNVQl9NQVhfVEVYVDsgKytpKXsKKwkJCWZpcnN0W2pdLnRleHRbaV0gPSBzdWItPnRleHRbaV07
CisJCSAgICB9CisJCSAgICBpZiAocHJldmlvdXNfc3ViX2VuZCl7CisJCQlmaXJzdFtqXS5lbmQg
PSBmaXJzdFtqIC0gMV0uZW5kOworCQkJZmlyc3RbaiAtIDFdLmVuZCA9IHByZXZpb3VzX3N1Yl9l
bmQ7CisJCQlwcmV2aW91c19zdWJfZW5kID0gMDsKKwkJICAgIH0KKwkJICAgIGJyZWFrOworICAg
IAkJfQorCSAgICB9CisJfQogICAgICAgICBpZihzdWI9PUVSUikgKytzdWJfZXJyczsgZWxzZSAr
K3N1Yl9udW07IC8vIEVycm9yIHZzLiBWYWxpZAogICAgIH0KICAgICAK