January 2005 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libao2 ao_oss.c,1.50,1.51
by syncmail＠mplayerhq.hu 06 Jan '05

06 Jan '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libao2 In directory mail:/var2/tmp/cvs-serv1479 Modified Files: ao_oss.c Log Message: Use AF_FORMAT_S16_NE instead of #ifdef WORDS_BIGENDIAN ... Index: ao_oss.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ao_oss.c 6 Jan 2005 13:15:53 -0000 1.50 +++ ao_oss.c 6 Jan 2005 17:35:43 -0000 1.51 @@ -283,20 +283,15 @@ if (oss_format == -1) { #ifdef WORDS_BIGENDIAN oss_format=AFMT_S16_BE; - format=AF_FORMAT_S16_BE; #else oss_format=AFMT_S16_LE; - format=AF_FORMAT_S16_LE; #endif + format=AF_FORMAT_S16_NE; } if( ioctl(audio_fd, SNDCTL_DSP_SETFMT, &oss_format)<0 || oss_format != format2oss(format)) if(format == AF_FORMAT_AC3){ mp_msg(MSGT_AO,MSGL_WARN, MSGTR_AO_OSS_CantSetAC3, dsp); -#ifdef WORDS_BIGENDIAN - format=AF_FORMAT_S16_BE; -#else - format=AF_FORMAT_S16_LE; -#endif + format=AF_FORMAT_S16_NE; goto ac3_retry; } #if 0

1 0

CVS: main/libmpdemux demux_real.c,1.64,1.65
by syncmail＠mplayerhq.hu 06 Jan '05

06 Jan '05

CVS change done by Roberto Togni CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv1900 Modified Files: demux_real.c Log Message: Reduce index verbosity Index: demux_real.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- demux_real.c 6 Jan 2005 16:29:46 -0000 1.64 +++ demux_real.c 6 Jan 2005 17:08:52 -0000 1.65 @@ -131,7 +131,7 @@ real_index_table_t *index; int i, entries; - if (verbose<=0) + if (verbose<=1) return; if (stream_id > MAX_STREAMS)

1 0

CVS: main/libvo vo_directx.c,1.49,1.50
by syncmail＠mplayerhq.hu 06 Jan '05

06 Jan '05

CVS change done by Sascha Sommer CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv5262/libvo Modified Files: vo_directx.c Log Message: fixed-vo/libmpeg2 aspect change fix Index: vo_directx.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- vo_directx.c 6 Jan 2005 15:58:37 -0000 1.49 +++ vo_directx.c 6 Jan 2005 16:24:58 -0000 1.50 @@ -1273,6 +1273,8 @@ if(vidmode)vo_fs=0; + if (g_cc != NULL)g_cc->lpVtbl->Release(g_cc); + g_cc=NULL; /*release all surfaces*/ if (g_lpddsBack != NULL) g_lpddsBack->lpVtbl->Release(g_lpddsBack); g_lpddsBack = NULL;

1 0

CVS: main/libvo vo_directx.c,1.48,1.49
by syncmail＠mplayerhq.hu 06 Jan '05

06 Jan '05

