[FFmpeg-devel] [PATCH 1/3] lavf/fifo: sort options by name

[Marth64]

LGTM. Options before are the same as after change.

On Mon, Mar 11, 2024 at 11:15 AM Stefano Sabatini <stefasab at gmail.com>
wrote:

> ---
>  libavformat/fifo.c | 28 ++++++++++++++--------------
>  1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/libavformat/fifo.c b/libavformat/fifo.c
> index 074a46485c..a3d41ba0d3 100644
> --- a/libavformat/fifo.c
> +++ b/libavformat/fifo.c
> @@ -663,36 +663,36 @@ static void fifo_deinit(AVFormatContext *avf)
>
>  #define OFFSET(x) offsetof(FifoContext, x)
>  static const AVOption options[] = {
> -        {"fifo_format", "Target muxer", OFFSET(format),
> -         AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0,
> AV_OPT_FLAG_ENCODING_PARAM},
> -
> -        {"queue_size", "Size of fifo queue", OFFSET(queue_size),
> -         AV_OPT_TYPE_INT, {.i64 = FIFO_DEFAULT_QUEUE_SIZE}, 1, INT_MAX,
> AV_OPT_FLAG_ENCODING_PARAM},
> -
> -        {"format_opts", "Options to be passed to underlying muxer",
> OFFSET(format_options),
> -         AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0,
> AV_OPT_FLAG_ENCODING_PARAM},
> +        {"attempt_recovery", "Attempt recovery in case of failure",
> OFFSET(attempt_recovery),
> +        AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
>
>          {"drop_pkts_on_overflow", "Drop packets on fifo queue overflow
> not to block encoder", OFFSET(drop_pkts_on_overflow),
>           AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
>
> -        {"restart_with_keyframe", "Wait for keyframe when restarting
> output", OFFSET(restart_with_keyframe),
> -         AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
> +        {"fifo_format", "Target muxer", OFFSET(format),
> +         AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0,
> AV_OPT_FLAG_ENCODING_PARAM},
>
> -        {"attempt_recovery", "Attempt recovery in case of failure",
> OFFSET(attempt_recovery),
> -        AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
> +        {"format_opts", "Options to be passed to underlying muxer",
> OFFSET(format_options),
> +         AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0,
> AV_OPT_FLAG_ENCODING_PARAM},
>
>          {"max_recovery_attempts", "Maximal number of recovery attempts",
> OFFSET(max_recovery_attempts),
>           AV_OPT_TYPE_INT, {.i64 = FIFO_DEFAULT_MAX_RECOVERY_ATTEMPTS}, 0,
> INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},
>
> -        {"recovery_wait_time", "Waiting time between recovery attempts",
> OFFSET(recovery_wait_time),
> -         AV_OPT_TYPE_DURATION, {.i64 =
> FIFO_DEFAULT_RECOVERY_WAIT_TIME_USEC}, 0, INT64_MAX,
> AV_OPT_FLAG_ENCODING_PARAM},
> +        {"queue_size", "Size of fifo queue", OFFSET(queue_size),
> +         AV_OPT_TYPE_INT, {.i64 = FIFO_DEFAULT_QUEUE_SIZE}, 1, INT_MAX,
> AV_OPT_FLAG_ENCODING_PARAM},
>
>          {"recovery_wait_streamtime", "Use stream time instead of real
> time while waiting for recovery",
>           OFFSET(recovery_wait_streamtime), AV_OPT_TYPE_BOOL, {.i64 = 0},
> 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
>
> +        {"recovery_wait_time", "Waiting time between recovery attempts",
> OFFSET(recovery_wait_time),
> +         AV_OPT_TYPE_DURATION, {.i64 =
> FIFO_DEFAULT_RECOVERY_WAIT_TIME_USEC}, 0, INT64_MAX,
> AV_OPT_FLAG_ENCODING_PARAM},
> +
>          {"recover_any_error", "Attempt recovery regardless of type of the
> error", OFFSET(recover_any_error),
>           AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
>
> +        {"restart_with_keyframe", "Wait for keyframe when restarting
> output", OFFSET(restart_with_keyframe),
> +         AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
> +
>          {"timeshift", "Delay fifo output", OFFSET(timeshift),
>           AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX,
> AV_OPT_FLAG_ENCODING_PARAM},
>
> --
> 2.34.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>