From patchwork Mon Jul 8 13:43:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: CoderVenkat X-Patchwork-Id: 50405 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5790055vqv; Mon, 8 Jul 2024 06:43:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXWAwpMUnhtYYiKPohv7OTsiTQl5EFKpyZgZTtnYv09ZQQQVrgux7BisiK5v8BDbFMqkuggVuAoJJUGLSskEPk9wOcuNJjg7WKBug== X-Google-Smtp-Source: AGHT+IFqLgfRpqv+lyyTjSNmfiBkxywBe9Kmqell1+xWiwLdC+7qOOuefLMMSYJBfQNGSgRImyPM X-Received: by 2002:a05:6512:3116:b0:52d:582e:4111 with SMTP id 2adb3069b0e04-52ea0622603mr10476249e87.18.1720446211488; Mon, 08 Jul 2024 06:43:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720446211; cv=none; d=google.com; s=arc-20160816; b=gFkddatYSBxMBrGaKuqdk3uRotq1xvkc0hZrUOE/0ah4hnPe3oH0Ydt5oQ8IZlXSSa lNvgD7SmNfoPP6tJPa9E+2ffhyxJY6ELWP3q5hfcE25iYMnfxCiXjqPxu1EXcwcjKG4C HOXPtJSSD2MTwZum6pdvgfxZcBBPlnacriCMzqORyvtX2rFX7orhh8nV0iNr8luaj6Bq 1Iv75BNH4sNaFyx3AOBEtG/N+wWUkFIVVG97vX0sn9lqy/S2Fv467m7CiAarOF2SysQD bLkWhL02C1Uyuph5rELooKyniZ2zd3tSg4w9FLNq0nePWDoBLQT32tlFPpJVMQ1eP0sa kJmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :in-reply-to:from:content-language:references:to:user-agent :mime-version:date:message-id:dkim-signature:delivered-to; bh=WwI4DYwFTiFfKtYaN7k6a4SINAI36znl29rwA6ICawY=; fh=q41DpHH7g+pT9ijxQSS5qY0keDg6/hn5Sx933NqzhoE=; b=OUo7LRB/Wd1824zxU6RM+frnNgXpPcISOEottzSfRu8fjQx70yBshIrt22Id0dgrl2 vqw24I6LEaciThd65goNj+y4sh2IT1hyynYZbdmIrVj3EIyMasWflRbp8tbkd2g6bu8Y aWryZGKpGxDqkwtZNOnzzAfRleCZ2MmgCgRiVRn/XCvAuzf7bTG3Oh4rkOCxSId995A3 UAadKOBZyMXuQdBhYXCOjhS4wdt3s736yVtsUHr94jKbF//wVfoiAfYiJpWA5vzld8ZT ecIdHvfg+FJcKgNiOcOWhyjzeFpd187s16hVmgqGf5xbTCtk5WnBLQF19BGd08kMRhW6 4diw==; 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=Kca7FjqN; 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 a640c23a62f3a-a77e80292cdsi219134166b.499.2024.07.08.06.43.30; Mon, 08 Jul 2024 06:43:31 -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=Kca7FjqN; 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 523D368DC49; Mon, 8 Jul 2024 16:43:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0393A68D8E8 for ; Mon, 8 Jul 2024 16:43:20 +0300 (EEST) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1f65a3abd01so27435925ad.3 for ; Mon, 08 Jul 2024 06:43:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720446198; x=1721050998; darn=ffmpeg.org; h=in-reply-to:from:cc:content-language:references:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=3tQZtruBEDIxES8P0WIhqZ+Ak535uX7UPi7OwRDQwZM=; b=Kca7FjqNOoYd39JHq06SvyfF7vEA3IdzNYpvMSMQQ8rc9bHDNDYSkoxR/4Mqf5kNPg dO8F+7MtUXP7uvEsxw7P36sVvjW6Kc0oar6j+/YS7R400YNC1o+cWYjj5YLRmFxsefB+ WBhBqIINFjK6F2c2ZalOQiuPvqoUyEeCegCe+9B5yQduFpRvrdhicEG3Q2N9ewdqCOqd KHZ/N5fi4kEtpl2CLYHmYWZpGFi4h+g9tsC8Bb3anZbOm2YWYU6WLCsM30TwuOOgRiIq 4eu2uBviyUlR2HEpbQag/1JcpMb2E3qxZtWQ0xWa/Soc182aaFt+PKUo+EbzOTT1iv35 HrEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720446198; x=1721050998; h=in-reply-to:from:cc:content-language:references:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3tQZtruBEDIxES8P0WIhqZ+Ak535uX7UPi7OwRDQwZM=; b=Q06alI6t135mkvErtr9BPR0UeCX4J1uYT8Gz8odd1rmnXmW1G2DlwzTencDCI71YlV /ZQlt5kKu22nFetXKBGESO0Q2b5hqN+L+a9sOf4eDPAiVDAUOAGK78YS3SDfoSSyIE0F wdVNTIFPumP6oBWG/tO1nNwsZiRZ75agyn0XZ6IkyEKfLE1sjoUXPy2xIz4BfK39sEz8 gpKG5WtyrQwG8kDXsp6NETGRBNOoZMPLMAWgGXZD2RlxZjLdCjNvv3Sibg2cKhIMgXAn Fx0IrfDUc/oGo/lMIubDBQpyBi87IXm80jXeimm4hbcbUnV0GjAzhSZ0XjAUQxZLaNQ3 XZnw== X-Gm-Message-State: AOJu0YxH28FAg9PqwsPeRx9AlfDKNNJdlX/Q43TQJJg69/8n/ImW4QbM negdSS1bZQiuvCuolcicUy47p+DmFQSde++weAH379FkUQV9tvu+FYvBSsiB X-Received: by 2002:a17:902:ecd2:b0:1fb:e31:b4e9 with SMTP id d9443c01a7336-1fb33ee5f55mr139776455ad.53.1720446198376; Mon, 08 Jul 2024 06:43:18 -0700 (PDT) Received: from [192.168.0.171] ([203.192.251.2]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fb76d945d2sm33925295ad.121.2024.07.08.06.43.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 08 Jul 2024 06:43:18 -0700 (PDT) Message-ID: Date: Mon, 8 Jul 2024 19:13:12 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <691930bc-b3e6-8185-2a7e-cf90462d4376@gmail.com> Content-Language: en-US From: CoderVenkat In-Reply-To: Subject: [FFmpeg-devel] [PATCH v2] avformat/hls: Fixed incorrect behaviour of default 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 Cc: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uGD+r9uYWz2C Hello, I have attached a patch with the requested changes. Thanks, vckt From 5ac9b69d1c570eff4bc72ee4469874a9b182537d Mon Sep 17 00:00:00 2001 From: vckt Date: Fri, 5 Jul 2024 18:51:32 +0530 Subject: [PATCH v2] 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 | 47 +++++++++++++++++++++++++++++++++++---- libavformat/hlsplaylist.c | 26 +++++++++++++++------- libavformat/hlsplaylist.h | 6 +++-- 4 files changed, 67 insertions(+), 15 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..86c1c9a274 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) { @@ -2032,6 +2059,8 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) int nb_varstreams = 0, nb_streams; char *p, *q, *saveptr1, *saveptr2, *varstr, *keyval; const char *val; + const size_t strlen_yes = strlen("YES"); + const size_t strlen_1 = strlen("1"); /* used in multiple arguments */ /** * Expected format for var_stream_map string is as below: @@ -2100,10 +2129,20 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) vs->language = val; continue; } else if (av_strstart(keyval, "default:", &val)) { - vs->is_default = (!av_strncasecmp(val, "YES", strlen("YES")) || - (!av_strncasecmp(val, "1", strlen("1")))); + vs->is_default = (!av_strncasecmp(val, "YES", strlen_yes) || + (!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..094bb56689 100644 --- a/libavformat/hlsplaylist.c +++ b/libavformat/hlsplaylist.c @@ -39,16 +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"); - if (language) { + 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); - } if (nb_channels) { avio_printf(out, "CHANNELS=\"%d\",", nb_channels); } @@ -57,16 +61,22 @@ 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"); - if (language) { + 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); - } avio_printf(out, "URI=\"%s\"\n", filename); } 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,