CVS change done by Sascha Sommer CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv10381/libvo Modified Files: vo_directx.c Log Message: 256 color mode support, use -vm to get better output when overlay is not supported Index: vo_directx.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- vo_directx.c 2 Jan 2005 16:44:44 -0000 1.48 +++ vo_directx.c 6 Jan 2005 15:58:37 -0000 1.49 @@ -1,6 +1,6 @@ /****************************************************************************** * vo_directx.c: Directx v2 or later DirectDraw interface for MPlayer - * Copyright (c) 2002 - 2004 Sascha Sommer <saschasommer(a)freenet.de>. + * Copyright (c) 2002 - 2005 Sascha Sommer <saschasommer(a)freenet.de>. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -116,6 +116,7 @@ {"YVU9 ",IMGFMT_YVU9 ,0,{sizeof(DDPIXELFORMAT), DDPF_FOURCC,MAKEFOURCC('Y','V','U','9'),0,0,0,0,0}}, {"YUY2 ",IMGFMT_YUY2 ,0,{sizeof(DDPIXELFORMAT), DDPF_FOURCC,MAKEFOURCC('Y','U','Y','2'),0,0,0,0,0}}, {"UYVY ",IMGFMT_UYVY ,0,{sizeof(DDPIXELFORMAT), DDPF_FOURCC,MAKEFOURCC('U','Y','V','Y'),0,0,0,0,0}}, + {"BGR8 ",IMGFMT_BGR8 ,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 8, 0x00000000, 0x00000000, 0x00000000, 0}}, {"RGB15",IMGFMT_RGB15,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x0000001F, 0x000003E0, 0x00007C00, 0}}, //RGB 5:5:5 {"BGR15",IMGFMT_BGR15,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x00007C00, 0x000003E0, 0x0000001F, 0}}, {"RGB16",IMGFMT_RGB16,0,{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x0000001F, 0x000007E0, 0x0000F800, 0}}, //RGB 5:6:5 @@ -1287,6 +1288,24 @@ /*create the surfaces*/ if(Directx_CreatePrimarySurface())return 1; + + //create palette for 256 color mode + if(image_format==IMGFMT_BGR8){ + LPDIRECTDRAWPALETTE ddpalette=NULL; + char* palette=malloc(4*256); + int i; + for(i=0; i<256; i++){ + palette[4*i+0] = ((i >> 5) & 0x07) * 255 / 7; + palette[4*i+1] = ((i >> 2) & 0x07) * 255 / 7; + palette[4*i+2] = ((i >> 0) & 0x03) * 255 / 3; + palette[4*i+3] = PC_NOCOLLAPSE; + } + g_lpdd->lpVtbl->CreatePalette(g_lpdd,DDPCAPS_8BIT|DDPCAPS_INITIALIZE,palette,&ddpalette,NULL); + g_lpddsPrimary->lpVtbl->SetPalette(g_lpddsPrimary,ddpalette); + free(palette); + ddpalette->lpVtbl->Release(ddpalette); + } + if (!nooverlay && Directx_CreateOverlay(image_format)) { if(format == primary_image_format)nooverlay=1; /*overlay creation failed*/

1 0

CVS: main/libaf af_format.c,1.22,1.23
by syncmail＠mplayerhq.hu 06 Jan '05

