From a2dd68d6b40edfe877e3d70cdfc15074b8de69d7 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Tue, 11 Aug 2009 17:54:11 +0000 Subject: Allow out-formats for IMGFMT_RGB48* in codecs.conf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29488 b3059339-0415-0410-9bf9-f77b7e298cf2 --- codec-cfg.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'codec-cfg.c') diff --git a/codec-cfg.c b/codec-cfg.c index bb604aa19b..6ae8486027 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -165,6 +165,8 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int {"RGB16", IMGFMT_RGB|16}, {"RGB24", IMGFMT_RGB|24}, {"RGB32", IMGFMT_RGB|32}, + {"RG48LE", IMGFMT_RGB|48}, + {"RG48BE", IMGFMT_RGB|49}, {"BGR4", IMGFMT_BGR|4}, {"BGR8", IMGFMT_BGR|8}, {"BGR15", IMGFMT_BGR|15}, -- cgit v1.2.3 From 8541fcf3651cd1a3b6e60e0d33edc92ece01dfd7 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 11 Aug 2009 18:15:21 +0000 Subject: fmt_table should be const as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29491 b3059339-0415-0410-9bf9-f77b7e298cf2 --- codec-cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'codec-cfg.c') diff --git a/codec-cfg.c b/codec-cfg.c index 6ae8486027..8fd6b2ade2 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -138,7 +138,7 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int return 1; } - static struct { + static const struct { const char *name; const unsigned int num; } fmt_table[] = { -- cgit v1.2.3 From 6960e4c1b1ccccba6ccd7e48d5c882a527632b81 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 11 Aug 2009 18:21:31 +0000 Subject: Explain how formats must be ordered in fmt_list so the parser can handle names where one matches the beginning of another. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29492 b3059339-0415-0410-9bf9-f77b7e298cf2 --- codec-cfg.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'codec-cfg.c') diff --git a/codec-cfg.c b/codec-cfg.c index 8fd6b2ade2..eaafaa3347 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -142,6 +142,9 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int const char *name; const unsigned int num; } fmt_table[] = { + // note: due to parser deficiencies/simplicity, if one format + // name matches the beginning of another, the longer one _must_ + // come first in this list. {"YV12", IMGFMT_YV12}, {"I420", IMGFMT_I420}, {"IYUV", IMGFMT_IYUV}, -- cgit v1.2.3 From e9db7e8b4f38806bbdad104d48231e3b19dc42ce Mon Sep 17 00:00:00 2001 From: cehoyos Date: Tue, 11 Aug 2009 18:57:22 +0000 Subject: s/RG48xE/RGB48xE git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29496 b3059339-0415-0410-9bf9-f77b7e298cf2 --- codec-cfg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'codec-cfg.c') diff --git a/codec-cfg.c b/codec-cfg.c index eaafaa3347..764457467b 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -162,14 +162,14 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int {"UYVY", IMGFMT_UYVY}, {"YVYU", IMGFMT_YVYU}, + {"RGB48LE", IMGFMT_RGB|48}, + {"RGB48BE", IMGFMT_RGB|49}, {"RGB4", IMGFMT_RGB|4}, {"RGB8", IMGFMT_RGB|8}, {"RGB15", IMGFMT_RGB|15}, {"RGB16", IMGFMT_RGB|16}, {"RGB24", IMGFMT_RGB|24}, {"RGB32", IMGFMT_RGB|32}, - {"RG48LE", IMGFMT_RGB|48}, - {"RG48BE", IMGFMT_RGB|49}, {"BGR4", IMGFMT_BGR|4}, {"BGR8", IMGFMT_BGR|8}, {"BGR15", IMGFMT_BGR|15}, -- cgit v1.2.3 From a3d39e2702b0b9d3abc721b60216fbd866fea48e Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 12 Aug 2009 01:03:21 +0000 Subject: 100l, fix compilation again and make codec-cfg.c use the predefined constants instead of reimplementing the IMGFMT_RGB|bit_depth logic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29500 b3059339-0415-0410-9bf9-f77b7e298cf2 --- codec-cfg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'codec-cfg.c') diff --git a/codec-cfg.c b/codec-cfg.c index 764457467b..c0246e9f21 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -162,8 +162,8 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int {"UYVY", IMGFMT_UYVY}, {"YVYU", IMGFMT_YVYU}, - {"RGB48LE", IMGFMT_RGB|48}, - {"RGB48BE", IMGFMT_RGB|49}, + {"RGB48LE", IMGFMT_RGB48LE}, + {"RGB48BE", IMGFMT_RGB48BE}, {"RGB4", IMGFMT_RGB|4}, {"RGB8", IMGFMT_RGB|8}, {"RGB15", IMGFMT_RGB|15}, -- cgit v1.2.3 From b6c472202f7ca15a07e665b5c0f29d6391e211d1 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 12 Aug 2009 01:04:37 +0000 Subject: make codec-cfg reuse the proper defined constants for all RGB/BGR formats instead of re-constructing them itself. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29501 b3059339-0415-0410-9bf9-f77b7e298cf2 --- codec-cfg.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'codec-cfg.c') diff --git a/codec-cfg.c b/codec-cfg.c index c0246e9f21..86424b54c4 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -164,20 +164,20 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int {"RGB48LE", IMGFMT_RGB48LE}, {"RGB48BE", IMGFMT_RGB48BE}, - {"RGB4", IMGFMT_RGB|4}, - {"RGB8", IMGFMT_RGB|8}, - {"RGB15", IMGFMT_RGB|15}, - {"RGB16", IMGFMT_RGB|16}, - {"RGB24", IMGFMT_RGB|24}, - {"RGB32", IMGFMT_RGB|32}, - {"BGR4", IMGFMT_BGR|4}, - {"BGR8", IMGFMT_BGR|8}, - {"BGR15", IMGFMT_BGR|15}, - {"BGR16", IMGFMT_BGR|16}, - {"BGR24", IMGFMT_BGR|24}, - {"BGR32", IMGFMT_BGR|32}, - {"RGB1", IMGFMT_RGB|1}, - {"BGR1", IMGFMT_BGR|1}, + {"RGB4", IMGFMT_RGB4}, + {"RGB8", IMGFMT_RGB8}, + {"RGB15", IMGFMT_RGB15}, + {"RGB16", IMGFMT_RGB16}, + {"RGB24", IMGFMT_RGB24}, + {"RGB32", IMGFMT_RGB32}, + {"BGR4", IMGFMT_BGR4}, + {"BGR8", IMGFMT_BGR8}, + {"BGR15", IMGFMT_BGR15}, + {"BGR16", IMGFMT_BGR16}, + {"BGR24", IMGFMT_BGR24}, + {"BGR32", IMGFMT_BGR32}, + {"RGB1", IMGFMT_RGB1}, + {"BGR1", IMGFMT_BGR1}, {"MPES", IMGFMT_MPEGPES}, {"ZRMJPEGNI", IMGFMT_ZRMJPEGNI}, -- cgit v1.2.3