From patchwork Thu Dec 14 03:14:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6764 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6218928jah; Wed, 13 Dec 2017 19:15:48 -0800 (PST) X-Google-Smtp-Source: ACJfBosX/dsgIPAumJ8Gdq7/ITbqctE3kwSL6dBPgH2HG3vteyWwGaNJsWonSTnh0UMyiDtAAJHR X-Received: by 10.28.111.218 with SMTP id c87mr783182wmi.91.1513221348527; Wed, 13 Dec 2017 19:15:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513221348; cv=none; d=google.com; s=arc-20160816; b=Oaq+qlVDuP9DfpYgvSeyqJxLF1/gMsIiyUto6khuif/N7z/LX8aVq7JpQTRJxaR4y6 ADyLn0PGy3SNCMRzAsl4RDykLEtpBNZgmoYfmOCsKDLbW7cJ9o1j8hmwmZ20TTWCppFf n+2NyaheKQUEdaZ2RaToP8NmjFf+7Jk4BidKZrbYpKD2jyHUFBqA7etpTrQDWBMVydui UKpjgHjqHkKaOkRLEO59sAxepfr2gaucZrCtKIg6i/Q8vpfcBfe4W2yLoRf0kDsR39u0 5xrgOncVMFUioDl9nQyjYZ3oZGVL82+CSsiu2fHNo9235RGC1IjTmSt4XuXT+kW6ncM5 LtLg== 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: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=CWtfQhG3r5qEeVrr15LP61NY3C/GiwbGdcKUYZHcHr4=; b=o0o/WyuKVokvsjaSQXWnZlnDNQz0Aatxj1wbvUsls8JfiBsRV+emFagol6jire4MSz jQDGuUZR3mMN6g3cd5XuTmsg2AGD3YsjnlPGH8Cj7Ks7elajqysF4Q+MnIvoUuFLP5j0 mc5DI8Ah2I4lEs7xn654j15rdFaQIJRnAKR3ogzhibT3gnWMoV2GdMhhBkfB70dVnfxb aaPKrvyQu1HjcQ5BLBD5NAfPnfmf97KuOtcH5Tgb66SlVw+6rQFvyLphJdCMpn8mFfXw BdAyBT8t0eo5vSJahna1r030QEP/BRa3KejqNQZLEk52epVhHNtGOzwq3/70Vgf9PzcI rWrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aTmkddYg; 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 sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j127si2257665wma.144.2017.12.13.19.15.47; Wed, 13 Dec 2017 19:15: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=@gmail.com header.s=20161025 header.b=aTmkddYg; 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 sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CC7C68A09E; Thu, 14 Dec 2017 05:15:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30ED56899D2 for ; Thu, 14 Dec 2017 05:15:30 +0200 (EET) Received: by mail-qk0-f194.google.com with SMTP id d141so4649298qkc.12 for ; Wed, 13 Dec 2017 19:15:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=4gfLrsY/FIftMNxwnh3L2g7q26Nv4oyiBRyFT8+k41s=; b=aTmkddYgDeSA9BFYEN25mkwbcb6khjRb8sI8u2Ysmf8I2rOv/GsXwJxLEggPcd1aef TirlAt5vww4EkRq6mn2ROGQR1PUJwfMpR0xhpbTagfZ+KO5sfabG2V0av5LV/VD/rlG6 jRmhRfu9JmXZkp9GvWTn/h15jvzSgr0/HXUviL24+BUgOiM2h4DqZyKxSFXM8/b+14tJ sx9DAYOFY9JAoRPz/P/azsYygbG62EjB7+bU1L6y/hN35OHlYzqCr+fD6HFFPhFX/UFq wSAtAAzu6SCxrZyjLgg4cNIZvH/Qb81QXCRMuKJWyDTBi2UgCwztYcZIx1MYU0UaOCfG FpcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=4gfLrsY/FIftMNxwnh3L2g7q26Nv4oyiBRyFT8+k41s=; b=FwF7vjtBUtnthyQlb+cboSMEshwPethk9ytsP/yiGne3ndGWHohSqmRrjdN4+V0bwj jeDQJbBxhv436lNBfmOepASeU/i8PIqdkO70tSZwZHSDJOgzxGu2zV/cqYtHFztnF9ug 364IGGWBq5XPxDCbUyF3UJA0bXyzrDgSXP8CvrdHzWS9Vb+wGwQA8RxjgtalkXuRU3uy nObH4r387DpiE/zknF9AtTcq3mmOE8IhWAZjQcc9hWpkt/cf4M0tYhgQxAXOElawxv5N QmdeftoqK6FGHjHLjwn9MAiydJHcBMcNI0VqD5ASiOZsTpT3vpsnCnrt2RGMMXYyt1nt i9Rw== X-Gm-Message-State: AKGB3mKUSap0QpyFRaLSdhRcI5dllcoHHwMT3T75aCHnSYs+1EgmxNI4 HK8EWaOOojardp8YMClURJ8MoQ== X-Received: by 10.55.214.25 with SMTP id t25mr9776671qki.43.1513221337437; Wed, 13 Dec 2017 19:15:37 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id r9sm1983598qtf.82.2017.12.13.19.15.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Dec 2017 19:15:36 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2017 00:14:13 -0300 Message-Id: <20171214031413.9756-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: flag discardable packets as such 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/matroskaenc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) This only has an effect when muxing h265 streams originating from the libx265 wrapper atm, as no other encoder or demuxer currently sets the flag. I compared the output of our muxer with the latest mkvmerge, and in the latter a few more SimpleBlocks were flagged as discardable than by our muxer after this patch. I can't say if our libx265 wrapper is not properly flagging what it should, or if mkvmerge's parser is flagging more frames than it should. diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f22c2ab70c..915ef3c107 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2100,7 +2100,8 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, MatroskaMuxContext *mkv = s->priv_data; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; uint8_t *data = NULL, *side_data = NULL; - int offset = 0, size = pkt->size, side_data_size = 0; + const int discardable = !!(pkt->flags & AV_PKT_FLAG_DISPOSABLE); + int offset = 0, size = pkt->size, side_data_size = 0, flags = 0; int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts; uint64_t additional_id = 0; int64_t discard_padding = 0; @@ -2160,12 +2161,15 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, blockid = MATROSKA_ID_BLOCK; } + if (blockid == MATROSKA_ID_SIMPLEBLOCK) + flags = (keyframe << 7) | discardable; + put_ebml_id(pb, blockid); put_ebml_num(pb, size + 4, 0); // this assumes stream_index is less than 126 avio_w8(pb, 0x80 | track_number); avio_wb16(pb, ts - mkv->cluster_pts); - avio_w8(pb, (blockid == MATROSKA_ID_SIMPLEBLOCK && keyframe) ? (1 << 7) : 0); + avio_w8(pb, flags); avio_write(pb, data + offset, size); if (data != pkt->data) av_free(data);