From patchwork Wed Aug 31 21:44:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: OZO Play and Live X-Patchwork-Id: 386 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1014535vsd; Thu, 1 Sep 2016 10:03:10 -0700 (PDT) X-Received: by 10.28.31.88 with SMTP id f85mr10684422wmf.90.1472749388613; Thu, 01 Sep 2016 10:03:08 -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 a75si11290909wmi.136.2016.09.01.10.03.04; Thu, 01 Sep 2016 10:03:08 -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 3934E689CFE; Thu, 1 Sep 2016 20:02:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00133.outbound.protection.outlook.com [40.107.0.133]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20604689AB4 for ; Thu, 1 Sep 2016 00:43:59 +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=4lpALkvmrPPZ0xSW7G3Mi4V5MRW/NbAys+EMs78Gv7Q=; b=rq2KP6Wtx95app3GDUKLB1i4iMX7JUCOaZAp4BJRxaiUZWn8oD1K3bg5NADlNPXfQz/jvq4cwwYEVBx5k5EcJHSK/4G55fL36FdbOx+MvA3U/b5kZg8QieCWA02mBu6DZclFUisyXa72bL6dhyCBnglR7mTME4dchDeE5A1zSXI= Received: from AMSPR07MB405.eurprd07.prod.outlook.com (10.242.22.141) by HE1PR0701MB2540.eurprd07.prod.outlook.com (10.168.129.18) 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 21:44:03 +0000 Received: from AMSPR07MB405.eurprd07.prod.outlook.com ([fe80::4d7a:cb9d:4f3d:50ed]) by AMSPR07MB405.eurprd07.prod.outlook.com ([fe80::4d7a:cb9d:4f3d:50ed%14]) with mapi id 15.01.0609.006; Wed, 31 Aug 2016 21:44:03 +0000 From: OZO Play and Live To: "Seppala Erkki (EXT-Vincit/Tampere)" , "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v2 12/18] avformat/mov: ff_mov_read_stsd_entries now deals with AVMEDIA_TYPE_DATA Thread-Index: AQHSA3vfoBcQ9PE0QkWHpPujKxt2BaBjmmsQ Date: Wed, 31 Aug 2016 21:44:03 +0000 Message-ID: References: <1471943019-14136-1-git-send-email-erkki.seppala.ext@nokia.com> <1472643361-10118-13-git-send-email-erkki.seppala.ext@nokia.com> In-Reply-To: <1472643361-10118-13-git-send-email-erkki.seppala.ext@nokia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=OZOPL@nokia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [194.157.37.27] x-ms-office365-filtering-correlation-id: ae4261dc-39c6-41fa-661f-08d3d1e7ed0b x-microsoft-exchange-diagnostics: 1; HE1PR0701MB2540; 6:NRpoI3u4KmFv35DagvWRERaw4l0Wn2bMpj0A+OopuKCahDrWpavRCxS+BPTQyWpm590QuQhmJzrlgRxtvouPS2AXEVMRubkhuWoqW4caHGNaHwg8gSSvDkO5OFPUfs1DYLuBquEnAKbqhHQATMIHOlKFDEORqYc724ZaYmX+lOqIOS1YSfAbjk0dTNJtn0XxmaRK8UpxkDOuV3f6u3Cz2kpMctMjKuP6427OGoSdDBZd/PGfSLbKNc0FdcsMR/RZyd4lE1/XnewVsneJnRSZLgpeAsihT7z+ZiSAivjsgLwGBGR8tjpCnjW3BbfNgv40E2Jtc7V//40hLCcu5RbAtQ==; 5:YUS6oxv1+VflTzfdRPnrqfiX8PBLOR1l6+5yTfc3DEY8QNRczOQj740rUCZKb8F7akXKMMK6GJU6shnLWh4aMZtzSU4GIrKRUwDDTdpmd2m2sEt65+Gyh7bFdCd8TfpASWYCMEeMZrcZlEmIqGAcEQ==; 24:gqy5E+vfGhi+8RrJPd3vOLS2yPDmovbUmNPZ/lCxUFQ1NZjmJOhZIwGRAogOFEBT1F8+MGckP/6rXwhK9UNXkh3Ek06D4L6xbBC+6EGdfJQ=; 7:JJc7Y+ibkB5WCfCc3RLf8IBRnrUZ+675s13SZrPXhxs+2A9N+D0gd9ztQc1FwWWW5PF5p7BbfveopRK8pm5c1fGv5KH84gPrRSQ5jdbeclImN555FoVrtN/8+NBp9959Qg+daw/fkMIDOoV0XryhQMEQqGoQYS5V76+j1DpmfWSOlucZ6Jl1/KMst1Xf8npSFc9RyhPjVENOcvGl9Hr1INjQREeB7kroYhXF8BTbFq4l+je6yE6xZS9bv1UmCuMO x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0701MB2540; 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:HE1PR0701MB2540; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0701MB2540; x-forefront-prvs: 00514A2FE6 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6009001)(7916002)(199003)(189002)(53754006)(13464003)(377454003)(189998001)(105586002)(76576001)(11100500001)(107886002)(5001770100001)(106116001)(97736004)(2950100001)(92566002)(19580405001)(2900100001)(5660300001)(87936001)(450100001)(4326007)(19580395003)(2906002)(106356001)(3900700001)(66066001)(4001430100002)(9686002)(7696003)(3846002)(8936002)(3660700001)(68736007)(586003)(54356999)(50986999)(76176999)(6116002)(2501003)(102836003)(101416001)(7846002)(7736002)(305945005)(74316002)(86362001)(80792005)(81166006)(33656002)(8676002)(3280700002)(81156014)(5250100002)(5002640100001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0701MB2540; H:AMSPR07MB405.eurprd07.prod.outlook.com; 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) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Aug 2016 21:44:03.2368 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0701MB2540 X-Mailman-Approved-At: Thu, 01 Sep 2016 20:02:54 +0300 Subject: Re: [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: OZO Play and Live Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi all, The OzoPL@nokia.com email address was used for sales and marketing queries and is no longer monitored. Should these messages be redirected elsewhere? Liz -----Original Message----- From: Seppala Erkki (EXT-Vincit/Tampere) Sent: Wednesday, August 31, 2016 2:36 PM To: ffmpeg-devel@ffmpeg.org Cc: Seppala Erkki (EXT-Vincit/Tampere) ; OZO Play and Live Subject: [PATCH v2 12/18] avformat/mov: ff_mov_read_stsd_entries now deals with AVMEDIA_TYPE_DATA Signed-off-by: Erkki Seppälä Signed-off-by: OZOPlayer --- libavformat/mov.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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) { -- 2.7.4 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)