Acked-by: André Roth <neol...@gmail.com>
On Tue, 18 Jun 2013 16:19:05 +0200
Guy Martin <gms...@tuxicoman.be> wrote:
> This patch add parsing support for the POLARIZATION parameter for the DVBv5
> file format.
>
> Signed-off-by: Guy Martin <gms...@tuxicoman.be>
> ---
> lib/include/dvb-file.h | 1 -
> lib/libdvbv5/dvb-file.c | 65
> ++++++++++++++++++++++---------------------------
> 2 files changed, 29 insertions(+), 37 deletions(-)
>
> diff --git a/lib/include/dvb-file.h b/lib/include/dvb-file.h
> index ea76080..e38fe85 100644
> --- a/lib/include/dvb-file.h
> +++ b/lib/include/dvb-file.h
> @@ -35,7 +35,6 @@ struct dvb_entry {
>
> char *location;
>
> -// enum dvbsat_polarization pol;
> int sat_number;
> unsigned freq_bpf;
> unsigned diseqc_wait;
> diff --git a/lib/libdvbv5/dvb-file.c b/lib/libdvbv5/dvb-file.c
> index aa42a37..02b28e7 100644
> --- a/lib/libdvbv5/dvb-file.c
> +++ b/lib/libdvbv5/dvb-file.c
> @@ -357,6 +357,29 @@ error:
> return -1;
> }
>
> +static int store_entry_prop(struct dvb_entry *entry,
> + uint32_t cmd, uint32_t value)
> +{
> + int i;
> +
> + for (i = 0; i < entry->n_props; i++) {
> + if (cmd == entry->props[i].cmd)
> + break;
> + }
> + if (i == entry->n_props) {
> + if (i == DTV_MAX_COMMAND) {
> + fprintf(stderr, "Can't add property %s\n",
> + dvb_v5_name[cmd]);
> + return -1;
> + }
> + entry->n_props++;
> + entry->props[i].cmd = cmd;
> + }
> +
> + entry->props[i].u.data = value;
> +
> + return 0;
> +}
>
> #define CHANNEL "CHANNEL"
>
> @@ -428,16 +451,15 @@ static int fill_entry(struct dvb_entry *entry, char
> *key, char *value)
> is_video = 1;
> else if (!strcasecmp(key, "AUDIO_PID"))
> is_audio = 1;
> - /*else if (!strcasecmp(key, "POLARIZATION")) {
> - entry->service_id = atol(value);
> - for (j = 0; ARRAY_SIZE(pol_name); j++)
> - if (!strcasecmp(value, pol_name[j]))
> + else if (!strcasecmp(key, "POLARIZATION")) {
> + for (j = 0; ARRAY_SIZE(dvb_sat_pol_name); j++)
> + if (!strcasecmp(value, dvb_sat_pol_name[j]))
> break;
> - if (j == ARRAY_SIZE(pol_name))
> + if (j == ARRAY_SIZE(dvb_sat_pol_name))
> return -2;
> - entry->pol = j;
> + store_entry_prop(entry, DTV_POLARIZATION, j);
> return 0;
> - }*/ else if (!strncasecmp(key,"PID_", 4)){
> + } else if (!strncasecmp(key,"PID_", 4)){
> type = strtol(&key[4], NULL, 16);
> if (!type)
> return 0;
> @@ -647,11 +669,6 @@ int write_dvb_file(const char *fname, struct dvb_file
> *dvb_file)
> fprintf(fp, "\n");
> }
>
> - /*if (entry->pol != POLARIZATION_OFF) {*/
> - /*fprintf(fp, "\tPOLARIZATION = %s\n",*/
> - /*pol_name[entry->pol]);*/
> - /*}*/
> -
> if (entry->sat_number >= 0) {
> fprintf(fp, "\tSAT_NUMBER = %d\n",
> entry->sat_number);
> @@ -751,29 +768,6 @@ char *dvb_vchannel(struct dvb_v5_descriptors *dvb_desc,
> return buf;
> }
>
> -static int store_entry_prop(struct dvb_entry *entry,
> - uint32_t cmd, uint32_t value)
> -{
> - int i;
> -
> - for (i = 0; i < entry->n_props; i++) {
> - if (cmd == entry->props[i].cmd)
> - break;
> - }
> - if (i == entry->n_props) {
> - if (i == DTV_MAX_COMMAND) {
> - fprintf(stderr, "Can't add property %s\n",
> - dvb_v5_name[cmd]);
> - return -1;
> - }
> - entry->n_props++;
> - }
> -
> - entry->props[i].u.data = value;
> -
> - return 0;
> -}
> -
> static void handle_std_specific_parms(struct dvb_entry *entry,
> struct dvb_v5_descriptors *dvb_desc)
> {
> @@ -812,7 +806,6 @@ static void handle_std_specific_parms(struct dvb_entry
> *entry,
> nit_table->frequency[0]);
> store_entry_prop(entry, DTV_MODULATION,
> nit_table->modulation);
> - /*entry->pol = nit_table->pol;*/
> store_entry_prop(entry, DTV_POLARIZATION,
> nit_table->pol);
> store_entry_prop(entry, DTV_DELIVERY_SYSTEM,
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
