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 7F15D46345 for ; Mon, 15 May 2023 09:40:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8CFC68C054; Mon, 15 May 2023 12:40:00 +0300 (EEST) Received: from mail.coaxion.net (mail.coaxion.net [51.15.18.212]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA4C268BED3 for ; Mon, 15 May 2023 12:39:54 +0300 (EEST) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id CB27CE2B716; Mon, 15 May 2023 11:39:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=coaxion.net; s=dkim; t=1684143593; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding; bh=flZkANzKbXukJ32z8MysLeV0V8YbXW/DwuhYHwhgkgA=; b=kO5QXAKPGirEHP1nc67oTw1Z1v3RMr/frHDWWG+Zs3eq6neHYTikU16lkWOR7nSqWb48wL eI0+D5z2YFeylXiDFq0FbRNEreB6uwGNvjFigRU+1vW3kdK7UUB6JqqfENLrN5RI1qtWmz wyJXNoLmBixgMDo0/GFD0inPwBxqlG2M38y55AD5ceRwXh916td3KUk6Srll4FVcot4Xvu dzJGWUJ0zzNpF6D8n/trldaDqt6lQ1YvU02oASiWl4tFeXkjPS0z0Y08gjw4Q9Wp2Ttj5V /H41j6elXwRH+R2dsqRez6PXNt1DuvX411IlFVaXCW5o1HgejHyDPygx79JelA== From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 12:39:44 +0300 Message-Id: <20230515093944.623728-1-slomo@coaxion.net> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Subject: [FFmpeg-devel] [PATCH] 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 b3JyZWN0bHksIGFuZCBhbGwgZGF0YSB3YXMgaGFuZGxlZCBhcyBmaWVsZCAxLgotLS0KIGxpYmF2 Zm9ybWF0L21vdi5jIHwgMzAgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9s aWJhdmZvcm1hdC9tb3YuYyBiL2xpYmF2Zm9ybWF0L21vdi5jCmluZGV4IDlmZGVlZjA1N2UuLmVk ZDE0NzAxYmYgMTAwNjQ0Ci0tLSBhL2xpYmF2Zm9ybWF0L21vdi5jCisrKyBiL2xpYmF2Zm9ybWF0 L21vdi5jCkBAIC04ODY4LDIyICs4ODY4LDQwIEBAIHN0YXRpYyBpbnQgbW92X2NoYW5nZV9leHRy YWRhdGEoTU9WU3RyZWFtQ29udGV4dCAqc2MsIEFWUGFja2V0ICpwa3QpCiAKIHN0YXRpYyBpbnQg Z2V0X2VpYTYwOF9wYWNrZXQoQVZJT0NvbnRleHQgKnBiLCBBVlBhY2tldCAqcGt0LCBpbnQgc2l6 ZSkKIHsKLSAgICBpbnQgbmV3X3NpemUsIHJldDsKKyAgICBjb25zdCB1aW50MzJfdCBjZGF0X2Zv dXJjYyA9IEFWX1JMMzIoImNkYXQiKTsKKyAgICBjb25zdCB1aW50MzJfdCBjZHQyX2ZvdXJjYyA9 IEFWX1JMMzIoImNkdDIiKTsKKyAgICBpbnQgbmV3X3NpemUsIHdyaXRlX3NpemUsIHJldDsKIAog ICAgIGlmIChzaXplIDw9IDgpCiAgICAgICAgIHJldHVybiBBVkVSUk9SX0lOVkFMSUREQVRBOwor CiAgICAgbmV3X3NpemUgPSAoKHNpemUgLSA4KSAvIDIpICogMzsKICAgICByZXQgPSBhdl9uZXdf cGFja2V0KHBrdCwgbmV3X3NpemUpOwogICAgIGlmIChyZXQgPCAwKQogICAgICAgICByZXR1cm4g cmV0OwogCi0gICAgYXZpb19za2lwKHBiLCA4KTsKLSAgICBmb3IgKGludCBqID0gMDsgaiA8IG5l d19zaXplOyBqICs9IDMpIHsKLSAgICAgICAgcGt0LT5kYXRhW2pdID0gMHhGQzsKLSAgICAgICAg cGt0LT5kYXRhW2orMV0gPSBhdmlvX3I4KHBiKTsKLSAgICAgICAgcGt0LT5kYXRhW2orMl0gPSBh dmlvX3I4KHBiKTsKKyAgICB3cml0ZV9zaXplID0gMDsKKyAgICB3aGlsZSAoc2l6ZSA+IDgpIHsK KyAgICAgIHVpbnQzMl90IGJveF9zaXplID0gYXZpb19yYjMyKHBiKTsKKyAgICAgIHVpbnQzMl90 IGJveF9mb3VyY2MgPSBhdmlvX3JsMzIocGIpOworCisgICAgICBpZiAoYm94X3NpemUgPD0gOCB8 fCAoYm94X3NpemUgJiAxKSAhPSAwIHx8IGJveF9zaXplID4gc2l6ZSkKKyAgICAgICAgcmV0dXJu IEFWRVJST1JfSU5WQUxJRERBVEE7CisgICAgICBpZiAoYm94X2ZvdXJjYyAhPSBjZGF0X2ZvdXJj YyAmJiBib3hfZm91cmNjICE9IGNkdDJfZm91cmNjKQorICAgICAgICByZXR1cm4gQVZFUlJPUl9J TlZBTElEREFUQTsKKworICAgICAgZm9yIChpbnQgaiA9IDg7IGogPCBib3hfc2l6ZTsgaiArPSAy KSB7CisgICAgICAgICAgcGt0LT5kYXRhW3dyaXRlX3NpemVdID0gYm94X2ZvdXJjYyA9PSBjZGF0 X2ZvdXJjYyA/IDB4RkMgOiAweEZGOworICAgICAgICAgIHBrdC0+ZGF0YVt3cml0ZV9zaXplKzFd ID0gYXZpb19yOChwYik7CisgICAgICAgICAgcGt0LT5kYXRhW3dyaXRlX3NpemUrMl0gPSBhdmlv X3I4KHBiKTsKKyAgICAgIH0KKworICAgICAgd3JpdGVfc2l6ZSArPSBib3hfc2l6ZTsKKyAgICAg IHNpemUgLT0gYm94X3NpemU7CiAgICAgfQogCisgICAgYXZfc2hyaW5rX3BhY2tldChwa3QsIHdy aXRlX3NpemUpOworCiAgICAgcmV0dXJuIDA7CiB9CiAKLS0gCjIuNDAuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZmZtcGVnLWRldmVsIG1haWxpbmcg bGlzdApmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZwpodHRwczovL2ZmbXBlZy5vcmcvbWFpbG1hbi9s aXN0aW5mby9mZm1wZWctZGV2ZWwKClRvIHVuc3Vic2NyaWJlLCB2aXNpdCBsaW5rIGFib3ZlLCBv ciBlbWFpbApmZm1wZWctZGV2ZWwtcmVxdWVzdEBmZm1wZWcub3JnIHdpdGggc3ViamVjdCAidW5z dWJzY3JpYmUiLgo=