From patchwork Mon Sep 19 13:25:35 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: 628 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1000637vsd; Mon, 19 Sep 2016 06:27:43 -0700 (PDT) X-Received: by 10.28.16.148 with SMTP id 142mr8743107wmq.5.1474291663760; Mon, 19 Sep 2016 06:27:43 -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 t194si19637255wmd.56.2016.09.19.06.27.43; Mon, 19 Sep 2016 06:27:43 -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 86217689F6F; Mon, 19 Sep 2016 16:26:05 +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-he1eur01on0119.outbound.protection.outlook.com [104.47.0.119]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 135C5689F6D for ; Mon, 19 Sep 2016 16:25:54 +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=u2J8/Z52/a1p3MNEVg/b/K2TAgTUP+5rHc6tvWQ2G+0=; b=KHUNTPj1gIvCxe4W/kwMNGEqEdZ4skvvseLhG7BTDZKonRA04ZIHF6mbEEzQd+7AKPYf650Q4gDYJjpPI4hUs055JwKHKt4fwKvpB6aHXTpY/1gjSjXi7XoUhNTcuZFCDGcX6c9drNYpIdKFjSSaBCrNUL/NY0hX2uctDXExpF0= 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_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.629.8; Mon, 19 Sep 2016 13:26:07 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id D07894F0F53; 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:35 +0300 Message-ID: <1474291548-17810-13-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: BN6PR13CA0041.namprd13.prod.outlook.com (10.171.172.27) To AM5PR0701MB2532.eurprd07.prod.outlook.com (10.169.154.7) X-MS-Office365-Filtering-Correlation-Id: 62ac3c87-575f-496c-e67c-08d3e090838a X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 2:Gzz3pixzUciFqEAJUbw6BaArLVI8jGnt3Oph8g4ByBI6Z+o4lqZrqxv1NgbSsD1Gb0xkKFZqMStRttghWZhwfZanbcYuugfqFpSG5+onCN4hmKfjPUd/tL3aNRb1LfK7Blh8DvAc7NEiqMPtOZLf0dPf68XpRDhtKV+mx1pG/LBFoDq2RH+/xqPRLmMDXH8e; 3:fgXdiIX5KXJhRVyOxVXR8jAeOwF3Cly8MSxbYhuJ/DFEtrEBnj4uucfZYFZcfZkV+ZPl1IO5muM6mb/jeCFsM3WNSMyw9+hIjDIS0TeRAkaTZFfA52Bnmk6BOJ72C5PB; 25:mA1vn2fa/cGLyOINIZ53TqzAYUHRMFeNQPV8qHxAWphc2BeKImbNJ+1qk/ld99AhMcUrhkMLjnhxSaqWhlQjovHEbDLTkCDwvKW+spaqsQ37zO+vmR8nPFhpLCYMcPe4pblloQZIG8hrFYQEXeJNZtlAs56K00AZc6x4oKcQxIKRW5aJC1Va7dKwxF7q+C2nTYPt4atUhAoa6an8eaRPCxXT5GQq/dr+uoWj80/BH/vdUj2+giGqfdPqvUr3+AwlXymGtlcuAoL3nTRCjThQ34xfPkrq0QopqqwTWKcGas5nW89ko7KYhVhpfOhiBYG+vEnHuwDCLTMK0eYVgmkkQI9Wr5c+07ASYuXbYn8MepSZHZsHhRxrsDXsX6M3OBXNttLEYNdGGpcZj6EJ/6lbum1+Ao24jkjOISJPe9UBosc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0701MB2532; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 31:e2RFCNBYHgHaOQufGalAN/IVUuekT+u/NIwWh9Q8oOcJVmnIb+0FYIrZ4D2Div1a1uSh7OzM3Et5mJW0evIKk0KHjunV3j+RB9Mv9kw42PEbGQxXFUYUevDFHO8hjRGSp8p4NpWzCFYj6q3kR3Wr983E4ozPITJT4v7ISO6SFPMWG+9NWI7Cm0YI+vrolD2KyTEt0YbOqVC9XtwXk/EjZwJ+5oDRVyUxVyJyLVJRMZE=; 20:iJaMjYQIKPim69mNLnczWJTpYIVFf6ijzEzCbmVM24lKbzn2WN9BTRWkiMbkhf7pSoyNkOGAozdjpOWd3rYbXtTbu1RvNzTKn7NthdhxIDp9my8Uyi55bQfZt0VTDmuqqNrGauh/jsrb6MxVViK1ptzTkac5HstHHzumXSgeSryDtlgYl9BHbemLT3h1ovAIZih7z2waXGf++BOdTTk7nRZUVMAVA2Le48AbJxQkZbz8IolQsERl0s0o33cCEty0EMRBwnDQcfmRNx8Vj6UJ2VilS1AeC93IEHK1o8HzhD42gex2/e2Eh3OJO1z7lTzBIEnMy2cENlhsf8XGmQCC4L2dztz0xWPVellCS46OhwqABvnoxRhMSCVCzGlei1/IUUkUVK0SqQOgmbK1y1zJ8rJ/KL1EkfGINrKMisUqFs1Rk7Sv406uMeewx2otewLxZrEX/7q60G+i4nuekAOy6D/X13h7xqmJrCczyBTNrjmsDUCsKGqalBlIJdehluon 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:3MaC3cyFXBa+8jCDwUiaZD6BhCMUvgsdsJC1hlIg2TB53MyN8L2bZSLQ0r1g3R4QKqh/6hWrax2MsskKq6eicOTswsf4NIRiWrysddeQoowbd10QhO/h+fMzyN7Q30Cc4XgjEfoEwlXNKif6jhzigZuQoYL+lCOKwJueVER+mA72dxA/GwHgrNxyvjJ0YXhaGm7Ab3zJGB87RrF/EdYEjEIeeqzvbWgSBDAuJoeR/YDu4lcl5am7GNRS8oDBGtSc7PewLJt1sfKT7e9qzIhuJM5DUXY+9rMmcRAWYbI2GujO4u0TJEP/ecgLw5hruCbLHJMAytde6Cr162h/VjGTJ19CtIBrsb2zex2Jbjyf1vxHW1138o9DVSbBimDEBldSI+XkA9CU67oHf+du7w7hmm5zJROfj721Bk+VppAnTbLsUOF4Hwz960CGJs+Vi+YyxLOu3G5by20dGzhKIjfcOQ== 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?MTtBTTVQUjA3MDFNQjI1MzI7MjM6SmZFdkkrUDE0NCs4emRkajdRN240U3ky?= =?utf-8?B?T3prSlRuRTBNUWp0YjY2dGdPd21KRk0rMVNjUDkvU3J0ZVRyaTcvVUpIM0xn?= =?utf-8?B?dWJyWTl5N0hmejdSS25LS3BQcVB3RzBJcHRtbFFXMk9RVzRSb2dlK21FcU5r?= =?utf-8?B?UTlKNjZFVGpaTzZaZjR0WTg5Q0M3L1dYRGJZcklKbU0vczU4YXArVHdhNzMr?= =?utf-8?B?YVBOSlU4aE5BWmsxQzBqSlp3UW9qQ1BjdXhBNzdzYlhjNi93SDh6K083c0hY?= =?utf-8?B?QjF0US9iSW5IcE1ITjZFWnRtelZYUm1Jc0IvSzVIUXh3bnpzbFBrM0gxblNi?= =?utf-8?B?a3N6bFFDK3FsWTlXTHcveXo5SERmaytQVGErS3lEVkVNNXpoNEFjVXl0VnVk?= =?utf-8?B?SEdMa1pGWkxGS0VGWW05b0dBVXhaL3dZYThqSzdEY3VwUDBGS2FOMVpMSVNm?= =?utf-8?B?aFFIZWYybUI2a2VzVDNJQ2F3T3BMQTJSMzZkNnN6Tlk1eVJGM0FUQmw1SFUw?= =?utf-8?B?UTc1b3VqWjdFZ2xBbEpBeDdmMHVOSnRrUDF0UzJ4VmIrMkM2ZlZiRWl5N2ZW?= =?utf-8?B?QzNVSzFHZXVseTE4RE5QQWplK2txNkpxR0NRR2QyWXBMY0t6WTFBU2dWZmFB?= =?utf-8?B?MkJ4WEUrMk1XU3VQYjhYTExnMHd4ajdIeUhBN3FRZllkeFB0S084VjBWVTA5?= =?utf-8?B?dTY5aW5RRTE0UVNFdGJOSERPUFhvb2xQOXRWRStCd243UjJpMFAwakUxYzVT?= =?utf-8?B?THhnUTBwa2hoemNyVE9BTzM2UVpRZncvcFdEOFZod2NyeHoyOHR4bFhROFQr?= =?utf-8?B?L0h1aTV3Yit3MDhMdkhyNCt1Nzk5UWliWWJxMlhKOHgyZElYY29kbW1tNXJz?= =?utf-8?B?TEkvT0ZBcEpzWTh2UG1RaUxFdzBBVGswdnVCNUdQK2lTYU5pd3F6dkM5Qlhu?= =?utf-8?B?a3dkNFVJcllNWWtVbjByYng2U3dpNnFLZkltV0dIa1dxa2hwT1phQTRDWHBK?= =?utf-8?B?MnZuOFVBT0NuMlhkQkNPdGxoVjZrc2pCR09oRWFObDB1WCtLb2M3dktGM280?= =?utf-8?B?MTRQcmowWC9WblZxK0F6ejVhalZlSWliMGtnZmwrK0hzUjlnYVFHek9oMmhS?= =?utf-8?B?UXFvNlVPL3JrWnZTbDAwcTVMWFkzWi84M1dGOUZ4WmpmcGljT0c4bHVjblM5?= =?utf-8?B?cUJqZlhDK1hYa3BEY0ppUWt0RUpRYVJoQ0gyVXFCSVBsSWMyK3gzb2lBdTVT?= =?utf-8?B?czgyUjFzWTR4OGN2ay9BQXBrMTkvQTN6YUtEa1I4NjMzbmcwZ1dSaitoMnJr?= =?utf-8?B?UXJXcXZlZVM1Q3NHenlFTSthc0tielNZbXF3aTBFT0tUeUhJTDExQm5TOU0r?= =?utf-8?B?VEdyOGo4empWMWM0Unh0dVZGei81RE9PNTdCYk0zdGVDODUrZWdoNkF1alpC?= =?utf-8?B?VnVmT1JTbUFyVjlyNVhsbnNrRmE5UzArRnExOWZTQ3Z5YjhWaDZiWkNXRE84?= =?utf-8?B?MGxHb3FlZGdEOGxXUFVrNm9lV2NLTS9CUldtTGZDc3hQK0JzZ1FpNGExWjM4?= =?utf-8?B?MTI2MC9Ic2dnVnhMdmFTL1ZFOTVuR1pERU9iaEQwTEszcTlPMm5EQmsxbkVz?= =?utf-8?B?YitXcVlVSERxaGtSV1RycE9TeHlMSkxoU3MvYnF1czJscUVUZ1Vhd0xFc0pD?= =?utf-8?Q?BTJdLAeqVdh5RZuOrmpCERWWnHSgwiRbVDGs+o3zC?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 6:2wpmp8mMIPAEkI6w5IZpPy7EFw44UXzO6MqkJ+PQ0bGsTXY8i8An7Q9sBlE7NG4iXnYgHOOxJ41aVfjeUs21E/s0MlVED0Vk9Q3UrGydWioj55aevqPxUYxXx2w7H5trVhBkghA4dgsfcPuN1uzD0HolrwCorxF/1GoXFnZI88HZmCN3nR8PWWCZHpi6B4mpOJ6x7bPPuwQishfYtrTehNg1Q5Cul75/8CNRG4fAXNCi+2p2W5TGS1sx+PdDuKsgsJUHekT/B24Etz0hROf6E12Z10C92BbO9WduzTskH9qu3QL8le2nG4TrfVhD0dHa+UUcjTnErlv6d5AwK/xs+g==; 5:bhl0bWlcjhbJaDA6wRxXpJS5JZ+Rnuz6wBF2h4+MjON1JMsG3P8EPsOmFtCGessojQ7em0mRE69v+N/HzFr0nBENZl/RMUPILaLxL1Mq9nriQcjgeIbAkGA/zwBJaux9fHOlI7578/ELMhK2aUFqSw==; 24:O+3XpR215RGI6RY5EbDoaQbQrKrhKvRDlB8yLC/NF0mYGyQPWU3lwfrbqPWAT+DZJvtCj31K6KHrzKJhIWNnQmLVTTUL5FNKNHGp1JeaWU0=; 7:gBR9jG9F1Huj2OpI69+6Vt58WgKOtlhx1tRJZVDJzfT56y6On0v6TZblRPv2kBzPDy3RQnFGS4CVMgiMouVsjLFZ5TomRTE542QzhFcF/5wd+m0m9wPOu8CvD4lpeHLfnH8dMZdMVr3USCMVGj+mYGmVJNv9KN4ZsHFu9O93mxGeK2mFOAsFrPc4E3mcFOpXL17RbTMHcuqHNih7ywXqbdoUm/HdKopGFdzG2gpw8Q0qRptl3ftK/GkUNd93QZZMKngsFW0IhRJgPp3bmznhoOvG/k/7ppA6VFFN4FkfhylLDeEw7bSOnOIrecZu6s4o SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2016 13:26:07.4150 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0701MB2532 Subject: [FFmpeg-devel] [PATCH v3 12/25] avformat/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" 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 84a6940..2c933d4 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; }