[MPlayer-dev-eng] [PATCH] support for overlapping subtitles

[Salvatore Falco]

This patch is to add support for overlapping subtitles, that is
subtitles whose start or end happens during another subtitle.

After reading the subtitles from the file in `subtitle* sub_read_file
(char *, float)' this patch looks for overlapping subtitles and split
them into more non-overlapping subtitles.
For example, given two subtitles, A and B, with in time order:
    1- A's beginning,
    2- B's beginning,
    3- A's ending,
    4- B's ending,
this patch creates three subtitles:
    1- a subtitle from A's to B's beginning, with A's lines and a number
	of blank lines equal to B's lines;
    2- a subtitle from B's beginning to A's ending, with all the lines from
	both subtitles;
    3- a subtitle form A's to B's ending, with only B's lines.
This patch slightly changes also `void adjust_subs_time(subtitle*,float,float)'
to avoid its working on overlapping subtitles.

Bye all,
    Salvatore Falco
-------------- next part --------------
LS0tIHN1YnJlYWRlci5jLm9yaWcJMjAwMi0xMC0xNyAwMjo1MzoxNC4wMDAwMDAwMDAgKzAyMDAK
KysrIHN1YnJlYWRlci5jCTIwMDItMTAtMjkgMDI6MDk6MTMuMDAwMDAwMDAwICswMTAwCkBAIC03
MjgsNyArNzI4LDcgQEAKIAogI2VuZGlmCiAKLXN0YXRpYyB2b2lkIGFkanVzdF9zdWJzX3RpbWUo
c3VidGl0bGUqIHN1YiwgZmxvYXQgc3VidGltZSwgZmxvYXQgZnBzKXsKK3N0YXRpYyB2b2lkIGFk
anVzdF9zdWJzX3RpbWUoc3VidGl0bGUqIHN1YiwgZmxvYXQgc3VidGltZSwgZmxvYXQgZnBzLCB1
bnNpZ25lZCBzaG9ydCBibG9jayl7CiAJaW50IG4sbTsKIAlzdWJ0aXRsZSogbmV4dHN1YjsKIAlp
bnQgaSA9IHN1Yl9udW07CkBAIC03MzYsNiArNzM2LDcgQEAKIAkKIAluPW09MDsKIAlpZiAoaSkJ
Zm9yICg7Oyl7CisJICAgIGlmICghYmxvY2spCiAJCWlmIChzdWItPmVuZCA8PSBzdWItPnN0YXJ0
KXsKIAkJCXN1Yi0+ZW5kID0gc3ViLT5zdGFydCArIHN1YmZtczsKIAkJCW0rKzsKQEAgLTc0Myw2
ICs3NDQsNyBAQAogCQl9CiAJCWlmICghLS1pKSBicmVhazsKIAkJbmV4dHN1YiA9IHN1YiArIDE7
CisJICAgIGlmIChibG9jayl7CiAJCWlmIChzdWItPmVuZCA+PSBuZXh0c3ViLT5zdGFydCl7CiAJ
CQlzdWItPmVuZCA9IG5leHRzdWItPnN0YXJ0IC0gMTsKIAkJCWlmIChzdWItPmVuZCAtIHN1Yi0+
c3RhcnQgPiBzdWJmbXMpCkBAIC03NjUsNiArNzY3LDcgQEAKIAkJCXN1Yi0+c3RhcnQgKj0gc3Vi
X2Zwcy9mcHM7CiAJCQlzdWItPmVuZCAgICo9IHN1Yl9mcHMvZnBzOwogCQl9CisJICAgIH0KIAog
CQlzdWIgPSBuZXh0c3ViOwogCQltID0gMDsKQEAgLTc3NCw4ICs3NzcsOCBAQAogCiBzdWJ0aXRs
ZSogc3ViX3JlYWRfZmlsZSAoY2hhciAqZmlsZW5hbWUsIGZsb2F0IGZwcykgewogICAgIEZJTEUg
KmZkOwotICAgIGludCBuX21heDsKLSAgICBzdWJ0aXRsZSAqZmlyc3Q7CisgICAgaW50IG5fbWF4
LCBuX2ZpcnN0LCBpLCBqLCBzdWJfZmlyc3QsIHN1Yl9vcmlnOworICAgIHN1YnRpdGxlICpmaXJz
dCwgKnNlY29uZDsKICAgICBjaGFyICpmbXRuYW1lW10gPSB7ICJtaWNyb2R2ZCIsICJzdWJyaXAi
LCAic3Vidmlld2VyIiwgInNhbWkiLCAidnBsYXllciIsCiAJCSAgICAgICAgInJ0IiwgInNzYSIs
ICJkdW5ub3doYXQiLCAibXBzdWIiLCAiYXF0IiwgInN1YnZpZXdlciAyLjAiLCAic3VicmlwIDAu
OSIgfTsKICAgICBzdWJ0aXRsZSAqICgqZnVuY1tdKShGSUxFICpmZCxzdWJ0aXRsZSAqZGVzdCk9
CkBAIC04NDMsOCArODQ2LDEwMyBAQAogCXJldHVybiBOVUxMOwogICAgIH0KIAotICAgIGFkanVz
dF9zdWJzX3RpbWUoZmlyc3QsIDYuMCwgZnBzKTsgLyogfjYgc2VjcyBBU1QgKi8KLSAgICByZXR1
cm4gZmlyc3Q7CisgICAgYWRqdXN0X3N1YnNfdGltZShmaXJzdCwgNi4wLCBmcHMsIDApOwkvKiB+
NiBzZWNzIEFTVCAqLworCisvLyBoZXJlIHdlIG1hbmFnZSBvdmVybGFwcGluZyBzdWJ0aXRsZXMK
KyAgICBzdWJfb3JpZyA9IHN1Yl9udW07CisgICAgbl9maXJzdCA9IHN1Yl9udW07CisgICAgbl9t
YXggPSAwOworICAgIHN1Yl9udW0gPSAwOworICAgIHNlY29uZCA9IE5VTEw7CisvLyBmb3IgZWFj
aCBzdWJ0aXRsZSBpbiBmaXJzdFtdCisgICAgZm9yIChzdWJfZmlyc3QgPSAwOyBzdWJfZmlyc3Qg
PCBuX2ZpcnN0OyArK3N1Yl9maXJzdCkgeworCXdoaWxlIChmaXJzdFtzdWJfZmlyc3RdLnN0YXJ0
IDw9IGZpcnN0W3N1Yl9maXJzdF0uZW5kKSB7CisJICAgIHVuc2lnbmVkIGxvbmcgZW5kX3RpbWUg
PSBmaXJzdFtzdWJfZmlyc3RdLmVuZDsKKwkgICAgaW50IGxpbmVzX3RvX2FkZCA9IDAsIHN1Yl90
b19hZGQsIGV2ZW50LCBscywgbGY7CisKKy8vIHRoZXJlIGlzIGEgbmV3IHN1YnRpdGxlLCBzbyBs
ZXQncyBtYWtlIHNlY29uZFtdIGJpZ2dlcgorCSAgICBuX21heCArPSAxOworCSAgICBzZWNvbmQg
PSByZWFsbG9jKHNlY29uZCwgbl9tYXggKiBzaXplb2Yoc3VidGl0bGUpKTsKKwkgICAgbWVtc2V0
KCZzZWNvbmRbbl9tYXggLSAxXSwgJ1wwJywgc2l6ZW9mKHN1YnRpdGxlKSk7CisKKy8vIGZpbmQg
dGhlIG51bWJlciBvZiBsaW5lcyBhbmQgc3VidGl0bGVzIHRoYXQgb3ZlcmxhcCB0aGUgY3VycmVu
dCBzdWJ0aXRsZQorCSAgICBmb3IgKHN1Yl90b19hZGQgPSAwOworCQkgKGVuZF90aW1lID4gZmly
c3Rbc3ViX2ZpcnN0ICsgc3ViX3RvX2FkZCArIDFdLnN0YXJ0KQorCQkgJiYgKHN1Yl9maXJzdCAr
IHN1Yl90b19hZGQgKyAxIDwgbl9maXJzdCk7ICsrc3ViX3RvX2FkZCkgeworCQlsaW5lc190b19h
ZGQgKz0gZmlyc3Rbc3ViX2ZpcnN0ICsgc3ViX3RvX2FkZCArIDFdLmxpbmVzOworCSAgICB9CisJ
ICAgIGlmICgobGluZXNfdG9fYWRkID4gMCkKKwkJJiYgKGZpcnN0W3N1Yl9maXJzdF0ubGluZXMg
KyBsaW5lc190b19hZGQgPAorCQkgICAgU1VCX01BWF9URVhUKSkgeworCQl1bnNpZ25lZCBsb25n
IG5leHQ7CisKKy8vIGZpbmQgbmV4dCBiZWdpbm5pbmctb2YtYS1zdWJ0aXRsZSB0aW1lCisJCW5l
eHQgPSBmaXJzdFtzdWJfZmlyc3RdLmVuZCArIDE7CisJCWV2ZW50ID0gc3ViX2ZpcnN0OworCQlm
b3IgKGogPSAwOyBqIDwgbGluZXNfdG9fYWRkOyBqKyspIHsKKwkJICAgIGlmICgoZmlyc3Rbc3Vi
X2ZpcnN0ICsgaiArIDFdLmVuZCArIDEgPCBuZXh0KQorCQkJJiYgKGZpcnN0W3N1Yl9maXJzdCAr
IGogKyAxXS5lbmQgPj0KKwkJCSAgICBmaXJzdFtzdWJfZmlyc3RdLnN0YXJ0KSkgeworCQkJZXZl
bnQgPSBzdWJfZmlyc3QgKyBqICsgMTsKKwkJCW5leHQgPSBmaXJzdFtldmVudF0uZW5kICsgMTsK
KwkJICAgIH0KKwkJICAgIGlmICgoZmlyc3Rbc3ViX2ZpcnN0ICsgaiArIDFdLnN0YXJ0IDwgbmV4
dCkKKwkJCSYmIChmaXJzdFtzdWJfZmlyc3QgKyBqICsgMV0uc3RhcnQgPgorCQkJICAgIGZpcnN0
W3N1Yl9maXJzdF0uc3RhcnQpKSB7CisJCQlldmVudCA9IHN1Yl9maXJzdCArIGogKyAxOworCQkJ
bmV4dCA9IGZpcnN0W2V2ZW50XS5zdGFydDsKKwkJICAgIH0KKwkJfQorCQlzZWNvbmRbc3ViX251
bV0uc3RhcnQgPSBmaXJzdFtzdWJfZmlyc3RdLnN0YXJ0OworCQlzZWNvbmRbc3ViX251bV0uZW5k
ID0gbmV4dCAtIDE7CisJCXNlY29uZFtzdWJfbnVtXS5saW5lcyA9IGZpcnN0W3N1Yl9maXJzdF0u
bGluZXM7CisJCWZvciAobHMgPSAwLCBsZiA9IDA7IGxzIDwgc2Vjb25kW3N1Yl9udW1dLmxpbmVz
OyBscysrLCBsZisrKSB7CisJCSAgICBzZWNvbmRbc3ViX251bV0udGV4dFtsc10gPQorCQkJc3Ry
ZHVwKGZpcnN0W3N1Yl9maXJzdF0udGV4dFtsZl0pOworCQl9CisJCWZvciAoaiA9IDA7IGogPCBz
dWJfdG9fYWRkOyBqKyspIHsKKwkJICAgIGlmICgoZmlyc3Rbc3ViX2ZpcnN0ICsgaiArIDFdLnN0
YXJ0IDw9CisJCQkgc2Vjb25kW3N1Yl9udW1dLnN0YXJ0KQorCQkJJiYgKGZpcnN0W3N1Yl9maXJz
dCArIGogKyAxXS5lbmQgPj0KKwkJCSAgICBzZWNvbmRbc3ViX251bV0uZW5kKQorCQkJJiYgKHNl
Y29uZFtzdWJfbnVtXS5saW5lcyArCisJCQkgICAgZmlyc3Rbc3ViX2ZpcnN0ICsgaiArIDFdLmxp
bmVzIDw9CisJCQkgICAgU1VCX01BWF9URVhUKSkgeworCQkJZm9yIChsZiA9IDA7IGxmIDwgZmly
c3Rbc3ViX2ZpcnN0ICsgaiArIDFdLmxpbmVzOworCQkJICAgICBsZisrLCBscysrKQorCQkJICAg
IHNlY29uZFtzdWJfbnVtXS50ZXh0W2xzXSA9CisJCQkJc3RyZHVwKGZpcnN0W3N1Yl9maXJzdCAr
IGogKyAxXS50ZXh0W2xmXSk7CisJCQlmaXJzdFtzdWJfZmlyc3QgKyBqICsgMV0uc3RhcnQgPSBu
ZXh0OworCQkgICAgfSBlbHNlCisJCQlmb3IgKGxmID0gMDsgbGYgPCBmaXJzdFtzdWJfZmlyc3Qg
KyBqICsgMV0ubGluZXM7CisJCQkgICAgIGxmKyssIGxzKyspCisJCQkgICAgc2Vjb25kW3N1Yl9u
dW1dLnRleHRbbHNdID0gc3RyZHVwKCIgIik7CisJCSAgICBzZWNvbmRbc3ViX251bV0ubGluZXMg
Kz0KKwkJCWZpcnN0W3N1Yl9maXJzdCArIGogKyAxXS5saW5lczsKKwkJfQorCQlmaXJzdFtzdWJf
Zmlyc3RdLnN0YXJ0ID0gbmV4dDsKKwkgICAgfSBlbHNlIHsKKwkJc2Vjb25kW3N1Yl9udW1dLnN0
YXJ0ID0gZmlyc3Rbc3ViX2ZpcnN0XS5zdGFydDsKKwkJc2Vjb25kW3N1Yl9udW1dLmVuZCA9IGZp
cnN0W3N1Yl9maXJzdF0uZW5kOworCQlzZWNvbmRbc3ViX251bV0ubGluZXMgPSBmaXJzdFtzdWJf
Zmlyc3RdLmxpbmVzOworCQlmb3IgKGxzID0gMDsgbHMgPCBzZWNvbmRbc3ViX251bV0ubGluZXM7
IGxzKyspCisJCSAgICBzZWNvbmRbc3ViX251bV0udGV4dFtsc10gPQorCQkJc3RyZHVwKGZpcnN0
W3N1Yl9maXJzdF0udGV4dFtsc10pOworCQlmaXJzdFtzdWJfZmlyc3RdLnN0YXJ0ID0gZmlyc3Rb
c3ViX2ZpcnN0XS5lbmQgKyAxOworCSAgICB9CisJICAgICsrc3ViX251bTsKKwl9CQkJLy8gd2hp
bGUKKyAgICB9CisgICAgYWRqdXN0X3N1YnNfdGltZShzZWNvbmQsIDYuMCwgZnBzLCAxKTsJLyog
fjYgc2VjcyBBU1QgKi8KKworICAgIGZvciAoaiA9IHN1Yl9vcmlnIC0gMTsgaiA8PSAwOyAtLWop
IHsKKwlmb3IgKGkgPSBmaXJzdFtqXS5saW5lcyAtIDE7IGkgPD0gMDsgLS1pKSB7CisJICAgIGZy
ZWUoZmlyc3Rbal0udGV4dFtpXSk7CisJfQorCWZyZWUoJmZpcnN0W2pdKTsKKyAgICB9CisKKyAg
ICByZXR1cm4gc2Vjb25kOwogfQogCiAjaWYgMAo=