06 Jan '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libaf In directory mail:/var2/tmp/cvs-serv1720 Modified Files: af_format.c Log Message: af_fmt2str fixes (remove trailing space, call with size of buffer, not size-1) Index: af_format.c =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af_format.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- af_format.c 3 Jan 2005 18:59:16 -0000 1.22 +++ af_format.c 6 Jan 2005 14:32:08 -0000 1.23 @@ -164,6 +164,9 @@ i+=snprintf(&str[i],size-i,"int "); } } + // remove trailing space + if (i > 0 && str[i - 1] == ' ') + i--; str[i] = 0; // make sure it is 0 terminated. return str; } @@ -268,7 +271,7 @@ case(AF_FORMAT_MPEG2): case(AF_FORMAT_AC3): af_msg(AF_MSG_ERROR,"[format] Sample format %s not yet supported \n", - af_fmt2str(format,buf,255)); + af_fmt2str(format,buf,256)); return AF_ERROR; } return AF_OK; @@ -295,9 +298,9 @@ (AF_OK != check_format(af->data->format))) return AF_ERROR; - af_msg(AF_MSG_VERBOSE,"[format] Changing sample format from %sto %s \n", - af_fmt2str(((af_data_t*)arg)->format,buf1,255), - af_fmt2str(af->data->format,buf2,255)); + af_msg(AF_MSG_VERBOSE,"[format] Changing sample format from %s to %s\n", + af_fmt2str(((af_data_t*)arg)->format,buf1,256), + af_fmt2str(af->data->format,buf2,256)); af->data->rate = ((af_data_t*)arg)->rate; af->data->nch = ((af_data_t*)arg)->nch; @@ -316,17 +319,17 @@ if ((data->format == AF_FORMAT_FLOAT_NE) && (af->data->format == AF_FORMAT_S16_NE)) { - af_msg(AF_MSG_VERBOSE,"[format] Accelerated %sto %sconversion\n", - af_fmt2str(((af_data_t*)arg)->format,buf1,255), - af_fmt2str(af->data->format,buf2,255)); + af_msg(AF_MSG_VERBOSE,"[format] Accelerated %s to %s conversion\n", + af_fmt2str(((af_data_t*)arg)->format,buf1,256), + af_fmt2str(af->data->format,buf2,256)); af->play = play_float_s16; } if ((data->format == AF_FORMAT_S16_NE) && (af->data->format == AF_FORMAT_FLOAT_NE)) { - af_msg(AF_MSG_VERBOSE,"[format] Accelerated %sto %sconversion\n", - af_fmt2str(((af_data_t*)arg)->format,buf1,255), - af_fmt2str(af->data->format,buf2,255)); + af_msg(AF_MSG_VERBOSE,"[format] Accelerated %s to %s conversion\n", + af_fmt2str(((af_data_t*)arg)->format,buf1,256), + af_fmt2str(af->data->format,buf2,256)); af->play = play_s16_float; } return AF_OK;

1 0

CVS: main/libao2 ao_oss.c,1.49,1.50
by syncmail＠mplayerhq.hu 06 Jan '05

06 Jan '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libao2 In directory mail:/var2/tmp/cvs-serv14888/libao2 Modified Files: ao_oss.c Log Message: Check for every 24 and 32 bit AFMT_ separately if it is defined. Patch by Walter Haidinger walter dot haidinger at gmx dot at Index: ao_oss.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ao_oss.c 29 Dec 2004 19:26:01 -0000 1.49 +++ ao_oss.c 6 Jan 2005 13:15:53 -0000 1.50 @@ -50,16 +50,28 @@ case AF_FORMAT_U16_BE: return AFMT_U16_BE; case AF_FORMAT_S16_LE: return AFMT_S16_LE; case AF_FORMAT_S16_BE: return AFMT_S16_BE; -#ifdef AFMT_S24_LE +#ifdef AFMT_U24_LE case AF_FORMAT_U24_LE: return AFMT_U24_LE; +#endif +#ifdef AFMT_U24_BE case AF_FORMAT_U24_BE: return AFMT_U24_BE; +#endif +#ifdef AFMT_S24_LE case AF_FORMAT_S24_LE: return AFMT_S24_LE; +#endif +#ifdef AFMT_S24_BE case AF_FORMAT_S24_BE: return AFMT_S24_BE; #endif -#ifdef AFMT_S32_LE +#ifdef AFMT_U32_LE case AF_FORMAT_U32_LE: return AFMT_U32_LE; +#endif +#ifdef AFMT_U32_BE case AF_FORMAT_U32_BE: return AFMT_U32_BE; +#endif +#ifdef AFMT_S32_LE case AF_FORMAT_S32_LE: return AFMT_S32_LE; +#endif +#ifdef AFMT_S32_BE case AF_FORMAT_S32_BE: return AFMT_S32_BE; #endif #ifdef AFMT_FLOAT @@ -90,16 +102,28 @@ case AFMT_U16_BE: return AF_FORMAT_U16_BE; case AFMT_S16_LE: return AF_FORMAT_S16_LE; case AFMT_S16_BE: return AF_FORMAT_S16_BE; -#ifdef AFMT_S24_LE +#ifdef AFMT_U24_LE case AFMT_U24_LE: return AF_FORMAT_U24_LE; +#endif +#ifdef AFMT_U24_BE case AFMT_U24_BE: return AF_FORMAT_U24_BE; +#endif +#ifdef AFMT_S24_LE case AFMT_S24_LE: return AF_FORMAT_S24_LE; +#endif +#ifdef AFMT_S24_BE case AFMT_S24_BE: return AF_FORMAT_S24_BE; #endif -#ifdef AFMT_S32_LE +#ifdef AFMT_U32_LE case AFMT_U32_LE: return AF_FORMAT_U32_LE; +#endif +#ifdef AFMT_U32_BE case AFMT_U32_BE: return AF_FORMAT_U32_BE; +#endif +#ifdef AFMT_S32_LE case AFMT_S32_LE: return AF_FORMAT_S32_LE; +#endif +#ifdef AFMT_S32_BE case AFMT_S32_BE: return AF_FORMAT_S32_BE; #endif #ifdef AFMT_FLOAT

