From patchwork Fri Jul 5 13:36:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: CoderVenkat X-Patchwork-Id: 50371 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4313058vqv; Fri, 5 Jul 2024 06:36:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUcx3Dm+SD2dgNxsYWzU2n0bu5yKjcGW1domB6IPYuGhuG1sWWrlJypZBTMqevXI8rVFusrl/uoOhw+bvzxCWr6qJzO4/gOIDlesw== X-Google-Smtp-Source: AGHT+IH9Zs8osRjtFLa5I7xsTkCSVsRVwExGy2NiDKn15asifQU+VGfRXosJGE3ZpSCnRhWZsg4P X-Received: by 2002:a2e:7d03:0:b0:2ee:8720:b4c3 with SMTP id 38308e7fff4ca-2ee8ee0e682mr31842591fa.43.1720186583711; Fri, 05 Jul 2024 06:36:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720186583; cv=none; d=google.com; s=arc-20160816; b=R7YI0tYL/iZtjfqZFjswKeQR2J7iRXmwCNpKelPbjQl4vcwrmIvsR4P/AX9rRKX2cY AtQrt6yCA+CxbyuA+oPxhb1cdM88xQWRNuDQpz1eo0Rdu4JRtrqMK6R+wZ7Smd4/HgYy K1Izy2BRdjed7FblXrQsrxLhOiGJqwj84iEMD33JZUg2oX4dzYL+8mGBWBM+ILMMkmh+ eAJkCY1TO8ogIrTMOtvj+tv/Lxkhr5uqMDy9C0QbZNvAU1ViBkdxaGjUnCrabvuQBFQY E5WYk03ry2a0719W2kya+tf/3mIh6F45KgG5Y5FIeb6UZC96wc2+5/wQbpATC0gcHDJH 1oGw== 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=OWSFCrp7qcmqB0RAObGpYmYum13VjuUEEPOLnV5upUQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=lGicybUJNyJ3MVnIHKssquMg7xROjLRPzA++moAKJG2MYoiE7IPq2mC6GChor0A/d/ cFwllY2ZkuLvDXBH0ZfgBVip7LARxuqiJuRRB2DVxpoEbfO6R+fVPHtKoK0Ue9oG7nlI yDBJnNjmnil26g+9C7Uhh2bezJfEjDA5L2ij2RB+rojLc34zyz6Lt9JfPDuURxD14k7/ yb6RNVuTTWSc55rg0Ts9bAz42OC7owOTZs4GjYLmCp5KVcEaXsHhoRJ+zzIVvyNWRO1m bq9VWFS29/rm4ZOnIvkqjpOzG84kPd5fK2U1kSqY26qMrMjpaZ3uoi8LHHnmEZYuS6AS ZAnw==; 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=C1GCTyeo; 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-2ee94caa00csi4554701fa.336.2024.07.05.06.36.23; Fri, 05 Jul 2024 06:36:23 -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=C1GCTyeo; 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 3CFFA68DB58; Fri, 5 Jul 2024 16:36:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F24AA68D245 for ; Fri, 5 Jul 2024 16:36:12 +0300 (EEST) Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3cabac56b38so1014100b6e.3 for ; Fri, 05 Jul 2024 06:36:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720186571; x=1720791371; 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=MWeQIoPpcBAy/7JsIElXLZm5ChxMx31CBJJ2Bf/mqLE=; b=C1GCTyeoX0HBueRIbYw1RUJm6bzb9DoF8/1+Vrok2vz3QeNnrA9vzW5EkGby42ZPfe Ty0PfrHBmQriU8fMPhV3XWF4x6buNNSG/GZkvrgFP64BZWacqEMAwLJHGLnXwZ9SGICo HUAK4SxdexD/+k/ZGJHsR5ZPwVupLiMC6IbV57kyWNbRSBlS/JY0eULx4rlKVZZbzHqP nd5TLvhoqUYzIRKEyan/9m7GUpJe8iV8Q/7HoLlb3P+lT3Eg7e1O2jbM27vDC98w7YrB EfJ2CvFgCuT3CnNbPtsxvhObZIbUicoPSIINvB43v6qDUULUBFS8zIdWfiAQi2vpvrLm st5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720186571; x=1720791371; 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=MWeQIoPpcBAy/7JsIElXLZm5ChxMx31CBJJ2Bf/mqLE=; b=j4zMiTJmLN4wyfdhqCtgm4gycnQ6CWyGi/LUCgIOkCpMQGQWwqBaW9GZ2Rk65597PB S16gs8tblUia40okmhzkdJwdHDqv50wHhrgXBdCS5tp/nRIlROVHWPi5y2DFByFB5X4V hPLnPL5pBew4hlfiDSbzbVD7lMT3L/wpRIlFJRFyw3ZrhKSgvB5/INSuseNB4zHSwcSk EEL7dUTgAaVqqNmNriKCp/4ktH9xyHRBFBF5hl+mN4seFaJ7f1AMHUBNzf0TFAfRDfn1 a0l1mRx7QQkaPLsqUeYCN0dsUM26CSj8nUaBBLIzDwGb62zvMWlyiK7Nj9GgFO+1XNFB BtBQ== X-Gm-Message-State: AOJu0Yz+9dWgykkbl12kqEiI99RVtpXc9RicJm9pR2Kpe/xbIt6xkXet WynKeVn4Ucywu9FuQIr2X8pjF9VmRoSpHFGHdZHNPc51NT3UgJx9SH9CXg== X-Received: by 2002:a05:6808:2e8e:b0:3d6:2c22:4b1e with SMTP id 5614622812f47-3d914c85ecemr5984485b6e.34.1720186570329; Fri, 05 Jul 2024 06:36:10 -0700 (PDT) Received: from [192.168.0.171] ([203.192.253.0]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70802464b18sm13993775b3a.45.2024.07.05.06.36.08 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Jul 2024 06:36:09 -0700 (PDT) Message-ID: <5c87a9a7-5d91-39a5-925f-f6007c473d92@gmail.com> Date: Fri, 5 Jul 2024 19:06:05 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org From: CoderVenkat Content-Disposition: attachment; filename="commit.patch" 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: ppHrYU02meKR From d4e321aa71b2b0dd8fc6d94e39cfa870d7ffa3ba 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..c84b44f20d 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,