From patchwork Mon Sep 19 13:25:38 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: 638 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1001033vsd; Mon, 19 Sep 2016 06:28:36 -0700 (PDT) X-Received: by 10.194.59.116 with SMTP id y20mr25707881wjq.181.1474291716888; Mon, 19 Sep 2016 06:28:36 -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 x17si24224616wma.104.2016.09.19.06.28.36; Mon, 19 Sep 2016 06:28:36 -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 D9A8E68A09F; Mon, 19 Sep 2016 16:26:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0124.outbound.protection.outlook.com [104.47.0.124]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 293AD689DDE for ; Mon, 19 Sep 2016 16:26:00 +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=GvUXNT/tp12YuRoPQ2RuG1Y9rNxadnwSja31R5Ip0js=; b=Z4YBxpz3ZokVCRgmmCe43Q6BVMS2th6JfPx5RnnrGB39YeK3x6adkgzIosbcnIJdvYA8zfsJ/op6LuQeWQMgI9OjFyoyItFB/B0oDYsHqIhU6k7yu4bBCJr9f3ihtCWvIj1SdTr0m2hAdUJEapWesJcGMNh+xJNGCFcOmrIp6y4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=erkki.seppala.ext@nokia.com; Received: from erkkise-laptop.vincit.intranet (131.228.2.24) by AM5PR0701MB2532.eurprd07.prod.outlook.com (10.169.154.7) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.629.8; Mon, 19 Sep 2016 13:26:14 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id DA68C4F0F59; Mon, 19 Sep 2016 16:25:48 +0300 (EEST) From: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= To: Date: Mon, 19 Sep 2016 16:25:38 +0300 Message-ID: <1474291548-17810-16-git-send-email-erkki.seppala.ext@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474291548-17810-1-git-send-email-erkki.seppala.ext@nokia.com> References: <1471943019-14136-1-git-send-email-erkki.seppala.ext@nokia.com> <1474291548-17810-1-git-send-email-erkki.seppala.ext@nokia.com> MIME-Version: 1.0 X-Originating-IP: [131.228.2.24] X-ClientProxiedBy: BN6PR17CA0033.namprd17.prod.outlook.com (10.175.189.19) To AM5PR0701MB2532.eurprd07.prod.outlook.com (10.169.154.7) X-MS-Office365-Filtering-Correlation-Id: 02746c6c-894e-414b-fe1d-08d3e0908797 X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 2:eK/CSMrYEoT7UTpcPSQSn0ZdYFAlaDKKw6R7T7GDzUYbBpdSh2srlVWA5cnixYPcI+NvEAkxYeVscnvmbapL3HtgWqL/ZwZShE94TH5yeMIqKIGM94Ja33asFhMmAO208dcDjg35GFSAifOe4CsnLnEIu0/mIPW4umKWIo3SyqpGYQlGY/honbasTiqQiQ+/; 3:lGFucQ+nontdR8AxGWGI3dusmQqp+GnSPfWGyX6A9qYwMEpua32Ap61YziPZSGEEjRW9QKrG2HGSxeUhd6psuGEaHZyn+/5P7tvMKy7aVyDDVdQ4SNakMc1MhWA9B5ef X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0701MB2532; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 25:dYtAUqf5IE5yaxGWbriD5hp/nVVHZKpXZYeyIizxCN26dGk20jMmF504ph4nSDlZpGbuCL/r6GfGkRfldVm4yjvcvInQhvFYYr4OeJv8lS0wlJLdw3dlSM8zs2Bnusrdz4MYbspWz/sBa4mXq4ejKEFjGEMehRgEgykTAbAzAR2F05DXsX2HKwDpZGNTBF4EkrWau2jWqljfWgrUAwK8/VJYLjfibSzIYZfFec8YO4UuJpZeTufloJ8RkE4QexH1EJzE3hHXWge1ZFfKYAaNSUGA1v5Yxj5SoZ6eqNOKqVi8pMJ2kgvzFURfPQTc2lYh2/j2NVogIAmNDFzbf2UY8uobW7U35nNRZhq4OCvjTcxUCKPSW5j1ynmgrWD5fxDkmDMaDTeg123q9bGfE4D9lLt4AJ+S/jjDnB+rKsLWHDVNRYZEUGUQ/iPp2DQbZJDh7E/Fj4UOLNkI264UlAaXjhPl1WiiXynpFI0YeveFwQo+ctHBPBTVFq4RDq8enXwSN+VVEx2ICF++U388GtdThdv2eTF+VROBAvVTf9cBtIZ//wKaWYM74csXn36+BHkNROypKJ425WRtFfZesNF4DJCq2TciVoEkopEV9wInVaxXRnoyInNqqIS5x+4wP5dteLf4imjV9Fi+z1yAcSVnf60au0UAb5u5LUiyKUI6HT7l7sl4CGlH1Ymp7n6FXMwuQyTukqo209lTr5dsd27oBg==; 31:s+OOujwY6UkLRGGWnrVr5fNW8mkhXc5CucwpXFcxUycBMUjZz3M66ecj+Mrnb15D2Tu0z55XH3e2xaFcLVa/GOkU53BLaxmlhywBJ/Mr8qRtKW7OgNez/oJR7F48Wu07h0R+VGxrBphYvW6RBaGIEs5jtfwb4nsMlhio7zm+IIObPOQJe48Hzf5iYty6qB1FmlIXxk8WskjM8eyEjR0l6rptS0gy2/Iwa2MIs5gz5VM= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 20:F1isk1FsiSjT9YHFIw6Y01RP1sHHBx9WkWAwlysR+0da8H6IsjjBG6JjNyWflzEUfXNeENIr4zpIMgNlndpo6tZzCyZAh7INjY2unFIYPf1y7/jShhyqPwwUCl/PoL6cUMseGPMVAIbBbkhuvu7KAgymKlsXuHh3MGqfUAwgGsEQBSBvld/ccIkfPVoMzazQuSiJpbwT6OyuqYd6zbs3LdYiSrtkBzR9qsSDrbKGSOIaC/rqR8jil4Mk3yUBnCx5SHBDP07HhXyKvKd9AT++2zaizMaIpd1+93XlKfli8hAu1yPYWLbFWZlPul6Aj6zIgmix5dMJnlsHddHl6n0Ia6FBTpUqxWOO85kGzaYu2R+k9WiIU9ytOObZc3WUl2yE1i/xjI4x4u7NDDXJAGZsXjOECm7TWFX2Qdw09TFR85l2VH9LVfa07lfv9nHDF/AeS1x2O5XZaJWkbV5+ZIZZXWxiKEMKI1g4hARBIWSk5T2+/L6Og2SnbwEmsT7yEbjk 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:AM5PR0701MB2532; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0701MB2532; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 4:hUr60cjCylXNtGURLKXG0NKT1PSjgRwVHDvB1GS5dQ4uyFVugAkT0aE1AwwF0vcd4us9YRmxyZ+8SdGhxzGxmT8XL1E5sR5V/cm9tQIqn2RPze2uAfQnKS7laO194R7iCNTXVG3vHegzAqIroUWj6wOBpuPFVz8/1qsObWmDcL7OYJts1DzXzbNPy0K3Qe2LP3pMkx7mqXvyUXLhQmmt3wG0aOWqw1jgEnRGxAiRHnADlCmzw2fwDX7dhAX8CDgEJlUB6ElmoDbGxKttNBsINIxB3ufgpwZf+nM2naN2L4DInYUzTT10tP2EzfnTnAvg0+B6QaYM5jrEoWMQ5Vvdx8Y951FVUVyQTqLlkIveY+wxNRPiKiA/wUJQ7PHz9bOamNpPTrpyf4ZhD9GdztBk7rsbiJdMxWbo7KaGvIieuh4DWtIvCTnl6sZ9oygOgv2GWob+pg5aLFNHGK1GnACA6A== X-Forefront-PRVS: 0070A8666B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(6116002)(3846002)(97736004)(76176999)(4326007)(81166006)(68736007)(2906002)(86362001)(101416001)(2870700001)(50226002)(5660300001)(2950100001)(7846002)(50466002)(586003)(66066001)(42186005)(450100001)(7736002)(189998001)(229853001)(46386002)(19580405001)(122856001)(2351001)(23676002)(107886002)(50986999)(90966002)(19580395003)(47776003)(305945005)(81156014)(45336002)(33646002)(36756003)(92566002)(5820100001)(106356001)(110136003)(105586002)(4001430100002)(52956003)(8676002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0701MB2532; 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?MTtBTTVQUjA3MDFNQjI1MzI7MjM6RmNGMXhQdk9Pc3k5WkpGQkdWME9oUkZo?= =?utf-8?B?bmZMNXprMkF5SEkzRXVOQmljWitKeUl5d01wOEV0Wi9pNzNSaFZzYjI5R2lV?= =?utf-8?B?MzB0NklIY0M2N3hJR0IwbVZMUW8rVm5zeHRzQzdRZ3ZPbEJ1Rjd1b0Z1Q2ls?= =?utf-8?B?c0xadGdoRjl2c24wRVorY1huNGFjZWRVcG1aeW1NanBKaUhXQ0J4NFR0di9B?= =?utf-8?B?Z0JJb0dqZzJLNWZaaUdvNkZUL1pOOGtwSDBrVXIrd0MyUVc0NVQ5RkcxUC9M?= =?utf-8?B?a0xtZHZwRjdCZXE3V1FlUkx5Vk4waitrV1VIRlh4cmYvVlZSeGtOcWZVZUcy?= =?utf-8?B?REFkbkQvZzk5eVBIT0U4OGkyQnY4c2JqM0pWSkJ6S2JkOGdWR0tMODJIbHlC?= =?utf-8?B?YVU2M2RyZmVodFJUMnpsK0pLblFFUHpYVkljTmJ4Zm9JRzdPcENiWlRacG5F?= =?utf-8?B?K0M0VHhDQ05odzFBalV3MXN5M0dTakN5OGhvYnNFaG5kNW5OLzl3dVJha1dE?= =?utf-8?B?RmlNWmUzWGU1blE5WlRxNlZkR3VzNkhYYU1lSGVySjM3NGZOaFNYN2RNZmxH?= =?utf-8?B?NmZhVkptcUQwRW8zWEFHazBqdVlkOXhwWWFkb3BxTmdBMkc0VTQ5TXBiN0p5?= =?utf-8?B?ekdPUWpXTXlNMVBsVnNpanVkVEpRdHBFamFGejNROWhZVEFCU0R3djg0UWh6?= =?utf-8?B?TFJiWTUxaEpPeDh4UiswMC9lUEcyR0JyWUwzNmVFcFJ3Uml2TjI0S1FMU1dX?= =?utf-8?B?YjI5N01NMWdIbmpLUE0vVmtYcWQxeGRtNCtUQmxZbkx1b2J2QmdTYWQ3Vm1y?= =?utf-8?B?YXArMFU1a1R6dE1INnR1eGVqOXlhNnVMQ1ltZG1Ock54MXBTQXNaemdBaXh5?= =?utf-8?B?cC8weENsNm1STnJtYjVoS2tzNXZidmNoN3pwUWU3eDJBZXlIcU8yb1pKMi9Y?= =?utf-8?B?OE04VmVmc2QvSnZZRUlNMEd4dDRpZGN3MndOc2FGTUtGU1JVMkwzZzdTVXRO?= =?utf-8?B?K3pGeXR4Q2lBTHJrLzdmdjc2SVBTUzNnbTdwbVJVY1F3QUF6UXhHVlFqdmxN?= =?utf-8?B?UDJTSkR4QmdNd2g1OStwL0t6S1VsdysrMTFwZ29NTUtpekVxT0hNN1RFYmc2?= =?utf-8?B?eE5qOUtUa0lBRWVWbzJ6OUdReHZBVFc5RERVN1cwWEt1RHgyWkJWQmN6cWFo?= =?utf-8?B?T3FmMjVYZUxWbVBxYzYwL1B4RUh5akFPa212V0xoZ2M2MzBKSktCanNSdk4v?= =?utf-8?B?STN3cUpjZE85NVlCZlRzQ1hGT25aNmIwWDJXNTFEL3FiejFLYU5aYS9FdjZM?= =?utf-8?B?eFVDMU82OElqZmQyY09uR1B2eVFqSGU0d0ZRTDJxZzNxa3Jnd2cvRnRFZUVr?= =?utf-8?B?UGFiMmR3N2ZzdUpuTzBDS29uRzZEOGRweUUvREpRYmxlRURrQThaVTAveUpD?= =?utf-8?B?RzdNSGIzWW1JcTBsOGJSejdTTWQrSStEQ3VzemdlTzBLOW9aR2NsRE5EejR2?= =?utf-8?B?SkZyVDd3Y3VIM3pyaVd0bFVQSlhMYWp5QTZHOFdwVkNpemRQWTNPOHhodWZU?= =?utf-8?B?MUQxbWFKU1BqRDAybGxwR1pmZURYTEdhVnhBTUM0M3NYdURTMkVXWGduNUpm?= =?utf-8?B?Q2FCSHVUUHUrM1VxRUEyK2VRTVBjNmdmbDRPYktRZ2VEMXJTTkpMakIrNFJp?= =?utf-8?Q?sJQHAfPHAqbdfoo9/6HxxiUCOkxL/qoNFQflBN11D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 6:w5SujCV2CcoEraJuJJerVlOT2c1Yk2UIyDD/5LW3q4FKooWZMgjyWa1XvMHccmWqvdaUgUzg2m6CHA7udbvry0h95pDCqqNfuifUXASMQZgu8bAadG3o1BvhjJvsW2t35yxYtOprYnuxIDFOg9XCe36cQpZLojbPO6pCLfxhDWILGTGN0ShgzQSXMdcQlJ1XHPfs296o2jZXaB4kv739Duy0CEhj0gjaAZaRZ/8yif3eONbxQaYbIHmicoGOfPVbTY2Czpf5C09Z50gPXZTb8z6RJbnhbfZXsMk1ps84zSe3lGSTpe1bN7OzfKup1sDyl54Ph4RDPJ0lxcrhu9kgbQ==; 5:lAkoSN+Y9qcFPIuV1X1ydZ2qYNo76kDdai17+cT0eish407kiRmtYpkEdLmok8smBJNHEtG4Xs7RPVjTNth5Zn0il8l7tD6rVmJkB6WJjNXwycafOZjRoxl75FYeS0g20FtRnWFaSIJELXJ1kH8YVQ==; 24:1Hml6gM3pfBmyQCWKRgAplSqOLxfldaADlHGgYO4ZEh4ZHbe5gZyeCsFS2v7DYFvUlJst6jpsVWeyUVxaIgz4xEgB/NTY6imjvsjfutRRTQ=; 7:dVhNjYsgoYQwKI03W08ikwizx6rjfCJtZ+irQtpPozSibRO8jdbbEiJ4wdIJ2MG5lSoBzPJr1+lswkJswHeg0wVZZwDTyTuAPncnsRgVOM5Ha4sNMBWTmJKgtPo4igxR4iCjqYtj1XVba6dYIhDo7QzV0zNqNVsx8dEdbWmZTUJeozeQy+WLg0m9oReeQWG+x9AYjXAx9Pd0nTPdHbclBBix2u82OlmRLna9i+0m0D6PgsBgB98VIeS6oLO9GWm4t19loQiCDGp3juu8eHqvUjwa+ilHdqdJu7Llu95NOc+7R0SD2L+TJOzv8AWOP7Eg SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2016 13:26:14.2107 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0701MB2532 Subject: [FFmpeg-devel] [PATCH v3 15/25] avformat/mov: basic support for identifying (and reading) timed metadata 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" mov_codec_id is now able to set AVMEDIA_TYPE_DATA to the st->codec->codec_type field when the input is of type AVMEDIA_TYPE_DATA; previously it used AVMEDIA_TYPE_SUBTITLE as the value to set in that case. Signed-off-by: Erkki Seppälä Signed-off-by: OZOPlayer --- libavformat/mov.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 82450e9..4dfe1eb 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1789,12 +1789,18 @@ static int mov_codec_id(AVStream *st, uint32_t format) id = ff_codec_get_id(ff_codec_bmp_tags, format); if (id > 0) st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA || - (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE && - st->codecpar->codec_id == AV_CODEC_ID_NONE)) { - id = ff_codec_get_id(ff_codec_movsubtitle_tags, format); - if (id > 0) - st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; + else { + if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA || + (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE && + st->codecpar->codec_id == AV_CODEC_ID_NONE)) { + id = ff_codec_get_id(ff_codec_movsubtitle_tags, format); + if (id > 0) + st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; + } + if (id <= 0 && + st->codecpar->codec_type == AVMEDIA_TYPE_DATA) { + id = ff_codec_get_id(ff_codec_metadata_tags, format); + } } }