lavu/opt: add AV_OPT_SAMPLE_FMT option

Stefano Sabatini committed 14 years ago

Commit 481fdee1 parent 7be09a94 files · +33 −1Browse files

Unified · Split

4 files

doc/APIchanges +3 −0
libavutil/opt.c +28 −0
libavutil/opt.h +1 −0
libavutil/version.h +1 −1

@@ -15,6 +15,9 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2012-11-03 - xxxxxxx - lavu 52.3.100 - opt.h
		19	Add AV_OPT_TYPE_SAMPLE_FMT value to AVOptionType enum.
		20
18	2012-10-21 - xxxxxxx - lavc 54.68.100 - avcodec.h	21	2012-10-21 - xxxxxxx - lavc 54.68.100 - avcodec.h
19	lavfi 3.20.100 - avfilter.h	22	lavfi 3.20.100 - avfilter.h
20	Add AV_PKT_DATA_STRINGS_METADATA side data type, used to transmit key/value	23	Add AV_PKT_DATA_STRINGS_METADATA side data type, used to transmit key/value

libavutil/opt.c+28−0

 #include "parseutils.h"
 #include "pixdesc.h"
 #include "mathematics.h"
+#include "samplefmt.h"
 #if FF_API_FIND_OPT
 //FIXME order them and do a bin search
         }
         *(enum AVPixelFormat *)dst = ret;
         return 0;
+    case AV_OPT_TYPE_SAMPLE_FMT:
+        if (!val || !strcmp(val, "none")) {
+            ret = AV_SAMPLE_FMT_NONE;
+        } else {
+            ret = av_get_sample_fmt(val);
+            if (ret == AV_SAMPLE_FMT_NONE) {
+                char *tail;
+                ret = strtol(val, &tail, 0);
+                if (*tail || (unsigned)ret >= AV_SAMPLE_FMT_NB) {
+                    av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as sample format\n", val);
+                    return AVERROR(EINVAL);
+                }
+            }
+        }
+        *(enum AVSampleFormat *)dst = ret;
+        return 0;
     }
     av_log(obj, AV_LOG_ERROR, "Invalid option type.\n");
     case AV_OPT_TYPE_PIXEL_FMT:
         ret = snprintf(buf, sizeof(buf), "%s", (char *)av_x_if_null(av_get_pix_fmt_name(*(enum AVPixelFormat *)dst), "none"));
         break;
+    case AV_OPT_TYPE_SAMPLE_FMT:
+        ret = snprintf(buf, sizeof(buf), "%s", (char *)av_x_if_null(av_get_sample_fmt_name(*(enum AVSampleFormat *)dst), "none"));
+        break;
     default:
         return AVERROR(EINVAL);
     }
             case AV_OPT_TYPE_PIXEL_FMT:
                 av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<pix_fmt>");
                 break;
+            case AV_OPT_TYPE_SAMPLE_FMT:
+                av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<sample_fmt>");
+                break;
             case AV_OPT_TYPE_CONST:
             default:
                 av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "");
     AVRational rational;
     int w, h;
     enum AVPixelFormat pix_fmt;
+    enum AVSampleFormat sample_fmt;
 } TestContext;
 #define OFFSET(x) offsetof(TestContext, x)
 {"mu",       "set mu flag ",   0,                AV_OPT_TYPE_CONST,    {.i64 = TEST_FLAG_MU},   INT_MIN,  INT_MAX, 0, "flags" },
 {"size",     "set size",       OFFSET(w),        AV_OPT_TYPE_IMAGE_SIZE,{0},             0,        0                   },
 {"pix_fmt",  "set pixfmt",     OFFSET(pix_fmt),  AV_OPT_TYPE_PIXEL_FMT,{0},              0,        0                   },
+{"sample_fmt", "set samplefmt", OFFSET(sample_fmt), AV_OPT_TYPE_SAMPLE_FMT,{0},          0,        0                   },
 {NULL},
 };
             "pix_fmt=yuv420p",
             "pix_fmt=2",
             "pix_fmt=bogus",
+            "sample_fmt=s16",
+            "sample_fmt=2",
+            "sample_fmt=bogus",
         };
         test_ctx.class = &test_class;

libavutil/opt.h+1−0

@@ -227,6 +227,7 @@ enum AVOptionType{ · 226 unmodified lines
227	AV_OPT_TYPE_CONST = 128,	227	AV_OPT_TYPE_CONST = 128,
228	AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers	228	AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers
229	AV_OPT_TYPE_PIXEL_FMT = MKBETAG('P','F','M','T'),	229	AV_OPT_TYPE_PIXEL_FMT = MKBETAG('P','F','M','T'),
		230	AV_OPT_TYPE_SAMPLE_FMT = MKBETAG('S','F','M','T'),
230	#if FF_API_OLD_AVOPTIONS	231	#if FF_API_OLD_AVOPTIONS
231	FF_OPT_TYPE_FLAGS = 0,	232	FF_OPT_TYPE_FLAGS = 0,
232	FF_OPT_TYPE_INT,	233	FF_OPT_TYPE_INT,

libavutil/version.h+1−1

@@ -75,7 +75,7 @@ · 74 unmodified lines
75	*/	75	*/
76		76
77	#define LIBAVUTIL_VERSION_MAJOR 52	77	#define LIBAVUTIL_VERSION_MAJOR 52
78	#define LIBAVUTIL_VERSION_MINOR 2	78	#define LIBAVUTIL_VERSION_MINOR 3
79	#define LIBAVUTIL_VERSION_MICRO 100	79	#define LIBAVUTIL_VERSION_MICRO 100
80		80
81	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	81	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

lavu/opt: add AV_OPT_SAMPLE_FMT option

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code