mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Fixed default values for DVB-T
This commit is contained in:
		@@ -2790,6 +2790,7 @@ Winfried K
 | 
				
			|||||||
 for using __cplusplus instead of DISABLE_TEMPLATES_COLLIDING_WITH_STL, and using
 | 
					 for using __cplusplus instead of DISABLE_TEMPLATES_COLLIDING_WITH_STL, and using
 | 
				
			||||||
 std::min(), std::max() and std::swap() is available
 | 
					 std::min(), std::max() and std::swap() is available
 | 
				
			||||||
 for adding some missing "AUTO" values to vdr.5
 | 
					 for adding some missing "AUTO" values to vdr.5
 | 
				
			||||||
 | 
					 for fixing default values for DVB-T
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Hans-Werner Hilse <hilse@web.de>
 | 
					Hans-Werner Hilse <hilse@web.de>
 | 
				
			||||||
 for adding the command line option --userdump to enable core dumps in case VDR
 | 
					 for adding the command line option --userdump to enable core dumps in case VDR
 | 
				
			||||||
@@ -3715,3 +3716,6 @@ Ulf Gr
 | 
				
			|||||||
Timo Weing<6E>rtner <timo@tiwe.de>
 | 
					Timo Weing<6E>rtner <timo@tiwe.de>
 | 
				
			||||||
 for reporting an integer overflow in calculating the disk use percentage if there's
 | 
					 for reporting an integer overflow in calculating the disk use percentage if there's
 | 
				
			||||||
 more than 20TB of recordings
 | 
					 more than 20TB of recordings
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Jose Angel <joseangelpp@gmail.com>
 | 
				
			||||||
 | 
					 for reporting a bug in default values for DVB-T
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								HISTORY
									
									
									
									
									
								
							@@ -9780,7 +9780,7 @@ Video Disk Recorder Revision History
 | 
				
			|||||||
  out by Onur Sent<6E>rk).
 | 
					  out by Onur Sent<6E>rk).
 | 
				
			||||||
- Official release.
 | 
					- Official release.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2022-11-13:
 | 
					2022-11-14:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Added UPDATE-2.6.0, which was missing in the official 2.6.0 release.
 | 
					- Added UPDATE-2.6.0, which was missing in the official 2.6.0 release.
 | 
				
			||||||
- Fixed unexpected calls of the '-r' script when a recording is interrupted and
 | 
					- Fixed unexpected calls of the '-r' script when a recording is interrupted and
 | 
				
			||||||
@@ -9795,3 +9795,4 @@ Video Disk Recorder Revision History
 | 
				
			|||||||
- Fixed a possible crash if an editing process is canceled while the edited
 | 
					- Fixed a possible crash if an editing process is canceled while the edited
 | 
				
			||||||
  recording is being replayed.
 | 
					  recording is being replayed.
 | 
				
			||||||
- Added a warning if an attempt is made to obtain a write lock twice from the same thread.
 | 
					- Added a warning if an attempt is made to obtain a write lock twice from the same thread.
 | 
				
			||||||
 | 
					- Fixed default values for DVB-T (thanks to Winfried K<>hler and Jose Angel).
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,7 +4,7 @@
 | 
				
			|||||||
 * See the main source file 'vdr.c' for copyright information and
 | 
					 * See the main source file 'vdr.c' for copyright information and
 | 
				
			||||||
 * how to reach the author.
 | 
					 * how to reach the author.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * $Id: dvbdevice.c 5.1 2021/06/09 09:12:25 kls Exp $
 | 
					 * $Id: dvbdevice.c 5.2 2022/11/14 16:31:08 kls Exp $
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "dvbdevice.h"
 | 
					#include "dvbdevice.h"
 | 
				
			||||||
@@ -23,6 +23,8 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static int DvbApiVersion = 0x0000; // the version of the DVB driver actually in use (will be determined by the first device created)
 | 
					static int DvbApiVersion = 0x0000; // the version of the DVB driver actually in use (will be determined by the first device created)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define BANDWIDTH_HZ_AUTO 0 // missing in DVB API 5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define DVBS_TUNE_TIMEOUT  9000 //ms
 | 
					#define DVBS_TUNE_TIMEOUT  9000 //ms
 | 
				
			||||||
#define DVBS_LOCK_TIMEOUT  2000 //ms
 | 
					#define DVBS_LOCK_TIMEOUT  2000 //ms
 | 
				
			||||||
