From patchwork Tue Aug 23 09:03:29 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: 258 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp2180489vsd; Tue, 23 Aug 2016 02:06:21 -0700 (PDT) X-Received: by 10.28.197.143 with SMTP id v137mr19477022wmf.26.1471943181298; Tue, 23 Aug 2016 02:06:21 -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 o21si2648692wmg.65.2016.08.23.02.06.20; Tue, 23 Aug 2016 02:06:21 -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 26413689CE4; Tue, 23 Aug 2016 12:04:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0132.outbound.protection.outlook.com [104.47.2.132]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93080689BA1 for ; Tue, 23 Aug 2016 12:04:14 +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=cxaWdeZri8zLjYVP902WL1futS2BW1kuJ0kQkkE8gCY=; b=RytsF/8pjfTLyn027L0z+BlhlELUjFFHdleSXXfGFll3B7pWJkHwpxtzDxFIAaFg1Qh8fgaih+0P0vHiL6t2BOB20jW8JiArBSHFqkTbV67lE/Y9Rv9rLHx8DxUrlElKAGBhqH2BsBlIZSCzxT1V0zOKB8LYEqtNJhkFsrKmlG4= 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 DB6PR0701MB2536.eurprd07.prod.outlook.com (10.168.76.135) 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:13 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id 635314449F2; Tue, 23 Aug 2016 12:04:04 +0300 (EEST) From: To: Date: Tue, 23 Aug 2016 12:03:29 +0300 Message-ID: <1471943019-14136-12-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: VI1PR0901CA0044.eurprd09.prod.outlook.com (10.167.203.140) To DB6PR0701MB2536.eurprd07.prod.outlook.com (10.168.76.135) X-MS-Office365-Filtering-Correlation-Id: 91c6486f-ba54-45f8-851e-08d3cb3473ee X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2536; 2:EPeoZjW/6uZE2WeWwHbTGKPPLZhYgix8Wv4BSoBpLX1tj5FtMTOHWNbP+lhHWJqcr6eqpWeR8oD2uKlcKO+OqwKDCwUDiXfF7TqYuJL0BM/t0GJT/gYxSkpi0LbbxkgGIL7C2HJ/HDq19yGtJvoZ9XXR4w0QfWJa/8nTgFiVnO1EWao4t/tdW/rgSMKeLPfH; 3:I6VJXdPg5dB3k+I6tqg9sEf+eXMSQuAwOIxY4Iu4CGV6fV3GzEWdX5PIxbxMLkIdg9GLWH39myfS0MjOflHbgnMJS5weFU7AqENH/2jLQCJo6DvAohTcTJavjfoeqppm; 25:Cc3AU9NaOGkFBMrQY4IWTk+erlhKBlV/h9uIC06bYtnI/K9I8Oz9NgSiQc1/j/Yzgj9Sv2Su3JGjNnTWW2shAy1Ag0ZUkclq2OAperN5p9O4TGX49y7Kpy7KRLP/qj6cdET0nwWLFaq1rX1EQWhSvUqi9+oALAtT3rsskM5UKvIH9pSvus79jcJsF/rhMtlPbKjHstW9TKpZo4jwHlJBeIAmvh6BvK5DH6NN7i/u4lKH8c7q0j80iYDeqb+oZBmTH1fC/gJ2gjYeaGrdKcZzuD9CHX0sMVyLUPYbvHpDvO5KGhMpi578Mz3FDXq9zUZ9hYkfEFNhyGBz9IcT4vZC/bnOsUzI5LZ4ode60JBFO4QSk2BiM4sZpaNvSD79geBvEujcpNEHo0Gx0io3jC5ez3DhK2UP1XuZGPMG8fSpxc0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0701MB2536; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2536; 31:WlHHKY7MZMEpo+hOgCs+KSZaMzkMNxaHJCAPAithXkSazMSzbfzOwRQdL8hki0izj+1Zkuf+hdVHi+p5hKi3gOcP4dMOMuNOu71GH6lRemQ1hxfTI8qukCx19nL0LzH7315yfl+8/TXf1WNb3vjC3QkMFcEW2d4Cbdk/gSHqvtQmVqg+XnQYupPQvL6xLK+mJgy2eCyNvA+R4khSTVxJwLf2PV3r+aUvlq7f+4KENBo=; 20:6N3YMMBXU2Td9Vc49UeKZGoG/HAO9qutCL3MuivPRd31v8RE7eQ0lWkVhpQvSPhSO8Eu4JYHBJLH4exh9lN8I/MxmV/eNq4QnNI/0BNOYBzdbagHvEJIeJ415fdlKGFbAa2RGR5+ZC4a/m9y9+4GUOwiHJuZyzBM68EKMMFfw/dz4FGZjlQN9jSSfgNtj9zIipzDv+zCJdgaY0BPvykg6fItTmyQGBOXqnbxqvaWkybypxaN6X27flT6UCBOfO28wcUe4VeaZhCNp8+qZq6nl1D8uZ7yXdx9JkANzae5TQVTQudd8XeHO73OVHQu3FbYcayHdWdFaeQGRZ4qin58GCWsWova3YpZu2cAdE+RcowRKHPnDdXLSUeNcIVHd2T+3ad2mqlNt//ovQheScyXtk2tR/63j0hX9n47QbfAity0ZiRk1svrT7M0cUqRHJUcKm5QImQ+EwEGkYPcki9W0VQiI5o6vFGPGd2MovVDem9znaBdODKHqMrJFBBHd8os 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:DB6PR0701MB2536; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0701MB2536; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2536; 4:6gQNgNsGsKbXuTPvpxPuUxGn3j4eIT3N4+MOs6U+0KZTI6XHkTem4ixnW65/Pmt8O509KsNAxcIduzqGMy4UM6rdtl8CK9kwA7JF7WG4yfSPJr3dBxGzAAM/TnqLh9HnGIY6q7mYQALyy6gsn9W8EjlGWta1JS16fsXCu19F7MJ2MK6YIwkrU3XzK2apvi+9WsVkaHHM5SLqTQpx3mBoUrieC+nV6zWlJG9VCNkJxIuuyJNvOCxEd1+3RAt/KxOTt8AIiQ+3cRBoU1DqrCoyNYiF72UCt0J5z1fSS0FW+TQpvGJdz2Hn77G56OYgDnacsLSkP8ZXSKKkrv/mPFcm0H2yk6rXNPnEX4Ok568g8ngXOwQvwhsRTOF8niOow9bZu7opkRMZaykkk8geUAFp0g5+YOWpnrT7kEaPrN76xCyUE40eb5k2ZPbpm6M0GKjYbg9q5Kidyk/OL0kAm6tseA== X-Forefront-PRVS: 004395A01C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(50466002)(6116002)(86362001)(5660300001)(45336002)(46386002)(36756003)(92566002)(47776003)(2351001)(106356001)(229853001)(66066001)(3846002)(586003)(450100001)(52956003)(90966002)(81166006)(2870700001)(19580405001)(33646002)(7736002)(4001430100002)(2950100001)(8676002)(5820100001)(305945005)(81156014)(7846002)(86152002)(23676002)(101416001)(19580395003)(97736004)(189998001)(110136002)(50226002)(107886002)(2906002)(4326007)(122856001)(68736007)(2876002)(42186005)(50986999)(76176999)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0701MB2536; 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?MTtEQjZQUjA3MDFNQjI1MzY7MjM6endMZ0NIaG5jZGNwK2p4VmIyeDhjN0Fq?= =?utf-8?B?dlEyUThsOVZzd1FxMVlhNUsxeGtLUG1Bd3IvNlFtQlIwL2EzZVFDNTVqbXAv?= =?utf-8?B?MVpudjBiUmFhKzBiQ2xhNStkdjBnZjRJeE9KTXNCWnd2SzdCcDh1YzhaN3Mz?= =?utf-8?B?WVA0aW1yR1pjbWZVNWl6ZzhvaHFvaFpxeGpkN2RwSVdmQmQyR2M0U3RUSERu?= =?utf-8?B?TE00K0VzVUNsRDc2VndkYk9BcUhXNE5DTHhXV2dqWjR1UGVDa3N2SG15V0w4?= =?utf-8?B?SDRxYUpOQWV6UkMrZnRCdGlhOEZLWEI0R2dLeU81N0R0dUZjY1NET1AwbHJZ?= =?utf-8?B?WFh1ZnZ2MDdQQkY3VXdBWklxcDZIR1hrUGpjUS9LZE9yTzRLNGhiOWZnbWl0?= =?utf-8?B?OElCK3ljS1JqZjNSVGo5L3IwUFhzWDYwbEFURFdWSVozN015TmgwbDFsNGpn?= =?utf-8?B?Ujk0VzEzN29Icm10TXhxTnJmMU5adDVlZkxKRW85UWpsVFoyV094VmxZa2VV?= =?utf-8?B?MUEya1JkVndaYWNTZXlUY0pNZ3QzWHZ1ZXNoNEc1SDZ1WVZ6LzZDazVLUTlO?= =?utf-8?B?cll0SkM5MFZkL2duUkJJUEk0aGhIQk5ndVl0Z3hMSnlkeEpyWTh5RUVVOUg0?= =?utf-8?B?SXlvTWhnRnAyeXVOMXFkU3ZzN01ycmZZOGtvR0MvNUxVYWxaVnBQY2VieFFw?= =?utf-8?B?ZHlvN1BhN2VoNkJmZjNTYjY1NHFrMzdETksrQXFaSHlNdXY3Rk1tb1ZRWFlW?= =?utf-8?B?YmJNWnBFMU5MYmZyYlJxTjFpV0tkZTEzUHgvTUNMZDZqWU92WmdGS2dFUHdH?= =?utf-8?B?LzVuM0V5VGR3NnZNSU5vV1RJTnROVGw4bFFPc3pEaTNBeFJUdlpqaGpoQ3oz?= =?utf-8?B?MkJzcGdVc0p4anZtWGE1U29qdE5HLzR6aDY0dGxoQWN0WVlvcGZXL3BLd0Nz?= =?utf-8?B?ekJ0YzNwczgza1ZCTFh2VFZTVmRSSnhta2tmTFBSZVhuVkVBRVprSGQ3bVc0?= =?utf-8?B?VUhtUWJkR09NUmlSZEl4VVpPSFpwdFZkZi9MVlM4L1FhUmc2Y3VGaS9IODBW?= =?utf-8?B?SCtCTVFKeWZmVkhNcXdWRVpNOWs2dXFYK1JqSjJkd3N6Y1FDTnU3ZkN5SVg3?= =?utf-8?B?cS8ybU5xaldINU1NcDFNbVhGdjBsVGd6dVBmK2hod0h2cFAzM3NjckM0QU45?= =?utf-8?B?dmFLUHdsRk1oeG11eE8zM0VoK205OFRQUnlDcTRvMEpKTVR1cElRTm8zM3lN?= =?utf-8?B?eUhGSmgvcy8yaTVjVlVmUGhkK09Ua0JvUTdXSTZFNjgvN21IMkh0dll2OXpz?= =?utf-8?B?QnE3Y2F1dlR0aUphMHBJRjJxK2UzMlEvQ2NQZ3F2WGU5ZW1zUDZXdGJqcDVQ?= =?utf-8?B?eml2emlMK0ZDZ0V0OTFRZWJvMVgxT05tVW9pbEp0TEV0dnFSdnVvcFY1ZitW?= =?utf-8?B?ZU1lSkV3QXJYbWtHN3FucS9Oc0V0RXVSMmthUUtxYVFDVUIydlpYQ1Bwc1pn?= =?utf-8?B?TnEzY2xURHJMcTF5eEFsSi8yY1FReEZlaVdLZ1pxbXlhYTVsTU5mZjU1QXZn?= =?utf-8?B?U3JqOWJqb1lPOVVRYStiaEhUQzgzRUJLZ0pQdUNmdDZYNytqdTFZVE5vWWZk?= =?utf-8?B?cmtCb09UdWk1bnkwS1h4a1owemRvMjNhaWhUR1Ezd0JlbTViaFoxcW00QzI1?= =?utf-8?B?ZjBjUU5zWncxVWxaVmtIcHhrUVVERjhGRjBHeHVxcVc1TDRGbERjMlBNU1JX?= =?utf-8?Q?+49I5j6/i9EhWJ2k84R7z9xBbBqVeD20aSz8E5I=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2536; 6:Mby+S7B3f2VjUxmK5p4YbK+sjHf0h5S05JK7N6tUkQ1aCM03GfvnFGwXqiLh+MaSl5nYliRmAprZhh8p3OlqBteBVMkfWxyTQ8qr63PzsXQIjaGUTpJDcZSsDC2qgW3jklpPyGEhFfdjeoBMT+MI8MzF1Tg16hKyJEFgomj2SvpNa1xXMaktDLp6cf3vq+7sutkq4wmvZ1Sn8FvbexZDVkCu7DgD0TA7TEwAHfgMlXihSDbtW4itODESaHuRM2l6xi3Xjr/h5isgW0LIET8lu80O4KVrR0a0Biklg1u0XexfwG9yzZRWJWEfb1gprg16mtLg2qUbSsamotW4CCDThA==; 5:CCFjWYYYCYAgeBjQN4orON1RtubwzX9TAt4mjuV+r1TIt2JOk15DU5KfdU9hZRoLmKghVHLVAiq+9DmJvnSSkz13z6c7Ux0zDNw7kk/fUUpPcFYBoCt79zOcY8yGutd9e29oTNwhAExU0YqKhPl+NQ==; 24:4LdmuDn7BJtAnXbmQX9+h0rcfIr9+gO1ArjMYK7GT4EXq36rXrw20sXLzS63+++47rlRn0RFGaqnZyKauLi3mvpYgzsY+q3ymAyzS8lYdO8=; 7:8pIA+9wpsxhbtQZ9HWQ3PJgRUKOLA0RAQCbbxPr8uIozlDgmxKssddaPzFwyZ/Tt92t9x84eENywpqwqxYLImABXxiHnr1lmksNUW5WgRo7u9NHvFygW85UKf2kphgE29H/hUen1hUTKjUWqjgvwq2jWXzaV8Mb8HEs+OrmXh4tx2bUT4byO3OiJWwbU3h+MgD4xcX/QsOvkrZnqZaEXA4kRUGsiMqdWmH1tpTW/rviExb3BSdhLlXtGzlNcqF3A SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 09:04:13.2240 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0701MB2536 Subject: [FFmpeg-devel] [PATCH 11/21] libavformat/movenc, isom: support metadata in mp4 files 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ä This involves adding a new tag to the ff_mp4_obj_type table as well as modifying mp4_get_codec_tag to return 'meta' for AV_CODEC_ID_META. Signed-off-by: Erkki Seppälä Signed-off-by: OZOPlayer --- libavformat/isom.c | 1 + libavformat/movenc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavformat/isom.c b/libavformat/isom.c index 473700f..9fb96ef 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -66,6 +66,7 @@ const AVCodecTag ff_mp4_obj_type[] = { { AV_CODEC_ID_QCELP , 0xE1 }, { AV_CODEC_ID_MPEG4SYSTEMS, 0x01 }, { AV_CODEC_ID_MPEG4SYSTEMS, 0x02 }, + { AV_CODEC_ID_META , 0x03 }, { AV_CODEC_ID_NONE , 0 }, }; diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 141f1a5..ff4bf85 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1175,6 +1175,7 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track) else if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) tag = MKTAG('m','p','4','v'); else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); else if (track->par->codec_id == AV_CODEC_ID_DVD_SUBTITLE) tag = MKTAG('m','p','4','s'); + else if (track->par->codec_id == AV_CODEC_ID_META) tag = MKTAG('m','e','t','a'); return tag; }