From patchwork Fri Jul 5 13:27:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: CoderVenkat X-Patchwork-Id: 50370 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4311475vqv; Fri, 5 Jul 2024 06:34:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUwOGKINWnQrys693qSa6MvINKoyhfqJwcrelKMCRaCVYNCWYn9FZHviYF9Ldpb3y4cBNwCWzg3IOPJGgWfVewg9AN7Mp0stdU/eg== X-Google-Smtp-Source: AGHT+IGQ12lhPhh124sdYMrDQRj3vSXvh9/mbO+TPrTWaEJ7kWZl8QSbk2IhNsufF6Jmm9SO6f8Z X-Received: by 2002:ac2:5bc7:0:b0:52e:9619:e26a with SMTP id 2adb3069b0e04-52ea0632f2bmr3454217e87.26.1720186447887; Fri, 05 Jul 2024 06:34:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720186447; cv=none; d=google.com; s=arc-20160816; b=cD65GeFBEEQ27DLCh9vtc7vbCUkQxVv0860oDq2DPt0+h5KGYx8RKQir1AdRgej9JV /00rsjAb5Au7LfGpJceVGXrHVe5XAwpyhu/TXTY2000Wydn19fwX3/BfUEZ4vd3Acqrw tq4iL1Guo8b+9S8mexsE5Fqy+RI7YQ9+Za3aW5mLU9qA/Dns7BybmdwY+1rq49QtUqJw B9lThIA4PhaPfOG9Ofj9zUBO1QGCJzXeGRBNL6+isKvSMEomEYnVC6PS9qQb1df07cxf kNeIzI02MQpnIqwjelYChaX2mJES/8g9NiEQvCzSpYRq1sRI6sYFe27LlLzh5kwYM6+X 4YMA== 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-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=2UQ+SMipZF5eotpwqk6gQ7gh7lzLtjix6KuZvnSst80=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=CFNDissRnFe6PLA36Rey4YfyzdGkQemEOgZ42IVRELhXp6H5qKvwq7N3bd2sCGUlZr aIH/E8TnIlkuluJQzKp2SZsfNv7ig6wLc13KTMRFxUWJ883fqWINl8ohi69f/SI9Cdem mDwTtu30K/fln9MTRIb1Txid32tUf1j20tQSBFtzLCqRLqxte2vz0SlcrKpEovGvsd8c X5mLdx8zAgfsLiZuV8S7w5FBDEnVexnSO8WlcdbUQ1QRtfE4jMpPtdbyQ6cvwc2RXxN+ Qoi8aFB4NajH6chyL1LJaHC3nLwLseL4zdkh0QnIwvT35kfIGb0qHD7pqeti5+rrRJqb Ti6A==; 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=IX0RobO5; 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 4fb4d7f45d1cf-58f20b5d8a5si1271490a12.193.2024.07.05.06.34.07; Fri, 05 Jul 2024 06:34:07 -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=IX0RobO5; 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 BC13268D2D8; Fri, 5 Jul 2024 16:27:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59B6068D2D8 for ; Fri, 5 Jul 2024 16:27:16 +0300 (EEST) Received: by mail-il1-f179.google.com with SMTP id e9e14a558f8ab-376517b9408so6488065ab.0 for ; Fri, 05 Jul 2024 06:27:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720186034; x=1720790834; darn=ffmpeg.org; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=zolSicnrCTbSBNEBu2gSGFX3UuLZPJPfIlepC+ep25Y=; b=IX0RobO5gL/etd/IWk0jcO51UOSR5LfsIxoX6drL3ioRneiQPdfg85liEh9yZ+1M/t TgJtPO7QyskGv0wiSt7km34wokOqR0yW8Wv01c9eGS0m3GXNHAfDMiGV7xt2z2OJt/+P t/Cpija7pF1dphZhSL2VWouZ81IjejX0pOjdYBfVFHhAJ8MRu3SZ40UZPTHNbJlkJBQN BRFlg4CZ/SRd5yCiktiLCqR/lJiLzHZtuHcLUGwCsM0DugJdJXrpaxjuKzHtngjWoPkQ joe3z0XXIl+rAS7VasfyaOYRUJLXHCMasfhgMG/nl0F0HGqFWNJmsv24Q9ST6FE8sWGi pjhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720186034; x=1720790834; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=zolSicnrCTbSBNEBu2gSGFX3UuLZPJPfIlepC+ep25Y=; b=lWw9Ah92T+ZbNXw4MGQfDUcQ2LL+0n8pArI4Yfx6Dj2ChPSQB5Q2fnGnu8hpF1c212 pGG9pwan0Ndxx2MbXBfRtjI397MhcC6Zvm9+jJPg5BmgRcDdd3SvwJyr1CESwoYqlABS tcQBKrakNYL52hgN+L12HOwI0WITDdxwFosE65zLd4Zuk67JRdEGMzjOE+p8wsLEzhDt qQcdLBc87Vf6LGYAvgh2WyBJxuGtwLPztYc4DJEoAWNS5/NEu902Bwv8xsIBne8ffRv3 jmp0+Zd2H4ckqDlu7PlRQ/UkTZb13a/+fGN/4qHqR/iQ9PGtMogRTcdQyxXdq6iAb482 AZTA== X-Gm-Message-State: AOJu0YyvR5q1ch99vN0Rgxlb9qOGX5P7idsrK55NX3euhRXoAE+pvTBV nO0rwJAZvLYsvAxHfZOysVQ4hjfY9FMQLehK0W1eVi3vY8rSZKgs0keH9A== X-Received: by 2002:a05:6e02:1806:b0:375:9c7e:d04 with SMTP id e9e14a558f8ab-383990c8df6mr59974775ab.10.1720186034329; Fri, 05 Jul 2024 06:27:14 -0700 (PDT) Received: from [192.168.0.171] ([203.192.253.0]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-72c6d3efefasm11077251a12.90.2024.07.05.06.27.12 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Jul 2024 06:27:13 -0700 (PDT) Message-ID: <691930bc-b3e6-8185-2a7e-cf90462d4376@gmail.com> Date: Fri, 5 Jul 2024 18:57:09 +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 From: CoderVenkat To: ffmpeg-devel@ffmpeg.org Content-Language: en-US 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: wGiexXGAgtuM In absence of default 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(-)  void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, int bandwidth,                                int avg_bandwidth,                                const char *filename, const char *agroup, 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);