diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-11 19:10:10 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-11 19:13:03 +0100 |
commit | 96d616052b3d39678e477fa10610ca688f46fff9 (patch) | |
tree | 8bd31d06318bc786ea8f1d84f92090c9c860bc11 /libavfilter | |
parent | 27506aceda8115f82f89691a4441d62a8cf24a6e (diff) | |
parent | d12b5b2f135aade4099f4b26b0fe678656158c13 (diff) |
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
* commit 'd12b5b2f135aade4099f4b26b0fe678656158c13':
build: Split test programs off into separate files
Some conversions done by: James Almer <jamrial@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/filtfmts-test.c (renamed from libavfilter/filtfmts.c) | 0 | ||||
-rw-r--r-- | libavfilter/formats-test.c | 65 | ||||
-rw-r--r-- | libavfilter/formats.c | 49 |
3 files changed, 65 insertions, 49 deletions
diff --git a/libavfilter/filtfmts.c b/libavfilter/filtfmts-test.c index 46a2d9447d..46a2d9447d 100644 --- a/libavfilter/filtfmts.c +++ b/libavfilter/filtfmts-test.c diff --git a/libavfilter/formats-test.c b/libavfilter/formats-test.c new file mode 100644 index 0000000000..a8916383e6 --- /dev/null +++ b/libavfilter/formats-test.c @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2007 Bobby Bingham + * + * 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 "formats.c" + +#undef printf + +int main(void) +{ + const int64_t *cl; + char buf[512]; + int i; + const char *teststrings[] ={ + "blah", + "1", + "2", + "-1", + "60", + "65", + "1c", + "2c", + "-1c", + "60c", + "65c", + "5.1", + "stereo", + "1+1+1+1", + "1c+1c+1c+1c", + "2c+1c", + "0x3", + }; + + for (cl = avfilter_all_channel_layouts; *cl != -1; cl++) { + av_get_channel_layout_string(buf, sizeof(buf), -1, *cl); + printf("%s\n", buf); + } + + for ( i = 0; i<FF_ARRAY_ELEMS(teststrings); i++) { + int64_t layout = -1; + int count = -1; + int ret; + ret = ff_parse_channel_layout(&layout, &count, teststrings[i], NULL); + + printf ("%d = ff_parse_channel_layout(%016"PRIX64", %2d, %s);\n", ret ? -1 : 0, layout, count, teststrings[i]); + } + + return 0; +} diff --git a/libavfilter/formats.c b/libavfilter/formats.c index f12dcf4783..20f45e33cc 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -683,52 +683,3 @@ int ff_parse_channel_layout(int64_t *ret, int *nret, const char *arg, *nret = av_get_channel_layout_nb_channels(chlayout); return 0; } - -#ifdef TEST - -#undef printf - -int main(void) -{ - const int64_t *cl; - char buf[512]; - int i; - const char *teststrings[] ={ - "blah", - "1", - "2", - "-1", - "60", - "65", - "1c", - "2c", - "-1c", - "60c", - "65c", - "5.1", - "stereo", - "1+1+1+1", - "1c+1c+1c+1c", - "2c+1c", - "0x3", - }; - - for (cl = avfilter_all_channel_layouts; *cl != -1; cl++) { - av_get_channel_layout_string(buf, sizeof(buf), -1, *cl); - printf("%s\n", buf); - } - - for ( i = 0; i<FF_ARRAY_ELEMS(teststrings); i++) { - int64_t layout = -1; - int count = -1; - int ret; - ret = ff_parse_channel_layout(&layout, &count, teststrings[i], NULL); - - printf ("%d = ff_parse_channel_layout(%016"PRIX64", %2d, %s);\n", ret ? -1 : 0, layout, count, teststrings[i]); - } - - return 0; -} - -#endif - |