From patchwork Tue Aug 23 09:03:32 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: 263 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp2180883vsd; Tue, 23 Aug 2016 02:07:21 -0700 (PDT) X-Received: by 10.28.203.134 with SMTP id b128mr18257801wmg.36.1471943241503; Tue, 23 Aug 2016 02:07: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 h3si2139573wja.172.2016.08.23.02.07.20; Tue, 23 Aug 2016 02:07: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 DB733689D08; Tue, 23 Aug 2016 12:05:02 +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-eopbgr50111.outbound.protection.outlook.com [40.107.5.111]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33A35689BF1 for ; Tue, 23 Aug 2016 12:04:25 +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=kKAhS1PnTYZhzqCuQsarP0ZFkzU04nHAo8k9QNWWJhM=; b=AXKUdHpj3WzhQ5IpQ9516GHi1gEIiHbJwSxzkOBN5vynnZnaxDyUO2wRBvnS9AD5cMipH8ahzcBJ0rWh6L90UU0SDAbjEoP+Ep9ZyQkQBPny2D7i3wr52XQ61xryWshFwfuu8bThNbunr3S0tlNe8B3tYrXKRQsVFAYkvaFvllw= 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 DB6PR0701MB2533.eurprd07.prod.outlook.com (10.168.76.21) 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:12 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id 72E824449F8; Tue, 23 Aug 2016 12:04:04 +0300 (EEST) From: To: Date: Tue, 23 Aug 2016 12:03:32 +0300 Message-ID: <1471943019-14136-15-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: DB5PR10CA0022.EURPRD10.PROD.OUTLOOK.COM (10.165.4.160) To DB6PR0701MB2533.eurprd07.prod.outlook.com (10.168.76.21) X-MS-Office365-Filtering-Correlation-Id: 51aca033-987a-4fca-669b-08d3cb347386 X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2533; 2:jd9N4G6xyUIYZifA4SGSWEwxr/bXSlsBXlZhO6u+pNKeZHCSD9yvyZnxws+FhnxqITzaln45ZiC50m6HQEuDOIFPikZHDg+ftxBLMOwP20fSXTkm69NxX2Mns2tzd4UI4bv3CoBWmmnmIHq9ulahasLxO4uvwbS4m4vDjwp6h9k9eLNMRpXZW2VMtlmaHlKw; 3:5fAWCLkph2OEMvO7T2rgW/V4kN8c+GdkX8esEvpqatja1V9hphiZl+ZJ/uXAXRjKpjTwnkryz6iMa1ypr0FvQdCmpf3Th/aIHNBT8Dsg7IR3v4Vr24xTVFRk9Mw4P2aM X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0701MB2533; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2533; 25:mnovp4zOh4aN8zCZ4fDKls7oMoUGB3SpJpg/wdFM3Z9j4YOXilTsJg7fIG0M3izg56b0SxV4EE4nBEoBQmHmX1fAAT2k46JqRtSLSDFk8nNyLju3XshYuTANshx8V/ODeTA60nUqu4X8B5D6BcB5yn+3sVHwOCL5M6nNSbxdDU1tb3pBz59c2sIl00em+tdJvyD3Nex4ytMCpSpIUid63ZHQ0d+fciNRspSvRb+CuNlUtXe7GuhYuzHDkXfK7JNv3DcErd1oLzxECF7jwhB+X8Nkc5t4nis+BDeDd82g41uoFzrrvQl/V7XwqOleKM4FgXdtzez4l6cCrQhZqIU+ZZnlYhtOS6dWRUt+0QZwhpxb+9AY9JX7k6knxIbFTnj9yNQfflICoTA4cO34vzv7cFh7ZCQSfySVho1wa0Y4GFGl1JkA4BXXHzCjnGSw1GzHEi0rz6lnd0Jzi3JO1Lc0l1nDwjsbjzbNzlYQsJGGQrzphXVQ+SoMh18op47pmMuZ7ZC0utBfW4dmZuPlXRq24NKEHAmz3mIgWe1Gt+UyELvRRfhMH1N23BFX2mHAdVysXVGJbglWE3FJDb5s/ZmUaKInjKPGBSjpxX9eShc6oQqEn6WXi99kXY4ryhPXViN5RSHUVm7eUANEOnM14n3S1tJV57w+ng3RtT9vcCjB9qsXER5WcYFAmJ7jmBMdACiP; 31:CtDNt7QhJCCq/87idyRxoY2JmR/hk/iU62iGrFO3xgQiX7oZblQ8WyQQdrCOYWVxfyxy4Cg6+LqO3JdjdoD+fGQyXIJ9zGEAgAmCEEjKQ6fb2552NoXysyjirdxS07z4Q7IR7Q+JQmRRsT/iXyEcDIR3YPhT6rCOl+y+1d+4XiHL8ZYpZ/+NYBHhbu3Q7b1d1hDB0IbTLMWq8CpHZuPF3wKxQL+oetq4zZpfkjxhSdU= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2533; 20:JOaO/GfrCr3pKjJskMQhcxVKw1o4mQ+SgLRIrVTSarGaYoKcq9q2c5H4hnAfn+of0GiWfbykc6wjpnawo9GuGuaTW37xJP/4GRt/uXQ0Q/4lmglWoDTOfOlzueyT7XIjn1le7PWPVrp1Yn0q3wTpy2/QoeRuVT21/QZmecRM60QOm9xbYuMTRhufuBfSATo1ljsGPwensPNzXEh5/NTC7bsACY7dwR8qKwk+cCcLd1vERo1bN36TTbtJaIetkrAA+TicbyFc+Z4DyNKndnaNPgf0T/i4W6nJLtD568HtkPHcHWrfo2XivcfjOpSVRM4k//QjbkEoaa35X1K0MLpAGNEguoPBYsD7ZFWWL7f9nUqbpE9FxnhG8hU3v3KhLWSFzR+ynLmcnXtASB7ulV07bHsJGM/ZHj/INZRjIJ0zA+jA91/ju5xfmM9eQwwGyJV13DVrXghphW37f15/wfhLgcpvWxxTi/qDTNDiGSKqGTabsEFZrdpqy0R1ogSuLH7q 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:DB6PR0701MB2533; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0701MB2533; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2533; 4:B/5oiofd68pM0UcwKRCh15SYOd/3YHUTijvXZt1DRRJPe1KF0F5ZBZWW4N7wAXb7dZb12VaKB7vRRXeeAsaL+t2UZPfxIA/TmUqnQoPIjUwvHVe8Srq4EaWtzIA8zDSfq+OPpS6My3uHm26B+ey1VTG01Pw0g/9sBjkR9I/lzB9TAfJOernYgsx8+W+yXNmNGy1SRAxzqdP+/jfZ3gtIPaWELSkbGSd6m0HyvwcJGqtbYolGXnx5ou80+zOrvmhBz5al9wmFXLzVaBOTX952qG0oE/UjQ8pBg0+CHFOsXvLxarg47MO/0GmWZs4Rog5Qt6qYxX8lhOi2YsMujdtjcnqvbAZQBu4BOu4Ra/WxScvyW+Zw9rEnz4oyD4Zrn01lK7QrXH5AaAV3Sgd/H1fW1SWgCS9LslYi94nEIlSzS9IsgT7VbGiBmD8YtmF5GHRCiFo4/gdWr+CrU6w3uZ17Sw== X-Forefront-PRVS: 004395A01C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(50466002)(2870700001)(2906002)(122856001)(92566002)(2351001)(586003)(50986999)(76176999)(4326007)(5820100001)(229853001)(2876002)(105586002)(7846002)(45336002)(305945005)(23676002)(6116002)(50226002)(46386002)(3846002)(81166006)(81156014)(68736007)(7736002)(5660300001)(36756003)(8676002)(107886002)(66066001)(86152002)(106356001)(4001430100002)(575784001)(19580405001)(19580395003)(52956003)(97736004)(86362001)(450100001)(189998001)(110136002)(33646002)(2950100001)(42186005)(101416001)(90966002)(47776003); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0701MB2533; 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?MTtEQjZQUjA3MDFNQjI1MzM7MjM6Mk1kd3pOL3ZVditUem9reDh6bmhDS05l?= =?utf-8?B?a3gwTVM3NDB2ODlCSVczaXlSNzB6M1d5cHZxRTJGNGQrYm9tOEtCaDVrZ0pM?= =?utf-8?B?MWwvZUtJaDlPdi8rSFVKcm1OUUlKbjdHRXVYbC9laWJCVEpwV1Q5aTNVOTh0?= =?utf-8?B?U2NnQ3NNemNqaGZ4dnoycUhZNEZ0dkZYbjJlWmRpRTZBd0VlK3RaTDJIRmdR?= =?utf-8?B?UllxMFh6VkE2dG8zUWNvWW1ZNXUyQS92VHdMZ296ekFyWk5ZSjgreURBRXE3?= =?utf-8?B?YU9vRzlOdTFVSUhseGNpKzVXeHJTbU5pQXU5ZGExTU95eDQvK01JQTByQnFu?= =?utf-8?B?SnI4SEZ0UEN1WDE1a212clkrOTNmWkNoMTR2N1QrOFIzWUlZRU9nRU0yRzZH?= =?utf-8?B?MjNSUDZxOFFLRHZEOWtlbFhUWE5aRlFMbHFsQWdOWDJCLzdkeGdadkVIK0pU?= =?utf-8?B?VzRESm5ZclNGRWd0V0NtSGNMSDQrbjl2RmNoblpLRk16WC9QdzlHc0ZSZGRT?= =?utf-8?B?ZWZQM25NUjViVnZucXYvcGJSa05WQXp3dTUvZVRIMDdzdkZ0UGl4eUYwaU1D?= =?utf-8?B?S1hQYnpYSHhGaXVCSUFONlE5MURHTThkc2hxWVBQanRDb3RMSisxV1drUzk1?= =?utf-8?B?d1hZbXY0UXBXY0xFTWFFclNGdlRxbVhCS3hlcDZrWWJyaTZCS0NCaXlUby9V?= =?utf-8?B?dytXblR1S3I5bVJmTTRMUTA5U1lrdk5NRE4weFQ2cjlrbENyNWNSd1czZEZp?= =?utf-8?B?ejBUQ2tsOWlxYlp6OEFYZFlEUEZkNHN6cVlhaTFxMmtlSVhUL1krbjFNSDVj?= =?utf-8?B?dHlwLzZJVU5ZN2xtSk1VLyt6ZEs0SE01ZkdleXQ2cUJIclZ1SUp4NzlyYTUy?= =?utf-8?B?T1dnNXlQVWs2ZDUzMm13RGFLQ3g1RDArUjdlVjhPWnhHQUV0WFhNWHhRREtn?= =?utf-8?B?OXkxTkc1REllMU1uUU9oekNlL1p2YVlzcHJtU1JScGZ6YnkxRlUrMStWQ1gw?= =?utf-8?B?alZPUnd6b2VxT1RoSjA1Z09BV1duMnJFbXNTNGxMWGdlV1lHemk5Y09pQ3BG?= =?utf-8?B?UnhETHl3S2tXSXFldHQ5dW5zYnN4aVJ6bHI2ajdMQ1k4Nm9XTkNwYTR4Q2xE?= =?utf-8?B?aGtJaU5XRkxPZ3pwcWFDR0NPY3JSUXhaWGQ4Vm9CSE9hTTlVZWtNUjBaV2Fa?= =?utf-8?B?REZxdkRhMEc5VG44MjRVdW1ib1BjaGZ6OGNhTW9NcnYrMGx3Mks1T1RPTUhW?= =?utf-8?B?SFhRUU1DMFE2UTcwRjR6WmpETVJWSERYU2p4Rk4rcmFVTEhYNFJBSUNHS2lt?= =?utf-8?B?cldaalRsVVFNV1BtOHFGZ1JIcGt0bXBCZlFERzZTU0dkRjdTNkVEMWlyUlJR?= =?utf-8?B?dW1HS20rZGlxN3B0LytjYUhNNTloVWlpeThTbkJRM3lGbWMvdHlDSjdTc29M?= =?utf-8?B?NEw1WWEzYkV6MlpleUFjU3JRYUpoYWdhMi9vb3J3UVJrTjRqZHZPTFlNTnB0?= =?utf-8?B?UGZhbTd6L25iVjZsTzA5OERpY1A3ZzIzTXNSS2cySlNJbTd2KzlmbDhRekFX?= =?utf-8?B?bkx4NERzVGEzMkdRTERHMXdIOXMwSUhPZHIzVmpUQWxoRVlSTFRRVlZ6T0xw?= =?utf-8?B?b0p0dWFPelBtNzlKNTYveWVJUjhDQXFaZUE0VDMyRHlXNGRsczA0Y3ZHMUVC?= =?utf-8?B?WXpPbFBOc3hHNEtmVmNrL1lxUzF5ektMWjlQODBUb3kyOCtDNnRHRlZBL3Nv?= =?utf-8?B?VjFMaGhGTE93YUZEakdJcnZLemlySVVJVXZoRG1hT0ljZVdIcmdtMncwMzFV?= =?utf-8?Q?LAhFrh0FLDGxJB+?= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2533; 6:cRHjFJAFo1YAn5qBz1b8E2ZTU/IkVEmjA+2+AY2mwcANEUB2IbuN4ppV3CfbsbKnxVPvMrnpYLFFEUMpMwaJDXcOI/xHNHSykTpVeuxEZWH+PErdxwGXDtGi1ozvHGAxespnfhbvy8OSU2pvtAJZipJ6kJThgDG6C2v6+0Bg3Zg59kOcdWoUmk9Igy1GObhVMm1YggdLB4zI2k3XQMWS3MDmflW3VrBs4hogy//f4zeArdc+Qq+Hl4aZOlewqIhWBwMaTngkvjn8kgKVhQ4fJyxk/y3wvvgLrFX9yQCAlaUklY/SBKrH0wOGuSJWffQ/i5IKR0OJR/vag0wj8FxAnw==; 5:mvQ+rm3CXs7C9TMCjOMR5PIAE0QiXfU6nKjUjbTeckXmEPIiIxN4sOJUoEEl5yPGrA4r+lSzvQMb2DVtFILfYOFi9ORLZB5aJ9uyoCNvV+qZmVsTCwuzv5Gc/LKqcN1TgKGDWq4lgE7AkrrB3Q0rSw==; 24:LOoxu/3Zp0Pkj9zhiTPmntTUXo/iNKeRCt8lg/o/6CVDo2X8Q28pDZN8rlIlA6/fcwJ2cb9ilzVlrA7uSza4Zo3pMnCR6wmP2xh2BU3ICkE=; 7:W7DGkLeuIxM2zoI0rL56GJ+2CBMnpgMm9hIwG7sOaf+omYQpRBQbUKqtfnS/8KyLgMWvoGShKw4uhMNMQkhWKDeha+xSBqIY6C1lXasmBVbZNNstNBa2tdkQ+XAokaESjkXHpUPWfh/pTBmB2GjaD1Z2JwxKVprsdEg9llcus2DZfTKNadR9YxJGAc4hHj+f+PfK+FRWjYpafDoevD5Rh7KE7GkyYVwasdNPYLMVC+sa5JKszqyX4aAkJO5TEUIY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 09:04:12.5146 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0701MB2533 Subject: [FFmpeg-devel] [PATCH 14/21] libavformat/mov: ff_mov_read_stsd_entries now deals with AVMEDIA_TYPE_DATA 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ä Signed-off-by: Erkki Seppälä Signed-off-by: OZOPlayer --- libavformat/mov.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index f18c0a3..275b532 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2259,6 +2259,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, (format >> 24) & 0xff, format, st->codecpar->codec_type); + ret = 0; if (st->codecpar->codec_type==AVMEDIA_TYPE_VIDEO) { st->codecpar->codec_id = id; mov_parse_stsd_video(c, pb, st, sc); @@ -2269,12 +2270,16 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) st->codecpar->codec_id = id; mov_parse_stsd_subtitle(c, pb, st, sc, size - (avio_tell(pb) - start_pos)); + } else if (st->codecpar->codec_type==AVMEDIA_TYPE_DATA){ + st->codecpar->codec_id = id; + ret = mov_parse_stsd_data(c, pb, st, sc, + size - (avio_tell(pb) - start_pos)); } else { ret = mov_parse_stsd_data(c, pb, st, sc, size - (avio_tell(pb) - start_pos)); - if (ret < 0) - return ret; } + if (ret < 0) + return ret; /* this will read extra atoms at the end (wave, alac, damr, avcC, hvcC, SMI ...) */ a.size = size - (avio_tell(pb) - start_pos); if (a.size > 8) {