1 0

CVS: main/libmpdemux demux_real.c,1.62,1.63
by syncmail＠mplayerhq.hu 06 Jan '05

06 Jan '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv29325/libmpdemux Modified Files: demux_real.c Log Message: Print waveheader only when verbose Index: demux_real.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- demux_real.c 1 Nov 2004 13:49:07 -0000 1.62 +++ demux_real.c 6 Jan 2005 13:10:10 -0000 1.63 @@ -1310,6 +1310,7 @@ sh->wf->wFormatTag = sh->format; + if (verbose > 0) print_wave_header(sh->wf); if(demuxer->audio->id==stream_id){

1 0

CVS: main configure,1.949,1.950
by syncmail＠mplayerhq.hu 06 Jan '05

06 Jan '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv11136 Modified Files: configure Log Message: RTC check should no longer be Linux-only. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.949 retrieving revision 1.950 diff -u -r1.949 -r1.950 --- configure 6 Jan 2005 00:06:55 -0000 1.949 +++ configure 6 Jan 2005 12:06:57 -0000 1.950 @@ -5020,9 +5020,8 @@ echocheck "RTC" -if linux ; then - if test "$_rtc" = auto ; then - cat > $TMPC << EOF +if test "$_rtc" = auto ; then + cat > $TMPC << EOF #include <sys/ioctl.h> #ifdef __linux__ #include <linux/rtc.h> @@ -5032,19 +5031,15 @@ #endif int main(void) { return RTC_PIE_ON; } EOF - _rtc=no - cc_check && _rtc=yes - fi - echores "$_rtc" -else _rtc=no - echores "no" + cc_check && _rtc=yes fi if test "$_rtc" = yes ; then _def_rtc='#define HAVE_RTC 1' else _def_rtc='#undef HAVE_RTC' fi +echores "$_rtc" echocheck "external liblzo support"

1 0

CVS: main/libao2 ao_plugin.c, 1.27, NONE audio_plugin.h, 1.14, NONE audio_plugin_internal.h, 1.4, NONE eq.h, 1.2, NONE filter.h, 1.3, NONE fir.h, 1.6, NONE firfilter.c, 1.3, NONE pl_delay.c, 1.9, NONE pl_eq.c, 1.9, NONE pl_extrastereo.c, 1.6, NONE pl_format.c, 1.10, NONE pl_resample.c, 1.14, NONE pl_surround.c, 1.15, NONE pl_volnorm.c, 1.8, NONE pl_volume.c, 1.5, NONE remez.c, 1.2, NONE remez.h, 1.1, NONE
by syncmail＠mplayerhq.hu 06 Jan '05

