diff mbox series

[FFmpeg-devel,v2] avfilter/src_movie: add format_opts for the opened file

Message ID 1637919519-16335-1-git-send-email-lance.lmwang@gmail.com
State New
Headers show
Series [FFmpeg-devel,v2] avfilter/src_movie: add format_opts for the opened file | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Limin Wang Nov. 26, 2021, 9:38 a.m. UTC
From: Limin Wang <lance.lmwang@gmail.com>

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 doc/filters.texi        | 5 +++++
 libavfilter/src_movie.c | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

Comments

Paul B Mahol Nov. 26, 2021, 9:48 a.m. UTC | #1
On Fri, Nov 26, 2021 at 10:38 AM <lance.lmwang@gmail.com> wrote:

> From: Limin Wang <lance.lmwang@gmail.com>
>
> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> ---
>  doc/filters.texi        | 5 +++++
>  libavfilter/src_movie.c | 4 +++-
>  2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/doc/filters.texi b/doc/filters.texi
> index 3731a14..f2d5957 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -28395,6 +28395,11 @@ timestamps.
>
>  @item dec_threads
>  Specifies the number of threads for decoding
> +
> +@item format_opts
> +Specify format options for the opened file. Format options can be
> specified
> +as a list of @var{key}=@var{value} pairs separated by ':'. For example,
> +some protocol you need to add protocol_whitelist for the opened file.
>  @end table
>
>  It allows overlaying a second video on top of the main input of
> diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
> index 220a43c..b89a680 100644
> --- a/libavfilter/src_movie.c
> +++ b/libavfilter/src_movie.c
> @@ -74,6 +74,7 @@ typedef struct MovieContext {
>      int max_stream_index; /**< max stream # actually used for output */
>      MovieStream *st; /**< array of all streams, one per output */
>      int *out_index; /**< stream number -> output number map, or -1 */
> +    AVDictionary *format_opts;
>  } MovieContext;
>
>  #define OFFSET(x) offsetof(MovieContext, x)
> @@ -92,6 +93,7 @@ static const AVOption movie_options[]= {
>      { "loop",         "set loop count",          OFFSET(loop_count),
>  AV_OPT_TYPE_INT,    {.i64 =  1},  0,        INT_MAX, FLAGS },
>      { "discontinuity", "set discontinuity threshold",
> OFFSET(discontinuity_threshold), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0,
> INT64_MAX, FLAGS },
>      { "dec_threads",  "set the number of threads for decoding",
> OFFSET(dec_threads), AV_OPT_TYPE_INT, {.i64 =  0}, 0, INT_MAX, FLAGS },
> +    { "format_opts",  "set format options for the opened file",
> OFFSET(format_opts), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, FLAGS},
>      { NULL },
>  };
>
> @@ -243,7 +245,7 @@ static av_cold int movie_common_init(AVFilterContext
> *ctx)
>      iformat = movie->format_name ?
> av_find_input_format(movie->format_name) : NULL;
>
>      movie->format_ctx = NULL;
> -    if ((ret = avformat_open_input(&movie->format_ctx, movie->file_name,
> iformat, NULL)) < 0) {
> +    if ((ret = avformat_open_input(&movie->format_ctx, movie->file_name,
> iformat, &movie->format_opts)) < 0) {
>          av_log(ctx, AV_LOG_ERROR,
>                 "Failed to avformat_open_input '%s'\n", movie->file_name);
>          return ret;
> --
> 1.8.3.1
>
>
Missing documentation entry.

How is one user supposed to use this option? If I'm not mistaken this can
only work to specify first value only, and because of ':' separator next
ones will be taken by filter itself.
Limin Wang Nov. 26, 2021, 10:12 a.m. UTC | #2
On Fri, Nov 26, 2021 at 10:48:07AM +0100, Paul B Mahol wrote:
> On Fri, Nov 26, 2021 at 10:38 AM <lance.lmwang@gmail.com> wrote:
> 
> > From: Limin Wang <lance.lmwang@gmail.com>
> >
> > Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> > ---
> >  doc/filters.texi        | 5 +++++
> >  libavfilter/src_movie.c | 4 +++-
> >  2 files changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/doc/filters.texi b/doc/filters.texi
> > index 3731a14..f2d5957 100644
> > --- a/doc/filters.texi
> > +++ b/doc/filters.texi
> > @@ -28395,6 +28395,11 @@ timestamps.
> >
> >  @item dec_threads
> >  Specifies the number of threads for decoding
> > +
> > +@item format_opts
> > +Specify format options for the opened file. Format options can be
> > specified
> > +as a list of @var{key}=@var{value} pairs separated by ':'. For example,
> > +some protocol you need to add protocol_whitelist for the opened file.
> >  @end table
> >
> >  It allows overlaying a second video on top of the main input of
> > diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
> > index 220a43c..b89a680 100644
> > --- a/libavfilter/src_movie.c
> > +++ b/libavfilter/src_movie.c
> > @@ -74,6 +74,7 @@ typedef struct MovieContext {
> >      int max_stream_index; /**< max stream # actually used for output */
> >      MovieStream *st; /**< array of all streams, one per output */
> >      int *out_index; /**< stream number -> output number map, or -1 */
> > +    AVDictionary *format_opts;
> >  } MovieContext;
> >
> >  #define OFFSET(x) offsetof(MovieContext, x)
> > @@ -92,6 +93,7 @@ static const AVOption movie_options[]= {
> >      { "loop",         "set loop count",          OFFSET(loop_count),
> >  AV_OPT_TYPE_INT,    {.i64 =  1},  0,        INT_MAX, FLAGS },
> >      { "discontinuity", "set discontinuity threshold",
> > OFFSET(discontinuity_threshold), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0,
> > INT64_MAX, FLAGS },
> >      { "dec_threads",  "set the number of threads for decoding",
> > OFFSET(dec_threads), AV_OPT_TYPE_INT, {.i64 =  0}, 0, INT_MAX, FLAGS },
> > +    { "format_opts",  "set format options for the opened file",
> > OFFSET(format_opts), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, FLAGS},
> >      { NULL },
> >  };
> >
> > @@ -243,7 +245,7 @@ static av_cold int movie_common_init(AVFilterContext
> > *ctx)
> >      iformat = movie->format_name ?
> > av_find_input_format(movie->format_name) : NULL;
> >
> >      movie->format_ctx = NULL;
> > -    if ((ret = avformat_open_input(&movie->format_ctx, movie->file_name,
> > iformat, NULL)) < 0) {
> > +    if ((ret = avformat_open_input(&movie->format_ctx, movie->file_name,
> > iformat, &movie->format_opts)) < 0) {
> >          av_log(ctx, AV_LOG_ERROR,
> >                 "Failed to avformat_open_input '%s'\n", movie->file_name);
> >          return ret;
> > --
> > 1.8.3.1
> >
> >
> Missing documentation entry.
> 
> How is one user supposed to use this option? If I'm not mistaken this can
> only work to specify first value only, and because of ':' separator next
> ones will be taken by filter itself.
Yes, the : need to add \ before it, below is one example used, I don't know how to express it
clearly in the document. Add one example?

./ffplay -f lavfi "movie=filename='1.sdp':format_opts='protocol_whitelist=file,rtp,udp\:protocol_blacklist=rtmp'"

> 
> _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel@ffmpeg.org
> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> > To unsubscribe, visit link above, or email
> > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> >
Paul B Mahol Nov. 26, 2021, 10:50 a.m. UTC | #3
On Fri, Nov 26, 2021 at 11:12 AM <lance.lmwang@gmail.com> wrote:

> On Fri, Nov 26, 2021 at 10:48:07AM +0100, Paul B Mahol wrote:
> > On Fri, Nov 26, 2021 at 10:38 AM <lance.lmwang@gmail.com> wrote:
> >
> > > From: Limin Wang <lance.lmwang@gmail.com>
> > >
> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> > > ---
> > >  doc/filters.texi        | 5 +++++
> > >  libavfilter/src_movie.c | 4 +++-
> > >  2 files changed, 8 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/doc/filters.texi b/doc/filters.texi
> > > index 3731a14..f2d5957 100644
> > > --- a/doc/filters.texi
> > > +++ b/doc/filters.texi
> > > @@ -28395,6 +28395,11 @@ timestamps.
> > >
> > >  @item dec_threads
> > >  Specifies the number of threads for decoding
> > > +
> > > +@item format_opts
> > > +Specify format options for the opened file. Format options can be
> > > specified
> > > +as a list of @var{key}=@var{value} pairs separated by ':'. For
> example,
> > > +some protocol you need to add protocol_whitelist for the opened file.
> > >  @end table
> > >
> > >  It allows overlaying a second video on top of the main input of
> > > diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
> > > index 220a43c..b89a680 100644
> > > --- a/libavfilter/src_movie.c
> > > +++ b/libavfilter/src_movie.c
> > > @@ -74,6 +74,7 @@ typedef struct MovieContext {
> > >      int max_stream_index; /**< max stream # actually used for output
> */
> > >      MovieStream *st; /**< array of all streams, one per output */
> > >      int *out_index; /**< stream number -> output number map, or -1 */
> > > +    AVDictionary *format_opts;
> > >  } MovieContext;
> > >
> > >  #define OFFSET(x) offsetof(MovieContext, x)
> > > @@ -92,6 +93,7 @@ static const AVOption movie_options[]= {
> > >      { "loop",         "set loop count",          OFFSET(loop_count),
> > >  AV_OPT_TYPE_INT,    {.i64 =  1},  0,        INT_MAX, FLAGS },
> > >      { "discontinuity", "set discontinuity threshold",
> > > OFFSET(discontinuity_threshold), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0,
> > > INT64_MAX, FLAGS },
> > >      { "dec_threads",  "set the number of threads for decoding",
> > > OFFSET(dec_threads), AV_OPT_TYPE_INT, {.i64 =  0}, 0, INT_MAX, FLAGS },
> > > +    { "format_opts",  "set format options for the opened file",
> > > OFFSET(format_opts), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, FLAGS},
> > >      { NULL },
> > >  };
> > >
> > > @@ -243,7 +245,7 @@ static av_cold int
> movie_common_init(AVFilterContext
> > > *ctx)
> > >      iformat = movie->format_name ?
> > > av_find_input_format(movie->format_name) : NULL;
> > >
> > >      movie->format_ctx = NULL;
> > > -    if ((ret = avformat_open_input(&movie->format_ctx,
> movie->file_name,
> > > iformat, NULL)) < 0) {
> > > +    if ((ret = avformat_open_input(&movie->format_ctx,
> movie->file_name,
> > > iformat, &movie->format_opts)) < 0) {
> > >          av_log(ctx, AV_LOG_ERROR,
> > >                 "Failed to avformat_open_input '%s'\n",
> movie->file_name);
> > >          return ret;
> > > --
> > > 1.8.3.1
> > >
> > >
> > Missing documentation entry.
> >
> > How is one user supposed to use this option? If I'm not mistaken this can
> > only work to specify first value only, and because of ':' separator next
> > ones will be taken by filter itself.
> Yes, the : need to add \ before it, below is one example used, I don't
> know how to express it
> clearly in the document. Add one example?
>
> ./ffplay -f lavfi
> "movie=filename='1.sdp':format_opts='protocol_whitelist=file,rtp,udp\:protocol_blacklist=rtmp'"
>

Cool, adding option example in filter documentation would be great.

>
> >
> > _______________________________________________
> > > ffmpeg-devel mailing list
> > > ffmpeg-devel@ffmpeg.org
> > > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> > >
> > > To unsubscribe, visit link above, or email
> > > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> > >
>
> --
> Thanks,
> Limin Wang
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
diff mbox series

Patch

diff --git a/doc/filters.texi b/doc/filters.texi
index 3731a14..f2d5957 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -28395,6 +28395,11 @@  timestamps.
 
 @item dec_threads
 Specifies the number of threads for decoding
+
+@item format_opts
+Specify format options for the opened file. Format options can be specified
+as a list of @var{key}=@var{value} pairs separated by ':'. For example,
+some protocol you need to add protocol_whitelist for the opened file.
 @end table
 
 It allows overlaying a second video on top of the main input of
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 220a43c..b89a680 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -74,6 +74,7 @@  typedef struct MovieContext {
     int max_stream_index; /**< max stream # actually used for output */
     MovieStream *st; /**< array of all streams, one per output */
     int *out_index; /**< stream number -> output number map, or -1 */
+    AVDictionary *format_opts;
 } MovieContext;
 
 #define OFFSET(x) offsetof(MovieContext, x)
@@ -92,6 +93,7 @@  static const AVOption movie_options[]= {
     { "loop",         "set loop count",          OFFSET(loop_count),   AV_OPT_TYPE_INT,    {.i64 =  1},  0,        INT_MAX, FLAGS },
     { "discontinuity", "set discontinuity threshold", OFFSET(discontinuity_threshold), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX, FLAGS },
     { "dec_threads",  "set the number of threads for decoding", OFFSET(dec_threads), AV_OPT_TYPE_INT, {.i64 =  0}, 0, INT_MAX, FLAGS },
+    { "format_opts",  "set format options for the opened file", OFFSET(format_opts), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, FLAGS},
     { NULL },
 };
 
@@ -243,7 +245,7 @@  static av_cold int movie_common_init(AVFilterContext *ctx)
     iformat = movie->format_name ? av_find_input_format(movie->format_name) : NULL;
 
     movie->format_ctx = NULL;
-    if ((ret = avformat_open_input(&movie->format_ctx, movie->file_name, iformat, NULL)) < 0) {
+    if ((ret = avformat_open_input(&movie->format_ctx, movie->file_name, iformat, &movie->format_opts)) < 0) {
         av_log(ctx, AV_LOG_ERROR,
                "Failed to avformat_open_input '%s'\n", movie->file_name);
         return ret;