Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
5ccbe67f
Commit
5ccbe67f
authored
Jul 28, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DTV: add 10 and 1.712 MHz bandwidth (from DVB-T2)
parent
5cadaf87
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
4 deletions
+15
-4
modules/access/dtv/access.c
modules/access/dtv/access.c
+3
-2
modules/access/dtv/linux.c
modules/access/dtv/linux.c
+12
-2
No files found.
modules/access/dtv/access.c
View file @
5ccbe67f
...
@@ -111,10 +111,11 @@ static const char *const transmission_user[] = { N_("Automatic"),
...
@@ -111,10 +111,11 @@ static const char *const transmission_user[] = { N_("Automatic"),
#define BANDWIDTH_TEXT N_("Bandwidth (MHz)")
#define BANDWIDTH_TEXT N_("Bandwidth (MHz)")
const
int
bandwidth_vlc
[]
=
{
0
,
const
int
bandwidth_vlc
[]
=
{
0
,
8
,
7
,
6
,
5
,
10
,
8
,
7
,
6
,
5
,
2
};
};
static
const
char
*
const
bandwidth_user
[]
=
{
N_
(
"Automatic"
),
static
const
char
*
const
bandwidth_user
[]
=
{
N_
(
"Automatic"
),
N_
(
"8 MHz"
),
N_
(
"7 MHz"
),
N_
(
"6 MHz"
),
N_
(
"5 MHz"
),
N_
(
"10 MHz"
),
N_
(
"8 MHz"
),
N_
(
"7 MHz"
),
N_
(
"6 MHz"
),
N_
(
"5 MHz"
),
N_
(
"1.712 MHz"
),
};
};
#define GUARD_TEXT N_("Guard interval")
#define GUARD_TEXT N_("Guard interval")
...
...
modules/access/dtv/linux.c
View file @
5ccbe67f
...
@@ -798,6 +798,16 @@ int dvb_set_dvbs2 (dvb_device_t *d, uint64_t freq_Hz, const char *modstr,
...
@@ -798,6 +798,16 @@ int dvb_set_dvbs2 (dvb_device_t *d, uint64_t freq_Hz, const char *modstr,
/*** DVB-T ***/
/*** DVB-T ***/
static
uint32_t
dvb_parse_bandwidth
(
uint32_t
i
)
{
switch
(
i
)
{
//case 0: return 0;
case
2
:
return
1712000
;
default:
return
i
*
1000000
;
}
}
static
int
dvb_parse_transmit_mode
(
int
i
)
static
int
dvb_parse_transmit_mode
(
int
i
)
{
{
static
const
dvb_int_map_t
tab
[]
=
{
static
const
dvb_int_map_t
tab
[]
=
{
...
@@ -857,7 +867,7 @@ int dvb_set_dvbt (dvb_device_t *d, uint32_t freq, const char *modstr,
...
@@ -857,7 +867,7 @@ int dvb_set_dvbt (dvb_device_t *d, uint32_t freq, const char *modstr,
uint32_t
mod
=
dvb_parse_modulation
(
modstr
,
QAM_AUTO
);
uint32_t
mod
=
dvb_parse_modulation
(
modstr
,
QAM_AUTO
);
fec_hp
=
dvb_parse_fec
(
fec_hp
);
fec_hp
=
dvb_parse_fec
(
fec_hp
);
fec_lp
=
dvb_parse_fec
(
fec_lp
);
fec_lp
=
dvb_parse_fec
(
fec_lp
);
bandwidth
*=
1000000
;
bandwidth
=
dvb_parse_bandwidth
(
bandwidth
)
;
transmit_mode
=
dvb_parse_transmit_mode
(
transmit_mode
);
transmit_mode
=
dvb_parse_transmit_mode
(
transmit_mode
);
guard
=
dvb_parse_guard
(
guard
);
guard
=
dvb_parse_guard
(
guard
);
hierarchy
=
dvb_parse_hierarchy
(
hierarchy
);
hierarchy
=
dvb_parse_hierarchy
(
hierarchy
);
...
@@ -880,7 +890,7 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr,
...
@@ -880,7 +890,7 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr,
#if DVBv5(3)
#if DVBv5(3)
uint32_t
mod
=
dvb_parse_modulation
(
modstr
,
QAM_AUTO
);
uint32_t
mod
=
dvb_parse_modulation
(
modstr
,
QAM_AUTO
);
fec
=
dvb_parse_fec
(
fec
);
fec
=
dvb_parse_fec
(
fec
);
bandwidth
*=
1000000
;
bandwidth
=
dvb_parse_bandwidth
(
bandwidth
)
;
transmit_mode
=
dvb_parse_transmit_mode
(
transmit_mode
);
transmit_mode
=
dvb_parse_transmit_mode
(
transmit_mode
);
guard
=
dvb_parse_guard
(
guard
);
guard
=
dvb_parse_guard
(
guard
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment