mirror of https://github.com/mpv-player/mpv
lots of changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@320 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
szabii
parent
7087dc33ee
commit
d90e255e2c
389
codec-cfg.c
389
codec-cfg.c
|
|
@ -1,8 +1,18 @@
|
|||
/*
|
||||
* codec.conf parser
|
||||
* by Szabolcs Berecz <szabi@inf.elte.hu>
|
||||
* (C) 2001
|
||||
*/
|
||||
|
||||
//#define DEBUG
|
||||
#define PRINT_LINENUM
|
||||
// printf("%s(%d): ", cfgfile, line_num)
|
||||
#define DEBUG
|
||||
|
||||
#ifdef DEBUG
|
||||
#define DBG(str, args...) printf(str, ##args)
|
||||
#else
|
||||
#define DBG(str, args...) do {} while (0)
|
||||
#endif
|
||||
|
||||
#define PRINT_LINENUM printf("%s(%d): ", cfgfile, line_num)
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
@ -16,7 +26,7 @@
|
|||
#include "libvo/video_out.h"
|
||||
#include "codec-cfg.h"
|
||||
|
||||
#define MALLOC_ADD 10
|
||||
#define MAX_NR_TOKEN 16
|
||||
|
||||
#define MAX_LINE_LEN 1000
|
||||
|
||||
|
|
@ -32,21 +42,28 @@
|
|||
|
||||
#define RET_EOF -1
|
||||
#define RET_EOL -2
|
||||
#define RET_OK 0
|
||||
|
||||
static FILE *fp;
|
||||
static int line_num = 0;
|
||||
static int line_pos; /* line pos */
|
||||
static int firstdef = 1;
|
||||
static char *line;
|
||||
static char *token;
|
||||
static char *token[MAX_NR_TOKEN];
|
||||
|
||||
static codecs_t *codecs=NULL;
|
||||
static int nr_codecs = 0;
|
||||
|
||||
static int get_token(void)
|
||||
static int get_token(int min, int max)
|
||||
{
|
||||
static int read_nextline = 1;
|
||||
int i;
|
||||
char c;
|
||||
|
||||
if (max >= MAX_NR_TOKEN) {
|
||||
printf("\nget_token(): max >= MAX_NR_TOKEN!\n");
|
||||
goto ret_eof;
|
||||
}
|
||||
|
||||
memset(token, 0x00, sizeof(*token) * max);
|
||||
|
||||
if (read_nextline) {
|
||||
if (!fgets(line, MAX_LINE_LEN, fp))
|
||||
|
|
@ -55,106 +72,103 @@ static int get_token(void)
|
|||
++line_num;
|
||||
read_nextline = 0;
|
||||
}
|
||||
while (isspace(line[line_pos]))
|
||||
++line_pos;
|
||||
if (line[line_pos] == '\0' || line[line_pos] == '#' ||
|
||||
line[line_pos] == ';') {
|
||||
read_nextline = 1;
|
||||
goto ret_eol;
|
||||
}
|
||||
token = line + line_pos;
|
||||
if (line[line_pos] == '"') {
|
||||
token++;
|
||||
for (/* NOTHING */; line[++line_pos] != '"' && line[line_pos];)
|
||||
/* NOTHING */;
|
||||
if (!line[line_pos]) {
|
||||
for (i = 0; i < max; i++) {
|
||||
while (isspace(line[line_pos]))
|
||||
++line_pos;
|
||||
if (line[line_pos] == '\0' || line[line_pos] == '#' ||
|
||||
line[line_pos] == ';') {
|
||||
read_nextline = 1;
|
||||
if (i >= min)
|
||||
goto ret_ok;
|
||||
goto ret_eol;
|
||||
}
|
||||
} else {
|
||||
for (/* NOTHING */; !isspace(line[line_pos]); line_pos++)
|
||||
/* NOTHING */;
|
||||
token[i] = line + line_pos;
|
||||
c = line[line_pos];
|
||||
if (c == '"' || c == '\'') {
|
||||
token[i]++;
|
||||
while (line[++line_pos] != c && line[line_pos])
|
||||
/* NOTHING */;
|
||||
} else {
|
||||
for (/* NOTHING */; !isspace(line[line_pos]) &&
|
||||
line[line_pos]; line_pos++)
|
||||
/* NOTHING */;
|
||||
}
|
||||
if (!line[line_pos]) {
|
||||
read_nextline = 1;
|
||||
if (i >= min - 1)
|
||||
goto ret_ok;
|
||||
goto ret_eol;
|
||||
}
|
||||
line[line_pos] = '\0';
|
||||
line_pos++;
|
||||
}
|
||||
line[line_pos] = '\0';
|
||||
line_pos++;
|
||||
#ifdef DEBUG
|
||||
printf("get_token ok\n");
|
||||
#endif
|
||||
return RET_OK;
|
||||
ret_ok:
|
||||
return i;
|
||||
ret_eof:
|
||||
#ifdef DEBUG
|
||||
printf("get_token EOF\n");
|
||||
#endif
|
||||
token = NULL;
|
||||
return RET_EOF;
|
||||
ret_eol:
|
||||
#ifdef DEBUG
|
||||
printf("get_token EOL\n");
|
||||
#endif
|
||||
token = NULL;
|
||||
return RET_EOL;
|
||||
}
|
||||
|
||||
static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc,
|
||||
unsigned int *map)
|
||||
{
|
||||
int i;
|
||||
int i, j, freeslots;
|
||||
char **aliasp;
|
||||
unsigned int tmp;
|
||||
|
||||
/* find first unused slot */
|
||||
for (i = 0; i < CODECS_MAX_FOURCC && fourcc[i] != 0xffffffff; i++)
|
||||
/* NOTHING */;
|
||||
if (i == CODECS_MAX_FOURCC) {
|
||||
printf("too many fourcc...\n");
|
||||
return 0;
|
||||
}
|
||||
#if 1
|
||||
if (alias) {
|
||||
do {
|
||||
fourcc[i] = *((unsigned int *) s);
|
||||
map[i] = *((unsigned int *) alias);
|
||||
s += 4;
|
||||
i++;
|
||||
} while (*(s++) == ',');
|
||||
} else {
|
||||
do {
|
||||
fourcc[i] = *((unsigned int *) s);
|
||||
map[i] = *((unsigned int *) s);
|
||||
s += 4;
|
||||
i++;
|
||||
} while (*(s++) == ',');
|
||||
}
|
||||
#else
|
||||
if (alias)
|
||||
aliasp = &alias;
|
||||
else
|
||||
aliasp = &s;
|
||||
freeslots = CODECS_MAX_FOURCC - i;
|
||||
if (!freeslots)
|
||||
goto too_many_error_out;
|
||||
|
||||
aliasp = (alias) ? &alias : &s;
|
||||
do {
|
||||
fourcc[i] = *((unsigned int *) s);
|
||||
map[i++] = *((unsigned int *) (*aliasp));
|
||||
tmp = *((unsigned int *) s);
|
||||
for (j = 0; j < i; j++)
|
||||
if (tmp == fourcc[j])
|
||||
goto duplicated_error_out;
|
||||
fourcc[i] = tmp;
|
||||
map[i] = *((unsigned int *) (*aliasp));
|
||||
s += 4;
|
||||
} while (*(s++) == ',');
|
||||
#endif
|
||||
i++;
|
||||
} while ((*(s++) == ',') && --freeslots);
|
||||
|
||||
if (!freeslots)
|
||||
goto too_many_error_out;
|
||||
if (*(--s) != '\0')
|
||||
return 0;
|
||||
return 1;
|
||||
duplicated_error_out:
|
||||
printf("\nduplicated fourcc/format\n");
|
||||
return 0;
|
||||
too_many_error_out:
|
||||
printf("\ntoo many fourcc/format...\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int add_to_format(char *s, unsigned int *fourcc, unsigned int *fourccmap)
|
||||
{
|
||||
// printf("\n-----[%s][%s]-----\n",s,format);
|
||||
//printf("\n-----[%s][%s]-----\n",s,format);
|
||||
|
||||
int i;
|
||||
int i, j;
|
||||
|
||||
/* find first unused slot */
|
||||
for (i = 0; i < CODECS_MAX_FOURCC && fourcc[i] != 0xffffffff; i++)
|
||||
/* NOTHING */;
|
||||
if (i == CODECS_MAX_FOURCC) {
|
||||
printf("too many fourcc...\n");
|
||||
printf("\ntoo many fourcc/format...\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
fourcc[i]=fourccmap[i]=strtoul(s,NULL,0);
|
||||
for (j = 0; j < i; j++)
|
||||
if (fourcc[j] == fourcc[i]) {
|
||||
printf("\nduplicated fourcc/format\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -199,17 +213,16 @@ static int add_to_out(char *sfmt, char *sflags, unsigned int *outfmt,
|
|||
NULL
|
||||
};
|
||||
|
||||
int i, j;
|
||||
int i, j, freeslots;
|
||||
unsigned char flags;
|
||||
|
||||
for (i = 0; i < CODECS_MAX_OUTFMT && outfmt[i] != 0xffffffff; i++)
|
||||
/* NOTHING */;
|
||||
if (i == CODECS_MAX_FOURCC) {
|
||||
printf("too many out...\n");
|
||||
return 0;
|
||||
}
|
||||
freeslots = CODECS_MAX_OUTFMT - i;
|
||||
if (!freeslots)
|
||||
goto too_many_error_out;
|
||||
|
||||
flags = 0; //get_flags(sflags);
|
||||
flags = 0;
|
||||
if(sflags) do {
|
||||
for (j = 0; flagstr[j] != NULL; j++)
|
||||
if (!strncmp(sflags, flagstr[j], strlen(flagstr[j])))
|
||||
|
|
@ -218,7 +231,6 @@ static int add_to_out(char *sfmt, char *sflags, unsigned int *outfmt,
|
|||
flags|=(1<<j);
|
||||
sflags+=strlen(flagstr[j]);
|
||||
} while (*(sflags++) == ',');
|
||||
|
||||
|
||||
do {
|
||||
for (j = 0; fmtstr[j] != NULL; j++)
|
||||
|
|
@ -230,10 +242,17 @@ static int add_to_out(char *sfmt, char *sflags, unsigned int *outfmt,
|
|||
outflags[i] = flags;
|
||||
++i;
|
||||
sfmt+=strlen(fmtstr[j]);
|
||||
} while (*(sfmt++) == ',');
|
||||
} while ((*(sfmt++) == ',') && --freeslots);
|
||||
|
||||
if (!freeslots)
|
||||
goto too_many_error_out;
|
||||
|
||||
if (*(--sfmt) != '\0') return 0;
|
||||
|
||||
return 1;
|
||||
too_many_error_out:
|
||||
printf("\ntoo many out...\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static short get_driver(char *s,int audioflag)
|
||||
|
|
@ -263,16 +282,35 @@ static short get_driver(char *s,int audioflag)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int valid_codec(codecs_t *codec)
|
||||
{
|
||||
#warning FIXME mi is kell egy codec-be?
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int add_comment(char *s, char **d)
|
||||
{
|
||||
int pos;
|
||||
|
||||
if (!*d)
|
||||
pos = 0;
|
||||
else {
|
||||
pos = strlen(*d);
|
||||
(*d)[pos++] = '\n';
|
||||
}
|
||||
if (!(*d = (char *) realloc(*d, pos + strlen(s) + 1))) {
|
||||
printf("can't allocate mem for comment\n");
|
||||
return 0;
|
||||
}
|
||||
strcpy(*d + pos, s);
|
||||
return 1;
|
||||
}
|
||||
|
||||
codecs_t *parse_codec_cfg(char *cfgfile)
|
||||
{
|
||||
|
||||
// codecs_t *codecs = NULL; // array of codecs
|
||||
codecs_t *codec = NULL; // currect codec
|
||||
int free_slots = 0;
|
||||
codecs_t *codec = NULL; // current codec
|
||||
int tmp, i;
|
||||
int state = 0;
|
||||
char *param1;
|
||||
|
||||
#ifdef DEBUG
|
||||
assert(cfgfile != NULL);
|
||||
|
|
@ -289,180 +327,141 @@ codecs_t *parse_codec_cfg(char *cfgfile)
|
|||
perror("parse_codec_cfg: can't get memory for 'line'");
|
||||
return NULL;
|
||||
}
|
||||
line_pos = 0;
|
||||
line[0] = '\0'; /* forces get_token to read next line */
|
||||
|
||||
for (;;) {
|
||||
tmp = get_token();
|
||||
if (tmp == RET_EOF)
|
||||
goto eof_out;
|
||||
while ((tmp = get_token(1, 1)) != RET_EOF) {
|
||||
if (tmp == RET_EOL)
|
||||
continue;
|
||||
if (!strcmp(token, "audiocodec") || !strcmp(token, "videocodec")) {
|
||||
PRINT_LINENUM;
|
||||
|
||||
if (!strcmp(token[0], "audiocodec") || !strcmp(token[0], "videocodec")) {
|
||||
if (nr_codecs)
|
||||
if (!valid_codec(codec))
|
||||
goto not_valid_error_out;
|
||||
if (!(codecs = (codecs_t *) realloc(codecs,
|
||||
sizeof(codecs_t) * (nr_codecs + 1)))) {
|
||||
perror("parse_codec_cfg: can't realloc 'codecs'");
|
||||
goto err_out;
|
||||
}
|
||||
codec=&codecs[nr_codecs];
|
||||
codec=&codecs[nr_codecs];
|
||||
nr_codecs++;
|
||||
memset(codec,0,sizeof(codecs_t));
|
||||
memset(codec->fourcc, 0xff, sizeof(codec->fourcc));
|
||||
memset(codec->outfmt, 0xff, sizeof(codec->outfmt));
|
||||
state = 0;
|
||||
|
||||
if (*token == 'a') { /* audiocodec */
|
||||
//printf("audio");
|
||||
if (*token[0] == 'a') { /* audiocodec */
|
||||
codec->flags |= CODECS_FLAG_AUDIO;
|
||||
} else if (*token == 'v') { /* videocodec */
|
||||
//printf("video");
|
||||
} else if (*token[0] == 'v') { /* videocodec */
|
||||
codec->flags &= !CODECS_FLAG_AUDIO;
|
||||
} else {
|
||||
printf("itt valami nagyon el van baszva\n");
|
||||
goto err_out;
|
||||
}
|
||||
if (get_token() < 0)
|
||||
if (get_token(1, 1) < 0)
|
||||
goto parse_error_out;
|
||||
codec->name = strdup(token);
|
||||
for (i = 0; i < nr_codecs - 1; i++) {
|
||||
#warning audio meg videocodecnek lehet ugyanaz a neve?
|
||||
if ((codec->flags & CODECS_FLAG_AUDIO) !=
|
||||
(codecs[i].flags & CODECS_FLAG_AUDIO))
|
||||
continue;
|
||||
if (!strcmp(token[0], codecs[i].name)) {
|
||||
PRINT_LINENUM;
|
||||
printf("codec name '%s' isn't unique\n", token[0]);
|
||||
goto err_out;
|
||||
}
|
||||
}
|
||||
codec->name = strdup(token[0]);
|
||||
state |= GOT_NAME;
|
||||
//printf(" %s\n", codec->name);
|
||||
} else if (!strcmp(token, "info")) {
|
||||
} else if (!strcmp(token[0], "info")) {
|
||||
if (!(state & GOT_NAME))
|
||||
goto parse_error_out;
|
||||
PRINT_LINENUM;
|
||||
//printf("info");
|
||||
if (state & GOT_INFO || get_token() < 0)
|
||||
if (state & GOT_INFO || get_token(1, 1) < 0)
|
||||
goto parse_error_out;
|
||||
codec->info = strdup(token);
|
||||
codec->info = strdup(token[0]);
|
||||
state |= GOT_INFO;
|
||||
//printf(" %s\n", codec->info);
|
||||
} else if (!strcmp(token, "comment")) {
|
||||
} else if (!strcmp(token[0], "comment")) {
|
||||
if (!(state & GOT_NAME))
|
||||
goto parse_error_out;
|
||||
PRINT_LINENUM;
|
||||
//printf("comment");
|
||||
if (get_token() < 0)
|
||||
if (get_token(1, 1) < 0)
|
||||
goto parse_error_out;
|
||||
#if 1
|
||||
if (!codec->comment)
|
||||
codec->comment = strdup(token);
|
||||
//printf(" %s\n", codec->comment);
|
||||
#else
|
||||
add_comment(token, &codec->comment);
|
||||
printf(" FIXMEEEEEEEEEEEEEEE\n");
|
||||
#endif
|
||||
} else if (!strcmp(token, "fourcc")) {
|
||||
if (!add_comment(token[0], &codec->comment)) {
|
||||
PRINT_LINENUM;
|
||||
printf("add_comment()-tel valami sux\n");
|
||||
}
|
||||
} else if (!strcmp(token[0], "fourcc")) {
|
||||
if (!(state & GOT_NAME))
|
||||
goto parse_error_out;
|
||||
PRINT_LINENUM;
|
||||
//printf("fourcc");
|
||||
// if (codec->flags & CODECS_FLAG_AUDIO) {
|
||||
// printf("\n'fourcc' in audiocodec definition!\n");
|
||||
// goto err_out;
|
||||
// }
|
||||
if (get_token() < 0)
|
||||
if (get_token(1, 2) < 0)
|
||||
goto parse_error_out;
|
||||
param1 = strdup(token);
|
||||
get_token();
|
||||
if (!add_to_fourcc(param1, token,
|
||||
if (!add_to_fourcc(token[0], token[1],
|
||||
codec->fourcc,
|
||||
codec->fourccmap))
|
||||
goto err_out;
|
||||
goto parse_error_out;
|
||||
state |= GOT_FOURCC;
|
||||
//printf(" %s: %s\n", param1, token);
|
||||
free(param1);
|
||||
} else if (!strcmp(token, "format")) {
|
||||
} else if (!strcmp(token[0], "format")) {
|
||||
if (!(state & GOT_NAME))
|
||||
goto parse_error_out;
|
||||
PRINT_LINENUM;
|
||||
//printf("format");
|
||||
// if (!(codec->flags & CODECS_FLAG_AUDIO)) {
|
||||
// printf("\n'format' in videocodec definition!\n");
|
||||
// goto err_out;
|
||||
// }
|
||||
if (get_token() < 0)
|
||||
if (get_token(1, 1) < 0)
|
||||
goto parse_error_out;
|
||||
if (!add_to_format(token[0], codec->fourcc,codec->fourccmap))
|
||||
goto parse_error_out;
|
||||
if (!add_to_format(token, codec->fourcc,codec->fourccmap))
|
||||
goto err_out;
|
||||
state |= GOT_FORMAT;
|
||||
//printf(" %s\n", token);
|
||||
} else if (!strcmp(token, "driver")) {
|
||||
} else if (!strcmp(token[0], "driver")) {
|
||||
if (!(state & GOT_NAME))
|
||||
goto parse_error_out;
|
||||
PRINT_LINENUM;
|
||||
//printf("driver");
|
||||
if (get_token() < 0)
|
||||
if (get_token(1, 1) < 0)
|
||||
goto parse_error_out;
|
||||
if ((codec->driver = get_driver(token,codec->flags&CODECS_FLAG_AUDIO)) == -1)
|
||||
if ((codec->driver = get_driver(token[0],codec->flags&CODECS_FLAG_AUDIO)) == -1)
|
||||
goto err_out;
|
||||
//printf(" %s\n", token);
|
||||
} else if (!strcmp(token, "dll")) {
|
||||
} else if (!strcmp(token[0], "dll")) {
|
||||
if (!(state & GOT_NAME))
|
||||
goto parse_error_out;
|
||||
PRINT_LINENUM;
|
||||
//printf("dll");
|
||||
if (get_token() < 0)
|
||||
if (get_token(1, 1) < 0)
|
||||
goto parse_error_out;
|
||||
codec->dll = strdup(token);
|
||||
//printf(" %s\n", codec->dll);
|
||||
} else if (!strcmp(token, "guid")) {
|
||||
codec->dll = strdup(token[0]);
|
||||
} else if (!strcmp(token[0], "guid")) {
|
||||
if (!(state & GOT_NAME))
|
||||
goto parse_error_out;
|
||||
PRINT_LINENUM;
|
||||
//printf("guid");
|
||||
if (get_token() < 0) goto parse_error_out;
|
||||
//printf("'%s'",token);
|
||||
codec->guid.f1=strtoul(token,NULL,0);
|
||||
if (get_token() < 0) goto parse_error_out;
|
||||
codec->guid.f2=strtoul(token,NULL,0);
|
||||
if (get_token() < 0) goto parse_error_out;
|
||||
codec->guid.f3=strtoul(token,NULL,0);
|
||||
if (get_token(11, 11) < 0) goto parse_error_out;
|
||||
codec->guid.f1=strtoul(token[0],NULL,0);
|
||||
codec->guid.f2=strtoul(token[1],NULL,0);
|
||||
codec->guid.f3=strtoul(token[2],NULL,0);
|
||||
for (i = 0; i < 8; i++) {
|
||||
if (get_token() < 0) goto parse_error_out;
|
||||
codec->guid.f4[i]=strtoul(token,NULL,0);
|
||||
codec->guid.f4[i]=strtoul(token[i + 3],NULL,0);
|
||||
}
|
||||
} else if (!strcmp(token, "out")) {
|
||||
} else if (!strcmp(token[0], "out")) {
|
||||
if (!(state & GOT_NAME))
|
||||
goto parse_error_out;
|
||||
PRINT_LINENUM;
|
||||
//printf("out");
|
||||
if (get_token() < 0)
|
||||
if (get_token(1, 2) < 0)
|
||||
goto parse_error_out;
|
||||
param1 = strdup(token);
|
||||
get_token();
|
||||
if (!add_to_out(param1, token, codec->outfmt,
|
||||
if (!add_to_out(token[0], token[1], codec->outfmt,
|
||||
codec->outflags))
|
||||
goto err_out;
|
||||
//printf(" %s: %s\n", param1, token);
|
||||
free(param1);
|
||||
} else if (!strcmp(token, "flags")) {
|
||||
} else if (!strcmp(token[0], "flags")) {
|
||||
if (!(state & GOT_NAME))
|
||||
goto parse_error_out;
|
||||
PRINT_LINENUM;
|
||||
//printf("flags");
|
||||
if (get_token() < 0)
|
||||
if (get_token(1, 1) < 0)
|
||||
goto parse_error_out;
|
||||
//printf(" %s\n", token);
|
||||
} else if (!strcmp(token, "status")) {
|
||||
#warning FIXME flags meg nincs implementalva...
|
||||
printf("\n\nUssetek!!!\n\n");
|
||||
} else if (!strcmp(token[0], "status")) {
|
||||
if (!(state & GOT_NAME))
|
||||
goto parse_error_out;
|
||||
if (get_token() < 0)
|
||||
if (get_token(1, 1) < 0)
|
||||
goto parse_error_out;
|
||||
if (!strcasecmp(token, "rulz"))
|
||||
if (!strcasecmp(token[0], "rulz"))
|
||||
codec->status = CODECS_STATUS_WORKING;
|
||||
else if (!strcasecmp(token, "suxx"))
|
||||
else if (!strcasecmp(token[0], "suxx"))
|
||||
codec->status = CODECS_STATUS_NOT_WORKING;
|
||||
else if (!strcasecmp(token, "checkthiz"))
|
||||
else if (!strcasecmp(token[0], "checkthiz"))
|
||||
codec->status = CODECS_STATUS_UNTESTED;
|
||||
else if (!strcasecmp(token, "notsogood"))
|
||||
else if (!strcasecmp(token[0], "notsogood"))
|
||||
codec->status = CODECS_STATUS_PROBLEMS;
|
||||
else
|
||||
goto parse_error_out;
|
||||
} else
|
||||
goto parse_error_out;
|
||||
}
|
||||
if (!valid_codec(codec))
|
||||
goto not_valid_error_out;
|
||||
out:
|
||||
free(line);
|
||||
fclose(fp);
|
||||
|
|
@ -476,9 +475,10 @@ err_out:
|
|||
free(codecs);
|
||||
codecs = NULL;
|
||||
goto out;
|
||||
eof_out:
|
||||
/* FIXME teljes az utolso config?? */
|
||||
goto out;
|
||||
not_valid_error_out:
|
||||
PRINT_LINENUM;
|
||||
printf("codec is not definied correctly\n");
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
codecs_t* find_codec(unsigned int fourcc,unsigned int *fourccmap,int audioflag){
|
||||
|
|
@ -504,7 +504,8 @@ int main(void)
|
|||
codecs_t *codecs;
|
||||
int i,j;
|
||||
|
||||
codecs = parse_codec_cfg("DOCS/codecs.conf");
|
||||
if (!(codecs = parse_codec_cfg("DOCS/codecs.conf")))
|
||||
return 0;
|
||||
|
||||
printf("total %d codecs parsed\n",nr_codecs);
|
||||
for(i=0;i<nr_codecs;i++){
|
||||
|
|
@ -528,7 +529,7 @@ int main(void)
|
|||
}
|
||||
}
|
||||
|
||||
printf("GUID: %08X %04X %04X",c->guid.f1,c->guid.f2,c->guid.f3);
|
||||
printf("GUID: %08lX %04X %04X",c->guid.f1,c->guid.f2,c->guid.f3);
|
||||
for(j=0;j<8;j++) printf(" %02X",c->guid.f4[j]);
|
||||
printf("\n");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
#ifndef __CODEC_CFG_H
|
||||
#define __CODEC_CFG_H
|
||||
|
||||
//#include <inttypes.h>
|
||||
|
||||
#ifndef IMGFMT_YV12
|
||||
#define IMGFMT_YV12 0x32315659
|
||||
#define IMGFMT_YUY2 (('2'<<24)|('Y'<<16)|('U'<<8)|'Y')
|
||||
|
|
@ -30,7 +28,6 @@
|
|||
#define CODECS_STATUS_WORKING 2
|
||||
|
||||
|
||||
//#warning nem kellene ket typedef GUID-nak...
|
||||
typedef struct {
|
||||
unsigned long f1;
|
||||
unsigned short f2;
|
||||
|
|
@ -38,7 +35,6 @@ typedef struct {
|
|||
unsigned char f4[8];
|
||||
} GUID;
|
||||
|
||||
/* I just rearranged, to use less memory... */
|
||||
typedef struct {
|
||||
unsigned int fourcc[CODECS_MAX_FOURCC];
|
||||
unsigned int fourccmap[CODECS_MAX_FOURCC];
|
||||
|
|
|
|||
Loading…
Reference in New Issue