From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2A4BB466F3 for ; Wed, 7 Jun 2023 14:26:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A84368BEB7; Wed, 7 Jun 2023 17:26:38 +0300 (EEST) Received: from mail.coaxion.net (mail.coaxion.net [51.15.18.212]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 011DB68B103 for ; Wed, 7 Jun 2023 17:26:30 +0300 (EEST) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id EC71CE20580; Wed, 7 Jun 2023 16:26:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=coaxion.net; s=dkim; t=1686147990; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=xLkaSzIYGAsa+HjNImtI8FoQp6s9T3uJS/LSha0rMak=; b=Y/nlU+hdtnaRZcMv0iXBZmnHByjpoeooVxbAdjz8h6n9VBNtFhN65+F15Xt4zHNEv5txR9 QfIzo0WINiiIqervlc8orZSPPNtPvPPcQpLreLIRcgj8qnc6u3bWPWvHEgKi3eeAEht5x4 kDePP8UxRluYpSgfPVcwjhiFYEWN2V1cnETR39aK9VrhF8fAwlfQbKFUDf8cTgdoG1T4Yx 6FcSpOS4hgvdR+ffJbxvLwrKhTRsg67KfzN3duLKo39bVOU/+xSHy5MVnJb2fvOgNBc6+i NvNd5Y96Jepptbaxom54ARW6za3DTCQyF3U14k7tkBv8Vh2jYyqgkpg0avbvew== From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jun 2023 17:26:27 +0300 Message-Id: <20230607142627.808312-1-slomo@coaxion.net> In-Reply-To: <20230607120933.776663-1-slomo@coaxion.net> References: <20230607120933.776663-1-slomo@coaxion.net> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Subject: [FFmpeg-devel] [PATCH v3] avformat/mov: Correctly read EIA608 packets if multiple boxes or non-field 1 data is present X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: RnJvbTogU2ViYXN0aWFuIERyw7ZnZSA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KClRoZSBw YXlsb2FkIG9mIEVJQTYwOCBzYW1wbGVzIGluIE1PViBpcyBvbmUgb3IgbW9yZSBjZGF0IG9yIGNk dDIgYm94ZXMuCmNkYXQgY29udGFpbnMgRUlBNjA4IGJ5dGUgcGFpcnMgZm9yIGZpZWxkIDEsIGNk dDIgZm9yIGZpZWxkIDIuCgpQcmV2aW91c2x5IGFueSBib3ggZm9sbG93aW5nIHRoZSBmaXJzdCB3 YXMgdHJlYXRlZCBhcyBFSUE2MDggYnl0ZSBwYWlycwppbnN0ZWFkIG9mIHBhcnNpbmcgdGhlbSBj b3JyZWN0bHksIGFuZCBhbGwgZGF0YSB3YXMgaGFuZGxlZCBhcyBmaWVsZCAxLgotLS0KCkNoYW5n ZXMgY29tcGFyZWQgdG8gdjI6CiAgLSBVc2UgMHhGRCBpbnN0ZWFkIG9mIDB4RkYgZm9yIGZpZWxk IDIuIFRoYW5rcyB0byBEZXZpbiBIZWl0bXVlbGxlciBmb3IKICAgIG5vdGljaW5nIHRoYXQgdHlw by4KCiBsaWJhdmZvcm1hdC9tb3YuYyB8IDMzICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQvbW92LmMgYi9saWJhdmZvcm1hdC9tb3YuYwppbmRleCA5 ZmRlZWYwNTdlLi40Yzc5ZmM4ODU3IDEwMDY0NAotLS0gYS9saWJhdmZvcm1hdC9tb3YuYworKysg Yi9saWJhdmZvcm1hdC9tb3YuYwpAQCAtODg2OCwyMiArODg2OCw0MyBAQCBzdGF0aWMgaW50IG1v dl9jaGFuZ2VfZXh0cmFkYXRhKE1PVlN0cmVhbUNvbnRleHQgKnNjLCBBVlBhY2tldCAqcGt0KQog CiBzdGF0aWMgaW50IGdldF9laWE2MDhfcGFja2V0KEFWSU9Db250ZXh0ICpwYiwgQVZQYWNrZXQg KnBrdCwgaW50IHNpemUpCiB7Ci0gICAgaW50IG5ld19zaXplLCByZXQ7CisgICAgY29uc3QgdWlu dDMyX3QgY2RhdF9mb3VyY2MgPSBBVl9STDMyKCJjZGF0Iik7CisgICAgY29uc3QgdWludDMyX3Qg Y2R0Ml9mb3VyY2MgPSBBVl9STDMyKCJjZHQyIik7CisgICAgaW50IG5ld19zaXplLCB3cml0ZV9z aXplLCByZXQ7CiAKICAgICBpZiAoc2l6ZSA8PSA4KQogICAgICAgICByZXR1cm4gQVZFUlJPUl9J TlZBTElEREFUQTsKKwogICAgIG5ld19zaXplID0gKChzaXplIC0gOCkgLyAyKSAqIDM7CiAgICAg cmV0ID0gYXZfbmV3X3BhY2tldChwa3QsIG5ld19zaXplKTsKICAgICBpZiAocmV0IDwgMCkKICAg ICAgICAgcmV0dXJuIHJldDsKIAotICAgIGF2aW9fc2tpcChwYiwgOCk7Ci0gICAgZm9yIChpbnQg aiA9IDA7IGogPCBuZXdfc2l6ZTsgaiArPSAzKSB7Ci0gICAgICAgIHBrdC0+ZGF0YVtqXSA9IDB4 RkM7Ci0gICAgICAgIHBrdC0+ZGF0YVtqKzFdID0gYXZpb19yOChwYik7Ci0gICAgICAgIHBrdC0+ ZGF0YVtqKzJdID0gYXZpb19yOChwYik7CisgICAgd3JpdGVfc2l6ZSA9IDA7CisgICAgd2hpbGUg KHNpemUgPiA4KSB7CisgICAgICB1aW50MzJfdCBib3hfc2l6ZSA9IGF2aW9fcmIzMihwYik7Cisg ICAgICB1aW50MzJfdCBib3hfZm91cmNjID0gYXZpb19ybDMyKHBiKTsKKworICAgICAgaWYgKGJv eF9zaXplIDw9IDggfHwgKGJveF9zaXplICYgMSkgIT0gMCB8fCBib3hfc2l6ZSA+IHNpemUpCisg ICAgICAgIHJldHVybiBBVkVSUk9SX0lOVkFMSUREQVRBOworICAgICAgaWYgKGJveF9mb3VyY2Mg IT0gY2RhdF9mb3VyY2MgJiYgYm94X2ZvdXJjYyAhPSBjZHQyX2ZvdXJjYykgeworICAgICAgICBh dmlvX3NraXAocGIsIGJveF9zaXplIC0gOCk7CisgICAgICAgIHNpemUgLT0gYm94X3NpemU7Cisg ICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICBmb3IgKGludCBqID0gODsgaiA8IGJv eF9zaXplOyBqICs9IDIpIHsKKyAgICAgICAgICBwa3QtPmRhdGFbd3JpdGVfc2l6ZV0gPSBib3hf Zm91cmNjID09IGNkYXRfZm91cmNjID8gMHhGQyA6IDB4RkQ7CisgICAgICAgICAgcGt0LT5kYXRh W3dyaXRlX3NpemUrMV0gPSBhdmlvX3I4KHBiKTsKKyAgICAgICAgICBwa3QtPmRhdGFbd3JpdGVf c2l6ZSsyXSA9IGF2aW9fcjgocGIpOworICAgICAgICAgIHdyaXRlX3NpemUgKz0gMzsKKyAgICAg IH0KKworICAgICAgc2l6ZSAtPSBib3hfc2l6ZTsKICAgICB9CiAKKyAgICBhdl9zaHJpbmtfcGFj a2V0KHBrdCwgd3JpdGVfc2l6ZSk7CisKICAgICByZXR1cm4gMDsKIH0KIAotLSAKMi40MC4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpmZm1wZWctZGV2 ZWwgbWFpbGluZyBsaXN0CmZmbXBlZy1kZXZlbEBmZm1wZWcub3JnCmh0dHBzOi8vZmZtcGVnLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ZmbXBlZy1kZXZlbAoKVG8gdW5zdWJzY3JpYmUsIHZpc2l0IGxp bmsgYWJvdmUsIG9yIGVtYWlsCmZmbXBlZy1kZXZlbC1yZXF1ZXN0QGZmbXBlZy5vcmcgd2l0aCBz dWJqZWN0ICJ1bnN1YnNjcmliZSIuCg==