From patchwork Sat Jun 5 15:01:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valerii Zapodovnikov X-Patchwork-Id: 28095 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2029239iof; Sat, 5 Jun 2021 08:01:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx00Z6FpBJS6aHFRlkCTjUWf7o0cLCp0Zq2JCw8ko50dydViGKly7yI9GHvxmIuv3exfyG4 X-Received: by 2002:a17:907:7ba8:: with SMTP id ne40mr9551266ejc.209.1622905281503; Sat, 05 Jun 2021 08:01:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622905281; cv=none; d=google.com; s=arc-20160816; b=dh9JKZL8gU3pcJ5jujdOj0bttkuspUqKjvw/3DjCZpfi+XhKwj3mMcDs8t4bzAVoSG 5NU2CVWee2Q1laWmKwDpKeMkWMwKwJiRPFwo+dBSX8uMTRrFUCfTybvT97ZpYVXBmy1f hg6EnSiEe1+2gMR8cDDykZiISVCwDDL895uXt3m3pTPUwobpAqG5i7qwtRGM5xhuZQoY +mCwi3UgheMfJ/TOrHPsPv1FPxOM3czvN+1h1FamI0Zc11rHu6iYu0OnNz5hZm31ruGH wLrEaIJlsz0+fz7Mi/gVxrtDM5JtqyydLeACCnJdrXigK8kwxOW4F8TEZY/3eEpgWQ41 Ma3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=61z0U638WnuUIjxzwsv2vxGuaGK7y7EC8Ba32sgDe8o=; b=ey8Nd8xJKhhNr1Hobz7ZRYTkcZsoAE85rbjMwQQ4jQ1gsZuM4NEI96dyMdhoa2xGY+ k0mHz1Q5kRgJghrDf0tu9mgCxfp91ZhhunQGNNX9TIqKFWWQ3iSq5xYxvHMLiJuxDuxj XQuZfDs7CXq1Gd0oW9Ioesls/cv8UOXLkrBhbS3RuimSB9acQGnlqEi/NfLxp3dFpbz2 oZHGwwN9U7pQeOE4CmGpEovoNTHOGKd8kZqHWh7P+qu3S7XDlHKqjwv2e+ujBYhYSGgH KOihQpfWyaMTMqtaoHERKHgaSmdcC9ZXD3B1gaZAE0nZIlbxILu6sRYOBgD/4/RES3rW LNpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="PgF/hsY7"; 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=QUARANTINE 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 cb24si7887125ejb.84.2021.06.05.08.01.21; Sat, 05 Jun 2021 08:01:21 -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=@gmail.com header.s=20161025 header.b="PgF/hsY7"; 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=QUARANTINE 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 7818468A50C; Sat, 5 Jun 2021 18:01:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F099568A4DC for ; Sat, 5 Jun 2021 18:01:11 +0300 (EEST) Received: by mail-lj1-f173.google.com with SMTP id a4so15481096ljq.9 for ; Sat, 05 Jun 2021 08:01:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=WF5nzFqBnc8vFp+gYkBAHsSI8tzdyHUy+23S3WyPls4=; b=PgF/hsY7Eb1nSVMtppl/H79ilFM548zrXjiTGkotmcEYY/WQk7C6MGmcAd58CFYxeB IDpglm+ZHlt7q6044mSvE7Io+9rPJV6+hfMD7APMsa3YUv5pX2LDDgrX04i3QM0pmuEq bM9Eu+OvidRQ/qsgfkErMj70EnyyoTlCDSRTr+ZaVXUvKpQeKkgd6E0jMbJp+p+YdUTC HmVeUJlBe6NCChBCVS6j3Rte7i+GrzPXufhpoOHW+FtAQs6DyGFR7nuOXTytLM0+lUHv GocMCBAtIqJPOEP20mxKFS7u2XziKx2K9vbhjToxQh/Jo57cWh0D3LxPWqfxFiZcEAmp j/Jg== 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:mime-version :content-transfer-encoding; bh=WF5nzFqBnc8vFp+gYkBAHsSI8tzdyHUy+23S3WyPls4=; b=YphaAAzvnW8fMcNvL6hUQOobyHQByhU7j77UWOID+BCMfhPG4X2OwHjMR1ClDsZ/ru 8WGKgcap0eCRzvCtgtGht65eG0hRUqahVrKrn84Bn8ks0mzn5vdXUZ/9af+fBy8xmva5 iWtXTXK03gw6QMa3Pz59XAAaPvAte2Cs8onFwt/ZDjivDqwbRkK1IgqElmjLY8+KXPjg bLRIpZkWmXeBWR5n73GV0Go8nnuatrSBOo0UmR/0TWYtL4ptTnwduXaTPfYQisL108ne 7CMGuuK9GW1qWrGT3dYMc0OeL00W12aubGGbeK2CT80Wh9rRfmuSMLp00BYGfYfsFU/K empA== X-Gm-Message-State: AOAM531PgT1SRwnmJ9qzAxF0vZjvB/cRpc5Sm/Tr3YzOlycdCA0fxczs rBlwBYi29AlZhPGaFTLEVMO09TCyjPk+HlxklD4= X-Received: by 2002:a2e:9c81:: with SMTP id x1mr7583839lji.110.1622905271001; Sat, 05 Jun 2021 08:01:11 -0700 (PDT) Received: from localhost (109-252-91-149.nat.spd-mgts.ru. [109.252.91.149]) by smtp.gmail.com with ESMTPSA id d18sm873711lfs.97.2021.06.05.08.01.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 05 Jun 2021 08:01:10 -0700 (PDT) From: Valerii Zapodovnikov To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Jun 2021 18:01:09 +0300 Message-Id: <20210605150109.5929-1-val.zapod.vz@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Revert "avformat/dashenc: Disable writing CODECS tag for HEVC streams" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: msWh/fo1gioW This reverts commit d6d407d2d758b404af0ce6a8ff46bf164db020a1. Hack not needed after a2b1dd0ce301450a47c972745a6b33c4c273aa5d. Will fix #7480 and #8904. This will include e.g. CODECS="hvc1.2.4.L123.B0" into m3u8. Signed-off-by: Valerii Zapodovnikov --- libavformat/dashenc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index ebbdfd627c..b0fb408f0d 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1309,7 +1309,6 @@ static int write_manifest(AVFormatContext *s, int final) AVStream *st = s->streams[i]; OutputStream *os = &c->streams[i]; char *agroup = NULL; - char *codec_str_ptr = NULL; int stream_bitrate = os->muxer_overhead; if (os->bit_rate > 0) stream_bitrate += os->bit_rate; @@ -1328,13 +1327,10 @@ static int write_manifest(AVFormatContext *s, int final) av_strlcat(codec_str, ",", sizeof(codec_str)); av_strlcat(codec_str, audio_codec_str, sizeof(codec_str)); } - if (st->codecpar->codec_id != AV_CODEC_ID_HEVC) { - codec_str_ptr = codec_str; - } get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i); ff_hls_write_stream_info(st, c->m3u8_out, stream_bitrate, playlist_file, agroup, - codec_str_ptr, NULL, NULL); + codec_str, NULL, NULL); } dashenc_io_close(s, &c->m3u8_out, temp_filename); if (use_rename)