ffmpeg: accept + prefix to -pix_fmt option to disable automatic conversions.

Nicolas George committed 14 years ago

Commit 9cf5bcd1 parent 440af103 files · +28 −0Browse files

Unified · Split

3 files

Changelog +1 −0
doc/ffmpeg.texi +8 −0
ffmpeg.c +19 −0

@@ -29,6 +29,7 @@ version next: · 28 unmodified lines
29	- add libavresample audio conversion library for compatibility	29	- add libavresample audio conversion library for compatibility
30	- MicroDVD decoder	30	- MicroDVD decoder
31	- Avid Meridien (AVUI) decoder	31	- Avid Meridien (AVUI) decoder
		32	- accept + prefix to -pix_fmt option to disable automatic conversions.
32		33
33		34
34	version 0.10:	35	version 0.10:

doc/ffmpeg.texi+8−0

@@ -418,6 +418,14 @@ also sources and sinks). This is an alias for @code{-filter:v}. · 417 unmodified lines
418	@item -pix_fmt[:@var{stream_specifier}] @var{format} (@emph{input/output,per-stream})	418	@item -pix_fmt[:@var{stream_specifier}] @var{format} (@emph{input/output,per-stream})
419	Set pixel format. Use @code{-pix_fmts} to show all the supported	419	Set pixel format. Use @code{-pix_fmts} to show all the supported
420	pixel formats.	420	pixel formats.
		421	If the selected pixel format can not be selected, ffmpeg will print a
		422	warning and select the best pixel format supported by the encoder.
		423	If @var{pix_fmt} is prefixed by a @code{+}, ffmpeg will exit with an error
		424	if the requested pixel format can not be selected, and automatic conversions
		425	inside filter graphs are disabled.
		426	If @var{pix_fmt} is a single @code{+}, ffmpeg selects the same pixel format
		427	as the input (or graph output) and automatic conversions are disabled.
		428
421	@item -sws_flags @var{flags} (@emph{input/output})	429	@item -sws_flags @var{flags} (@emph{input/output})
422	Set SwScaler flags.	430	Set SwScaler flags.
423	@item -vdt @var{n}	431	@item -vdt @var{n}

ffmpeg.c+19−0

     int copy_initial_nonkeyframes;
     enum PixelFormat pix_fmts[2];
+    int keep_pix_fmt;
 } OutputStream;
 static char *choose_pixel_fmts(OutputStream *ost)
 {
+    if (ost->keep_pix_fmt) {
+        if (ost->filter)
+            avfilter_graph_set_auto_convert(ost->filter->graph->graph,
+                                            AVFILTER_AUTO_CONVERT_NONE);
+        if (ost->st->codec->pix_fmt == PIX_FMT_NONE)
+            return NULL;
+        ost->pix_fmts[0] = ost->st->codec->pix_fmt;
+        return ost->pix_fmts;
+    }
     if (ost->st->codec->pix_fmt != PIX_FMT_NONE) {
         return av_strdup(av_get_pix_fmt_name(choose_pixel_fmt(ost->st, ost->enc, ost->st->codec->pix_fmt)));
     } else if (ost->enc->pix_fmts) {
             return ret;
     }
+    if (ost->keep_pix_fmt)
+        avfilter_graph_set_auto_convert(fg->graph,
+                                        AVFILTER_AUTO_CONVERT_NONE);
     if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0)
         return ret;
         video_enc->bits_per_raw_sample = frame_bits_per_raw_sample;
         MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st);
+        if (frame_pix_fmt && *frame_pix_fmt == '+') {
+            ost->keep_pix_fmt = 1;
+            if (!*++frame_pix_fmt)
+                frame_pix_fmt = NULL;
+        }
         if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == PIX_FMT_NONE) {
             av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
             exit_program(1);

ffmpeg: accept + prefix to -pix_fmt option to disable automatic conversions.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code