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 3EF6845B86 for ; Fri, 22 Sep 2023 19:13:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D58068C9D4; Fri, 22 Sep 2023 22:13:51 +0300 (EEST) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D495068C807 for ; Fri, 22 Sep 2023 22:13:45 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3746C20008 for ; Fri, 22 Sep 2023 19:13:44 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 22 Sep 2023 21:13:44 +0200 Message-Id: <20230922191344.7018-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH v3] 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: U3VnZ2VzdGVkLWJ5OiBUb21hcyBIw6RyZGluIDxnaXRAaGFlcmRpbi5zZT4KRml4ZXM6IDUxODk2 L2NsdXN0ZXJmdXp6LXRlc3RjYXNlLW1pbmltaXplZC1mZm1wZWdfZGVtX01YRl9mdXp6ZXItNTEz MDM5NDI4NjgxNzI4MAoKU2lnbmVkLW9mZi1ieTogTWljaGFlbCBOaWVkZXJtYXllciA8bWljaGFl bEBuaWVkZXJtYXllci5jYz4KLS0tCiBsaWJhdmZvcm1hdC9teGZkZWMuYyB8IDI4ICsrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAx MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmZvcm1hdC9teGZkZWMuYyBiL2xpYmF2 Zm9ybWF0L214ZmRlYy5jCmluZGV4IDQ4NDZjNWQyMDZhLi4xMzEzZjE0ZmEwMyAxMDA2NDQKLS0t IGEvbGliYXZmb3JtYXQvbXhmZGVjLmMKKysrIGIvbGliYXZmb3JtYXQvbXhmZGVjLmMKQEAgLTEw Miw3ICsxMDIsNiBAQCB0eXBlZGVmIHN0cnVjdCBNWEZQYXJ0aXRpb24gewogICAgIHVpbnQ2NF90 IHByZXZpb3VzX3BhcnRpdGlvbjsKICAgICBpbnQgaW5kZXhfc2lkOwogICAgIGludCBib2R5X3Np ZDsKLSAgICBpbnQ2NF90IHRoaXNfcGFydGl0aW9uOwogICAgIGludDY0X3QgZXNzZW5jZV9vZmZz ZXQ7ICAgICAgICAgLy8vPCBhYnNvbHV0ZSBvZmZzZXQgb2YgZXNzZW5jZQogICAgIGludDY0X3Qg ZXNzZW5jZV9sZW5ndGg7CiAgICAgaW50MzJfdCBrYWdfc2l6ZTsKQEAgLTcyNywxMCArNzI2LDEz IEBAIHN0YXRpYyBpbnQgbXhmX3JlYWRfcGFydGl0aW9uX3BhY2sodm9pZCAqYXJnLCBBVklPQ29u dGV4dCAqcGIsIGludCB0YWcsIGludCBzaXplCiAgICAgVUlEIG9wOwogICAgIHVpbnQ2NF90IGZv b3Rlcl9wYXJ0aXRpb247CiAgICAgdWludDMyX3QgbmJfZXNzZW5jZV9jb250YWluZXJzOworICAg IHVpbnQ2NF90IHRoaXNfcGFydGl0aW9uOwogCiAgICAgaWYgKG14Zi0+cGFydGl0aW9uc19jb3Vu dCA+PSBJTlRfTUFYIC8gMikKICAgICAgICAgcmV0dXJuIEFWRVJST1JfSU5WQUxJRERBVEE7CiAK KyAgICBhdl9hc3NlcnQwKGtsdl9vZmZzZXQgPj0gbXhmLT5ydW5faW4pOworCiAgICAgdG1wX3Bh cnQgPSBhdl9yZWFsbG9jX2FycmF5KG14Zi0+cGFydGl0aW9ucywgbXhmLT5wYXJ0aXRpb25zX2Nv dW50ICsgMSwgc2l6ZW9mKCpteGYtPnBhcnRpdGlvbnMpKTsKICAgICBpZiAoIXRtcF9wYXJ0KQog ICAgICAgICByZXR1cm4gQVZFUlJPUihFTk9NRU0pOwpAQCAtNzczLDcgKzc3NSwxMyBAQCBzdGF0 aWMgaW50IG14Zl9yZWFkX3BhcnRpdGlvbl9wYWNrKHZvaWQgKmFyZywgQVZJT0NvbnRleHQgKnBi LCBpbnQgdGFnLCBpbnQgc2l6ZQogICAgIHBhcnRpdGlvbi0+Y29tcGxldGUgPSB1aWRbMTRdID4g MjsKICAgICBhdmlvX3NraXAocGIsIDQpOwogICAgIHBhcnRpdGlvbi0+a2FnX3NpemUgPSBhdmlv X3JiMzIocGIpOwotICAgIHBhcnRpdGlvbi0+dGhpc19wYXJ0aXRpb24gPSBhdmlvX3JiNjQocGIp OworICAgIHRoaXNfcGFydGl0aW9uID0gYXZpb19yYjY0KHBiKTsKKyAgICBpZiAodGhpc19wYXJ0 aXRpb24gIT0ga2x2X29mZnNldCAtIG14Zi0+cnVuX2luKSB7CisgICAgICAgIGF2X2xvZyhteGYt PmZjLCBBVl9MT0dfV0FSTklORywKKyAgICAgICAgICAgICAgICJ0aGlzX3BhcnRpdGlvbiAlIlBS SWQ2NCIgbWlzbWF0Y2hlcyAlIlBSSWQ2NCJcbiIsCisgICAgICAgICAgICAgICB0aGlzX3BhcnRp dGlvbiwga2x2X29mZnNldCAtIG14Zi0+cnVuX2luKTsKKyAgICB9CisgICAgdGhpc19wYXJ0aXRp b24gPSBrbHZfb2Zmc2V0IC0gbXhmLT5ydW5faW47CiAgICAgcGFydGl0aW9uLT5wcmV2aW91c19w YXJ0aXRpb24gPSBhdmlvX3JiNjQocGIpOwogICAgIGZvb3Rlcl9wYXJ0aXRpb24gPSBhdmlvX3Ji NjQocGIpOwogICAgIHBhcnRpdGlvbi0+aGVhZGVyX2J5dGVfY291bnQgPSBhdmlvX3JiNjQocGIp OwpAQCAtNzkzLDggKzgwMSw4IEBAIHN0YXRpYyBpbnQgbXhmX3JlYWRfcGFydGl0aW9uX3BhY2so dm9pZCAqYXJnLCBBVklPQ29udGV4dCAqcGIsIGludCB0YWcsIGludCBzaXplCiAgICAgICAgIGF2 X2RpY3Rfc2V0KCZzLT5tZXRhZGF0YSwgIm9wZXJhdGlvbmFsX3BhdHRlcm5fdWwiLCBzdHIsIDAp OwogICAgIH0KIAotICAgIGlmIChwYXJ0aXRpb24tPnRoaXNfcGFydGl0aW9uICYmCi0gICAgICAg IHBhcnRpdGlvbi0+cHJldmlvdXNfcGFydGl0aW9uID09IHBhcnRpdGlvbi0+dGhpc19wYXJ0aXRp b24pIHsKKyAgICBpZiAodGhpc19wYXJ0aXRpb24gJiYKKyAgICAgICAgcGFydGl0aW9uLT5wcmV2 aW91c19wYXJ0aXRpb24gPT0gdGhpc19wYXJ0aXRpb24pIHsKICAgICAgICAgYXZfbG9nKG14Zi0+ ZmMsIEFWX0xPR19FUlJPUiwKICAgICAgICAgICAgICAgICJQcmV2aW91c1BhcnRpdGlvbiBlcXVh bCB0byBUaGlzUGFydGl0aW9uICUiUFJJeDY0IlxuIiwKICAgICAgICAgICAgICAgIHBhcnRpdGlv bi0+cHJldmlvdXNfcGFydGl0aW9uKTsKQEAgLTgwMiwxMSArODEwLDExIEBAIHN0YXRpYyBpbnQg bXhmX3JlYWRfcGFydGl0aW9uX3BhY2sodm9pZCAqYXJnLCBBVklPQ29udGV4dCAqcGIsIGludCB0 YWcsIGludCBzaXplCiAgICAgICAgIGlmICghbXhmLT5wYXJzaW5nX2JhY2t3YXJkICYmIG14Zi0+ bGFzdF9mb3J3YXJkX3BhcnRpdGlvbiA+IDEpIHsKICAgICAgICAgICAgIE1YRlBhcnRpdGlvbiAq cHJldiA9CiAgICAgICAgICAgICAgICAgbXhmLT5wYXJ0aXRpb25zICsgbXhmLT5sYXN0X2Zvcndh cmRfcGFydGl0aW9uIC0gMjsKLSAgICAgICAgICAgIHBhcnRpdGlvbi0+cHJldmlvdXNfcGFydGl0 aW9uID0gcHJldi0+dGhpc19wYXJ0aXRpb247CisgICAgICAgICAgICBwYXJ0aXRpb24tPnByZXZp b3VzX3BhcnRpdGlvbiA9IHByZXYtPnBhY2tfb2ZzIC0gbXhmLT5ydW5faW47CiAgICAgICAgIH0K ICAgICAgICAgLyogaWYgbm8gcHJldmlvdXMgYm9keSBwYXJ0aXRpb24gYXJlIGZvdW5kIHBvaW50 IHRvIHRoZSBoZWFkZXIKICAgICAgICAgICogcGFydGl0aW9uICovCi0gICAgICAgIGlmIChwYXJ0 aXRpb24tPnByZXZpb3VzX3BhcnRpdGlvbiA9PSBwYXJ0aXRpb24tPnRoaXNfcGFydGl0aW9uKQor ICAgICAgICBpZiAocGFydGl0aW9uLT5wcmV2aW91c19wYXJ0aXRpb24gPT0gdGhpc19wYXJ0aXRp b24pCiAgICAgICAgICAgICBwYXJ0aXRpb24tPnByZXZpb3VzX3BhcnRpdGlvbiA9IDA7CiAgICAg ICAgIGF2X2xvZyhteGYtPmZjLCBBVl9MT0dfRVJST1IsCiAgICAgICAgICAgICAgICAiT3ZlcnJp ZGluZyBQcmV2aW91c1BhcnRpdGlvbiB3aXRoICUiUFJJeDY0IlxuIiwKQEAgLTgyOCw3ICs4MzYs NyBAQCBzdGF0aWMgaW50IG14Zl9yZWFkX3BhcnRpdGlvbl9wYWNrKHZvaWQgKmFyZywgQVZJT0Nv bnRleHQgKnBiLCBpbnQgdGFnLCBpbnQgc2l6ZQogICAgICAgICAgICAgIlBhcnRpdGlvblBhY2s6 IFRoaXNQYXJ0aXRpb24gPSAweCUiUFJJWDY0CiAgICAgICAgICAgICAiLCBQcmV2aW91c1BhcnRp dGlvbiA9IDB4JSJQUklYNjQiLCAiCiAgICAgICAgICAgICAiRm9vdGVyUGFydGl0aW9uID0gMHgl IlBSSVg2NCIsIEluZGV4U0lEID0gJWksIEJvZHlTSUQgPSAlaVxuIiwKLSAgICAgICAgICAgIHBh cnRpdGlvbi0+dGhpc19wYXJ0aXRpb24sCisgICAgICAgICAgICB0aGlzX3BhcnRpdGlvbiwKICAg ICAgICAgICAgIHBhcnRpdGlvbi0+cHJldmlvdXNfcGFydGl0aW9uLCBmb290ZXJfcGFydGl0aW9u LAogICAgICAgICAgICAgcGFydGl0aW9uLT5pbmRleF9zaWQsIHBhcnRpdGlvbi0+Ym9keV9zaWQp OwogCkBAIC05MDIsNyArOTEwLDcgQEAgc3RhdGljIHVpbnQ2NF90IHBhcnRpdGlvbl9zY29yZShN WEZQYXJ0aXRpb24gKnApCiAgICAgICAgIHNjb3JlID0gMzsKICAgICBlbHNlCiAgICAgICAgIHNj b3JlID0gMTsKLSAgICByZXR1cm4gKHNjb3JlIDw8IDYwKSB8ICgodWludDY0X3QpcC0+dGhpc19w YXJ0aXRpb24gPj4gNCk7CisgICAgcmV0dXJuIChzY29yZSA8PCA2MCkgfCAoKHVpbnQ2NF90KXAt PnBhY2tfb2ZzID4+IDQpOwogfQogCiBzdGF0aWMgaW50IG14Zl9hZGRfbWV0YWRhdGFfc2V0KE1Y RkNvbnRleHQgKm14ZiwgTVhGTWV0YWRhdGFTZXQgKiptZXRhZGF0YV9zZXQpCkBAIC0zNTM5LDE0 ICszNTQ3LDE0IEBAIHN0YXRpYyB2b2lkIG14Zl9jb21wdXRlX2Vzc2VuY2VfY29udGFpbmVycyhB VkZvcm1hdENvbnRleHQgKnMpCiAKICAgICAgICAgICAgIC8qIGVzc2VuY2UgY29udGFpbmVyIHNw YW5zIHRvIHRoZSBuZXh0IHBhcnRpdGlvbiAqLwogICAgICAgICAgICAgaWYgKHggPCBteGYtPnBh cnRpdGlvbnNfY291bnQgLSAxKQotICAgICAgICAgICAgICAgIHAtPmVzc2VuY2VfbGVuZ3RoID0g bXhmLT5wYXJ0aXRpb25zW3grMV0udGhpc19wYXJ0aXRpb24gLSBwLT5lc3NlbmNlX29mZnNldDsK KyAgICAgICAgICAgICAgICBwLT5lc3NlbmNlX2xlbmd0aCA9IG14Zi0+cGFydGl0aW9uc1t4KzFd LnBhY2tfb2ZzIC0gbXhmLT5ydW5faW4gLSBwLT5lc3NlbmNlX29mZnNldDsKIAogICAgICAgICAg ICAgaWYgKHAtPmVzc2VuY2VfbGVuZ3RoIDwgMCkgewogICAgICAgICAgICAgICAgIC8qIG5leHQg VGhpc1BhcnRpdGlvbiA8IGVzc2VuY2Vfb2Zmc2V0ICovCiAgICAgICAgICAgICAgICAgcC0+ZXNz ZW5jZV9sZW5ndGggPSAwOwogICAgICAgICAgICAgICAgIGF2X2xvZyhteGYtPmZjLCBBVl9MT0df RVJST1IsCiAgICAgICAgICAgICAgICAgICAgICAgICJwYXJ0aXRpb24gJWk6IGJhZCBUaGlzUGFy dGl0aW9uID0gJSJQUklYNjQiXG4iLAotICAgICAgICAgICAgICAgICAgICAgICB4KzEsIG14Zi0+ cGFydGl0aW9uc1t4KzFdLnRoaXNfcGFydGl0aW9uKTsKKyAgICAgICAgICAgICAgICAgICAgICAg eCsxLCBteGYtPnBhcnRpdGlvbnNbeCsxXS5wYWNrX29mcyAtIG14Zi0+cnVuX2luKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgfQogICAgIH0KLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZmZtcGVnLWRldmVsIG1haWxpbmcgbGlzdApm Zm1wZWctZGV2ZWxAZmZtcGVnLm9yZwpodHRwczovL2ZmbXBlZy5vcmcvbWFpbG1hbi9saXN0aW5m by9mZm1wZWctZGV2ZWwKClRvIHVuc3Vic2NyaWJlLCB2aXNpdCBsaW5rIGFib3ZlLCBvciBlbWFp bApmZm1wZWctZGV2ZWwtcmVxdWVzdEBmZm1wZWcub3JnIHdpdGggc3ViamVjdCAidW5zdWJzY3Jp YmUiLgo=