Commit 33bd9ac8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

DTV: DVB-T2 PLP ID is between 0 and 255

(cherry picked from commit fd0970abdfc80fe92cf6b87ed6b6987526919035)

Conflicts:
	modules/access/dtv/bdagraph.cpp
parent f687ca24
......@@ -301,7 +301,7 @@ vlc_module_begin ()
change_integer_list (hierarchy_vlc, hierarchy_user)
change_safe ()
add_integer ("dvb-plp-id", 0, PLP_ID_TEXT, PLP_ID_TEXT, false)
change_integer_range (0, 0xFFFFFFFF)
change_integer_range (0, 255)
change_safe ()
set_section (N_("ISDB-T reception parameters"), NULL)
......
......@@ -237,7 +237,7 @@ int dvb_set_dvbt (dvb_device_t *d, uint32_t freq, const char * /*mod*/,
int dvb_set_dvbt2 (dvb_device_t *, uint32_t /*freq*/, const char * /*mod*/,
uint32_t /*fec*/, uint32_t /*bandwidth*/, int /*tx_mode*/,
uint32_t /*guard*/, uint32_t /*plp*/)
uint32_t /*guard*/, uint8_t /*plp*/)
{
return VLC_EGENERIC;
}
......
......@@ -85,7 +85,7 @@ int dvb_set_dvbt (dvb_device_t *, uint32_t freq, const char *mod,
int transmission, uint32_t guard, int hierarchy);
int dvb_set_dvbt2 (dvb_device_t *, uint32_t freq, const char *mod,
uint32_t fec, uint32_t bandwidth,
int transmission, uint32_t guard, uint32_t plp);
int transmission, uint32_t guard, uint8_t plp);
/* ATSC */
int dvb_set_atsc (dvb_device_t *, uint32_t freq, const char *mod);
......
......@@ -991,7 +991,7 @@ int dvb_set_dvbt (dvb_device_t *d, uint32_t freq, const char *modstr,
int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr,
uint32_t fec, uint32_t bandwidth,
int transmit_mode, uint32_t guard, uint32_t plp)
int transmit_mode, uint32_t guard, uint8_t plp)
{
#if DVBv5(3)
uint32_t mod = dvb_parse_modulation (modstr, QAM_AUTO);
......@@ -1012,7 +1012,7 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr,
# else
DTV_DVBT2_PLP_ID,
# endif
plp);
(uint32_t)plp);
#else
# warning DVB-T2 needs Linux DVB version 5.3 or later.
msg_Err (d->obj, "DVB-T2 support not compiled-in");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment