From patchwork Fri Jul 5 13:32:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: CoderVenkat X-Patchwork-Id: 50369 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4310341vqv; Fri, 5 Jul 2024 06:32:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQAE1/ZLqOOhKQYjsox7Aa2zfV9R18is6PiTaSPhGZDWT51fR3nyDMIki6RnkYMr37VFGB4A2xyVRTeXazWpznPt8PIzWWRxe7Wg== X-Google-Smtp-Source: AGHT+IFrsoHQL4r6tkvJGCbZuJQ/Qf3XMyHGJdqGLn1fOWqY+WGpBnPza9W911qCpOfzCvJYRbL2 X-Received: by 2002:a2e:9b89:0:b0:2ee:4da5:be67 with SMTP id 38308e7fff4ca-2ee8ec7b181mr30580771fa.0.1720186354494; Fri, 05 Jul 2024 06:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720186354; cv=none; d=google.com; s=arc-20160816; b=PaqKoQprg157hUPrJy3Fnz9DluSFU9Ng6aP1Lw/p0+12wJKv3TiLRFVFse7MIB0L/1 hiqsMmeyxES5hKFK5EXB9tdrcqAlcXQsZqsYCjgpxahUdXs7XvNwpDzLdjnXaBfhvwFb X7ZtT6ZVZ7lix2H1XqxxOnFXlOMA1gdj95eJAlnH0crDtK7KZym6KXO+1lNsAjG0bNI+ NMJ+VRfQ+FDJwzAnQMnBJVP58EF/yGOL5AE/iZdAjf92sFleJPuIiOU6YdBMsGKy2m/M 2kmH4GfDYRKKhnGdDoTZESMzLfu+EzYRuaR289kXADLfvKkSATLWoiwHCGXOH63AyaSt gfRA== 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:from:to:content-language:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=I/MKx4CzdgwMOxemc/aw9U3eYVogCpxasfVmVc9xxqE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Eqkn2cOm74qyoPbLQ+chOjPZjn5B8nFZhssLA7l3RplQcrz79i7SUV1lXQ6mHq1sFh McpC3VNRULaE3pO9vme/EIOdFIGVt4GZ6zfuGh1/OKCm8K4GG4Pk1dh7RSsdzLT5zJFz BAZmFfj1UUMuss4j+9O1lxt20QymqnCoC5xrdfC0MLTHio0LLY9v4F+4k8qeuXqVwRqO 3/azk8dgW6PGVSPTi5Eo3umveCxG/AG+vZ+rg5Xunfv0fevAKmou03mcW5woPICvEUaZ LOcCAx7h3xzUqmstrrYQsbQKpBksuFu9WW4IaExHy4a516d5vbOyDFT3RZtPr/2TyWrW bfmw==; 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=j1BS4Bt+; 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-2ee7b7d62dfsi17067581fa.213.2024.07.05.06.32.33; Fri, 05 Jul 2024 06:32:34 -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=j1BS4Bt+; 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 2031068DAED; Fri, 5 Jul 2024 16:32:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 428AE68DAED for ; Fri, 5 Jul 2024 16:32:23 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-70b07bdbfbcso738367b3a.0 for ; Fri, 05 Jul 2024 06:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720186341; x=1720791141; darn=ffmpeg.org; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=RgL7LrUTZjOemrTE+FlsfVu4fVb/Nj0NWLjZFSkuptI=; b=j1BS4Bt+gingtvNxjbGwAyjgn5uQCbnalzIWId+aq5CUSU3AmWFf0fo+yOxjdTLGuT ljG9nEvJL6teZDlnEPCVAE22A9zCrkffGH7b/DffbRhs/QALW/lUkJga6uXUfTEzWo4d zUHs7ZBxrBD3q1JBoXXFuAtS6+u+aZrsIbQgpyp5TvswVi/7roBUm7uzLawAoCjx656T HcyA/FU9ULrrOLnMoKCi22fuXcBdvqyXwhlMc2N7ZOtVcRt3RnLbL6dOr5Yhsdw4rk6P HP/+fvKGU1Ty9ahTrLiqVuL7jqzJJPF9tmVCnr5O1zCKQRA5tDtB/NRYNoMjNhxekOyc 0hEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720186341; x=1720791141; h=content-transfer-encoding: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=RgL7LrUTZjOemrTE+FlsfVu4fVb/Nj0NWLjZFSkuptI=; b=xRH6jSQrmBtcr4GZgjKqpFoOO1kyPMIw5SKyqZ9HuEdE8J57Aj83u3y8K3P+S47OZd Hj+SKZ2qU77DiBh+GutRjxjjAPWsMrZgil7WS3twRScE+AMF34nn/PSlEdwQLqkgUFh/ Y5jyKyXnkCsHuQE7Y0sOETUx96Iwsw4kLUhwAdkMXdKMxXPrQYaeQlT7BPG2mzyJVqG2 ktUSnnTx+4XBjkDApKFprfpCLUyTtX31/2v3Qx43jRk7qacx/zy+3ABncrJTyYwwznWg /yOzQUDYxAtU4BVFE5NqQa3o2v6HQ4u2LVj1xWOyz8XugAhk/QXhSPqmWliIU1VKu9bv gigA== X-Gm-Message-State: AOJu0Yyc1vP26VWWFKdlL6bOmTV/vMarBDf3eG41j9lrIeOIR1N6F6b6 BATdOe3WQjroJz662P+BQ1F32uV3U1FWV90SOSm2djrdGdrzLs6/U/BxvA== X-Received: by 2002:a05:6a20:3259:b0:1b8:4486:fb74 with SMTP id adf61e73a8af0-1c0cd228c0fmr5061780637.25.1720186340435; Fri, 05 Jul 2024 06:32:20 -0700 (PDT) Received: from [192.168.0.171] ([203.192.253.0]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-72c69b54d31sm11053012a12.19.2024.07.05.06.32.18 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Jul 2024 06:32:19 -0700 (PDT) Message-ID: <97784b6e-07fe-84a7-e6e8-c0c55044d5fa@gmail.com> Date: Fri, 5 Jul 2024 19:02:14 +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 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: fvLsjj6i08KL 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(-)  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);