From patchwork Mon Sep 19 13:25:39 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: 642 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1001351vsd; Mon, 19 Sep 2016 06:29:19 -0700 (PDT) X-Received: by 10.194.173.168 with SMTP id bl8mr23509279wjc.136.1474291759814; Mon, 19 Sep 2016 06:29:19 -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 b2si25296837wmi.107.2016.09.19.06.29.18; Mon, 19 Sep 2016 06:29:19 -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 E3FAD68A0F6; Mon, 19 Sep 2016 16:26:09 +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 3DBC6689B51 for ; Mon, 19 Sep 2016 16:26:03 +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=j+dbh5zlVJvon5b2/BUnfw5QaNSPSCMFIiNF4HNMNsw=; b=KKwtfAo40ew5IH95ndYHffUb4b3mTM+We8AvmuU/5dmPUC5X0n7CzVvjvYoHiMu1bXURZoDOKi50YAp26M4/HwH5g5YjxuopkT9D/5DCFOExNXnt3eLNKEX5UrO8k7PGUqQaFA/f0lkuPKJPDn4LSOLKQ66FzG4JRJVH3b2wpl4= 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:16 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id DE4554F0F5B; 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:39 +0300 Message-ID: <1474291548-17810-17-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: BY2PR21CA0024.namprd21.prod.outlook.com (10.162.74.162) To AM5PR0701MB2532.eurprd07.prod.outlook.com (10.169.154.7) X-MS-Office365-Filtering-Correlation-Id: 8e8bc2c1-94dc-43d0-7bef-08d3e09088e0 X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 2:WL4dQfcHMs+6DeZS9WFnKqEf2sTG4BMq4TzL1sp8p6Y2tD4vi0ru9ayhR7izpr/5O55iZsqsxE59JAF99pYnfeR82O+tvRcHWF3BmSI9gueTGVYIMxzGMV+0yEOlUePTQ64/ATnM1t+ZasRRar+/mPhYcxvw+LLQwDRc6eSjDF+ijsZXa8Mey60guMHxr2Mi; 3:7a0ENja3Lfqk4bYJABGJLkwnuI1TJX3SbbRLB81ZOrR4P9wdvCgX6bR9A2jHR4xcqPZk2rJzPrPUqWeNpCgkqsoA378qfNJ35nMVFdT3Z8K1NAikn4u+ebTWLPQBFxBA; 25:IAf5OWBrpTjvIn/omPjmIGJ9M5SO5mvn9awNvQy8+jxlObYzR8x7/WlfHxM0WV//AFSxxLJzgvFvpZC4Jg5ij7I7Bik5m12nCxeiKyNwMnQIG8nCgKjDbypzQBKko2fu/WarAj5W4rtP1rhFOZn+fMxJjsBHXHR7GMNlbdlPiKNkgKT/3VMrMr/2ceAZ6fAdgJgOgiC78J5i1JPr3R0ld/sg1Xc7vTVSQeJFnPpfvsLF6I1NWyx/qlb4Uj1dE9ztHgLCXdyLEAPK3CUON348FmnlmvsCAIo0xy/bVDQ+WFxUsfBRb9mlpFOCKmT5RwwuzCtC1vySVyhuOveZwe1fzWIZMR3HDTviuyjl+N4gjKGHZIMn+5dhyuxkDkG65o38GR9/Qrex9IkPByIlmZZv/Mpb6EdZgxrqBi3wDOKThbg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0701MB2532; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 31:JKuvzWKERQkaqPXx+/pi6rv0ARfDgbeXssF6GhhcWnMlKBKiPV+kNuWZ3hiwsxeDLszVhTACm64TKjSVYm34gXd2sxIIa0fK3ie7YstTZR6CnboypQ+UTxzaFOyhrPPVHFXLfDfQepGvphLwh9j3Iz6VfuapPcwLaIwYGhVXMRIjBWIlHDeVkQnSsL40NYrnOW5iHx/4L3JAK8GpNpoXd/XGWv3DjF0K6e8yCbbDNUY=; 20:P+ebPenax4ouZUGwzYfG8HzAOUBmZRrLsuOdSewivMsfVYTwzHzZBpVSvVac8RCoP1aI6LUgR2kbVBsKpWqkhIQHSEmRYQcjxSl1ImhQ9M5zp7PIti3Ire+FSg3Hiqf6vsiM7xskWemOTcPO25Z27pgz6gnIWS9aIjp1+KNM4/N9SYFfb+JBZ3getaLUwQL8q2UGcF9Q/Qf9XsSrXJfH8q8PdtM0EfCW0S2y/33BhMSWTBhzptNVXltz6azdf20H328afs5V/L4Ie5LgSiT6MkqTUnIF9MBtnsVGqm7ED+NTxGaNRfXkRLSM1aqSSJVUlzLDMX+gu4X7OT4IhfJJjZlUN0iHj/VvGwougKshvPVHpX+VDjsVqpOs+t3xG+X+ZJPxBsRehAukviZhvJDh7TMIDMALTtgRxQmROGBRwCQlcjrOSKA9h++b5liVac3yvlqt6MCPhbOpL6ZJ96TmzUeb8U7QgaSOCKAcaWgJUgXoZA3V8azOGx8okMKdy5Qh 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:SVo5gw2CVfIWYk4UIv9aDigQCgMIhC0AGkgv02ggluzh5sjsgtNIrh2zXCY8MGHCe9uXTL3svQlSrOEAoNOUmeW77M7LzcIL1Z+GFJGj77zp2AG+eJNgJoFJCN0f0b7z3yG92XOKz/5B/15wl52F61Kn7T3ceZg3aUX3IdLJHrxEgeh9l1mOix2JYgmY6Qt/YrVnH8B5J5pQW0h79yUbpvEKOfJoALmDzG3VnC881s9fjgOIewh5Bscx4M6ZkeTEKTbZ5Mxr07MqRYutp2vEht7fVDS45Zey+Fq09+gYxQgcvhDWP/A4p3a5E2DNDTOSZ5krMJ2SdnWGlNGNgeYQKKOeF2IDSNQ3JzI6Fb5OMVhe67E2pMh25TVBGTD+bhIaiVWS6rsEkO5p9QfwTo4h3MEOocQ6Tps6DreFmGh8d1HPDgzmyQ8koXp5Ko/W59tHUa7q/PiROOqBqw+yT7R0AA== 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?MTtBTTVQUjA3MDFNQjI1MzI7MjM6SHZQTVVxRnZDUHNRakFCMWpOTlhkTjQv?= =?utf-8?B?Q2QvOTdUN3dabHZHdEFWQTRQSFhQcVF1dEpBYkhXT1MwMTNtaVhQajNmaEFi?= =?utf-8?B?aWxXUTYrZFdGa0JMSGFJb1VSS1IxZ3JHODhZZFp4M0hTd2hDY0t0NWk0VS9K?= =?utf-8?B?b2pGaWltVkhGRHhZMysyejdQZHoyYmt6OCt5WTArMEV5R2tkZ2I2SC9BUDdB?= =?utf-8?B?Zng0WXFCNlJ2R2t5bU41eWdPaVU4UUxFcDBDVGdWbTBVNjlaZnFzdjFwem15?= =?utf-8?B?bTNQQ2J0cTJ1ZGw4WmJRci9GN2xFVEN5RlZNREthQUJJQ25sRU0zV3BSbC9r?= =?utf-8?B?L2dJaXNKNlg4dnB2eGpwOC9UUUR5WGNBcTFrd2V0WS9hUDFDZnVta3RNMmRj?= =?utf-8?B?MTFDQnA2bDhmQ01ydXMybFhJUk9CV3JzaGZrcVBQR25SSjBkSW5sYzNvSFpV?= =?utf-8?B?cFpEcis0N0wzUFhJUnFtR3dpa2l1VkFXZnJGc2NJWHovandnSnY1VXlJWURi?= =?utf-8?B?bWYvYTZJMFBubFJWOTQ0R1VFRXphM25ycStrdlBOdUNHME9ibTF5UStTVU5F?= =?utf-8?B?OWNxMlM2THBVelFCaUZvQlJLRlBYYUhKT0wyMndvZW00YjZ4RWZhcHRXcW85?= =?utf-8?B?czJldG5HV2FJMDBJZU93TGwxNzc1S2ZVZGp3TkZJbjVQM3prZVgwK2dzV2JE?= =?utf-8?B?VnpZOE1aNTlCT0gvc0xPQTVka3ZLK2Vyc1dUUHY3R3JtQ2FKclNxOUdOM1R5?= =?utf-8?B?UzVqaVRwbTFTUTFHS1lseDFUQ3pyakw1QTZSZGFXb0NhcTVJM0pQdzVwWHda?= =?utf-8?B?dlJjdGJzaGNaUllNalk4M1Z5VWZQakVkamxpWUl4V1Q0WDMrbDV5V3psTXlt?= =?utf-8?B?MXhOZjNEd3R0b2FHQ2haa2lXbnRFR2tqa0lXQ3VJc0szaDMzWERmQ3RQK0dH?= =?utf-8?B?c0QzK21TcFFUczBzRDV3RjgzMG5HbzlLNjY2eUVHWWR5SkVyQzFEWWk0Um1l?= =?utf-8?B?bWkzUWZvbnhwQ2pnZDB2S3FSQVpicUo3L1JDQUpLWnd5RitnSFBsakt0V3FL?= =?utf-8?B?OUp2TStsakRhdWV1R0F4RFFiSytLMUxqMkkraWZTYjRpdjdWaTFyekNXQnRH?= =?utf-8?B?bm5HcFQ4bXUzNXVTaUJWeHNVc0pGVW1MZkFBZ29heU5KRjE4eVJYMTJSeHJN?= =?utf-8?B?YmlxQTU0VEIyYlhhcm5WQ0NRaTJpUWZpNENMdDRVUVJ4K0FkU1N0UTFsdzNu?= =?utf-8?B?MThIajBZQnFCbTJyUksweng5WFdTZXc5MEVCZ3RoNHNMd2oxZ1piVFd0bkhn?= =?utf-8?B?VkE3MjgxSnJKdUZHV1dGN2VWajRSK0VrQjVFQUZMTjJwdk1SOHBFa1NzaFJY?= =?utf-8?B?UEpQVHQ0ZmdGTUlqcUJTMUxlUkZaNHBsTDRIQ1IrTWtST2RCQllSeFlod2d0?= =?utf-8?B?SUJsMXdJZm1qMzR5RmVHM1FONFV5WVRjS0R5OWdtb0pkSWhNbDk4S3VsajVv?= =?utf-8?B?dFREa1h5VTlZcXY3VWJTWk5oMU11ZXNuU1lvajR3TFFERjlidjFBNGhPcEFr?= =?utf-8?B?eGdleXB4aEhrWUpzM0J1bE5nb2lLWlRPNVdXUXptMGV6YnZNYzNaTTRYTWFY?= =?utf-8?B?UVplN3M0L21xTm11dUg2S0NHejZkaGRqK1BYUzBpdUlVQnViUncvdkhZQ2x4?= =?utf-8?Q?B8T0eGxPUSUNsQfEqJwbdGqpxZJ9NgQSxZSs/j9ct?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2532; 6:4kymhgHIIV73Vs8n+x/n1trxY9Dia2HdUQJX4fDqCdguHB01wthSvCzDbjYGIVsP873jTw3jhOLnlWWuVlGZAqfBl0AF3zvQqxof7X1tB0efOyX/oDM9jA82jT4ZuRoUvIrbrT191Drf2d5CNxvmb7f+9V5LM4oCRRhNQnosS9HsUqWCsd4rR/1eBqOVTSV+Fil6b23+UhDCy3fIYVWVtWYJYCfqZqUM6hEtEHDr1WxHiq3WXFt/BatSIHZIXX5Z0PUpBFvPkzqp7n2ufefHAzfXwjDqDILMhriJg9NlKhmWgFTbhgkRUNa47j4HhM30zWcyGyq/liO+Kx31/+ttzg==; 5:YXufK+t+6c+lxAvOjko1R8cv8HClpNXV1xfPHlDczIX/lBvGCqHVkLjpLC6wDhkQ2BBshFpjFcEciDA4eRsECgpoMfcmnTJ04oFcPbtxsexsHX9jxoltWk15RBoOp4tPs2KwwyxLhPY0DPeZFw9gDg==; 24:lDSRgAmcXsKyMDwP2gdVWwdmP0NNlwdTn2YvDWcfn39hGBamMmNOMJACLiPIVd0ZXoRqG8Yra6iOyFzW6sN3XkXpTh/zxCF19GRVOIcJrDU=; 7:/fL5OJ5EyKd40/hl/nLNIszex6c2eCuK9c1VNEGtO4pT6jxY7SMkaiLIJFOqNzJcZruUMgo9yL/m/PoRekK7oKJocreVfI0/K6j7jfNjX0vZDKx8Wyf4USIajsAKV3jwcE+TbEjtWlJ4L/HQkTh2mT9dtzJWRzsL7OdFw+bvrZFRWIOZvBSw5bUU7/bEDMJf7gE8LIAWZpZWD98Nr/W4xePphMsaN8jJoTOe8FZ5bs2VHOq/9wUL4sJi88D/AgJwot0/v4umXbL9Q2j5d5Qp4MWZbdMluSFa5F4+oYztjvgmHJ06lFwLuxYbPP2fqvaU SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2016 13:26:16.2484 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0701MB2532 Subject: [FFmpeg-devel] [PATCH v3 16/25] avformat/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" 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 4dfe1eb..f9126c4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2257,6 +2257,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); @@ -2267,12 +2268,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) {