From patchwork Mon Sep 19 13:25:43 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: 640 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1001165vsd; Mon, 19 Sep 2016 06:28:54 -0700 (PDT) X-Received: by 10.28.125.209 with SMTP id y200mr9873360wmc.25.1474291734615; Mon, 19 Sep 2016 06:28:54 -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 r204si19085266wmg.79.2016.09.19.06.28.54; Mon, 19 Sep 2016 06:28:54 -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 9B0B268A0CD; Mon, 19 Sep 2016 16:26:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0105.outbound.protection.outlook.com [104.47.1.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 413D3689FEA for ; Mon, 19 Sep 2016 16:26:02 +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=sFd1DDY5wXfcY1JQgQi8dZFQfljQKKVdA/6JKnV/i40=; b=tH69ZV7FskBirMxdC/GvmRj3oKadQUVRemfafh9Uty3aa8O6TPyA7mMxH0GhY7DBQoflxY7n+LXnTML/YeuA5ls5KT71DtidPhc2r+CNzp7kj66LN+dRCmmgCD2clMD+HQevRZe6Efz3xI9CC2B7KgV3c/kqwm41iLoOwi+NA0I= 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 AM5PR0701MB2530.eurprd07.prod.outlook.com (10.169.153.150) 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:16 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id EDDCB4F0F63; 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:43 +0300 Message-ID: <1474291548-17810-21-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: YQXPR01CA0053.CANPRD01.PROD.OUTLOOK.COM (10.165.103.21) To AM5PR0701MB2530.eurprd07.prod.outlook.com (10.169.153.150) X-MS-Office365-Filtering-Correlation-Id: b1136103-1396-48cb-f1e1-08d3e09088c1 X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2530; 2:dleHKx8fwlViW1zz6wl33SIg+apdGncZbO5H3oskoXOFgS7Hfa9nC3f0xj0OjgZ8WMoAX7hMLPIoMbcmqLiTVXrBwAUQQb4qGlR+Qu0plDoZRSduQdwY23eRfEELiPKZdYk4jBQbmLG6VEIkZWDsOekehotcZaS5j0iL6cfi4+1Tgg1REF4tgD9VoO4N6UMe; 3:l+M52zh4l82bEVeJtU64gDiQPyre0/AKvAQboC7ssS+cYBnCEVhYa1m+tgWBwIKu2czKu7s59MDaKxQ1wN5XPf54hztAXFIvywF7QK7RotXnZAHWw2S6EmGtiZYcsKZU; 25:Q1ZEvoK2L5duCUDY46ip85NflCbfdn8jYXhiD2RBKiO7rkcTp6qyJ8KjnAYtOo40OYDlzu9TigbOaCw8XphC+x8JZF/Ay+B1qeOFvPYFMvMaNOqkSNGsve6JUOmk2OUAyoHX8PnsREiDaGq+LXmirFn4Z8tovG+T/+2w/I0MB5w+qEK+n8IP+OlpB39dQZMVrjoixQ1gq9cjYs6AWffBYmaIqixxBBnIOmmImN7lUBVrWoOpf3TNAyNmk+hWQEE2gaSAublr12ehA1uUFJffqFnbUo75yECZ++UiEK88lKIdZFrYHZU7eXoa5IoTD9qJGI6trMKenl+NA9wJXjTR40RfDLyNAfq1xa0byLVttUsLDq2RgnGcfGKQVyL8lZiyinkNwiD5NIlt0dkRNK+kc/xaXx+CswjNViqR3kNiaOI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0701MB2530; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2530; 31:Sp0PsqTluVW5HynuqQueR0qOz7eAem715yKIW8oUV8Th1wODdwx7h4Ul0WcYqKPLeFrHmoe+aYcMtxhVO7ChzOC8oCWCQHNax4iOd1h+zEDOrNVfOWxilukZbfZ6XaILXHtpB/u3XoBxBt9mX1UrMSrvVqKbKIzgXrzqQDJFl3w08InwyFQaHAcNj9VPcijR8LBikNtiyEhV/hZzF7529pBIT53rjScsKyUNYByp4H8=; 20:+yFmMpQNbNOpJcR2mIBRCGwKLL//mt0oB/ggW9oUS2SeW5LWhHOrm+KH/SayQQtLQOeOPCLVAx27JJ6pOjRodC0p6+R8QtDDq0Ra6s+wFk1zyYg0i03zd0HSFcnu43ftNcA2yD05K7uT4fK1SDnBZVYce1ryVraZezfcV7S4GnXTpzH2uN4GdzbPVozT/c4QkMOMxzVR9Tr7It4xBqP7iHtFyzVAruIZlG1B56lr3XW7j2ZdYF6Kfdw6c5O9J3M56hlJ/YTH8NhTeLpW9LEuf6LZtUYD3t8ThASEEKEbUTnkZMg86GpqE49bej4mIJaGJuFbFJ55QRAC12pxmoMPQMAa95EAcMDe5zMVMbEL3oxN8AZg83EhPLFJumiIVwGVWrC2X0/h+UtyhzQY1OljcRwPzS42AgO0qNdtQs8FovBvIXoDM00eFLU5S3aSiPIeSPy81l1mhXi6SZYTv1g/T2g563BUKm9PG6VdRQr4XcPX8KKnTaIC9/yXuKLbszuc 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)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:AM5PR0701MB2530; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0701MB2530; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2530; 4:PsaCU6opjvHazVOIhNQkqUjmaVQ1zyw05oUiFIVb0S6vTB3jYeN6zg05IVBwNCnB2+kqNNT5X0vDYCXVN/IeY9KTaGfh+ZPgyaGmc0WmMApWJfSDCufYXTvyZui2zUxOyyapIKfXjRgcOfN2nqf4foS/uQ5iFxa0Zn1pUaV2nJ40fwb+uXQv2mYDJREkSVKhgCliq2irr2MLddVY5B6eatBthlehzHzAJG6PdT6cSbB1SJw7WoB7l13AB+UKVpcBN0oD9+/Pj+BxZVPxYzvcb32QhcyVwuOBLyOaeZ4cyqCR7Ma6+U3IUdaUHdl+f8CA/137UkOyYU+zMPcYwFtQaVQin7VsuBmqB7vfLvp3j1igz/qS/j+v7P7h5HDiqsloiK7xlGjoIeGl2M+muSiR563fEDLNWQnjsF3ymGJKP3houCfFoDI7Ok2ipbsWnj1/FVuHUd91mxIcBoHHTpTTsg== X-Forefront-PRVS: 0070A8666B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(6116002)(3846002)(101416001)(305945005)(36756003)(86362001)(33646002)(50466002)(586003)(76176999)(50986999)(81166006)(81156014)(4326007)(8676002)(66066001)(2351001)(47776003)(7846002)(23676002)(7736002)(45336002)(2906002)(110136003)(50226002)(229853001)(46386002)(5820100001)(19580395003)(4001430100002)(107886002)(42186005)(2950100001)(97736004)(2870700001)(189998001)(68736007)(92566002)(19580405001)(450100001)(90966002)(5660300001)(52956003)(105586002)(106356001)(122856001); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0701MB2530; H:erkkise-laptop.vincit.intranet; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTVQUjA3MDFNQjI1MzA7MjM6SnN6NGkxRnJXNUdDTHBQOGxoUkRLczlP?= =?utf-8?B?SU15RWZaM1UvbGwzNU12KzJTTDFkRHVDS3hWOE9qbGh3aUdjbUEwaTBicE00?= =?utf-8?B?Y0RrNi9TQ1hzcHVEMVJ4bXhtblRWdEpjaFBKUmhESHZwUFJkT0psanVjWENh?= =?utf-8?B?cjdaUkZTWFFaVXhMcEhJdEdLRnlEVWZiZlNxL3UyUHFOcnNDamdML0o2UEVE?= =?utf-8?B?M3Q3ak5LdXNIcVY0TVVCSjdUM1pSYmR3SlVhUkFZVTFjZ2pSeDBlZXFQTnZV?= =?utf-8?B?NkszTG10eVJtbXB1ZFJWdFViaXdlRndtQmowZDJOVEc2bzB6Qjlid3dnVU1h?= =?utf-8?B?OVc0dHBmWFVXUS9GaWFsS25tbzZZbEdCTUIveUR1MHVVVmZNZEoraWd5WXN0?= =?utf-8?B?L3lCQnUzcVVXQjBQN2JMc3M1UlZvOHVKQUdnTHg2eVhBYnNLZzUwQS8xT0ln?= =?utf-8?B?OEpqeHB4U0kvT3BmZ05Cd0JGWGdBb3pwZXdIb3VpaG40S0dtS3JPV0g0TDAz?= =?utf-8?B?ZGgrUit0dG1xOVIweDB4NHN5cE1DeTZoWVJ6b0FiQ21TOGFuSnVkNjBNWEpy?= =?utf-8?B?ZUFPMi9wdkNyZnFIS2ErZ1F0YjhacGs3R2IwZ2RLNjBnbzZzc29YVnR3dllI?= =?utf-8?B?ejlhZUxMZlhFOGI5ZXA2V3dQUjRkVDE0VXdTY0JDRDNHS1c2SnNlc1N3OVB4?= =?utf-8?B?eVZxTWY3RlpqYTdkY2tlMmlwYUxXdGkwUmZuLzA0cnJpYnZHdTBGa1hjYVRo?= =?utf-8?B?UWlLTzBkaDhpR3JybVFQY2E0ZnRsSFc0L3Z5WVRUOU1sWnJmNVRPV1BBMEYy?= =?utf-8?B?eG9ZblB6ZTVJWGtySVhNTWdxVjVMZjdFOTl3dmRzWU1xVjN1TFJDTWpxQnF4?= =?utf-8?B?dGlPK1RkdU5SWGlldkF1eXVTWkxQYTEzT1NLSWJqcVRScWQ2TDVXcGxYekNv?= =?utf-8?B?WjVCWHZVaWEvK09UNHBJUGlXS01BcEg0TmpFZ0RLSWhsSkd6ZmcrbE9vdHdG?= =?utf-8?B?aHJYNlc0QmNGallrdUdOUFB6TXBGSURFbFhwdjJ2UHRiYW1SWTN4UFJrQis5?= =?utf-8?B?NHZsL2ViRjlIdVU5dTAyU0ErQTZvQ21DNU1DeG45Mld0VkdieG9pRXlNOEFC?= =?utf-8?B?NzdpclVURzdyeE16WjQ2bCt1OElYNWZmdWltTDlHQ1lsSjVRUmU3SXlzeWNq?= =?utf-8?B?Znlndi9zVGNXTnI1WUl6RTAwRExESlJHUU1Vcm1JdjR6dG53RUZJWHp5dzhC?= =?utf-8?B?Ulk2b0Y2dkV5eHlqQVByeFVuK1NjTXlOb1BoazFTbFNjRTFrSzJ2RnlJUzcv?= =?utf-8?B?ZXdhQWdxNkc0YTJzWS9adUJ4bEs3TWpYR0VFOHViK3krZkdDM0htditEWEhx?= =?utf-8?B?NVFzcEpaaUtiVm5aRjU5UDRwWko0ZlpYeEFUWmFVbjhGbTh1MUtTdTc2UDBH?= =?utf-8?B?bHY0YnZ2ZUk0SFdJMXYxa1IwVjFDTzZtV0NTL25GV0haV01zb0t3WVIwTUsv?= =?utf-8?B?ekgxM3FtTHA4SzZQU2VQNkk3cDVVWGVra2JKQzV5c3hsM1M4UVU5V0lMVHF0?= =?utf-8?B?Wk5XTW5mZlFBTlAvK3pJQzZES040RlB6aWxITFBGNzdWc3kyV1dQekFVN1R6?= =?utf-8?B?Qk9pZGw1Sk84bEQxdVgyNWVwUW1pYnRlNG5IcDlpSTBQdHVKZWthak1UL1V2?= =?utf-8?Q?KCpmJLpYFqQ+y/UMY1R0QLy64s4OYhTU79HeObVPe?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2530; 6:9XO5a5v6vGTzxTwD0qoDCwGUSgpaGNWbBIGEalg2n0WzjSf7aO8aBuMPISC4TrN8wOHENN2RWXVc4ULBtmMuPz2//3/tJmc+PeCS7yFKjAvN0GJq4atJjHoBeMULoif25aySFxYgOfvPHPjGOh4qHmlpRZj5iN1XGzoCVNe4oim3QyRKUQJEiMpL2DTC/qQZoQiI069+rPT9OnNxgMgMfiendNKZ0A4Vh8Z+H3Iho2eCp3e9Q93Ka0AUxAEWFNA6P3Axjpb318zj+n4EGzkJo3K1bVT143igHpDW2VM8lo3uePoWGUhA25U9CUbz6GETzKvp9qswCnFyAGESyZzP4Q==; 5:AvoCYODZozmSPM8XokeLPbUObGkgAuFngJCgiym2F0gf5Jto0Hm6bH4BKkh7Wq89A9sOaKRrIT6oQEuiWtI4sofKnvbXvoT/fkwRal6eU563Q2EW+a0QRpxXWogIbNavIZyoQsBhPAuceP38o68isg==; 24:52tfUYqeJNo7tR6P8nszkDTw8Y31/hnPi83PjJT3SbUXrfVDnz+eQ/7C9SEBjY+eHdHzU9cwXYSTDbo3RJTOVY+eWkHiJviIur+5JpOKmm4=; 7:IcGZPKF1PguYfMqfdSzgneA+9Blkx+OwTyywKJH/Jx7DFj5TLnSiyPLSqOXTKiQ0EOzSfudKyrJS1P3cgm/cyoXIDDRPlg1BeQlObkNFrEq593MXfmFcCqX02t/eIURQyE0xYRynCREENOkW0AwhDGNNffgdargu6BajRZsN8YRdVkNe5N8Cue76ztAYJd2+H9ZJRE2rnKYlHePEAZbWWg4E3fYWn0CJdYbm0c2+2ksjQcezSdVP6116nSML5gfJquaurfKsVln2XYRbqSnulHtqRG+xehsQSzEHBMNw3791CAFNPhx9tIOcTUamNlIS SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2016 13:26:16.1214 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0701MB2530 Subject: [FFmpeg-devel] [PATCH v3 20/25] avformat/movenc: mov_write_audio_tag can write the proper number of channels, not the hardcoded 2 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" It does it only when the chnl box is to be written. The specification for the chnl box (ISO 14496-12) requires proper number of channels to be written here is it is used, and without the proper number of channels available it becomes tricky to parse the data, as the number of channels in this box comes from that value. Signed-off-by: Erkki Seppälä Signed-off-by: OZOPlayer --- libavformat/movenc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 2543404..4245396 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1045,7 +1045,13 @@ static int mov_write_audio_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex avio_wb16(pb, 16); avio_wb16(pb, track->audio_vbr ? -2 : 0); /* compression ID */ } else { /* reserved for mp4/3gp */ - avio_wb16(pb, 2); + /* parsing chln box requires the proper number of channels having been + written into the audio header */ + if (av_stream_get_side_data(track->st, AV_PKT_DATA_AUDIO_TRACK_CHANNEL_LAYOUT, + NULL)) + avio_wb16(pb, track->par->channels); + else + avio_wb16(pb, 2); avio_wb16(pb, 16); avio_wb16(pb, 0); }