From patchwork Fri Jan 26 23:02:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 7424 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp1248312jak; Fri, 26 Jan 2018 15:02:48 -0800 (PST) X-Google-Smtp-Source: AH8x224bWzB4KRBJiIS4zlY50huxLl+woBn6Dp5n5rQ+5/N4r7NkS+IkkkBRn5096rl05e+cqhMa X-Received: by 10.223.150.116 with SMTP id c49mr3291507wra.225.1517007768160; Fri, 26 Jan 2018 15:02:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517007768; cv=none; d=google.com; s=arc-20160816; b=PV1aXsOVc+fM8ViPssaKJuMYaWfw+DKjzrY3k6q6gcZplzbfVj6m1270Q374MkRhcj wYVojL3nR/HJln34yJRedzk2vFYhya2obKx9cJjZaSkPT1b6ogE+kuO26GhPsd/9q2hG gBxtIRKsryUm2L+a2jmQibvPmBdFRUWuyb+wocC+7ffGNUD97PxR43GmctaXyyPnBKnN mJhRl8cIV22yGQFiDdBnbtXElW3lMk6FyYp6sfp7kmZykvIbAD/XmQpJos5sFNwg+2ut jp+TYeXaKjBJWENJF8Dv80e4jVdw7/TSkgqFGS9fLE1EjKcLT19GGrx668iYx+xw0wSy H6Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=OqpAWL+QQyYIOpn8gQPFR9dlBXAt8u7otMTi4qh8wVY=; b=EWN1OF0A4UVqF9WQID5xGRtoBhCX0REg4O02ZF/5dqJcWN7CBTKdfN7a0Zza/6IOb0 6JVFAG08uWb/jeuJMrLLbcojAlJ3xJAFHPaCxXHbJSSpvLzNgzNhS284dvHshniDH7ZN FdKyi9IDGevuTdgTddgKbgzE+RYgf3lzxTM5sCVpQNS2Q4lFIEiSN2rMtLVCRWhcPPt9 O1u/jUtNifZKInWRr+CxA35BGCwg3NlguGnY4txnN8iOYL/CfDY6Cy+1WPOQ/W1vJ8mk ELHE8tfccnECE+UCG2DkNRSbPd7tMszwErx4p38KEKN4rvtW/Gml+qe5WbrPzZG+wNIK 8r6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=Hwnh8VHX; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v66si3265271wmd.262.2018.01.26.15.02.47; Fri, 26 Jan 2018 15:02:48 -0800 (PST) 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=@googlemail.com header.s=20161025 header.b=Hwnh8VHX; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4AE7D68097E; Sat, 27 Jan 2018 01:02:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 070F1680467 for ; Sat, 27 Jan 2018 01:02:35 +0200 (EET) Received: by mail-wm0-f49.google.com with SMTP id r71so4119877wmd.1 for ; Fri, 26 Jan 2018 15:02:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WwLcTfVKXUTW2ZdYtW9V0PFJqxRZliLPjvMwhSbP8fc=; b=Hwnh8VHX1ewv6q/XWLBperoKcDaBm2JXKwZ3qgIC8FKSQR2NgaL52GOBcGix48J2kW 2Cfvkv5k87ByYVXUHbbcnfXLTacM2/r5ttJ044Ss/Ml5w/xsNFEuPk4wkqKDiCSUOehB M1F0YCAlOBH30IlqStBoXavug2qXyNpbDk2uRm4fFjR/HLeeQWcjk6a4AfCtGryu9qnv EeQ44lf/VgwdhIsJMUMaReafDTQ6PDMF6txzMjBpH+hSxcWbvaF3k/xMMK2mDvChZgNr Sr/2HiaG7fPaYOPhZb5gF3jEcl9iSRSZjHJgYGNactt4/f67DcLDp8JMFIOAZlJMSsJE gbvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WwLcTfVKXUTW2ZdYtW9V0PFJqxRZliLPjvMwhSbP8fc=; b=P8MFFiwCtAlPsidnqMkvFBxd6JYizGv3QwAE4nlbmkPFCql/prEE0p8gsHqrvT//Zb GwFUsiwx2ko6tR7fa6tGB1qC4NFIKptH8dioIaQkIa8PYcZA76IzkLIQxmSoazsSw50a MtxWtM/pWYgExI0yBHWMibiIb+xYG9t//KCowtDX0pz8ZLSACYAi6Kp6TP7drlQCvX1A mKQk7Sl/phiYjsX01Hxa74MFF5Gy1E3yEI+n9edC6jddqPeRQsHk4xqaG4LsKVDT7jIa Basg1v3gUK1Wo9IQRMUfeaO5EEKjVYGSXK5M2qh8pJYcTr4Ywo/RPaHwtVlUgyYUzzp3 CQwQ== X-Gm-Message-State: AKwxyteTzb+AU8M+8c0bCLBYYUtX2azNVaMB9xHHagT+stB3cl+twhzJ iPkexWDzPrhSZlOYLGb+inMz5A== X-Received: by 10.28.94.12 with SMTP id s12mr11193349wmb.155.1517007758877; Fri, 26 Jan 2018 15:02:38 -0800 (PST) Received: from debian.speedport.ip (p2003006CCD4EDC34D5C3DFDB46660F3F.dip0.t-ipconnect.de. [2003:6c:cd4e:dc34:d5c3:dfdb:4666:f3f]) by smtp.googlemail.com with ESMTPSA id j77sm7939757wmf.37.2018.01.26.15.02.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jan 2018 15:02:37 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Jan 2018 00:02:36 +0100 Message-Id: <20180126230236.15481-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH] mov: do not mark timed thumbnail tracks as attached picture 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The AV_DISPOSITION_ATTACHED_PIC flag is meant only for exporting a static picture (such as embedded cover art) as pseudo video track. The requirement is that there is exactly 1 packet, and that normal demuxing does not return it (otherwise avformat_queue_attached_pictures() would add it a second time). It should never used on actual video tracks that return packets when demuxing. I considered keeping the current behavior if there is exactly 1 frame (according to nb_index_entries), but that would require additional work to make sure avformat_queue_attached_pictures() does not add it a second time, so I didn't bother. Reverts part of 697400eac07c0614f6b9f2e7615563982dbcbe4a and fixes regressions with certain API users with such mp4 files. --- libavformat/mov.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 22faecfc17..f74be03359 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6335,23 +6335,7 @@ static void mov_read_chapters(AVFormatContext *s) cur_pos = avio_tell(sc->pb); if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { - st->disposition |= AV_DISPOSITION_ATTACHED_PIC | AV_DISPOSITION_TIMED_THUMBNAILS; - if (st->nb_index_entries) { - // Retrieve the first frame, if possible - AVPacket pkt; - AVIndexEntry *sample = &st->index_entries[0]; - if (avio_seek(sc->pb, sample->pos, SEEK_SET) != sample->pos) { - av_log(s, AV_LOG_ERROR, "Failed to retrieve first frame\n"); - goto finish; - } - - if (av_get_packet(sc->pb, &pkt, sample->size) < 0) - goto finish; - - st->attached_pic = pkt; - st->attached_pic.stream_index = st->index; - st->attached_pic.flags |= AV_PKT_FLAG_KEY; - } + st->disposition |= AV_DISPOSITION_TIMED_THUMBNAILS; } else { st->codecpar->codec_type = AVMEDIA_TYPE_DATA; st->codecpar->codec_id = AV_CODEC_ID_BIN_DATA;