06 Jan '05

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libao2 In directory mail:/var2/tmp/cvs-serv1322 Removed Files: ao_plugin.c audio_plugin.h audio_plugin_internal.h eq.h filter.h fir.h firfilter.c pl_delay.c pl_eq.c pl_extrastereo.c pl_format.c pl_resample.c pl_surround.c pl_volnorm.c pl_volume.c remez.c remez.h Log Message: unused parts removed --- ao_plugin.c DELETED --- --- audio_plugin.h DELETED --- --- audio_plugin_internal.h DELETED --- --- eq.h DELETED --- --- filter.h DELETED --- --- fir.h DELETED --- --- firfilter.c DELETED --- --- pl_delay.c DELETED --- --- pl_eq.c DELETED --- --- pl_extrastereo.c DELETED --- --- pl_format.c DELETED --- --- pl_resample.c DELETED --- --- pl_surround.c DELETED --- --- pl_volnorm.c DELETED --- --- pl_volume.c DELETED --- --- remez.c DELETED --- --- remez.h DELETED ---

1 0

CVS: main/libmpdemux dvbin.h, 1.8, 1.9 dvbin.c, 1.11, 1.12 dvb_tune.c, 1.10, 1.11
by syncmail＠mplayerhq.hu 06 Jan '05

06 Jan '05

