From patchwork Fri Jul 5 18:04:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: CoderVenkat X-Patchwork-Id: 50372 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4479179vqv; Fri, 5 Jul 2024 11:04:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWmQgruoHc6ffQWk66UbDWEYStqwy7fPEJeexGWbjRb8Y8QItzjaM8OIuaJ0Czi8/nAFK2pCOU5tIImVEU+ttlADWMLJcp3IOtqZg== X-Google-Smtp-Source: AGHT+IGvks6BXYguzz6G7roobzt90DN1l+WA6HeGlyVfsXX4QAm+wdV07RP72QFjDsoRBwcr4xRJ X-Received: by 2002:a2e:a78f:0:b0:2ec:5603:41a with SMTP id 38308e7fff4ca-2ee8ed66bc0mr43395461fa.2.1720202679296; Fri, 05 Jul 2024 11:04:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720202679; cv=none; d=google.com; s=arc-20160816; b=RX1uEvM3C1+DTW9d81ku3G9QG7+cI0lPhWilSGodsnSAtYSg7LylXtT27j4Yf6h4fM RJyIW+5Tlh4G/WaJJdsm6giX78o/QU+wbfh/WBwfp2CZ/2ncvLD68Kr+qpMM60vXYde8 xnDKMEjbSSMwkp+CX275lIArcZr1HiGMekw6Owb/R0CsEoTCDB1F5B744++t8y9K49xr uiBZpSDAt+KinaM0ynoC1kgyzQTaJAyBBajBpUb8Fl4LrSiIfLn7s4Irc2WNF4YKT/hG C77KYjP7WKxu6APUard2Oy7QnHKioe/oWJThnTR2gdvKgkLR5Xpuqz5Qa4Hl7CJd4FtS X+HA== 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:content-disposition:from:to:content-language :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=EQnzhVARQIXFdHUwgRXr2t/5gcQMTOTf85MiXHJ+k+I=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Oi/9c2Dj9um0p4w7kxMZuPjije8eWcCoDr7AwPI+Qei/bazWccoSZjPqzV/0kwBkns 4L87V08+Mel5nlAYPjeDDfMKxVUQqPc+cl+MTiIjwbl/+QVAkB87yJz1qbtLjzV02tq5 NeJEYubN9m/igmOUXvngpDTfzKT2yClbawVQpNYmuGYI/8h9fnneFILQt4rhNKHLgUK5 GHA547ivhzYAHgJPsF3bfNTcx31VvYLN7f14jMYorD/DKChBnsrOID0/cKAApcpyV0n7 xNBfvlYfvQ2pA5vR21cfNACm56z/3SQ4195b/5Tf8D/JpMhFbYl9DF8pOPsRCYrYoyLs mv0A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Nb0HZFhQ; 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 38308e7fff4ca-2ee91ff8405si8604341fa.159.2024.07.05.11.04.38; Fri, 05 Jul 2024 11:04:39 -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=20230601 header.b=Nb0HZFhQ; 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 57D3D68D879; Fri, 5 Jul 2024 21:04:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AB0368D750 for ; Fri, 5 Jul 2024 21:04:27 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1f65a3abd01so13358345ad.3 for ; Fri, 05 Jul 2024 11:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720202665; x=1720807465; darn=ffmpeg.org; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=kA34Ogn+7h2YwzCEDsykehTQeyQbeCRdDews2+LEHmE=; b=Nb0HZFhQOjxokvsKWyneatpnQ9ELULeSbRsryFec3ZEEG6BUf0amSVKXmvSxJwv9+F f7n954OdEv+gp/6qbU9tEeM81zLHAHxznWNm3cRXXwi9IBHN1LqCor9D1tAAC6zEGSHR WbQrRttPnSokWC5bOZlU6x8gy4p3LW/ugFuHv939ApIU2IKpz635gtDmx+oghbA2H59m jDOAUH57DmnfbAX/HmTA41kk6SzsrTnCQJBPrzqaLHmEj/6s4xGU57U6ZzGfNXSniKy9 k7VR083QdVdvWwk0W0PUb7aTPkCVxAXk6PP9ShqxzBckBM4MrjCYJgxRX04zafbXH/WE zXUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720202665; x=1720807465; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kA34Ogn+7h2YwzCEDsykehTQeyQbeCRdDews2+LEHmE=; b=V9EuT96YLl6yB/LaU9MwyptWSOQtoPi1eb+LkIRCP6CyITLa20URPvii0bWM7bRT3I sWSWmddr9WE3igzxYKxVw/ggxN/N1oPWDhjW5MV+Z6VTcE6ds9NRvHuKWnwLe0A/182Z 4DQq4bk4rMBnqVIKi1P10WR2JjnqPz60YHM+wOgWDQoo3HzM1rdPWfJwI/Hfk7Wh7kXo NnAQc5CvUmOCXxfnvK1MwZktBJASIQoplrc5Y3VG+I7jENmENubVIGINcVe1nwk0lJgx qtENWWw8MrLa1ghheF1gbPNabMtJEBfrdFvOJQGY87xcMTGxJym7/pDwmNnpl0u17zNv Ke2g== X-Gm-Message-State: AOJu0YxXsZ0nf2C0e0Tvhq7W5xMygVJDGquZ5V0o7zKOrhnU16RlPojp wOX6GV9Uc15pSEUDr08WW2+/LJH39QMqmw92yYAw7f4FGIf8/baRb9z5bQ== X-Received: by 2002:a17:902:ea0c:b0:1f7:1706:2596 with SMTP id d9443c01a7336-1fb33f2922cmr51843305ad.67.1720202665074; Fri, 05 Jul 2024 11:04:25 -0700 (PDT) Received: from [192.168.0.171] ([203.192.253.0]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fac15694ecsm143533755ad.226.2024.07.05.11.04.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Jul 2024 11:04:24 -0700 (PDT) Message-ID: <286145d5-a2c0-4046-ba09-ce03c832b139@gmail.com> Date: Fri, 5 Jul 2024 23:34:20 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org From: CoderVenkat Content-Disposition: attachment; filename*0="0001-avformat-hls-Fixed-incorrect-behaviour-of-default-se.pa"; filename*1="tch" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avformat/hls: Fixed incorrect behaviour of default setting, , added autoselect and forced 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: QLTwUyXPC5yG From aa824368fc020e052905fc1a651477d2880281d5 Mon Sep 17 00:00:00 2001 From: vckt Date: Fri, 5 Jul 2024 18:51:32 +0530 Subject: [PATCH] avformat/hls: Fixed incorrect behaviour of default setting, added autoselect and forced In absence of defualt in var_stream_map, it was setting default=yes on every stream, but according to RFC8216 4.3.4.1 only one stream in a default group may have that. Additionally added support for autoselect=yes/no, whose presence combined with default means that it MUST be YES. Similarly forced=yes/no for subtitle stream. Showed sample output of incorrectness in bug #11088 Signed-off-by: vckt --- libavformat/dashenc.c | 3 ++- libavformat/hlsenc.c | 41 +++++++++++++++++++++++++++++++++++++-- libavformat/hlsplaylist.c | 25 ++++++++++++++++++++---- libavformat/hlsplaylist.h | 6 ++++-- 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index d4a6fe0304..898a227cbe 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1273,6 +1273,7 @@ static int write_manifest(AVFormatContext *s, int final) const char *audio_group = "A1"; char audio_codec_str[128] = "\0"; int is_default = 1; + int autoselect = 0; int max_audio_bitrate = 0; for (i = 0; i < s->nb_streams; i++) { @@ -1285,7 +1286,7 @@ static int write_manifest(AVFormatContext *s, int final) continue; get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i); ff_hls_write_audio_rendition(c->m3u8_out, audio_group, - playlist_file, NULL, i, is_default, + playlist_file, NULL, i, is_default, autoselect, s->streams[i]->codecpar->ch_layout.nb_channels); max_audio_bitrate = FFMAX(st->codecpar->bit_rate + os->muxer_overhead, max_audio_bitrate); diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 274de00f9a..af4501af54 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -184,6 +184,8 @@ typedef struct VariantStream { unsigned int nb_streams; int m3u8_created; /* status of media play-list creation */ int is_default; /* default status of audio group */ + int autoselect; /* autoselect by system language */ + int forced; /* forced status of subtitle stream */ const char *language; /* audio language name */ const char *agroup; /* audio group name */ const char *sgroup; /* subtitle group name */ @@ -1434,6 +1436,31 @@ static int create_master_playlist(AVFormatContext *s, avio_printf(hls->m3u8_out, ",INSTREAM-ID=\"%s\"\n", ccs->instreamid); } + /* Check only one default is present in a group */ + for (i = 0; i < hls->nb_varstreams; i++) { + vs = &(hls->var_streams[i]); + for (j = 0; j < hls->nb_varstreams; j++) { + if (i != j) { + temp_vs = &(hls->var_streams[j]); + if (vs->agroup && temp_vs->agroup && + !vs->has_video && !temp_vs->has_video) { + if (!av_strcasecmp(vs->agroup, temp_vs->agroup) && + vs->is_default && temp_vs->is_default) { + av_log(s, AV_LOG_ERROR, "Two streams in an agroup can not be default\n"); + goto fail; + } + } else if (vs->sgroup && temp_vs->sgroup && + !vs->has_video && !temp_vs->has_video) { + if (!av_strcasecmp(vs->sgroup, temp_vs->sgroup) && + vs->is_default && temp_vs->is_default) { + av_log(s, AV_LOG_ERROR, "Two streams in an sgroup can not be default\n"); + goto fail; + } + } + } + } + } + /* For audio only variant streams add #EXT-X-MEDIA tag with attributes*/ for (i = 0; i < hls->nb_varstreams; i++) { vs = &(hls->var_streams[i]); @@ -1452,7 +1479,7 @@ static int create_master_playlist(AVFormatContext *s, if (vs->streams[j]->codecpar->ch_layout.nb_channels > nb_channels) nb_channels = vs->streams[j]->codecpar->ch_layout.nb_channels; - ff_hls_write_audio_rendition(hls->m3u8_out, vs->agroup, m3u8_rel_name, vs->language, i, hls->has_default_key ? vs->is_default : 1, nb_channels); + ff_hls_write_audio_rendition(hls->m3u8_out, vs->agroup, m3u8_rel_name, vs->language, i, hls->has_default_key ? vs->is_default : 0, vs->autoselect, nb_channels); } /* For variant streams with video add #EXT-X-STREAM-INF tag with attributes*/ @@ -1533,7 +1560,7 @@ static int create_master_playlist(AVFormatContext *s, break; } - ff_hls_write_subtitle_rendition(hls->m3u8_out, sgroup, vtt_m3u8_rel_name, vs->language, i, hls->has_default_key ? vs->is_default : 1); + ff_hls_write_subtitle_rendition(hls->m3u8_out, sgroup, vtt_m3u8_rel_name, vs->language, i, hls->has_default_key ? vs->is_default : 0, vs->autoselect, vs->forced); } if (!hls->has_default_key || !hls->has_video_m3u8) { @@ -2104,6 +2131,16 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) (!av_strncasecmp(val, "1", strlen("1")))); hls->has_default_key = 1; continue; + } else if (av_strstart(keyval, "autoselect:", &val)) { + vs->autoselect = (!av_strncasecmp(val, "YES", strlen("YES")) || + (!av_strncasecmp(val, "1", strlen("1")))) || + (hls->has_default_key && vs->is_default); + /* autoselect must = 1 if default = 1 */ + continue; + } else if (av_strstart(keyval, "forced:", &val)) { + vs->forced = (!av_strncasecmp(val, "YES", strlen("YES")) || + (!av_strncasecmp(val, "1", strlen("1")))); + continue; } else if (av_strstart(keyval, "name:", &val)) { vs->varname = val; continue; diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c index f8a6977702..40a8a36849 100644 --- a/libavformat/hlsplaylist.c +++ b/libavformat/hlsplaylist.c @@ -39,13 +39,20 @@ void ff_hls_write_playlist_version(AVIOContext *out, int version) void ff_hls_write_audio_rendition(AVIOContext *out, const char *agroup, const char *filename, const char *language, - int name_id, int is_default, int nb_channels) + int name_id, int is_default, + int autoselect, int nb_channels) { if (!out || !agroup || !filename) return; avio_printf(out, "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"group_%s\"", agroup); - avio_printf(out, ",NAME=\"audio_%d\",DEFAULT=%s,", name_id, is_default ? "YES" : "NO"); + avio_printf(out, ",NAME=\"audio_%d\",", name_id); + if (is_default) { + avio_printf(out, "DEFAULT=YES,"); + } + if (autoselect) { + avio_printf(out, "AUTOSELECT=YES,"); + } if (language) { avio_printf(out, "LANGUAGE=\"%s\",", language); } @@ -57,13 +64,23 @@ void ff_hls_write_audio_rendition(AVIOContext *out, const char *agroup, void ff_hls_write_subtitle_rendition(AVIOContext *out, const char *sgroup, const char *filename, const char *language, - int name_id, int is_default) + int name_id, int is_default, + int autoselect, int forced) { if (!out || !filename) return; avio_printf(out, "#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID=\"%s\"", sgroup); - avio_printf(out, ",NAME=\"subtitle_%d\",DEFAULT=%s,", name_id, is_default ? "YES" : "NO"); + avio_printf(out, ",NAME=\"subtitle_%d\",", name_id); + if (is_default) { + avio_printf(out, "DEFAULT=YES,"); + } + if (autoselect) { + avio_printf(out, "AUTOSELECT=YES,"); + } + if (forced) { + avio_printf(out, "FORCED=YES,"); + } if (language) { avio_printf(out, "LANGUAGE=\"%s\",", language); } diff --git a/libavformat/hlsplaylist.h b/libavformat/hlsplaylist.h index d7aa44d8dc..41e640a09a 100644 --- a/libavformat/hlsplaylist.h +++ b/libavformat/hlsplaylist.h @@ -38,10 +38,12 @@ typedef enum { void ff_hls_write_playlist_version(AVIOContext *out, int version); void ff_hls_write_audio_rendition(AVIOContext *out, const char *agroup, const char *filename, const char *language, - int name_id, int is_default, int nb_channels); + int name_id, int is_default, + int autoselect, int nb_channels); void ff_hls_write_subtitle_rendition(AVIOContext *out, const char *sgroup, const char *filename, const char *language, - int name_id, int is_default); + int name_id, int is_default, + int autoselect, int forced); void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, int bandwidth, int avg_bandwidth, const char *filename, const char *agroup,