From patchwork Tue Aug 23 09:03:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: erkki.seppala.ext@nokia.com X-Patchwork-Id: 245 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp2179924vsd; Tue, 23 Aug 2016 02:04:59 -0700 (PDT) X-Received: by 10.28.183.134 with SMTP id h128mr18119248wmf.7.1471943099627; Tue, 23 Aug 2016 02:04:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dq8si2102161wjb.285.2016.08.23.02.04.59; Tue, 23 Aug 2016 02:04:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nokia.onmicrosoft.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=nokia.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B061A689C5C; Tue, 23 Aug 2016 12:04:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50104.outbound.protection.outlook.com [40.107.5.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E44E689BF1 for ; Tue, 23 Aug 2016 12:04:07 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9DnpmDj3jXIbcYOEYSxBbX1qJ1OMr4bYrznrRcKL+l0=; b=Bm+BiF3Fvja6U79GT4JgT3RzUbL9MCC3YkRyR/fPiX1zcCNdYVIZIiiu8QBl+fDxGSJKmEQoPCt4OAaudgkFmWW5jwGOM6pw3VZTx7vROshNtnDQ1Tmh93eA6MiP6SPP0dLpsNABt5tD340DntLzyWOQ7w7AHigCpr4y3TGMRU8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=erkki.seppala.ext@nokia.com; Received: from erkkise-laptop.vincit.intranet (131.228.2.4) by AM5PR0701MB2529.eurprd07.prod.outlook.com (10.169.153.149) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.557.21; Tue, 23 Aug 2016 09:04:07 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id 3FE554449E0; Tue, 23 Aug 2016 12:04:04 +0300 (EEST) From: To: Date: Tue, 23 Aug 2016 12:03:20 +0300 Message-ID: <1471943019-14136-3-git-send-email-erkki.seppala.ext@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471943019-14136-1-git-send-email-erkki.seppala.ext@nokia.com> References: <1471943019-14136-1-git-send-email-erkki.seppala.ext@nokia.com> MIME-Version: 1.0 X-Originating-IP: [131.228.2.4] X-ClientProxiedBy: AM2PR03CA0028.eurprd03.prod.outlook.com (10.160.207.38) To AM5PR0701MB2529.eurprd07.prod.outlook.com (10.169.153.149) X-MS-Office365-Filtering-Correlation-Id: f9399f4a-a077-4926-7351-08d3cb34704a X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2529; 2:YGy/667wqML8aZOptJhkSzjJKUd4DOWEPqiU+lYKIpHM8DrAf92xmySiM7Dy/ykc5JgFvKmEdRI1rcW5vRQ213/kD0bhq+MAJ4CBOfqnMFFi0nyIT+BpQkyrcixpmqJfF36afNrWRug/0AGjCb6ktwJYOJ9iwZ2faUHhqXVTcrY2Zx4MPcJuuhzRrwFq2Zr2; 3:cLLJ3bLZn8tTYWtCQdIGKV8+THk2myMGvNvVJlIeGrhaDMGlhg8E0/n/JT1NU/b2eCTNZwEjBlr7qkapEeMJ6VS2/SYKLBWbEb/PTzrR5hDAcydIAkq6A/ti2ygyPdAa; 25:Rf2/STog9wJr0tPcoSARXawpVgzbvaGINjSRoB1R+1qYqOYRsgfUIZk7LwrbSYkIS0aPsoe0vKe54ZtaTMRoXJgNFpHKMBnVG3a5SrYW4hGoBWymObAE1VSsLM8dCVb6/Cxn3ygY+qN03G2x3NGLaNIe2R8xTEg2IK9WoA8mv2xUkFRRXHnIgBSUDvC1Trd8rPWM1RwtsP1FwC2dAaWlmYuMxAScw/yBGo9R7z4k6OIgZcMhaUwceaKQawUwc5V8CjHd1uh8L69m3fiZq/xmtNpmNNQMUv31tM/+ygs7BsApHIDSxgpXeq5BnRC8uhXcZ6WEmv1BkEuBT5dV/elUsGeGhcE1lXUEjQ6hyKZdYhupgs2bsFPmYisNDZVgixFB9uCZNkn4yFGPBUDlt//Y9nzEzeSORPai0NjTa1TMBX0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0701MB2529; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2529; 31:JglRPaIXePtSB+J1/E2NY0jIX3o5kOCiN23Z3I7t+OemU3IcK5mfSs2zrWMbK/wHc3f0GVWPvEyJfH3kfCMk+M4H9522bRebKZ/ItXfG9PxbgvSMv/7eXPHyaKfBd7y16qRZU4pfc9nZ36NmkvV1eQrUhGGZhRv7X3sxAEOH0Pw9cZIMhIm1ggCkLphhFvlpgX227OY2VGcgOsYvq56KQOtBNnHRoR0Laay7NKsZmmw=; 20:1IdBkCQFLXHsmM9qTtljwwbcKaErMc6+dHxZQvgQet783/iLKLtJ+rtKcoo9+IkWxLerH9yzNk6m3c1TvDGDuHh0/pcABmRIboBQDjweRQDVjtl5YjNyMIWiKLBQ9guDHh7DKiyqZDKOwZIHgIfuGAQdxZwOpzTKJNib9O+rnJdwSeAnsB29Uy3yJu+WfX9bR5Iw87f4gkNsOidrygysFm+9hEq6T1X9853s8UMWdF1S2ciMbEN9DM9Nsu6vVO6ciplFSEhLFLHhUMGXqn0Tf/Kj98WNXjXHyajyWGidZrFd6Y28YRElS8sq5gZbzvYh9IAWbPOwMhp9ApYN1jWJEiJvFJY8SiLJOi79axaTnrgtLCAcAfes8EIOuV3RlaLMprENmnKa+ZHHeAdkoRVBVjNpOVxp6TMBxjC3BLvZUf7BlvDDxItljSXYVv4u4WEuxFbhPZXyRomnAoEuqQYXLxKTdh4HsdgEZJ8vRNFQWWm71rFT/FiUEXsNOWnvIzHR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:AM5PR0701MB2529; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0701MB2529; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2529; 4:Mnyh51bYZjFtgt5ra9rqO4GW+qzEuKgMWLpmLuYvbLrmtol+QFtanb8WSQs1kQyfuVCHse5ClCfpZw7+6Szo1hPJUmOn4BFilmYBMa8unNNsLs7+F4WTypLthnMRbKkI0bMP+xae0+y1LyMpaHArLmtzSFDKS9KcB3/RlXD+hADjJZuYr6Vye2LUF5/ihMFv6O/imN25ZNtxErguHljTjPIdvkHIY5QF21H0WS34ayarQ2WjEEpLUHBPJUAxql+95L5a1COSZ5pDYeTAqyB3QtOaBrjI5OzvpU3btnT2bI9JTg2l7f5lrn0o8J7fXLeTBU+bzSBRqmQUlPSTw1nxlmOSWq79fLN3UKnpar3wro2TVmXhkCQ0KkgdrLX/n8vaRRUDknteVmicej86Twxj8mzFNLC35Rq2rqlX0dttsAg/PZN0x+yN29w8nebYAiB9lI1b2X3KPkOOza81wjIYqQ== X-Forefront-PRVS: 004395A01C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(23676002)(81156014)(81166006)(305945005)(107886002)(106356001)(189998001)(586003)(3846002)(110136002)(2351001)(92566002)(450100001)(5660300001)(50226002)(2950100001)(8676002)(50466002)(122856001)(42186005)(36756003)(46386002)(4001430100002)(45336002)(229853001)(90966002)(2876002)(76176999)(6116002)(86362001)(101416001)(19580405001)(2906002)(2870700001)(50986999)(33646002)(86152002)(4326007)(97736004)(19580395003)(7846002)(47776003)(5820100001)(66066001)(7736002)(52956003)(68736007)(105586002)(309714004); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0701MB2529; H:erkkise-laptop.vincit.intranet; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTVQUjA3MDFNQjI1Mjk7MjM6NDBKN3ZYSGdLNnNPN2h2cU1weWZRL2RL?= =?utf-8?B?dXZ1VHNmUEVEaU1qNWh4SmNNUGJ0VVpyT1JKV1ZRazg3Z2txVDZSbFdzRml0?= =?utf-8?B?eWFXZ3pGMFdzT0JVSEM0RzBLZ2JVNWpRL09UWlZQK3ZMYVIvU0FYaFhrSUxE?= =?utf-8?B?NFl1VXo2Z29XWlA0bjVrMHkzTDNJalhrbWNJSjhRN3ZHUnVBMFJKOW9UYkdC?= =?utf-8?B?MWZEODNJOHhHNDN3Vjc0TUxYSEhydGE3M1A2dEgrU3hQKzdZWVBFRFcwaFZs?= =?utf-8?B?Y3JUUjYycUhsRVdwSHFBRFdhSjFjVldBbE1Xd1NhUlJJTXkySnhUL0R0UXE4?= =?utf-8?B?ZWdUc0dvWEM2ajRSSkhXKytibGdYdGZBM0g0aWxNWm9ZekdtSEsvaVYvOXdq?= =?utf-8?B?RUxIc1dMYjNpRndQS1MvZXRTV0NUeStmTnV4dTZTZkZJZW9jNVVCdDh5OVVh?= =?utf-8?B?TGxWcSszcXFpdlA4U3Q4c25DUnRlQTBlL1FmVkVHS2YrUUhNWGlqYXFPV2Ix?= =?utf-8?B?TXI2RnJuQ1ZaQ0EvVHIwem1rd3o5STBCZE93RlpldXU4Vnh1U1N2dDNsTVlO?= =?utf-8?B?RzJSUGR1M0wzUktWZXR6b0swNVVoT0N6N000ejkyUUVCU1FjMWxBRGdBZ1Rp?= =?utf-8?B?UEM0cFVyOFkzaHRjQjNJbG1jLzFCMS8rZmh2V0x1QW9JcE5kY2Y4WXI2bW9t?= =?utf-8?B?T0xIKzhGY1Vtb1NFenJRZjZMMnc3YnNZOE1QOGVFeTNIdUpSaDRLazZYTm1C?= =?utf-8?B?cll6TUFqLzd4TTl5QkVXVFNnaWRrV2NNZ3BrLzlzeUY4NnZtQ1g5MzNpR3cw?= =?utf-8?B?Z3dwNHZqL1M5aXRpSytqUGlCcFFjaEZ3Ly9xWFYrOVVONEZ2eTVXTUFHU21X?= =?utf-8?B?VU5sa2tSSXdFNFlXbGhmaXk2cCtFSHdqbk04QndhZ1Q0TkxyNm83dWlaMEhI?= =?utf-8?B?RkxaY2R1ZGh4aFBFbHlVRzNxNzUwNlkxZTNMZVQ0c3dOa3JLeUxHeXhzUFZk?= =?utf-8?B?enQ1blhvczRqd0tMUk1TdndIWU1PbDYvNVE1UU5YN3ZpdU9qZWxzYWFUTnd4?= =?utf-8?B?OUZKSmlkVEFQam1zU1MxTCt3clNNUEZKSTNTOWhNL202b1hXcGNaUlBjYWNX?= =?utf-8?B?Y1hocGpXZGIzQUNHTWRENnRsbVFYS0YrUGYybUw1OStEVGVUcnRGR1pLM0pJ?= =?utf-8?B?M0pVWG1lbFNVMXlqRzFFOHpURThmUVVOa1A5WXNKTE8wZTRkdE85Z2V2dUFZ?= =?utf-8?B?Zk1oTkdQTUlITXorb1ZNRnZXeTJaOGdDOE9zMTBYUUthUEV1UHV5V2xaWU1k?= =?utf-8?B?V1hzTTc5MWUwNmh6V2hLblV1K1c1d2NsUXoyUjNvV3RlVzFVVkdHVTJBSUIv?= =?utf-8?B?Y0NVazJJRmY4cEFmVjh1ZC9XTU9JR3ZXdEhIa2NoREFVRENMdDRGclBFSEV3?= =?utf-8?B?L0NpeTNQOW5xK1R4QmRsazdQckUrSkZtL1E5QS9MSytiUTFzU0xtSnp1Qk5n?= =?utf-8?B?Y2FzL3kwQkZNN2tIbXZxMTZyeUowbmxCSkx1QWhnMVFWYldISHFrckp5K2Jx?= =?utf-8?B?aEtLWUF6QzZnSkJoRUNHV2hCM3MvZzdaTmV3T0pXTGs3TlBvMVIxZWRMN25L?= =?utf-8?B?clY0UStmMWdVc0xYR1hROHNTM1NCT2pFNisvUUJCRFpqR2dLdnVTTFAwK1Nn?= =?utf-8?B?RGlna2w0VXNWMjNWZlpxVFl6blNOeEQxeWlBSVhIY3dPY0ZlVmMzNlBuRzBG?= =?utf-8?B?UkF1R2V3UmdFYjJaTGtlYkl0OE55aE00bkdPK29XeHY0YVA1Z2pNZTdSOTZU?= =?utf-8?Q?SsODj61AoKabv3d?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2529; 6:1gHCIWEXLdDleEWRY3p13qTQ4VezdJBUH9VQ5/lWSp9fmZuvi54ZFQQcm4xqjdSlh1cMTaslJqE054ari1dYxHiuACtdg/4izsIvOn1xQfrDIIQ54JkJKjedHIUmFsWkXko6VuIFcBIM9Cz8Jj9J1JWTUvbEP3KJCdRS6WKGi+M+cpIMFG0Dyp4j0TH/YWBjpFxcGeY8XihffYy2mNZaXkqoRTvcW2B3WtPfOP17vUMlIYHTn6dYUAZI6sed7bFgK6dO1Ti1/i9vGMCUJon2VIpqEy1QWsadlQVWemzHn1GvGku5lIoyxzQ/EKDonVpJEp0XyvwEecE0/MNhPU8wyw==; 5:i/X3ss9dl63g86t8LxnaNrDTvlZ5fAhoXmFmGnE/UG5odzj7LBc09G9yTHyBN13h38x6e1lcvN/Tg6t8dTgOvOpPokW1vG1+fmkEOxfrxoHsL3MI0SwQnqrMtQuIliTR7+3Y0l0gjUDBPJUTs0Foxg==; 24:WakJxntoT9WTVyUxk8BPfmANxWkRFs97ykegA7HFUYKfCfbMfN/7Lvkm1NpiKenLLjcyh9hjQBbskQenEnESIyj/CJxpRXENvGH+p54oS1M=; 7:PZzGzbXvoAYo1lBbeGf5IaP5YOwUk48rCx9+K+NYwDJRDCXF7f6IAjPN00fFWnxPKNmWc5VxJRY1qXP8UvYm9GOwAr182hThmL2NW3MvXPooBcZkXPNJ9V86F3PV7+txk5Rb18sScsjHhCBD1TzeaEI2W8BtyTuRvZSLkcvSHdKFWWxi1Dl7AqxvgXQzNnNbcWyfvZJievQhUo3PdiFkR33h7WvcwDGuA0fj1CWCE9Ov9Sm3kHbk5h35uF03YFfM SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 09:04:07.1526 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0701MB2529 Subject: [FFmpeg-devel] [PATCH 02/21] libavformat/utils: added ability to probe AVMEDIA_TYPE_DATA format X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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?Erkki=20Sepp=C3=A4l=C3=A4?= , OZOPlayer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Erkki Seppälä Now force_codec_ids supports AVMEDIA_TYPE_DATA and avformat_query_codec accepts data codecs as well in addition to video, audio and subtitle tracks. Signed-off-by: Erkki Seppälä Signed-off-by: OZOPlayer --- libavformat/utils.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index dd9df92..d7f3c7a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -612,6 +612,10 @@ static void force_codec_ids(AVFormatContext *s, AVStream *st) if (s->subtitle_codec_id) st->codecpar->codec_id = s->subtitle_codec_id; break; + case AVMEDIA_TYPE_DATA: + if (s->data_codec_id) + st->codec->codec_id = s->data_codec_id; + break; } } @@ -4601,7 +4605,8 @@ int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, return !!av_codec_get_tag2(ofmt->codec_tag, codec_id, &codec_tag); else if (codec_id == ofmt->video_codec || codec_id == ofmt->audio_codec || - codec_id == ofmt->subtitle_codec) + codec_id == ofmt->subtitle_codec || + codec_id == ofmt->data_codec) return 1; } return AVERROR_PATCHWELCOME;