#define DVBC_TUNE_TIMEOUT  9000 //ms
 | 
					#define DVBC_TUNE_TIMEOUT  9000 //ms
 | 
				
			||||||
@@ -59,6 +61,7 @@ const tDvbParameterMap BandwidthValues[] = {
 | 
				
			|||||||
  {    8,  8000000, "8 MHz" },
 | 
					  {    8,  8000000, "8 MHz" },
 | 
				
			||||||
  {   10, 10000000, "10 MHz" },
 | 
					  {   10, 10000000, "10 MHz" },
 | 
				
			||||||
  { 1712,  1712000, "1.712 MHz" },
 | 
					  { 1712,  1712000, "1.712 MHz" },
 | 
				
			||||||
 | 
					  {  999, BANDWIDTH_HZ_AUTO, trNOOP("auto") },
 | 
				
			||||||
  {  -1, 0, NULL }
 | 
					  {  -1, 0, NULL }
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -255,10 +258,10 @@ bool cDvbTransponderParameters::Parse(const char *s)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  polarization = 0;
 | 
					  polarization = 0;
 | 
				
			||||||
  inversion    = INVERSION_AUTO;
 | 
					  inversion    = INVERSION_AUTO;
 | 
				
			||||||
  bandwidth    = 8000000;
 | 
					  bandwidth    = BANDWIDTH_HZ_AUTO;
 | 
				
			||||||
  coderateH    = FEC_AUTO;
 | 
					  coderateH    = FEC_AUTO;
 | 
				
			||||||
  coderateL    = FEC_AUTO;
 | 
					  coderateL    = FEC_AUTO;
 | 
				
			||||||
  modulation   = QPSK;
 | 
					  modulation   = QAM_AUTO;
 | 
				
			||||||
  system       = DVB_SYSTEM_1;
 | 
					  system       = DVB_SYSTEM_1;
 | 
				
			||||||
  transmission = TRANSMISSION_MODE_AUTO;
 | 
					  transmission = TRANSMISSION_MODE_AUTO;
 | 
				
			||||||
  guard        = GUARD_INTERVAL_AUTO;
 | 
					  guard        = GUARD_INTERVAL_AUTO;
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								vdr.5
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								vdr.5
									
									
									
									
									
								
							@@ -8,7 +8,7 @@
 | 
				
			|||||||
.\" License as specified in the file COPYING that comes with the
 | 
					.\" License as specified in the file COPYING that comes with the
 | 
				
			||||||
.\" vdr distribution.
 | 
					.\" vdr distribution.
 | 
				
			||||||
.\"
 | 
					.\"
 | 
				
			||||||
.\" $Id: vdr.5 5.6 2022/01/14 10:46:15 kls Exp $
 | 
					.\" $Id: vdr.5 5.7 2022/11/14 16:25:58 kls Exp $
 | 
				
			||||||
.\"
 | 
					.\"
 | 
				
			||||||
.TH vdr 5 "27 Dec 2021" "2.6" "Video Disk Recorder Files"
 | 
					.TH vdr 5 "27 Dec 2021" "2.6" "Video Disk Recorder Files"
 | 
				
			||||||
.SH NAME
 | 
					.SH NAME
 | 
				
			||||||
@@ -91,7 +91,7 @@ meaning (and allowed values) are
 | 
				
			|||||||
.TS
 | 
					.TS
 | 
				
			||||||
tab (@);
 | 
					tab (@);
 | 
				
			||||||
l l.
 | 
					l l.
 | 
				
			||||||
\fBB\fR@Bandwidth (1712, 5, 6, 7, 8, 10)
 | 
					\fBB\fR@Bandwidth (1712, 5, 6, 7, 8, 10, 999)
 | 
				
			||||||
\fBC\fR@Code rate high priority (0, 12, 23, 34, 35, 45, 56, 67, 78, 89, 910, 999)
 | 
					\fBC\fR@Code rate high priority (0, 12, 23, 34, 35, 45, 56, 67, 78, 89, 910, 999)
 | 
				
			||||||
\fBD\fR@coDe rate low priority (0, 12, 23, 34, 35, 45, 56, 67, 78, 89, 910, 999)
 | 
					\fBD\fR@coDe rate low priority (0, 12, 23, 34, 35, 45, 56, 67, 78, 89, 910, 999)
 | 
				
			||||||
\fBG\fR@Guard interval (4, 8, 16, 32, 128, 19128, 19256, 999)
 | 
					\fBG\fR@Guard interval (4, 8, 16, 32, 128, 19128, 19256, 999)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user