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 31E9944D98 for ; Fri, 23 Dec 2022 21:22:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F12A768BA2D; Fri, 23 Dec 2022 23:22:53 +0200 (EET) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66F6668B9CA for ; Fri, 23 Dec 2022 23:22:47 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 79A301BF205 for ; Fri, 23 Dec 2022 21:22:46 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Dec 2022 22:22:45 +0100 Message-Id: <20221223212245.19169-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 YXZmb3JtYXQvbXhmZGVjLmMgfCAzNyArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQvbXhmZGVjLmMgYi9saWJhdmZvcm1hdC9teGZkZWMuYwpp bmRleCBlNjExOGUxNDFkLi5jYmFjZDAzZDFlIDEwMDY0NAotLS0gYS9saWJhdmZvcm1hdC9teGZk ZWMuYworKysgYi9saWJhdmZvcm1hdC9teGZkZWMuYwpAQCAtMTAwLDcgKzEwMCw2IEBAIHR5cGVk ZWYgc3RydWN0IE1YRlBhcnRpdGlvbiB7CiAgICAgdWludDY0X3QgcHJldmlvdXNfcGFydGl0aW9u OwogICAgIGludCBpbmRleF9zaWQ7CiAgICAgaW50IGJvZHlfc2lkOwotICAgIGludDY0X3QgdGhp c19wYXJ0aXRpb247CiAgICAgaW50NjRfdCBlc3NlbmNlX29mZnNldDsgICAgICAgICAvLy88IGFi c29sdXRlIG9mZnNldCBvZiBlc3NlbmNlCiAgICAgaW50NjRfdCBlc3NlbmNlX2xlbmd0aDsKICAg ICBpbnQzMl90IGthZ19zaXplOwpAQCAtNzI1LDEwICs3MjQsMTQgQEAgc3RhdGljIGludCBteGZf cmVhZF9wYXJ0aXRpb25fcGFjayh2b2lkICphcmcsIEFWSU9Db250ZXh0ICpwYiwgaW50IHRhZywg aW50IHNpemUKICAgICBVSUQgb3A7CiAgICAgdWludDY0X3QgZm9vdGVyX3BhcnRpdGlvbjsKICAg ICB1aW50MzJfdCBuYl9lc3NlbmNlX2NvbnRhaW5lcnM7CisgICAgdWludDY0X3QgdGhpc19wYXJ0 aXRpb247CiAKICAgICBpZiAobXhmLT5wYXJ0aXRpb25zX2NvdW50ID49IElOVF9NQVggLyAyKQog ICAgICAgICByZXR1cm4gQVZFUlJPUl9JTlZBTElEREFUQTsKIAorICAgIGlmIChrbHZfb2Zmc2V0 IDwgMCB8fCBrbHZfb2Zmc2V0ID4gSU5UNjRfTUFYIC0gUlVOX0lOX01BWCkKKyAgICAgICAgcmV0 dXJuIEFWRVJST1JfSU5WQUxJRERBVEE7CisKICAgICB0bXBfcGFydCA9IGF2X3JlYWxsb2NfYXJy YXkobXhmLT5wYXJ0aXRpb25zLCBteGYtPnBhcnRpdGlvbnNfY291bnQgKyAxLCBzaXplb2YoKm14 Zi0+cGFydGl0aW9ucykpOwogICAgIGlmICghdG1wX3BhcnQpCiAgICAgICAgIHJldHVybiBBVkVS Uk9SKEVOT01FTSk7CkBAIC03NzEsNyArNzc0LDEzIEBAIHN0YXRpYyBpbnQgbXhmX3JlYWRfcGFy dGl0aW9uX3BhY2sodm9pZCAqYXJnLCBBVklPQ29udGV4dCAqcGIsIGludCB0YWcsIGludCBzaXpl CiAgICAgcGFydGl0aW9uLT5jb21wbGV0ZSA9IHVpZFsxNF0gPiAyOwogICAgIGF2aW9fc2tpcChw YiwgNCk7CiAgICAgcGFydGl0aW9uLT5rYWdfc2l6ZSA9IGF2aW9fcmIzMihwYik7Ci0gICAgcGFy dGl0aW9uLT50aGlzX3BhcnRpdGlvbiA9IGF2aW9fcmI2NChwYik7CisgICAgdGhpc19wYXJ0aXRp b24gPSBhdmlvX3JiNjQocGIpOworICAgIGlmICh0aGlzX3BhcnRpdGlvbiAhPSBrbHZfb2Zmc2V0 ICsgbXhmLT5ydW5faW4pIHsKKyAgICAgICAgYXZfbG9nKG14Zi0+ZmMsIEFWX0xPR19XQVJOSU5H LAorICAgICAgICAgICAgICAgInRoaXNfcGFydGl0aW9uICUiUFJJZDY0IiBtaXNtYXRjaGVzICUi UFJJZDY0IlxuIiwKKyAgICAgICAgICAgICAgIHRoaXNfcGFydGl0aW9uLCBrbHZfb2Zmc2V0ICsg bXhmLT5ydW5faW4pOworICAgICAgICB0aGlzX3BhcnRpdGlvbiA9IGtsdl9vZmZzZXQgKyBteGYt PnJ1bl9pbjsKKyAgICB9CiAgICAgcGFydGl0aW9uLT5wcmV2aW91c19wYXJ0aXRpb24gPSBhdmlv X3JiNjQocGIpOwogICAgIGZvb3Rlcl9wYXJ0aXRpb24gPSBhdmlvX3JiNjQocGIpOwogICAgIHBh cnRpdGlvbi0+aGVhZGVyX2J5dGVfY291bnQgPSBhdmlvX3JiNjQocGIpOwpAQCAtNzkxLDggKzgw MCw4IEBAIHN0YXRpYyBpbnQgbXhmX3JlYWRfcGFydGl0aW9uX3BhY2sodm9pZCAqYXJnLCBBVklP Q29udGV4dCAqcGIsIGludCB0YWcsIGludCBzaXplCiAgICAgICAgIGF2X2RpY3Rfc2V0KCZzLT5t ZXRhZGF0YSwgIm9wZXJhdGlvbmFsX3BhdHRlcm5fdWwiLCBzdHIsIDApOwogICAgIH0KIAotICAg IGlmIChwYXJ0aXRpb24tPnRoaXNfcGFydGl0aW9uICYmCi0gICAgICAgIHBhcnRpdGlvbi0+cHJl dmlvdXNfcGFydGl0aW9uID09IHBhcnRpdGlvbi0+dGhpc19wYXJ0aXRpb24pIHsKKyAgICBpZiAo dGhpc19wYXJ0aXRpb24gJiYKKyAgICAgICAgcGFydGl0aW9uLT5wcmV2aW91c19wYXJ0aXRpb24g PT0gdGhpc19wYXJ0aXRpb24pIHsKICAgICAgICAgYXZfbG9nKG14Zi0+ZmMsIEFWX0xPR19FUlJP UiwKICAgICAgICAgICAgICAgICJQcmV2aW91c1BhcnRpdGlvbiBlcXVhbCB0byBUaGlzUGFydGl0 aW9uICUiUFJJeDY0IlxuIiwKICAgICAgICAgICAgICAgIHBhcnRpdGlvbi0+cHJldmlvdXNfcGFy dGl0aW9uKTsKQEAgLTgwMCwxMSArODA5LDExIEBAIHN0YXRpYyBpbnQgbXhmX3JlYWRfcGFydGl0 aW9uX3BhY2sodm9pZCAqYXJnLCBBVklPQ29udGV4dCAqcGIsIGludCB0YWcsIGludCBzaXplCiAg ICAgICAgIGlmICghbXhmLT5wYXJzaW5nX2JhY2t3YXJkICYmIG14Zi0+bGFzdF9mb3J3YXJkX3Bh cnRpdGlvbiA+IDEpIHsKICAgICAgICAgICAgIE1YRlBhcnRpdGlvbiAqcHJldiA9CiAgICAgICAg ICAgICAgICAgbXhmLT5wYXJ0aXRpb25zICsgbXhmLT5sYXN0X2ZvcndhcmRfcGFydGl0aW9uIC0g MjsKLSAgICAgICAgICAgIHBhcnRpdGlvbi0+cHJldmlvdXNfcGFydGl0aW9uID0gcHJldi0+dGhp c19wYXJ0aXRpb247CisgICAgICAgICAgICBwYXJ0aXRpb24tPnByZXZpb3VzX3BhcnRpdGlvbiA9 IHByZXYtPnBhY2tfb2ZzICsgbXhmLT5ydW5faW47CiAgICAgICAgIH0KICAgICAgICAgLyogaWYg bm8gcHJldmlvdXMgYm9keSBwYXJ0aXRpb24gYXJlIGZvdW5kIHBvaW50IHRvIHRoZSBoZWFkZXIK ICAgICAgICAgICogcGFydGl0aW9uICovCi0gICAgICAgIGlmIChwYXJ0aXRpb24tPnByZXZpb3Vz X3BhcnRpdGlvbiA9PSBwYXJ0aXRpb24tPnRoaXNfcGFydGl0aW9uKQorICAgICAgICBpZiAocGFy dGl0aW9uLT5wcmV2aW91c19wYXJ0aXRpb24gPT0gdGhpc19wYXJ0aXRpb24pCiAgICAgICAgICAg ICBwYXJ0aXRpb24tPnByZXZpb3VzX3BhcnRpdGlvbiA9IDA7CiAgICAgICAgIGF2X2xvZyhteGYt PmZjLCBBVl9MT0dfRVJST1IsCiAgICAgICAgICAgICAgICAiT3ZlcnJpZGluZyBQcmV2aW91c1Bh cnRpdGlvbiB3aXRoICUiUFJJeDY0IlxuIiwKQEAgLTgyNiw3ICs4MzUsNyBAQCBzdGF0aWMgaW50 IG14Zl9yZWFkX3BhcnRpdGlvbl9wYWNrKHZvaWQgKmFyZywgQVZJT0NvbnRleHQgKnBiLCBpbnQg dGFnLCBpbnQgc2l6ZQogICAgICAgICAgICAgIlBhcnRpdGlvblBhY2s6IFRoaXNQYXJ0aXRpb24g PSAweCUiUFJJWDY0CiAgICAgICAgICAgICAiLCBQcmV2aW91c1BhcnRpdGlvbiA9IDB4JSJQUklY NjQiLCAiCiAgICAgICAgICAgICAiRm9vdGVyUGFydGl0aW9uID0gMHglIlBSSVg2NCIsIEluZGV4 U0lEID0gJWksIEJvZHlTSUQgPSAlaVxuIiwKLSAgICAgICAgICAgIHBhcnRpdGlvbi0+dGhpc19w YXJ0aXRpb24sCisgICAgICAgICAgICB0aGlzX3BhcnRpdGlvbiwKICAgICAgICAgICAgIHBhcnRp dGlvbi0+cHJldmlvdXNfcGFydGl0aW9uLCBmb290ZXJfcGFydGl0aW9uLAogICAgICAgICAgICAg cGFydGl0aW9uLT5pbmRleF9zaWQsIHBhcnRpdGlvbi0+Ym9keV9zaWQpOwogCkBAIC04ODcsNyAr ODk2LDcgQEAgc3RhdGljIGludCBteGZfcmVhZF9wYXJ0aXRpb25fcGFjayh2b2lkICphcmcsIEFW SU9Db250ZXh0ICpwYiwgaW50IHRhZywgaW50IHNpemUKICAgICByZXR1cm4gMDsKIH0KIAotc3Rh dGljIHVpbnQ2NF90IHBhcnRpdGlvbl9zY29yZShNWEZQYXJ0aXRpb24gKnApCitzdGF0aWMgdWlu dDY0X3QgcGFydGl0aW9uX3Njb3JlKE1YRkNvbnRleHQgKm14ZiwgTVhGUGFydGl0aW9uICpwKQog ewogICAgIHVpbnQ2NF90IHNjb3JlOwogICAgIGlmICghcCkKQEAgLTkwMCw3ICs5MDksNyBAQCBz dGF0aWMgdWludDY0X3QgcGFydGl0aW9uX3Njb3JlKE1YRlBhcnRpdGlvbiAqcCkKICAgICAgICAg c2NvcmUgPSAzOwogICAgIGVsc2UKICAgICAgICAgc2NvcmUgPSAxOwotICAgIHJldHVybiAoc2Nv cmUgPDwgNjApIHwgKCh1aW50NjRfdClwLT50aGlzX3BhcnRpdGlvbiA+PiA0KTsKKyAgICByZXR1 cm4gKHNjb3JlIDw8IDYwKSB8ICgodWludDY0X3QpcC0+cGFja19vZnMgKyBteGYtPnJ1bl9pbiA+ PiA0KTsKIH0KIAogc3RhdGljIGludCBteGZfYWRkX21ldGFkYXRhX3NldChNWEZDb250ZXh0ICpt eGYsIE1YRk1ldGFkYXRhU2V0ICoqbWV0YWRhdGFfc2V0KQpAQCAtMzI0NCwxMCArMzI1MywxMCBA QCBzdGF0aWMgY29uc3QgTVhGTWV0YWRhdGFSZWFkVGFibGVFbnRyeSBteGZfbWV0YWRhdGFfcmVh ZF90YWJsZVtdID0gewogICAgIHsgeyAweDAwLDB4MDAsMHgwMCwweDAwLDB4MDAsMHgwMCwweDAw LDB4MDAsMHgwMCwweDAwLDB4MDAsMHgwMCwweDAwLDB4MDAsMHgwMCwweDAwIH0sIE5VTEwsIDAs IEFueVR5cGUgfSwKIH07CiAKLXN0YXRpYyBpbnQgbXhmX21ldGFkYXRhc2V0X2luaXQoTVhGTWV0 YWRhdGFTZXQgKmN0eCwgZW51bSBNWEZNZXRhZGF0YVNldFR5cGUgdHlwZSwgTVhGUGFydGl0aW9u ICpwYXJ0aXRpb24pCitzdGF0aWMgaW50IG14Zl9tZXRhZGF0YXNldF9pbml0KE1YRkNvbnRleHQg Km14ZiwgTVhGTWV0YWRhdGFTZXQgKmN0eCwgZW51bSBNWEZNZXRhZGF0YVNldFR5cGUgdHlwZSwg TVhGUGFydGl0aW9uICpwYXJ0aXRpb24pCiB7CiAgICAgY3R4LT50eXBlID0gdHlwZTsKLSAgICBj dHgtPnBhcnRpdGlvbl9zY29yZSA9IHBhcnRpdGlvbl9zY29yZShwYXJ0aXRpb24pOworICAgIGN0 eC0+cGFydGl0aW9uX3Njb3JlID0gcGFydGl0aW9uX3Njb3JlKG14ZiwgcGFydGl0aW9uKTsKICAg ICBzd2l0Y2ggKHR5cGUpewogICAgIGNhc2UgTXVsdGlwbGVEZXNjcmlwdG9yOgogICAgIGNhc2Ug RGVzY3JpcHRvcjoKQEAgLTMyNzIsNyArMzI4MSw3IEBAIHN0YXRpYyBpbnQgbXhmX3JlYWRfbG9j YWxfdGFncyhNWEZDb250ZXh0ICpteGYsIEtMVlBhY2tldCAqa2x2LCBNWEZNZXRhZGF0YVJlYWRG CiAgICAgICAgIGlmICghbWV0YSkKICAgICAgICAgICAgIHJldHVybiBBVkVSUk9SKEVOT01FTSk7 CiAgICAgICAgIGN0eCAgPSBtZXRhOwotICAgICAgICBteGZfbWV0YWRhdGFzZXRfaW5pdChtZXRh LCB0eXBlLCBteGYtPmN1cnJlbnRfcGFydGl0aW9uKTsKKyAgICAgICAgbXhmX21ldGFkYXRhc2V0 X2luaXQobXhmLCBtZXRhLCB0eXBlLCBteGYtPmN1cnJlbnRfcGFydGl0aW9uKTsKICAgICB9IGVs c2UgewogICAgICAgICBtZXRhID0gTlVMTDsKICAgICAgICAgY3R4ICA9IG14ZjsKQEAgLTM1MjAs MTQgKzM1MjksMTQgQEAgc3RhdGljIHZvaWQgbXhmX2NvbXB1dGVfZXNzZW5jZV9jb250YWluZXJz KEFWRm9ybWF0Q29udGV4dCAqcykKIAogICAgICAgICAgICAgLyogZXNzZW5jZSBjb250YWluZXIg c3BhbnMgdG8gdGhlIG5leHQgcGFydGl0aW9uICovCiAgICAgICAgICAgICBpZiAoeCA8IG14Zi0+ cGFydGl0aW9uc19jb3VudCAtIDEpCi0gICAgICAgICAgICAgICAgcC0+ZXNzZW5jZV9sZW5ndGgg PSBteGYtPnBhcnRpdGlvbnNbeCsxXS50aGlzX3BhcnRpdGlvbiAtIHAtPmVzc2VuY2Vfb2Zmc2V0 OworICAgICAgICAgICAgICAgIHAtPmVzc2VuY2VfbGVuZ3RoID0gbXhmLT5wYXJ0aXRpb25zW3gr MV0ucGFja19vZnMgKyBteGYtPnJ1bl9pbiAtIHAtPmVzc2VuY2Vfb2Zmc2V0OwogCiAgICAgICAg ICAgICBpZiAocC0+ZXNzZW5jZV9sZW5ndGggPCAwKSB7CiAgICAgICAgICAgICAgICAgLyogbmV4 dCBUaGlzUGFydGl0aW9uIDwgZXNzZW5jZV9vZmZzZXQgKi8KICAgICAgICAgICAgICAgICBwLT5l c3NlbmNlX2xlbmd0aCA9IDA7CiAgICAgICAgICAgICAgICAgYXZfbG9nKG14Zi0+ZmMsIEFWX0xP R19FUlJPUiwKICAgICAgICAgICAgICAgICAgICAgICAgInBhcnRpdGlvbiAlaTogYmFkIFRoaXNQ YXJ0aXRpb24gPSAlIlBSSVg2NCJcbiIsCi0gICAgICAgICAgICAgICAgICAgICAgIHgrMSwgbXhm LT5wYXJ0aXRpb25zW3grMV0udGhpc19wYXJ0aXRpb24pOworICAgICAgICAgICAgICAgICAgICAg ICB4KzEsIG14Zi0+cGFydGl0aW9uc1t4KzFdLnBhY2tfb2ZzICsgbXhmLT5ydW5faW4pOwogICAg ICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpmZm1wZWctZGV2ZWwgbWFpbGluZyBsaXN0 CmZmbXBlZy1kZXZlbEBmZm1wZWcub3JnCmh0dHBzOi8vZmZtcGVnLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ZmbXBlZy1kZXZlbAoKVG8gdW5zdWJzY3JpYmUsIHZpc2l0IGxpbmsgYWJvdmUsIG9yIGVt YWlsCmZmbXBlZy1kZXZlbC1yZXF1ZXN0QGZmbXBlZy5vcmcgd2l0aCBzdWJqZWN0ICJ1bnN1YnNj cmliZSIuCg==