Ticket #6874: hdhr-dvbt.patch
File hdhr-dvbt.patch, 2.4 KB (added by , 15 years ago) |
---|
-
mythtv/libs/libmythtv/hdhrrecorder.cpp
176 176 data->AddMPEGSPListener(this); 177 177 data->AddMPEGListener(this); 178 178 179 ATSCStreamData *atsc = dynamic_cast<ATSCStreamData*>(data);180 179 DVBStreamData *dvb = dynamic_cast<DVBStreamData*>(data); 181 180 181 if (dvb) 182 dvb->AddDVBMainListener(this); 183 184 ATSCStreamData *atsc = dynamic_cast<ATSCStreamData*>(data); 185 182 186 if (atsc && atsc->DesiredMinorChannel()) 183 187 atsc->SetDesiredChannel(atsc->DesiredMajorChannel(), 184 188 atsc->DesiredMinorChannel()); 185 else if (dvb) 186 dvb->AddDVBMainListener(this); 189 187 190 else if (data->DesiredProgram() >= 0) 188 191 data->SetDesiredProgram(data->DesiredProgram()); 189 192 } … … 301 304 if (lpid == GetStreamData()->VideoPIDSingleProgram()) 302 305 { 303 306 //cerr<<"v"; 304 _buffer_packets = !FindMPEG2Keyframes(&tspacket); 305 BufferedWrite(tspacket); 307 ProgramMapTable *pmt = _stream_data->PMTSingleProgram(); 308 uint video_stream_type = pmt->StreamType(pmt->FindPID(lpid)); 309 310 if (video_stream_type == StreamID::H264Video) 311 _buffer_packets = !FindH264Keyframes(&tspacket); 312 else if (StreamID::IsVideo(video_stream_type)) 313 _buffer_packets = !FindMPEG2Keyframes(&tspacket); 314 315 if ((video_stream_type != StreamID::H264Video) || _seen_sps) 316 BufferedWrite(tspacket); 306 317 } 307 318 else if (GetStreamData()->IsAudioPID(lpid)) 308 319 { -
mythtv/libs/libmythtv/hdhrchannel.cpp
361 361 QString modulation, QString si_std) 362 362 { 363 363 // Convert dtv_multiplex.modulation strings to something the HDHR can use: 364 #if 0 364 365 modulation.replace("qam_", "qam"); // e.g. qam_256 -> qam256 365 #if 0366 366 if (modulation == "qamauto") 367 367 modulation = "qam"; // "auto" works just as well? 368 #endif369 368 370 369 if (modulation.isEmpty()) 370 #endif 371 371 modulation = "auto"; 372 372 373 373 QString chan = modulation + ':' + QString::number(frequency);