| Message ID | 53381345139167@web11e.yandex.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/16/2012 08:46 PM, CrazyCat wrote: > DTV_ISDBS_TS_ID replaced with DTV_STREAM_ID. > Aliases DTV_ISDBS_TS_ID, DTV_DVBS2_MIS_ID for DTV_STREAM_ID. > DTV_DVBT2_PLP_ID marked as legacy. > > Signed-off-by: Evgeny Plehov <EvgenyPlehov@ukr.net> > diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h > index f50d405..3444dda 100644 > --- a/include/linux/dvb/frontend.h > +++ b/include/linux/dvb/frontend.h > @@ -62,6 +62,7 @@ typedef enum fe_caps { > FE_CAN_8VSB = 0x200000, > FE_CAN_16VSB = 0x400000, > FE_HAS_EXTENDED_CAPS = 0x800000, /* We need more bitspace for newer APIs, indicate this. */ > + FE_CAN_MULTISTREAM = 0x4000000, /* frontend supports DVB-S2 multistream filtering */ > FE_CAN_TURBO_FEC = 0x8000000, /* frontend supports "turbo fec modulation" */ > FE_CAN_2G_MODULATION = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */ > FE_NEEDS_BENDING = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */ > @@ -314,9 +315,11 @@ struct dvb_frontend_event { > > #define DTV_ISDBT_LAYER_ENABLED 41 > > -#define DTV_ISDBS_TS_ID 42 > +#define DTV_STREAM_ID 42 > +#define DTV_ISDBS_TS_ID DTV_STREAM_ID > +#define DTV_DVBS2_MIS_ID DTV_STREAM_ID @Mauro, should we rename also DTV_ISDBS_TS_ID to DTV_ISDBS_TS_ID_LEGACY to remind users ? > -#define DTV_DVBT2_PLP_ID 43 > +#define DTV_DVBT2_PLP_ID_LEGACY 43 > > #define DTV_ENUM_DELSYS 44 > > diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h > index 7c64c09..bec0cda 100644 > --- a/drivers/media/dvb/dvb-core/dvb_frontend.h > +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h > @@ -368,11 +368,8 @@ struct dtv_frontend_properties { > u8 interleaving; > } layer[3]; > > - /* ISDB-T specifics */ > - u32 isdbs_ts_id; > - > - /* DVB-T2 specifics */ > - u32 dvbt2_plp_id; > + /* Multistream specifics */ > + u32 stream_id; u32 == 32 bit long unsigned number. See next comment. > > /* ATSC-MH specifics */ > u8 atscmh_fic_ver; > diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c > index aebcdf2..bccd245 100644 > --- a/drivers/media/dvb/dvb-core/dvb_frontend.c > +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c > @@ -946,8 +946,7 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe) > c->layer[i].segment_count = 0; > } > > - c->isdbs_ts_id = 0; > - c->dvbt2_plp_id = 0; > + c->stream_id = -1; unsigned number cannot be -1. It can be only 0 or bigger. Due to that this is wrong. > > switch (c->delivery_system) { > case SYS_DVBS: > @@ -1017,8 +1016,8 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = { > _DTV_CMD(DTV_ISDBT_LAYERC_SEGMENT_COUNT, 1, 0), > _DTV_CMD(DTV_ISDBT_LAYERC_TIME_INTERLEAVING, 1, 0), > > - _DTV_CMD(DTV_ISDBS_TS_ID, 1, 0), > - _DTV_CMD(DTV_DVBT2_PLP_ID, 1, 0), > + _DTV_CMD(DTV_STREAM_ID, 1, 0), > + _DTV_CMD(DTV_DVBT2_PLP_ID_LEGACY, 1, 0), > > /* Get */ > _DTV_CMD(DTV_DISEQC_SLAVE_REPLY, 0, 1), > @@ -1382,11 +1381,10 @@ static int dtv_property_process_get(struct dvb_frontend *fe, > case DTV_ISDBT_LAYERC_TIME_INTERLEAVING: > tvp->u.data = c->layer[2].interleaving; > break; > - case DTV_ISDBS_TS_ID: > - tvp->u.data = c->isdbs_ts_id; > - break; > - case DTV_DVBT2_PLP_ID: > - tvp->u.data = c->dvbt2_plp_id; > + > + case DTV_STREAM_ID: > + case DTV_DVBT2_PLP_ID_LEGACY: > + tvp->u.data = c->stream_id; > break; > > /* ATSC-MH */ > @@ -1771,11 +1769,10 @@ static int dtv_property_process_set(struct dvb_frontend *fe, > case DTV_ISDBT_LAYERC_TIME_INTERLEAVING: > c->layer[2].interleaving = tvp->u.data; > break; > - case DTV_ISDBS_TS_ID: > - c->isdbs_ts_id = tvp->u.data; > - break; > - case DTV_DVBT2_PLP_ID: > - c->dvbt2_plp_id = tvp->u.data; > + > + case DTV_STREAM_ID: > + case DTV_DVBT2_PLP_ID_LEGACY: > + c->stream_id = tvp->u.data; > break; > > /* ATSC-MH */ regards Antti
Em 16-08-2012 15:11, Antti Palosaari escreveu: > On 08/16/2012 08:46 PM, CrazyCat wrote: >> DTV_ISDBS_TS_ID replaced with DTV_STREAM_ID. >> Aliases DTV_ISDBS_TS_ID, DTV_DVBS2_MIS_ID for DTV_STREAM_ID. >> DTV_DVBT2_PLP_ID marked as legacy. >> >> Signed-off-by: Evgeny Plehov <EvgenyPlehov@ukr.net> >> diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h >> index f50d405..3444dda 100644 >> --- a/include/linux/dvb/frontend.h >> +++ b/include/linux/dvb/frontend.h >> @@ -62,6 +62,7 @@ typedef enum fe_caps { >> FE_CAN_8VSB = 0x200000, >> FE_CAN_16VSB = 0x400000, >> FE_HAS_EXTENDED_CAPS = 0x800000, /* We need more bitspace for newer APIs, indicate this. */ >> + FE_CAN_MULTISTREAM = 0x4000000, /* frontend supports DVB-S2 multistream filtering */ It is better to change this comment to cover the other standards. >> FE_CAN_TURBO_FEC = 0x8000000, /* frontend supports "turbo fec modulation" */ >> FE_CAN_2G_MODULATION = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */ >> FE_NEEDS_BENDING = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */ >> @@ -314,9 +315,11 @@ struct dvb_frontend_event { >> >> #define DTV_ISDBT_LAYER_ENABLED 41 >> >> -#define DTV_ISDBS_TS_ID 42 >> +#define DTV_STREAM_ID 42 >> +#define DTV_ISDBS_TS_ID DTV_STREAM_ID >> +#define DTV_DVBS2_MIS_ID DTV_STREAM_ID > > @Mauro, should we rename also DTV_ISDBS_TS_ID to DTV_ISDBS_TS_ID_LEGACY to remind users ? I think so. > >> -#define DTV_DVBT2_PLP_ID 43 >> +#define DTV_DVBT2_PLP_ID_LEGACY 43 >> >> #define DTV_ENUM_DELSYS 44 >> >> diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h >> index 7c64c09..bec0cda 100644 >> --- a/drivers/media/dvb/dvb-core/dvb_frontend.h >> +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h >> @@ -368,11 +368,8 @@ struct dtv_frontend_properties { >> u8 interleaving; >> } layer[3]; >> >> - /* ISDB-T specifics */ >> - u32 isdbs_ts_id; >> - >> - /* DVB-T2 specifics */ >> - u32 dvbt2_plp_id; >> + /* Multistream specifics */ >> + u32 stream_id; > > u32 == 32 bit long unsigned number. See next comment. > >> >> /* ATSC-MH specifics */ >> u8 atscmh_fic_ver; >> diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c >> index aebcdf2..bccd245 100644 >> --- a/drivers/media/dvb/dvb-core/dvb_frontend.c >> +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c >> @@ -946,8 +946,7 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe) >> c->layer[i].segment_count = 0; >> } >> >> - c->isdbs_ts_id = 0; >> - c->dvbt2_plp_id = 0; >> + c->stream_id = -1; > > unsigned number cannot be -1. It can be only 0 or bigger. Due to that this is wrong. > >> >> switch (c->delivery_system) { >> case SYS_DVBS: >> @@ -1017,8 +1016,8 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = { >> _DTV_CMD(DTV_ISDBT_LAYERC_SEGMENT_COUNT, 1, 0), >> _DTV_CMD(DTV_ISDBT_LAYERC_TIME_INTERLEAVING, 1, 0), >> >> - _DTV_CMD(DTV_ISDBS_TS_ID, 1, 0), >> - _DTV_CMD(DTV_DVBT2_PLP_ID, 1, 0), >> + _DTV_CMD(DTV_STREAM_ID, 1, 0), >> + _DTV_CMD(DTV_DVBT2_PLP_ID_LEGACY, 1, 0), >> >> /* Get */ >> _DTV_CMD(DTV_DISEQC_SLAVE_REPLY, 0, 1), >> @@ -1382,11 +1381,10 @@ static int dtv_property_process_get(struct dvb_frontend *fe, >> case DTV_ISDBT_LAYERC_TIME_INTERLEAVING: >> tvp->u.data = c->layer[2].interleaving; >> break; >> - case DTV_ISDBS_TS_ID: >> - tvp->u.data = c->isdbs_ts_id; >> - break; >> - case DTV_DVBT2_PLP_ID: >> - tvp->u.data = c->dvbt2_plp_id; >> + >> + case DTV_STREAM_ID: >> + case DTV_DVBT2_PLP_ID_LEGACY: >> + tvp->u.data = c->stream_id; >> break; >> >> /* ATSC-MH */ >> @@ -1771,11 +1769,10 @@ static int dtv_property_process_set(struct dvb_frontend *fe, >> case DTV_ISDBT_LAYERC_TIME_INTERLEAVING: >> c->layer[2].interleaving = tvp->u.data; >> break; >> - case DTV_ISDBS_TS_ID: >> - c->isdbs_ts_id = tvp->u.data; >> - break; >> - case DTV_DVBT2_PLP_ID: >> - c->dvbt2_plp_id = tvp->u.data; >> + >> + case DTV_STREAM_ID: >> + case DTV_DVBT2_PLP_ID_LEGACY: >> + c->stream_id = tvp->u.data; >> break; >> >> /* ATSC-MH */ The rest looks fine for me. Still missing the DocBook additions for multistream (Documentation/DocBook/media/dvb/dvbproperty.xml). > > regards > Antti > > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, > diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h > index 7c64c09..bec0cda 100644 > --- a/drivers/media/dvb/dvb-core/dvb_frontend.h > +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h > @@ -368,11 +368,8 @@ struct dtv_frontend_properties { > u8 interleaving; > } layer[3]; > > - /* ISDB-T specifics */ > - u32 isdbs_ts_id; > - > - /* DVB-T2 specifics */ > - u32 dvbt2_plp_id; > + /* Multistream specifics */ > + u32 stream_id; > > /* ATSC-MH specifics */ > u8 atscmh_fic_ver; It would be nice if you would include a patch to replace isdbs_ts_id in dvb/pt1/va1j5jf8007s.c, which is the only file to use the variable. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
16.08.2012, 21:11, "Antti Palosaari" <crope@iki.fi>: >> - /* ISDB-T specifics */ >> - u32 isdbs_ts_id; >> - >> - /* DVB-T2 specifics */ >> - u32 dvbt2_plp_id; >> + /* Multistream specifics */ >> + u32 stream_id; > > u32 == 32 bit long unsigned number. See next comment. >> >> - c->isdbs_ts_id = 0; >> - c->dvbt2_plp_id = 0; >> + c->stream_id = -1; > > unsigned number cannot be -1. It can be only 0 or bigger. Due to that > this is wrong. so maybe better declare in as int ? depend from standard valid stream id (for DVB is 0-255) and any another value (-1) disable stream filtering in demod. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
16.08.2012, 21:11, "Antti Palosaari" <crope@iki.fi>: > @Mauro, should we rename also DTV_ISDBS_TS_ID to DTV_ISDBS_TS_ID_LEGACY > to remind users ? Maybe leave DTV_ISDBS_TS_ID and convert DTV_DVBT2_PLP_ID to DTV_DVB_STREAM_ID ? and dvbt2_plp_id convert to dvb_stream_id. Because DVB and ISDB different standards and look like stream id for ISDB is 16 bit, for DVB-S2/T2 8 bit. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em 17-08-2012 14:52, CrazyCat escreveu: > 16.08.2012, 21:11, "Antti Palosaari" <crope@iki.fi>: >> @Mauro, should we rename also DTV_ISDBS_TS_ID to DTV_ISDBS_TS_ID_LEGACY >> to remind users ? > > Maybe leave DTV_ISDBS_TS_ID and convert DTV_DVBT2_PLP_ID to DTV_DVB_STREAM_ID ? and dvbt2_plp_id convert to dvb_stream_id. > > Because DVB and ISDB different standards and look like stream id for ISDB is 16 bit, for DVB-S2/T2 8 bit. Well, Frequency range in satellite standards are in kHz, while the frequencies on the other ones are in Hz. So, I don't think that the number of bits should limit it. In a matter of fact, even on DVB-T/T2, DVB-S/S2, ... there are some fields that gained more bits. So, I don't see any issue on using DTV_DVB_STREAM_ID on all of them, even if the number of bits are different. Of course, the API documentation should be clear about the field differences. Regards, Mauro. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/17/2012 08:21 PM, CrazyCat wrote: > > 16.08.2012, 21:11, "Antti Palosaari" <crope@iki.fi>: >>> - /* ISDB-T specifics */ >>> - u32 isdbs_ts_id; >>> - >>> - /* DVB-T2 specifics */ >>> - u32 dvbt2_plp_id; >>> + /* Multistream specifics */ >>> + u32 stream_id; >> >> u32 == 32 bit long unsigned number. See next comment. >>> >>> - c->isdbs_ts_id = 0; >>> - c->dvbt2_plp_id = 0; >>> + c->stream_id = -1; >> >> unsigned number cannot be -1. It can be only 0 or bigger. Due to that >> this is wrong. > > so maybe better declare in as int ? depend from standard valid stream id (for DVB is 0-255) and any another value (-1) disable stream filtering in demod. I agree that. Actually I was thinking same. For DVB-T2 valid values are 0-255, I haven't looked others but surely int maximum should enough for all. regards Antti
Em 17-08-2012 14:21, CrazyCat escreveu: > > 16.08.2012, 21:11, "Antti Palosaari" <crope@iki.fi>: >>> - /* ISDB-T specifics */ >>> - u32 isdbs_ts_id; >>> - >>> - /* DVB-T2 specifics */ >>> - u32 dvbt2_plp_id; >>> + /* Multistream specifics */ >>> + u32 stream_id; >> >> u32 == 32 bit long unsigned number. See next comment. >>> >>> - c->isdbs_ts_id = 0; >>> - c->dvbt2_plp_id = 0; >>> + c->stream_id = -1; >> >> unsigned number cannot be -1. It can be only 0 or bigger. Due to that >> this is wrong. > > so maybe better declare in as int ? depend from standard valid stream id (for DVB is 0-255) and any another value (-1) disable stream filtering in demod. It should be noticed that DVBv5 will pass it as u32 in any case. So, maybe it is better to use UINT_MAX as the no-filter value: /home/v4l/v4l/patchwork/include/linux/kernel.h:#define UINT_MAX (~0U) Some care is needed when doing that, to avoid 32bits/64bits compat conflicts. Also, this define doesn't exist in userspace. so, maybe using something like: #define NO_STREAM_ID_FILTER (~0U) Would work properly, as, even on 64bits system with 32bits userspace, this should work or, if we want to be pedantic: #define NO_STREAM_ID_FILTER ((u32)(~0U)) > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h index f50d405..3444dda 100644 --- a/include/linux/dvb/frontend.h +++ b/include/linux/dvb/frontend.h @@ -62,6 +62,7 @@ typedef enum fe_caps { FE_CAN_8VSB = 0x200000, FE_CAN_16VSB = 0x400000, FE_HAS_EXTENDED_CAPS = 0x800000, /* We need more bitspace for newer APIs, indicate this. */ + FE_CAN_MULTISTREAM = 0x4000000, /* frontend supports DVB-S2 multistream filtering */ FE_CAN_TURBO_FEC = 0x8000000, /* frontend supports "turbo fec modulation" */ FE_CAN_2G_MODULATION = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */ FE_NEEDS_BENDING = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */ @@ -314,9 +315,11 @@ struct dvb_frontend_event { #define DTV_ISDBT_LAYER_ENABLED 41 -#define DTV_ISDBS_TS_ID 42 +#define DTV_STREAM_ID 42 +#define DTV_ISDBS_TS_ID DTV_STREAM_ID +#define DTV_DVBS2_MIS_ID DTV_STREAM_ID -#define DTV_DVBT2_PLP_ID 43 +#define DTV_DVBT2_PLP_ID_LEGACY 43 #define DTV_ENUM_DELSYS 44 diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 7c64c09..bec0cda 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h @@ -368,11 +368,8 @@ struct dtv_frontend_properties { u8 interleaving; } layer[3]; - /* ISDB-T specifics */ - u32 isdbs_ts_id; - - /* DVB-T2 specifics */ - u32 dvbt2_plp_id; + /* Multistream specifics */ + u32 stream_id; /* ATSC-MH specifics */ u8 atscmh_fic_ver; diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index aebcdf2..bccd245 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -946,8 +946,7 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe) c->layer[i].segment_count = 0; } - c->isdbs_ts_id = 0; - c->dvbt2_plp_id = 0; + c->stream_id = -1; switch (c->delivery_system) { case SYS_DVBS: @@ -1017,8 +1016,8 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = { _DTV_CMD(DTV_ISDBT_LAYERC_SEGMENT_COUNT, 1, 0), _DTV_CMD(DTV_ISDBT_LAYERC_TIME_INTERLEAVING, 1, 0), - _DTV_CMD(DTV_ISDBS_TS_ID, 1, 0), - _DTV_CMD(DTV_DVBT2_PLP_ID, 1, 0), + _DTV_CMD(DTV_STREAM_ID, 1, 0), + _DTV_CMD(DTV_DVBT2_PLP_ID_LEGACY, 1, 0), /* Get */ _DTV_CMD(DTV_DISEQC_SLAVE_REPLY, 0, 1), @@ -1382,11 +1381,10 @@ static int dtv_property_process_get(struct dvb_frontend *fe, case DTV_ISDBT_LAYERC_TIME_INTERLEAVING: tvp->u.data = c->layer[2].interleaving; break; - case DTV_ISDBS_TS_ID: - tvp->u.data = c->isdbs_ts_id; - break; - case DTV_DVBT2_PLP_ID: - tvp->u.data = c->dvbt2_plp_id; + + case DTV_STREAM_ID: + case DTV_DVBT2_PLP_ID_LEGACY: + tvp->u.data = c->stream_id; break; /* ATSC-MH */ @@ -1771,11 +1769,10 @@ static int dtv_property_process_set(struct dvb_frontend *fe, case DTV_ISDBT_LAYERC_TIME_INTERLEAVING: c->layer[2].interleaving = tvp->u.data; break; - case DTV_ISDBS_TS_ID: - c->isdbs_ts_id = tvp->u.data; - break; - case DTV_DVBT2_PLP_ID: - c->dvbt2_plp_id = tvp->u.data; + + case DTV_STREAM_ID: + case DTV_DVBT2_PLP_ID_LEGACY: + c->stream_id = tvp->u.data; break; /* ATSC-MH */
DTV_ISDBS_TS_ID replaced with DTV_STREAM_ID. Aliases DTV_ISDBS_TS_ID, DTV_DVBS2_MIS_ID for DTV_STREAM_ID. DTV_DVBT2_PLP_ID marked as legacy. Signed-off-by: Evgeny Plehov <EvgenyPlehov@ukr.net> -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html