CVS change done by Nico Sabbi CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv16213 Modified Files: dvbin.h dvbin.c dvb_tune.c Log Message: added support for ATSC tuner and conf.file Index: dvbin.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/dvbin.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dvbin.h 26 Aug 2004 19:37:55 -0000 1.8 +++ dvbin.h 6 Jan 2005 09:43:10 -0000 1.9 @@ -8,6 +8,7 @@ #ifdef HAVE_DVB_HEAD #include <linux/dvb/dmx.h> #include <linux/dvb/frontend.h> + #include <linux/dvb/version.h> #else #include <ost/dmx.h> #include <ost/sec.h> @@ -26,6 +27,12 @@ #define dmx_pes_type_t dmxPesType_t #endif +#undef DVB_ATSC +#if defined(DVB_API_VERSION_MINOR) +#if DVB_API_VERSION == 3 && DVB_API_VERSION_MINOR >= 1 +#define DVB_ATSC 1 +#endif +#endif #define DVB_CHANNEL_LOWER -1 @@ -92,6 +99,7 @@ #define TUNER_SAT 1 #define TUNER_TER 2 #define TUNER_CBL 3 +#define TUNER_ATSC 4 extern int dvb_step_channel(dvb_priv_t *, int); extern int dvb_set_channel(dvb_priv_t *, int, int); Index: dvbin.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/dvbin.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dvbin.c 26 Aug 2004 19:38:04 -0000 1.11 +++ dvbin.c 6 Jan 2005 09:43:10 -0000 1.12 @@ -133,6 +133,7 @@ const char *cbl_conf = "%a[^:]:%d:%a[^:]:%d:%a[^:]:%a[^:]:%a[^:]:%a[^:]\n"; const char *sat_conf = "%a[^:]:%d:%c:%d:%d:%a[^:]:%a[^:]\n"; const char *ter_conf = "%a[^:]:%d:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]\n"; + const char *atsc_conf = "%a[^:]:%d:%a[^:]:%a[^:]:%a[^:]\n"; mp_msg(MSGT_DEMUX, MSGL_V, "CONFIG_READ FILE: %s, type: %d\n", filename, type); if((f=fopen(filename, "r"))==NULL) @@ -180,6 +181,16 @@ "CBL, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d", list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate); } +#ifdef DVB_ATSC + else if(type == TUNER_ATSC) + { + fields = sscanf(line, atsc_conf, + &ptr->name, &ptr->freq, &mod, &vpid_str, &apid_str); + mp_msg(MSGT_DEMUX, MSGL_V, + "ATSC, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d\n", + list->NUM_CHANNELS, fields, ptr->name, ptr->freq); + } +#endif else //SATELLITE { fields = sscanf(line, sat_conf, @@ -264,7 +275,11 @@ else if(! strcmp(cr, "FEC_NONE")) ptr->cr =FEC_NONE; else ptr->cr =FEC_AUTO; + } + + if((type == TUNER_TER) || (type == TUNER_CBL) || (type == TUNER_ATSC)) + { if(! strcmp(mod, "QAM_128")) ptr->mod = QAM_128; else if(! strcmp(mod, "QAM_256")) @@ -275,9 +290,15 @@ ptr->mod = QAM_32; else if(! strcmp(mod, "QAM_16")) ptr->mod = QAM_16; - //else ptr->mod = QPSK; - } +#ifdef DVB_ATSC + else if(! strcmp(mod, "VSB_8") || ! strcmp(mod, "8VSB")) + ptr->mod = VSB_8; + else if(! strcmp(mod, "VSB_16") || !strcmp(mod, "16VSB")) + ptr->mod = VSB_16; + ptr->inv = INVERSION_AUTO; +#endif + } if(type == TUNER_TER) { @@ -487,6 +508,11 @@ sprintf(priv->new_tuning, "%d|%09d|%d|%d|%d|%d", priv->card, channel->freq, channel->inv, channel->srate, channel->cr, channel->mod); break; +#ifdef DVB_ATSC + case TUNER_ATSC: + sprintf(priv->new_tuning, "%d|%09d|%d", priv->card, channel->freq, channel->mod); + break; +#endif } @@ -752,7 +778,7 @@ type = dvb_get_tuner_type(fd); close(fd); - if(type != TUNER_SAT && type != TUNER_TER && type != TUNER_CBL) + if(type != TUNER_SAT && type != TUNER_TER && type != TUNER_CBL && type != TUNER_ATSC) { mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't detect tuner type of card %d, skipping\n", i); continue; @@ -769,6 +795,9 @@ case TUNER_SAT: conf_file = get_path("channels.conf.sat"); break; + case TUNER_ATSC: + conf_file = get_path("channels.conf.atsc"); + break; } if((access(conf_file, F_OK | R_OK) != 0)) Index: dvb_tune.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/dvb_tune.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dvb_tune.c 31 Dec 2004 11:40:01 -0000 1.10 +++ dvb_tune.c 6 Jan 2005 09:43:10 -0000 1.11 @@ -84,6 +84,11 @@ mp_msg(MSGT_DEMUX, MSGL_V, "TUNER TYPE SEEMS TO BE DVB-C\n"); return TUNER_CBL; +#ifdef DVB_ATSC + case FE_ATSC: + mp_msg(MSGT_DEMUX, MSGL_V, "TUNER TYPE SEEMS TO BE DVB-ATSC\n"); + return TUNER_ATSC; +#endif default: mp_msg(MSGT_DEMUX, MSGL_ERR, "UNKNOWN TUNER TYPE\n"); return 0; @@ -386,6 +391,12 @@ mp_msg(MSGT_DEMUX, MSGL_V, " SymbolRate: %d\n",feparams->u.qpsk.symbol_rate); mp_msg(MSGT_DEMUX, MSGL_V, " FEC_inner: %d\n",feparams->u.qpsk.fec_inner); break; +#ifdef DVB_ATSC + case FE_ATSC: + mp_msg(MSGT_DEMUX, MSGL_V, "Event: Frequency: %d\n",feparams->frequency); + mp_msg(MSGT_DEMUX, MSGL_V, " Modulation: %d\n",feparams->u.vsb.modulation); + break; +#endif default: break; } @@ -755,6 +766,13 @@ feparams.u.qam.QAM = modulation; #endif break; +#ifdef DVB_ATSC + case FE_ATSC: + mp_msg(MSGT_DEMUX, MSGL_V, "tuning ATSC to %d, modulation=%d\n",freq,modulation); + feparams.frequency=freq; + feparams.u.vsb.modulation = modulation; + break; +#endif default: mp_msg(MSGT_DEMUX, MSGL_V, "Unknown FE type. Aborting\n"); return 0;

1 0