stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

esfilter: rename ONCE to ONE_TIME, improve doc

Browse source
This commit is contained in:
Jaroslav Kysela 2015-01-26 15:00:04 +01:00
parent f39ddd1f05
commit 879b842ea1
4 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
docs/html/config_esfilter.html
View file

@ -1,7 +1,7 @@
<div class="hts-doc-text"> <div class="hts-doc-text">
This table defines rules to filter and order the elementary streams This table defines rules to filter and order the elementary streams
like video or audio from the input feed. (PIDs) like video or audio from the input feed.
<p> <p>
The execution order of commands is granted. It means that first rule The execution order of commands is granted. It means that first rule
@ -90,10 +90,20 @@ The columns have the following functions:
<dt>USE <dt>USE
<dd>Use this elementary stream. <dd>Use this elementary stream.
<dt>ONCE <dt>ONE_TIME
<dd>Use this elementary stream only once per service type. <dd>Use this elementary stream only one time per service type (like
The language is distinguished, too. video, audio, subtitles) and language. The first sucessfully
The first successfully compared rule wins. compared rule wins. For example, when one AC3 elementary stream
is marked to be used with 'eng' language and another rule with
the ONE_TIME action was matched, the new AC3 elementary stream
will not be added if the language for new AC3 elementary stream
is 'eng'. Note that the second rule might not have the language
filter (column) set.
<p>
For the CA filter, this rule means that the new CA elementary stream
is added only if another CA is not already used.
</p>
<dt>EXCLUSIVE <dt>EXCLUSIVE
<dd>Use only this elementary stream. No other elementary streams <dd>Use only this elementary stream. No other elementary streams

2
src/esfilter.c
View file

@ -85,7 +85,7 @@ esfilter_txt2class(const char *s)
static struct strtab esfilteractiontab[] = { static struct strtab esfilteractiontab[] = {
{ "NONE", ESFA_NONE }, { "NONE", ESFA_NONE },
{ "USE", ESFA_USE }, { "USE", ESFA_USE },
{ "ONCE", ESFA_ONCE }, { "ONE_TIME", ESFA_ONE_TIME },
{ "EXCLUSIVE", ESFA_EXCLUSIVE }, { "EXCLUSIVE", ESFA_EXCLUSIVE },
{ "EMPTY", ESFA_EMPTY }, { "EMPTY", ESFA_EMPTY },
{ "IGNORE", ESFA_IGNORE } { "IGNORE", ESFA_IGNORE }

2
src/esfilter.h
View file

@ -73,7 +73,7 @@ extern struct esfilter_entry_queue esfilters[];
typedef enum { typedef enum {
ESFA_NONE = 0, ESFA_NONE = 0,
ESFA_USE, /* use this stream */ ESFA_USE, /* use this stream */
ESFA_ONCE, /* use this stream once per language */ ESFA_ONE_TIME, /* use this stream once per language */
ESFA_EXCLUSIVE, /* use this stream exclusively */ ESFA_EXCLUSIVE, /* use this stream exclusively */
ESFA_EMPTY, /* use this stream when no streams were added */ ESFA_EMPTY, /* use this stream when no streams were added */
ESFA_IGNORE, ESFA_IGNORE,

4
src/service.c
View file

@ -517,7 +517,7 @@ ca_ignore:
ca->filter |= ESFM_IGNORE; ca->filter |= ESFM_IGNORE;
st->es_filter |= ESFM_IGNORE; st->es_filter |= ESFM_IGNORE;
break; break;
case ESFA_ONCE: case ESFA_ONE_TIME:
TAILQ_FOREACH(st2, &t->s_components, es_link) TAILQ_FOREACH(st2, &t->s_components, es_link)
if (st2->es_type == SCT_CA && (st2->es_filter & ESFM_USED) != 0) if (st2->es_type == SCT_CA && (st2->es_filter & ESFM_USED) != 0)
break; break;
@ -566,7 +566,7 @@ ca_ignore:
ignore: ignore:
st->es_filter |= ESFM_IGNORE; st->es_filter |= ESFM_IGNORE;
break; break;
case ESFA_ONCE: case ESFA_ONE_TIME:
TAILQ_FOREACH(st2, &t->s_components, es_link) { TAILQ_FOREACH(st2, &t->s_components, es_link) {
if (st == st2) if (st == st2)
continue; continue;