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 614A840610 for ; Sat, 24 Dec 2022 19:36:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0AEF368BBD7; Sat, 24 Dec 2022 21:36:30 +0200 (EET) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 194B968BAA7 for ; Sat, 24 Dec 2022 21:36:23 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 37FDC240002 for ; Sat, 24 Dec 2022 19:36:21 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 24 Dec 2022 20:36:21 +0100 Message-Id: <20221224193621.4593-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/mxfdec: Remove this_partition 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 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: U3VnZ2VzdGVkLWJ5OiBUb21hcyBIw6RyZGluIDxnaXRAaGFlcmRpbi5zZT4KClNpZ25lZC1vZmYt Ynk6IE1pY2hhZWwgTmllZGVybWF5ZXIgPG1pY2hhZWxAbmllZGVybWF5ZXIuY2M+Ci0tLQogbGli YXZmb3JtYXQvbXhmZGVjLmMgfCAyOSArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2xpYmF2Zm9ybWF0L214ZmRlYy5jIGIvbGliYXZmb3JtYXQvbXhmZGVjLmMKaW5kZXggZTYx MThlMTQxZC4uMDU1MzcyODI1MyAxMDA2NDQKLS0tIGEvbGliYXZmb3JtYXQvbXhmZGVjLmMKKysr IGIvbGliYXZmb3JtYXQvbXhmZGVjLmMKQEAgLTEwMCw3ICsxMDAsNiBAQCB0eXBlZGVmIHN0cnVj dCBNWEZQYXJ0aXRpb24gewogICAgIHVpbnQ2NF90IHByZXZpb3VzX3BhcnRpdGlvbjsKICAgICBp bnQgaW5kZXhfc2lkOwogICAgIGludCBib2R5X3NpZDsKLSAgICBpbnQ2NF90IHRoaXNfcGFydGl0 aW9uOwogICAgIGludDY0X3QgZXNzZW5jZV9vZmZzZXQ7ICAgICAgICAgLy8vPCBhYnNvbHV0ZSBv ZmZzZXQgb2YgZXNzZW5jZQogICAgIGludDY0X3QgZXNzZW5jZV9sZW5ndGg7CiAgICAgaW50MzJf dCBrYWdfc2l6ZTsKQEAgLTcyNSwxMCArNzI0LDE0IEBAIHN0YXRpYyBpbnQgbXhmX3JlYWRfcGFy dGl0aW9uX3BhY2sodm9pZCAqYXJnLCBBVklPQ29udGV4dCAqcGIsIGludCB0YWcsIGludCBzaXpl CiAgICAgVUlEIG9wOwogICAgIHVpbnQ2NF90IGZvb3Rlcl9wYXJ0aXRpb247CiAgICAgdWludDMy X3QgbmJfZXNzZW5jZV9jb250YWluZXJzOworICAgIHVpbnQ2NF90IHRoaXNfcGFydGl0aW9uOwog CiAgICAgaWYgKG14Zi0+cGFydGl0aW9uc19jb3VudCA+PSBJTlRfTUFYIC8gMikKICAgICAgICAg cmV0dXJuIEFWRVJST1JfSU5WQUxJRERBVEE7CiAKKyAgICBpZiAoa2x2X29mZnNldCA8IG14Zi0+ cnVuX2luKQorICAgICAgICByZXR1cm4gQVZFUlJPUl9JTlZBTElEREFUQTsKKwogICAgIHRtcF9w YXJ0ID0gYXZfcmVhbGxvY19hcnJheShteGYtPnBhcnRpdGlvbnMsIG14Zi0+cGFydGl0aW9uc19j b3VudCArIDEsIHNpemVvZigqbXhmLT5wYXJ0aXRpb25zKSk7CiAgICAgaWYgKCF0bXBfcGFydCkK ICAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsKQEAgLTc3MSw3ICs3NzQsMTMgQEAgc3Rh dGljIGludCBteGZfcmVhZF9wYXJ0aXRpb25fcGFjayh2b2lkICphcmcsIEFWSU9Db250ZXh0ICpw YiwgaW50IHRhZywgaW50IHNpemUKICAgICBwYXJ0aXRpb24tPmNvbXBsZXRlID0gdWlkWzE0XSA+ IDI7CiAgICAgYXZpb19za2lwKHBiLCA0KTsKICAgICBwYXJ0aXRpb24tPmthZ19zaXplID0gYXZp b19yYjMyKHBiKTsKLSAgICBwYXJ0aXRpb24tPnRoaXNfcGFydGl0aW9uID0gYXZpb19yYjY0KHBi KTsKKyAgICB0aGlzX3BhcnRpdGlvbiA9IGF2aW9fcmI2NChwYik7CisgICAgaWYgKHRoaXNfcGFy dGl0aW9uICE9IGtsdl9vZmZzZXQgLSBteGYtPnJ1bl9pbikgeworICAgICAgICBhdl9sb2cobXhm LT5mYywgQVZfTE9HX1dBUk5JTkcsCisgICAgICAgICAgICAgICAidGhpc19wYXJ0aXRpb24gJSJQ UklkNjQiIG1pc21hdGNoZXMgJSJQUklkNjQiXG4iLAorICAgICAgICAgICAgICAgdGhpc19wYXJ0 aXRpb24sIGtsdl9vZmZzZXQgLSBteGYtPnJ1bl9pbik7CisgICAgICAgIHRoaXNfcGFydGl0aW9u ID0ga2x2X29mZnNldCAtIG14Zi0+cnVuX2luOworICAgIH0KICAgICBwYXJ0aXRpb24tPnByZXZp b3VzX3BhcnRpdGlvbiA9IGF2aW9fcmI2NChwYik7CiAgICAgZm9vdGVyX3BhcnRpdGlvbiA9IGF2 aW9fcmI2NChwYik7CiAgICAgcGFydGl0aW9uLT5oZWFkZXJfYnl0ZV9jb3VudCA9IGF2aW9fcmI2 NChwYik7CkBAIC03OTEsOCArODAwLDggQEAgc3RhdGljIGludCBteGZfcmVhZF9wYXJ0aXRpb25f cGFjayh2b2lkICphcmcsIEFWSU9Db250ZXh0ICpwYiwgaW50IHRhZywgaW50IHNpemUKICAgICAg ICAgYXZfZGljdF9zZXQoJnMtPm1ldGFkYXRhLCAib3BlcmF0aW9uYWxfcGF0dGVybl91bCIsIHN0 ciwgMCk7CiAgICAgfQogCi0gICAgaWYgKHBhcnRpdGlvbi0+dGhpc19wYXJ0aXRpb24gJiYKLSAg ICAgICAgcGFydGl0aW9uLT5wcmV2aW91c19wYXJ0aXRpb24gPT0gcGFydGl0aW9uLT50aGlzX3Bh cnRpdGlvbikgeworICAgIGlmICh0aGlzX3BhcnRpdGlvbiAmJgorICAgICAgICBwYXJ0aXRpb24t PnByZXZpb3VzX3BhcnRpdGlvbiA9PSB0aGlzX3BhcnRpdGlvbikgewogICAgICAgICBhdl9sb2co bXhmLT5mYywgQVZfTE9HX0VSUk9SLAogICAgICAgICAgICAgICAgIlByZXZpb3VzUGFydGl0aW9u IGVxdWFsIHRvIFRoaXNQYXJ0aXRpb24gJSJQUkl4NjQiXG4iLAogICAgICAgICAgICAgICAgcGFy dGl0aW9uLT5wcmV2aW91c19wYXJ0aXRpb24pOwpAQCAtODAwLDExICs4MDksMTEgQEAgc3RhdGlj IGludCBteGZfcmVhZF9wYXJ0aXRpb25fcGFjayh2b2lkICphcmcsIEFWSU9Db250ZXh0ICpwYiwg aW50IHRhZywgaW50IHNpemUKICAgICAgICAgaWYgKCFteGYtPnBhcnNpbmdfYmFja3dhcmQgJiYg bXhmLT5sYXN0X2ZvcndhcmRfcGFydGl0aW9uID4gMSkgewogICAgICAgICAgICAgTVhGUGFydGl0 aW9uICpwcmV2ID0KICAgICAgICAgICAgICAgICBteGYtPnBhcnRpdGlvbnMgKyBteGYtPmxhc3Rf Zm9yd2FyZF9wYXJ0aXRpb24gLSAyOwotICAgICAgICAgICAgcGFydGl0aW9uLT5wcmV2aW91c19w YXJ0aXRpb24gPSBwcmV2LT50aGlzX3BhcnRpdGlvbjsKKyAgICAgICAgICAgIHBhcnRpdGlvbi0+ cHJldmlvdXNfcGFydGl0aW9uID0gcHJldi0+cGFja19vZnMgLSBteGYtPnJ1bl9pbjsKICAgICAg ICAgfQogICAgICAgICAvKiBpZiBubyBwcmV2aW91cyBib2R5IHBhcnRpdGlvbiBhcmUgZm91bmQg cG9pbnQgdG8gdGhlIGhlYWRlcgogICAgICAgICAgKiBwYXJ0aXRpb24gKi8KLSAgICAgICAgaWYg KHBhcnRpdGlvbi0+cHJldmlvdXNfcGFydGl0aW9uID09IHBhcnRpdGlvbi0+dGhpc19wYXJ0aXRp b24pCisgICAgICAgIGlmIChwYXJ0aXRpb24tPnByZXZpb3VzX3BhcnRpdGlvbiA9PSB0aGlzX3Bh cnRpdGlvbikKICAgICAgICAgICAgIHBhcnRpdGlvbi0+cHJldmlvdXNfcGFydGl0aW9uID0gMDsK ICAgICAgICAgYXZfbG9nKG14Zi0+ZmMsIEFWX0xPR19FUlJPUiwKICAgICAgICAgICAgICAgICJP dmVycmlkaW5nIFByZXZpb3VzUGFydGl0aW9uIHdpdGggJSJQUkl4NjQiXG4iLApAQCAtODI2LDcg KzgzNSw3IEBAIHN0YXRpYyBpbnQgbXhmX3JlYWRfcGFydGl0aW9uX3BhY2sodm9pZCAqYXJnLCBB VklPQ29udGV4dCAqcGIsIGludCB0YWcsIGludCBzaXplCiAgICAgICAgICAgICAiUGFydGl0aW9u UGFjazogVGhpc1BhcnRpdGlvbiA9IDB4JSJQUklYNjQKICAgICAgICAgICAgICIsIFByZXZpb3Vz UGFydGl0aW9uID0gMHglIlBSSVg2NCIsICIKICAgICAgICAgICAgICJGb290ZXJQYXJ0aXRpb24g PSAweCUiUFJJWDY0IiwgSW5kZXhTSUQgPSAlaSwgQm9keVNJRCA9ICVpXG4iLAotICAgICAgICAg ICAgcGFydGl0aW9uLT50aGlzX3BhcnRpdGlvbiwKKyAgICAgICAgICAgIHRoaXNfcGFydGl0aW9u LAogICAgICAgICAgICAgcGFydGl0aW9uLT5wcmV2aW91c19wYXJ0aXRpb24sIGZvb3Rlcl9wYXJ0 aXRpb24sCiAgICAgICAgICAgICBwYXJ0aXRpb24tPmluZGV4X3NpZCwgcGFydGl0aW9uLT5ib2R5 X3NpZCk7CiAKQEAgLTkwMCw3ICs5MDksNyBAQCBzdGF0aWMgdWludDY0X3QgcGFydGl0aW9uX3Nj b3JlKE1YRlBhcnRpdGlvbiAqcCkKICAgICAgICAgc2NvcmUgPSAzOwogICAgIGVsc2UKICAgICAg ICAgc2NvcmUgPSAxOwotICAgIHJldHVybiAoc2NvcmUgPDwgNjApIHwgKCh1aW50NjRfdClwLT50 aGlzX3BhcnRpdGlvbiA+PiA0KTsKKyAgICByZXR1cm4gKHNjb3JlIDw8IDYwKSB8ICgodWludDY0 X3QpcC0+cGFja19vZnMgPj4gNCk7CiB9CiAKIHN0YXRpYyBpbnQgbXhmX2FkZF9tZXRhZGF0YV9z ZXQoTVhGQ29udGV4dCAqbXhmLCBNWEZNZXRhZGF0YVNldCAqKm1ldGFkYXRhX3NldCkKQEAgLTM1 MjAsMTQgKzM1MjksMTQgQEAgc3RhdGljIHZvaWQgbXhmX2NvbXB1dGVfZXNzZW5jZV9jb250YWlu ZXJzKEFWRm9ybWF0Q29udGV4dCAqcykKIAogICAgICAgICAgICAgLyogZXNzZW5jZSBjb250YWlu ZXIgc3BhbnMgdG8gdGhlIG5leHQgcGFydGl0aW9uICovCiAgICAgICAgICAgICBpZiAoeCA8IG14 Zi0+cGFydGl0aW9uc19jb3VudCAtIDEpCi0gICAgICAgICAgICAgICAgcC0+ZXNzZW5jZV9sZW5n dGggPSBteGYtPnBhcnRpdGlvbnNbeCsxXS50aGlzX3BhcnRpdGlvbiAtIHAtPmVzc2VuY2Vfb2Zm c2V0OworICAgICAgICAgICAgICAgIHAtPmVzc2VuY2VfbGVuZ3RoID0gbXhmLT5wYXJ0aXRpb25z W3grMV0ucGFja19vZnMgLSBteGYtPnJ1bl9pbiAtIHAtPmVzc2VuY2Vfb2Zmc2V0OwogCiAgICAg ICAgICAgICBpZiAocC0+ZXNzZW5jZV9sZW5ndGggPCAwKSB7CiAgICAgICAgICAgICAgICAgLyog bmV4dCBUaGlzUGFydGl0aW9uIDwgZXNzZW5jZV9vZmZzZXQgKi8KICAgICAgICAgICAgICAgICBw LT5lc3NlbmNlX2xlbmd0aCA9IDA7CiAgICAgICAgICAgICAgICAgYXZfbG9nKG14Zi0+ZmMsIEFW X0xPR19FUlJPUiwKICAgICAgICAgICAgICAgICAgICAgICAgInBhcnRpdGlvbiAlaTogYmFkIFRo aXNQYXJ0aXRpb24gPSAlIlBSSVg2NCJcbiIsCi0gICAgICAgICAgICAgICAgICAgICAgIHgrMSwg bXhmLT5wYXJ0aXRpb25zW3grMV0udGhpc19wYXJ0aXRpb24pOworICAgICAgICAgICAgICAgICAg ICAgICB4KzEsIG14Zi0+cGFydGl0aW9uc1t4KzFdLnBhY2tfb2ZzIC0gbXhmLT5ydW5faW4pOwog ICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQotLSAKMi4xNy4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpmZm1wZWctZGV2ZWwgbWFpbGluZyBs aXN0CmZmbXBlZy1kZXZlbEBmZm1wZWcub3JnCmh0dHBzOi8vZmZtcGVnLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ZmbXBlZy1kZXZlbAoKVG8gdW5zdWJzY3JpYmUsIHZpc2l0IGxpbmsgYWJvdmUsIG9y IGVtYWlsCmZmbXBlZy1kZXZlbC1yZXF1ZXN0QGZmbXBlZy5vcmcgd2l0aCBzdWJqZWN0ICJ1bnN1 YnNjcmliZSIuCg==