From patchwork Wed Aug 31 11:35:55 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: 358 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp328234vsd; Wed, 31 Aug 2016 04:37:57 -0700 (PDT) X-Received: by 10.28.134.203 with SMTP id i194mr20270439wmd.22.1472643476971; Wed, 31 Aug 2016 04:37:56 -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 x17si23251866wma.104.2016.08.31.04.37.53; Wed, 31 Aug 2016 04:37:56 -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 A3F51689ADA; Wed, 31 Aug 2016 14:36:14 +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-eopbgr50127.outbound.protection.outlook.com [40.107.5.127]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE2D1689A80 for ; Wed, 31 Aug 2016 14:36:04 +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=c1ULzfCUUpvlB4o32yz8MZaaWL5QvmPBfXdlaCH74L8=; b=elwoh8jP077yS82cv1Ww9SZpL7hT6QH8yYtzgzd1tOjclFiyPIfazDTCwAMF2tmlRTmG7xYubbr3SFnUH9DVvil08KWA58y58cGdHnhExTWAR3mbnHEWROoaCLW/onkIJr5fPbHYpLYct5iI4pMgCTRYuEUVHOUDOPTf4YID5hQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=erkki.seppala.ext@nokia.com; Received: from erkkise-laptop.vincit.intranet (131.228.2.27) 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.599.9; Wed, 31 Aug 2016 11:36:09 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id EA05F4CB956; Wed, 31 Aug 2016 14:36:01 +0300 (EEST) From: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= To: Date: Wed, 31 Aug 2016 14:35:55 +0300 Message-ID: <1472643361-10118-13-git-send-email-erkki.seppala.ext@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472643361-10118-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.27] X-ClientProxiedBy: HE1PR02CA0071.eurprd02.prod.outlook.com (10.163.170.39) To DB6PR0701MB2533.eurprd07.prod.outlook.com (10.168.76.21) X-MS-Office365-Filtering-Correlation-Id: 106da9a0-95db-4504-d3ae-08d3d193010e X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2533; 2:cB334zZVJBOqUdUb834xgTGkZkfDQ1UXpLg5uhYcKEyXwLr4fQxiVoTE+Mf7U4t0DQmr2RMAGQqId8vUFv8vFQtf30GsMk3b9bXRtaUffIz+3JONY82bhAtP4CQLXkdKh8lgl8UJGNTNHkIrngPYHOzShRbBmdIHKmCV1FsDsG+CeefLfwywckb3YLVX4IKt; 3:nzqhRi58btDInubriWJWyFzj/vOoShZlQSoN++VoIwRPmAzs5c1BCtiohCXGfS6U8YyoZ29ixjnLIVBsmMcx+Ex5qSOGJURCOIHD5iGgiQP5F8CyWQfOF7zxEIvheaDF; 25:J/AxpEOdNfcs0iLlzF+XZRJrWHxk8wa/BBLxidU0ws+Z+hM82U7kGZ3Han8Njuu3aRzD/7EZBPd2O9S4W4IkTKnEP47Wv/KenYqv5ycg8kDZaXHFjwnF+akAyaC50fRwBpv9TqBkQShpklSLmZ+5yeMB9HGgcc6EYdi/EdMzCkWkKN9mk0eOC5KC9wkmwAGr7TDm0MUKJuowgzp913GN1gzl+ws1XzmPchM7aIyaYNr9jrrJUFxFwEKVTM/bITQEyScG4hS2YzU2Cn351SzSNJwLAuJDOawK+waxf7IT7QnOMGvS6fV45YTnZZBh37a6NbXwin8vkdQ+2ZtFdI/0S7vC5ApUaMtCrspADOBNHF1NXvnvzsF+SJmR6suIBaZIgH1Ot8CQBbxWpbTCbX7OHQWF2Jc88lwebniZM/jGxI8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0701MB2533; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2533; 31:N/CFxB9fZz53xMyt3ZJupidLYI5s2NeRNSMnc7Syu8tzvcdbuqUok0hyMBI2AnLekhHvLlAwZNMRGiAZKhzbjyZ6cPOSgySGID+CL91HPd7O5k9qFo2mAFXAFrfZMTFa7FjTDJIw8+7F7RPJ727eq+yzVnMqlv4MHoM4jGpqYaO8TRw6m5mCsWuVD5l9xgfENYB2ItbagRJvVGlqHp3RS3t9syBQC9PUQeYaNTIEpb4=; 20:Imcj8AluK+blVSLc0ZPiK7Udi6EqCfX7Ac1RhBKgTlHtBXzDrDkRkx9BpXaGnc5UWeLRKgMsohfazgyAIueR2SXTLWjXmHoD7Cp5EN1TtRGMBkjMKGmcavO1zrCPEx173JejevBhsvfJu8lf6N3HNsg5MpeUUkiiP0nVo3JH/NX50oF0yaWOTwIaNsMQLPQ8IDrrbs3sZME/21ONdM4bFnJjTxFij0NS8w7gdxwjp+mH7fv12JUSEtTIH83beCbg0YUhPZc63esPW5A+i+4jz8bl+bKsVkODaoOq697QbcQF5wWBY+7HumFC7P/9fBwIKOuvqh5kbPBJxMOHyyjLiZcXzgdw/CklyrwXh6sZPU9nchuyJjXKHVJrVfE+30jIwaAYb8ux07DdjpeHTKWWguR090OIgXEa8/bQkkEaVemt4CF7dJfVYFx3S5gCKl+FmhBt6H6JzrzodeGoZ8ulsVG9iY43DhsVa6aGbJNIeAysiOgxzjjDXVmw2uJHz0y2 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)(10201501046)(3002001)(6055026); SRVR:DB6PR0701MB2533; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0701MB2533; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2533; 4:vuHsCHoRJUxrpmlwzr2LvzBG6L/j5ULrmhvomVmoBR7Y+m3mKlUZUm8QlkNpXatf589Gz+Qt34/DkiboTWGFu23VFTVg8D8hLN3OuknSkuCbNV5GPoAL/rnYAdtJT2NCQpecyPwhB6VmN2ZYt5qpDg990Xc+/0THmDPW/wYpQusY+vADvNcfCyP9a5+1p/M+llgMPdGLvXln2V29bE7UuoV+40VYE6FtEpcOtB8xYA1mjvPuE9Q4Xi1U2cg4DPW2wWolhHA0lfWLLkBZ8WU1DQCW/VHvrSpQk0afNS5Qy18FyvTmU9uRgfyF9krLFtNSro7qoZNWGNtfoWYqJ3Jr5BddrWG84+FcRhLAUsY+lK+moO+Z/+TuDP7C6q6nZg3OBF6gnOQv/gKmTLJCMZc/QD2L3C1pNqXt22WdRhKRP/DjeXgEyxJzCo/Dp56rUOODLq6yZih7SlLkvY3Qhf9vIQ== X-Forefront-PRVS: 00514A2FE6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(101416001)(90966002)(86362001)(52956003)(2351001)(2906002)(105586002)(46386002)(106356001)(76176999)(2950100001)(2870700001)(305945005)(229853001)(5660300001)(19580395003)(7846002)(47776003)(92566002)(7736002)(50466002)(23676002)(45336002)(19580405001)(50986999)(122856001)(4326007)(8676002)(5820100001)(81166006)(81156014)(42186005)(4001430100002)(97736004)(36756003)(68736007)(586003)(66066001)(110136002)(50226002)(33646002)(6116002)(107886002)(450100001)(189998001)(3846002); 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?MTtEQjZQUjA3MDFNQjI1MzM7MjM6YmV5Zmw4cW4xcXdWOGpHOU9ldGJ5WG1z?= =?utf-8?B?WWZ6dmZiemsrMmMzVGlyanVpTHQyUlhUV21qQUgxNTBJTHYydFZqKzJMYi9I?= =?utf-8?B?WVp3RW44OVZqNDZ3a21OYkhJNHVHUzZHdHBoQUZtR0J0YkdwZ2xqWm9hZy9V?= =?utf-8?B?TTl3d1l5Wk9sdVExOEtQQ3FXYXhYZDBlTVpNMzU0MUZxVG1MZk9GaHIrbkdU?= =?utf-8?B?dU05T0R4UDV3cDIrbnRYbFpoVjNuVkFHd2VaZms2c1Q5NjhjcHRlWTJKd3dZ?= =?utf-8?B?SGtCSDZ6TU1nZlhENkxtbDEzNEVVdnRaRzYxdkFwSlBJRjB1K243WlRiQjdq?= =?utf-8?B?TkdEeTZIbVdpNW5nazY2enlTSTJLdENmeERQVTBhdEw3T1YxdTByb05Fd2Rr?= =?utf-8?B?aFkwNHdjbU9XTEdPY1h5dXRDTm5PNkY5enR4OG9kcCs2eEJvZ0gxUlRwNU15?= =?utf-8?B?RGtZU1JDaTZ6bXNwRjZ4T043QmFFcjJuSXVjUEhKQkNvdkQ1OWlLNFBnSU96?= =?utf-8?B?K1RjalNieEJWWHBSU05NY2VOSkFnbDIvVTJFM1N5MTgvaUpYYWVmZEY0Kzlm?= =?utf-8?B?TlkxOGpUbWFWY1o1dzJHQ3c1SGJPRGN4QkFmd0FEMmxaWWVZTTVqZFRZTXFG?= =?utf-8?B?WW1IdzhSS1BIc2pHNmpxQTZ5ZDQ3ODJ2bERQaU4wZkI2NlFvaWszUnhSTnJH?= =?utf-8?B?L25Zb0tYSERCUDJtcXpMWDQ4Z2wxTi9kdEY4S2pzKzlwQk8zQnlORFVYYll2?= =?utf-8?B?VGlVVjcxLzBuRVZLT20wS0ZmMXlLeUJISFR2VUZOMEwrNzFudWN3c2VocFhr?= =?utf-8?B?amhnaVF5S1NkS3BQMCsxNFVrNG5mWWNGTjhnWll5Q3VwbGJxMUs2ajF3YzVh?= =?utf-8?B?WkR1WC9GaHJKREpHMUZOM01lUGs2cC9mT2kySXo1UC9OSW1lRUhPcUlIY2hn?= =?utf-8?B?QVVZQ2dTTzVvaUhab3lvNEN6NjlIdlBQRWFSenAwVlpDK3BLd05vbDhHWjNt?= =?utf-8?B?OFd0WWRwOU12UFNCbmd6UGxHakp6RFA4NXNnVFY4VW1WUlppMXlGek8rMCtR?= =?utf-8?B?RXFrdFFpQlFPUzZLN1kwVXZpQk0vVEJhVWVITXNjaW5pcGNJdU9yMUlwVDJK?= =?utf-8?B?bmZSdjh6Uk1RTE4vUjdkQ2ZCL2pPdU81UXA2VXQ0b0gzSEZpaVlFMU9tTFcz?= =?utf-8?B?Q2tmWVVvSzQ0akN4M1RoMHcyYlJXVnFpQnB4dmNZb0crRDdwRmJvRXdNcmdm?= =?utf-8?B?ZWJaRkhGSjJCOW1ObTJZSVdRK0dpYUpLQys3M3d6K3NVMjdKNklhYVJGNzFS?= =?utf-8?B?VUIwTm9tMVpRWnJWZk5Hb0lteDF4c1UrVU1rR2c2Tm5jLys3UlkwSUxmZ1BQ?= =?utf-8?B?RHUrNmVLVmZDV0ZHT2NsamdZcEVNZjNUZHRBdjcydG5kZm5ESG51YnJ2a2Jz?= =?utf-8?B?M0YvcTM3c2NSUHZjZkF3Q3ZBbnRmUjhNRXZYdGI3bmp0WWhabDIxaFZtZktJ?= =?utf-8?B?NG50UUdueCtGTEZuamtiQWhyd0JIdDhuSnFLZjNodlJNdko4eTVqbTJUcEl6?= =?utf-8?B?TVZ1SGYraUIyZlhVdWdOb09GblZDM0lQeFN1cHdKczVLTlhrckJ0NThsekR3?= =?utf-8?B?aDNPR1dmcHZjVVZFNWxZR20xY1k5ektnVW8xWnB2SDRUV25Demc0RWJIMjNM?= =?utf-8?Q?4JGMm3OBPPM1zI7Dc9zi++5GeXbC97z7wf1SNYfVA?= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2533; 6:gh6Bx5YwtxAIZuBXUE2bqBoa3HJ1+xEdcm1R+/uQ/aG4pSTgPSWc1GT9fhiysMoPhXbzi4SJmwLMgn3efZrNaXxrcmyAyNdLyBAT8cPi8Qn1fmvi4HYaZFLqIYyr6Z0EqOj9Zid5jkfAJL8N8tnEILdltROwIV01eVXV2i6jOe4j0gdiV3x+TRWqBBXGK+gQM0neJyYASx7/ztGh9zxjLbgDB/pr+WLM0a7X+mqDCQJofbmWyZC/Gu7APU02zyNDemTypMLKFco2TZde9x4ncdkiDlExVyEbo4K7LSJLOfAGEXKu//Z3oGkREDI7V/owgLBQl9n0Fq5Qb5pKxk06/w==; 5:5bpB7KHs60AcNWayTuuAmR+QGZCi45GUItkfPXufzmWpWVS3MF07+LHIWq2thTzTPbRY4SZL2wzqrDwG79q9uUvYfBQaHpZIvvdpRiuu5ROnccy3FqKcF6192XNIwV28bs4J9Gx5M4+aqWDGOtj5aw==; 24:In55FiCNHniQbRLCtbFnM8PlzO9lIO02bx8fNVljp46xdcecMbhas0ElkxnT4siuQ4rQj2xI2zIyPjiiV24PqOwrX3XeCXsf+MEgIREjhqM=; 7:dNhTmVk+aowGEIkCmg2+JhwYl8cROt68puv5oAsvnLm23cBB9IETXFlyVXI5YKynHZndxDutwlzjuv4SxFX/q+liGCj74ij9u6VtqO5s87BjYHSjMu3OObP56IrngI7gwsaWq1/tbpkXgwpZVaWJseRb63aKFdLGfMCoOeB8ZDSOQASjReU7HQKicVf8FNmDy8CMRiW0JYC5UG0u1StcmL4XerqWQY5F+6ZNBKGZS28MumEPLlAGwcgZZ5BpHJkm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2016 11:36:09.6928 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0701MB2533 Subject: [FFmpeg-devel] [PATCH v2 12/18] 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 1012b3c..0544d13 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) {