[FFmpeg-devel] [PATCH] tools: move raw-test program to tools, with the name pixfmt2fourcc
Stefano Sabatini
stefasab at gmail.com
Fri Sep 14 14:14:07 CEST 2012
---
libavcodec/Makefile | 3 +-
libavcodec/raw.c | 95 -----------------------------------------
tools/pixfmt2fourcc.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 115 insertions(+), 96 deletions(-)
create mode 100644 tools/pixfmt2fourcc.c
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 988c999..740dc47 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -778,12 +778,13 @@ TESTPROGS = cabac \
golomb \
iirfilter \
rangecoder \
- raw \
snowenc \
TESTPROGS-$(HAVE_MMX) += motion
TESTOBJS = dctref.o
+TOOLS = pixfmt2fourcc
+
HOSTPROGS = aac_tablegen \
aacps_tablegen \
cbrt_tablegen \
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 0475cd2..35d98f0 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -187,98 +187,3 @@ unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt)
}
return 0;
}
-
-#ifdef TEST
-
-#include <unistd.h> /* getopt */
-#include "libavutil/pixdesc.h"
-
-#undef printf
-#undef fprintf
-
-static void usage(void)
-{
- printf("\n"
- "Options:\n"
- "-l list the pixel format for each fourcc\n"
- "-L list the fourccs for each pixel format\n"
- "-p PIX_FMT given a pixel format, print the list of associated fourccs\n"
- "-h print this help\n");
-}
-
-static void print_pix_fmt_fourccs(enum PixelFormat pix_fmt, char sep)
-{
- int i;
-
- for (i = 0; i < FF_ARRAY_ELEMS(ff_raw_pix_fmt_tags); i++) {
- if (ff_raw_pix_fmt_tags[i].pix_fmt == pix_fmt) {
- char buf[32];
- av_get_codec_tag_string(buf, sizeof(buf), ff_raw_pix_fmt_tags[i].fourcc);
- printf("%s%c", buf, sep);
- }
- }
-}
-
-int main(int argc, char **argv)
-{
- int i, list_fourcc_pix_fmt = 0, list_pix_fmt_fourccs = 0;
- const char *pix_fmt_name = NULL;
- char c;
-
- if (argc == 1) {
- usage();
- return 0;
- }
-
- while ((c = getopt(argc, argv, "hp:lL")) != -1) {
- switch (c) {
- case 'h':
- usage();
- return 0;
- case 'l':
- list_fourcc_pix_fmt = 1;
- break;
- case 'L':
- list_pix_fmt_fourccs = 1;
- break;
- case 'p':
- pix_fmt_name = optarg;
- break;
- case '?':
- usage();
- return 1;
- }
- }
-
- if (list_fourcc_pix_fmt) {
- for (i = 0; i < FF_ARRAY_ELEMS(ff_raw_pix_fmt_tags); i++) {
- char buf[32];
- av_get_codec_tag_string(buf, sizeof(buf), ff_raw_pix_fmt_tags[i].fourcc);
- if (ff_raw_pix_fmt_tags[i].pix_fmt != PIX_FMT_NONE)
- printf("%s: %s\n", buf, av_get_pix_fmt_name(ff_raw_pix_fmt_tags[i].pix_fmt));
- }
- }
-
- if (list_pix_fmt_fourccs) {
- for (i = 0; i < PIX_FMT_NB; i++) {
- const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[i];
- if (!pix_desc->name || pix_desc->flags & PIX_FMT_HWACCEL)
- continue;
- printf("%s: ", pix_desc->name);
- print_pix_fmt_fourccs(i, ' ');
- printf("\n");
- }
- }
-
- if (pix_fmt_name) {
- enum PixelFormat pix_fmt = av_get_pix_fmt(pix_fmt_name);
- if (pix_fmt == PIX_FMT_NONE) {
- fprintf(stderr, "Invalid pixel format selected '%s'\n", pix_fmt_name);
- return 1;
- }
- print_pix_fmt_fourccs(pix_fmt, '\n');
- }
-
- return 0;
-}
-#endif
diff --git a/tools/pixfmt2fourcc.c b/tools/pixfmt2fourcc.c
new file mode 100644
index 0000000..ddaee4b
--- /dev/null
+++ b/tools/pixfmt2fourcc.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2012 Stefano Sabatini
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <unistd.h> /* getopt */
+#include "libavutil/pixdesc.h"
+#include "libavcodec/avcodec.h"
+#include "libavutil/common.h"
+#include "libavcodec/raw.h"
+
+static void usage(void)
+{
+ printf("Show the relationships between rawvideo pixel formats and FourCC tags.\n");
+ printf("usage: pixfmt2fourcc [OPTIONS]\n");
+ printf("\n"
+ "Options:\n"
+ "-l list the pixel format for each fourcc\n"
+ "-L list the fourccs for each pixel format\n"
+ "-p PIX_FMT given a pixel format, print the list of associated fourccs (one per line)\n"
+ "-h print this help\n");
+}
+
+static void print_pix_fmt_fourccs(enum PixelFormat pix_fmt, char sep)
+{
+ int i;
+
+ for (i = 0; ff_raw_pix_fmt_tags[i].pix_fmt != PIX_FMT_NONE; i++) {
+ if (ff_raw_pix_fmt_tags[i].pix_fmt == pix_fmt) {
+ char buf[32];
+ av_get_codec_tag_string(buf, sizeof(buf), ff_raw_pix_fmt_tags[i].fourcc);
+ printf("%s%c", buf, sep);
+ }
+ }
+}
+
+int main(int argc, char **argv)
+{
+ int i, list_fourcc_pix_fmt = 0, list_pix_fmt_fourccs = 0;
+ const char *pix_fmt_name = NULL;
+ char c;
+
+ if (argc == 1) {
+ usage();
+ return 0;
+ }
+
+ while ((c = getopt(argc, argv, "hp:lL")) != -1) {
+ switch (c) {
+ case 'h':
+ usage();
+ return 0;
+ case 'l':
+ list_fourcc_pix_fmt = 1;
+ break;
+ case 'L':
+ list_pix_fmt_fourccs = 1;
+ break;
+ case 'p':
+ pix_fmt_name = optarg;
+ break;
+ case '?':
+ usage();
+ return 1;
+ }
+ }
+
+ if (list_fourcc_pix_fmt) {
+ for (i = 0; ff_raw_pix_fmt_tags[i].pix_fmt != PIX_FMT_NONE; i++) {
+ char buf[32];
+ av_get_codec_tag_string(buf, sizeof(buf), ff_raw_pix_fmt_tags[i].fourcc);
+ printf("%s: %s\n", buf, av_get_pix_fmt_name(ff_raw_pix_fmt_tags[i].pix_fmt));
+ }
+ }
+
+ if (list_pix_fmt_fourccs) {
+ for (i = 0; i < PIX_FMT_NB; i++) {
+ const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[i];
+ if (!pix_desc->name || pix_desc->flags & PIX_FMT_HWACCEL)
+ continue;
+ printf("%s: ", pix_desc->name);
+ print_pix_fmt_fourccs(i, ' ');
+ printf("\n");
+ }
+ }
+
+ if (pix_fmt_name) {
+ enum PixelFormat pix_fmt = av_get_pix_fmt(pix_fmt_name);
+ if (pix_fmt == PIX_FMT_NONE) {
+ fprintf(stderr, "Invalid pixel format selected '%s'\n", pix_fmt_name);
+ return 1;
+ }
+ print_pix_fmt_fourccs(pix_fmt, '\n');
+ }
+
+ return 0;
+}
+
--
1.7.5.4
More information about the ffmpeg-devel
mailing list