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 5774846146 for ; Wed, 7 Jun 2023 12:10:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4484368C258; Wed, 7 Jun 2023 15:10:46 +0300 (EEST) Received: from mail.coaxion.net (mail.coaxion.net [51.15.18.212]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12917689B0B for ; Wed, 7 Jun 2023 15:10:39 +0300 (EEST) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 88D74E202CA; Wed, 7 Jun 2023 14:10:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=coaxion.net; s=dkim; t=1686139838; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Isv86pSY+aTjHTj19e84rdMZhJaA+KimunlHB/HTb7U=; b=ak2WZ9BFAauBxTpJUxujdAlsBh7gKs2O+MLd3CenrC6voq/NgGNN+PWzJcGcgKsrq9dmzU 5DYHBnbCjAgFKzqiMM8s78Lfk4L49fsMyXhpnMJ1dAH2CeOhDkDDyedZb/Z5E2XNIkWY7U UmXyoWx1t7XoPV6oSKxaL2oHD+FP1g4JczweE3ZiNaw+Zuvoezj2F2nNLgUec/kZu45yVl LD+thm9/B6RaaWzFXE/nlhKt1KDu4zreNOhfElHgILjZ7JFIVY3SlIWDLfJnGiaZej/+Ks UA1tOBgvW28/+vRYAwahKWqv9+tUox1+51IMNz+rQHQd8y4gC/U31UDstTg/fg== From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jun 2023 15:09:33 +0300 Message-Id: <20230607120933.776663-1-slomo@coaxion.net> In-Reply-To: <20230515093944.623728-1-slomo@coaxion.net> References: <20230515093944.623728-1-slomo@coaxion.net> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Subject: [FFmpeg-devel] [PATCH v2] 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 ZXMgY29tcGFyZWQgdG8gdjE6CiAgLSBTa2lwIG92ZXIgdW5rbm93biBib3hlcyBpbnN0ZWFkIG9m IGVycm9yaW5nIG91dCwgYXMgcmVxdWlyZWQgYnkgdGhlIHNwZWMuCiAgLSBDYWxjdWxhdGUgd3Jp dGVfc2l6ZSBjb3JyZWN0bHkuCgogbGliYXZmb3JtYXQvbW92LmMgfCAzMyArKysrKysrKysrKysr KysrKysrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCA2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L21vdi5jIGIvbGliYXZmb3Jt YXQvbW92LmMKaW5kZXggOWZkZWVmMDU3ZS4uMzQxYjQyMjI4ZCAxMDA2NDQKLS0tIGEvbGliYXZm b3JtYXQvbW92LmMKKysrIGIvbGliYXZmb3JtYXQvbW92LmMKQEAgLTg4NjgsMjIgKzg4NjgsNDMg QEAgc3RhdGljIGludCBtb3ZfY2hhbmdlX2V4dHJhZGF0YShNT1ZTdHJlYW1Db250ZXh0ICpzYywg QVZQYWNrZXQgKnBrdCkKIAogc3RhdGljIGludCBnZXRfZWlhNjA4X3BhY2tldChBVklPQ29udGV4 dCAqcGIsIEFWUGFja2V0ICpwa3QsIGludCBzaXplKQogewotICAgIGludCBuZXdfc2l6ZSwgcmV0 OworICAgIGNvbnN0IHVpbnQzMl90IGNkYXRfZm91cmNjID0gQVZfUkwzMigiY2RhdCIpOworICAg IGNvbnN0IHVpbnQzMl90IGNkdDJfZm91cmNjID0gQVZfUkwzMigiY2R0MiIpOworICAgIGludCBu ZXdfc2l6ZSwgd3JpdGVfc2l6ZSwgcmV0OwogCiAgICAgaWYgKHNpemUgPD0gOCkKICAgICAgICAg cmV0dXJuIEFWRVJST1JfSU5WQUxJRERBVEE7CisKICAgICBuZXdfc2l6ZSA9ICgoc2l6ZSAtIDgp IC8gMikgKiAzOwogICAgIHJldCA9IGF2X25ld19wYWNrZXQocGt0LCBuZXdfc2l6ZSk7CiAgICAg aWYgKHJldCA8IDApCiAgICAgICAgIHJldHVybiByZXQ7CiAKLSAgICBhdmlvX3NraXAocGIsIDgp OwotICAgIGZvciAoaW50IGogPSAwOyBqIDwgbmV3X3NpemU7IGogKz0gMykgewotICAgICAgICBw a3QtPmRhdGFbal0gPSAweEZDOwotICAgICAgICBwa3QtPmRhdGFbaisxXSA9IGF2aW9fcjgocGIp OwotICAgICAgICBwa3QtPmRhdGFbaisyXSA9IGF2aW9fcjgocGIpOworICAgIHdyaXRlX3NpemUg PSAwOworICAgIHdoaWxlIChzaXplID4gOCkgeworICAgICAgdWludDMyX3QgYm94X3NpemUgPSBh dmlvX3JiMzIocGIpOworICAgICAgdWludDMyX3QgYm94X2ZvdXJjYyA9IGF2aW9fcmwzMihwYik7 CisKKyAgICAgIGlmIChib3hfc2l6ZSA8PSA4IHx8IChib3hfc2l6ZSAmIDEpICE9IDAgfHwgYm94 X3NpemUgPiBzaXplKQorICAgICAgICByZXR1cm4gQVZFUlJPUl9JTlZBTElEREFUQTsKKyAgICAg IGlmIChib3hfZm91cmNjICE9IGNkYXRfZm91cmNjICYmIGJveF9mb3VyY2MgIT0gY2R0Ml9mb3Vy Y2MpIHsKKyAgICAgICAgYXZpb19za2lwKHBiLCBib3hfc2l6ZSAtIDgpOworICAgICAgICBzaXpl IC09IGJveF9zaXplOworICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKworICAgICAgZm9yIChp bnQgaiA9IDg7IGogPCBib3hfc2l6ZTsgaiArPSAyKSB7CisgICAgICAgICAgcGt0LT5kYXRhW3dy aXRlX3NpemVdID0gYm94X2ZvdXJjYyA9PSBjZGF0X2ZvdXJjYyA/IDB4RkMgOiAweEZGOworICAg ICAgICAgIHBrdC0+ZGF0YVt3cml0ZV9zaXplKzFdID0gYXZpb19yOChwYik7CisgICAgICAgICAg cGt0LT5kYXRhW3dyaXRlX3NpemUrMl0gPSBhdmlvX3I4KHBiKTsKKyAgICAgICAgICB3cml0ZV9z aXplICs9IDM7CisgICAgICB9CisKKyAgICAgIHNpemUgLT0gYm94X3NpemU7CiAgICAgfQogCisg ICAgYXZfc2hyaW5rX3BhY2tldChwa3QsIHdyaXRlX3NpemUpOworCiAgICAgcmV0dXJuIDA7CiB9 CiAKLS0gCjIuNDAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZmZtcGVnLWRldmVsIG1haWxpbmcgbGlzdApmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZwpo dHRwczovL2ZmbXBlZy5vcmcvbWFpbG1hbi9saXN0aW5mby9mZm1wZWctZGV2ZWwKClRvIHVuc3Vi c2NyaWJlLCB2aXNpdCBsaW5rIGFib3ZlLCBvciBlbWFpbApmZm1wZWctZGV2ZWwtcmVxdWVzdEBm Zm1wZWcub3JnIHdpdGggc3ViamVjdCAidW5zdWJzY3JpYmUiLgo=