Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH 01/47] fftools/ffmpeg_mux_init: handle pixel format endianness
@ 2023-07-15 10:45 Anton Khirnov
  2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 02/47] fftools/ffmpeg_filter: move "smart" pixfmt selection to ffmpeg_mux_init Anton Khirnov
                   ` (46 more replies)
  0 siblings, 47 replies; 53+ messages in thread
From: Anton Khirnov @ 2023-07-15 10:45 UTC (permalink / raw)
  To: ffmpeg-devel

When -pix_fmt designates a BE/LE pixel format, it gets translated into
the native one by av_get_pix_fmt(). This may not always be the best
choice, as the encoder might only support one endianness. In such a
case, explicitly choose the endianness supported by the encoder.

While this is currently redundant with choose_pixel_fmt() in
ffmpeg_filter.c, the latter code will be deprecated in following commits.
---
 fftools/ffmpeg_mux_init.c | 55 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 6458414b5f..2d45fa7c7c 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -495,6 +495,54 @@ static int parse_matrix_coeffs(void *logctx, uint16_t *dest, const char *str)
     return 0;
 }
 
+static int fmt_in_list(const int *formats, int format)
+{
+    for (; *formats != -1; formats++)
+        if (*formats == format)
+            return 1;
+    return 0;
+}
+
+static enum AVPixelFormat pix_fmt_parse(OutputStream *ost, const char *name)
+{
+    const enum AVPixelFormat *fmts = ost->enc_ctx->codec->pix_fmts;
+    enum AVPixelFormat fmt;
+
+    fmt = av_get_pix_fmt(name);
+    if (fmt == AV_PIX_FMT_NONE) {
+        av_log(ost, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", name);
+        return AV_PIX_FMT_NONE;
+    }
+
+    /* when the user specified-format is an alias for an endianness-specific
+     * one (e.g. rgb48 -> rgb48be/le), it gets translated into the native
+     * endianness by av_get_pix_fmt();
+     * the following code handles the case when the native endianness is not
+     * supported by the encoder, but the other one is */
+    if (fmts && !fmt_in_list(fmts, fmt)) {
+        const char *name_canonical = av_get_pix_fmt_name(fmt);
+        int len = strlen(name_canonical);
+
+        if (strcmp(name, name_canonical) &&
+            (!strcmp(name_canonical + len - 2, "le") ||
+             !strcmp(name_canonical + len - 2, "be"))) {
+            char name_other[64];
+            enum AVPixelFormat fmt_other;
+
+            snprintf(name_other, sizeof(name_other), "%s%ce",
+                     name, name_canonical[len - 2] == 'l' ? 'b' : 'l');
+            fmt_other = av_get_pix_fmt(name_other);
+            if (fmt_other != AV_PIX_FMT_NONE && fmt_in_list(fmts, fmt_other)) {
+                av_log(ost, AV_LOG_VERBOSE, "Mapping pixel format %s->%s\n",
+                       name, name_other);
+                fmt = fmt_other;
+            }
+        }
+    }
+
+    return fmt;
+}
+
 static int new_stream_video(Muxer *mux, const OptionsContext *o,
                             OutputStream *ost)
 {
@@ -558,9 +606,10 @@ static int new_stream_video(Muxer *mux, const OptionsContext *o,
             if (!*++frame_pix_fmt)
                 frame_pix_fmt = NULL;
         }
-        if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == AV_PIX_FMT_NONE) {
-            av_log(ost, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
-            return AVERROR(EINVAL);
+        if (frame_pix_fmt) {
+            video_enc->pix_fmt = pix_fmt_parse(ost, frame_pix_fmt);
+            if (video_enc->pix_fmt == AV_PIX_FMT_NONE)
+                return AVERROR(EINVAL);
         }
 
         MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st);
-- 
2.40.1

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 53+ messages in thread

end of thread, other threads:[~2023-08-02  5:32 UTC | newest]

Thread overview: 53+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-15 10:45 [FFmpeg-devel] [PATCH 01/47] fftools/ffmpeg_mux_init: handle pixel format endianness Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 02/47] fftools/ffmpeg_filter: move "smart" pixfmt selection to ffmpeg_mux_init Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 03/47] fftools/ffmpeg_mux_init: deprecate "smart" pixel format selection Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 04/47] tests/fate: fix mismatches between requested and actually used pixel formats Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 05/47] fftools/ffmpeg_filter: stop accessing encoder from pixfmt selection Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 06/47] fftools/ffmpeg_filter: restrict reap_filters() to a single filtergraph Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 07/47] fftools/ffmpeg_mux_init: avoid invalid memory access in set_dispositions() Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 08/47] fftools/ffmpeg_enc: return errors from enc_frame() instead of aborting Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 09/47] fftools/ffmpeg_enc: return errors from enc_open() " Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 10/47] fftools/ffmpeg_enc: return errors from do_*_out() " Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 11/47] fftools/ffmpeg_enc: return errors from enc_flush() " Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 12/47] fftools/ffmpeg_enc: return errors from encode_frame() " Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 13/47] fftools/ffmpeg_mux: return errors from of_output_packet() " Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 14/47] fftools/ffmpeg_dec: return error codes from dec_packet() " Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 15/47] fftools/ffmpeg_dec: drop redundant handling of AVERROR_EXPERIMENTAL Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 16/47] fftools/ffmpeg_filter: return error codes from ofilter_bind_ost() instead of aborting Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 17/47] fftools/ffmpeg_filter: return error codes from init_input_filter() " Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 18/47] fftools/ffmpeg_filter: replace remaining exit_program() with error codes Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 19/47] fftools/ffmpeg_filter: return error codes from choose_pix_fmts() instead of aborting Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 20/47] fftools/ffmpeg_filter: return error codes from fg_create() " Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 21/47] fftools/ffmpeg_filter: return error codes from set_channel_layout() " Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 22/47] fftools/ffmpeg_filter: replace remaining report_and_exit() with error codes Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 23/47] fftools/cmdutils: return error codes from setup_find_stream_info_opts() instead of aborting Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 24/47] fftools/ffmpeg_opt: reimplement -streamid using a dictionary Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 25/47] fftools/cmdutils: drop unused ALLOC_ARRAY_ELEM() Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 26/47] fftools/cmdutils: add error handling to allocate_array_elem() Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 27/47] fftools/cmdutils: add error handling to grow_array() Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 28/47] fftools/cmdutils: add error handling to GROW_ARRAY() Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 29/47] fftools/ffmpeg: return errors from find_codec_or_die() instead of aborting Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 30/47] fftools/ffmpeg_opt: replace exit_program() with returning error codes Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 31/47] fftools/opt_common: " Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 32/47] fftools: return errors from parse_number_or_die() instead of aborting Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 33/47] fftools: remove parse_time_or_die() Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 34/47] fftools: handle errors in parse_options() Anton Khirnov
2023-07-15 10:45 ` [FFmpeg-devel] [PATCH 35/47] fftools/cmdutils: constify the first parameter of filter_codec_opts() Anton Khirnov
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 36/47] fftools/cmdutils: add error handling to filter_codec_opts() Anton Khirnov
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 37/47] fftools/ffmpeg_opt: consolidate printing errors in ffmpeg_parse_options() Anton Khirnov
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 38/47] fftools/ffmpeg: consolidate exiting from main() on error Anton Khirnov
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 39/47] fftools/cmdutils: return AVERROR_EXIT for OPT_EXIT options instead of aborting() Anton Khirnov
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 40/47] fftools/ffmpeg: return an error from assert_avoptions() instead of aborting Anton Khirnov
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 41/47] fftools/ffmpeg: return an error from MATCH_PER_STREAM_OPT() " Anton Khirnov
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 42/47] fftools/ffprobe: replace report_and_exit() with returning error codes Anton Khirnov
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 43/47] fftools/ffplay: replace report_and_exit() with returning an error code Anton Khirnov
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 44/47] fftools/opt_common: " Anton Khirnov
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 45/47] fftools/ffprobe: inline opt_output_file() into its only caller Anton Khirnov
2023-08-02  5:28   ` Stefano Sabatini
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 46/47] fftools/ffprobe: stop calling exit_program() Anton Khirnov
2023-07-20 20:35   ` Marton Balint
2023-07-21 12:06     ` Anton Khirnov
2023-07-21 12:14       ` Anton Khirnov
2023-08-02  5:32   ` Stefano Sabatini
2023-07-15 10:46 ` [FFmpeg-devel] [PATCH 47/47] fftools/ffmpeg: " Anton Khirnov
2023-07-20 18:56 ` [FFmpeg-devel] [PATCH 01/47] fftools/ffmpeg_mux_init: handle pixel format endianness Anton Khirnov

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git