X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bbedbd76e313e3115580d819efc608d3ad9dfc9d..76fe69e113637a200aafdc2d6dede772706e4b09:/lib/service/servicedvbrecord.cpp diff --git a/lib/service/servicedvbrecord.cpp b/lib/service/servicedvbrecord.cpp index 4c41b5ed..b34dad10 100644 --- a/lib/service/servicedvbrecord.cpp +++ b/lib/service/servicedvbrecord.cpp @@ -1,7 +1,6 @@ #include #include #include - #include DEFINE_REF(eDVBServiceRecord); @@ -13,6 +12,8 @@ eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref): m_ref(ref m_want_record = 0; m_tuned = 0; m_target_fd = -1; + m_error = 0; + m_streaming = 0; } void eDVBServiceRecord::serviceEvent(int event) @@ -26,6 +27,13 @@ void eDVBServiceRecord::serviceEvent(int event) m_tuned = 1; if (m_state == stateRecording && m_want_record) doRecord(); + m_event((iRecordableService*)this, evTunedIn); + break; + } + case eDVBServicePMTHandler::eventTuneFailed: + { + eDebug("record failed to tune"); + m_event((iRecordableService*)this, evTuneFailed); break; } case eDVBServicePMTHandler::eventNewProgramInfo: @@ -34,6 +42,7 @@ void eDVBServiceRecord::serviceEvent(int event) doPrepare(); else if (m_want_record) /* doRecord can be called from Prepared and Recording state */ doRecord(); + m_event((iRecordableService*)this, evNewProgramInfo); break; } } @@ -42,6 +51,8 @@ void eDVBServiceRecord::serviceEvent(int event) RESULT eDVBServiceRecord::prepare(const char *filename, time_t begTime, time_t endTime, int eit_event_id) { m_filename = filename; + m_streaming = 0; + if (m_state == stateIdle) { int ret = doPrepare(); @@ -94,17 +105,27 @@ RESULT eDVBServiceRecord::prepare(const char *filename, time_t begTime, time_t e return -1; } +RESULT eDVBServiceRecord::prepareStreaming() +{ + m_filename = ""; + m_streaming = 1; + if (m_state == stateIdle) + return doPrepare(); + return -1; +} + RESULT eDVBServiceRecord::start() { m_want_record = 1; /* when tune wasn't yet successfully, doRecord stays in "prepared"-state which is fine. */ + m_event((iRecordableService*)this, evStart); return doRecord(); } RESULT eDVBServiceRecord::stop() { - eDebug("stop recording!!"); + eDebug("stop recording!"); if (m_state == stateRecording) { if (m_record) @@ -115,13 +136,14 @@ RESULT eDVBServiceRecord::stop() m_target_fd = -1; } m_state = statePrepared; - } - + } else + eDebug("(was not recording)"); if (m_state == statePrepared) { m_record = 0; m_state = stateIdle; } + m_event((iRecordableService*)this, evRecordStopped); return 0; } @@ -142,138 +164,175 @@ int eDVBServiceRecord::doRecord() { int err = doPrepare(); if (err) + { + m_error = errTuneFailed; + m_event((iRecordableService*)this, evRecordFailed); return err; + } if (!m_tuned) return 0; /* try it again when we are tuned in */ - if (!m_record && m_tuned) + if (!m_record && m_tuned && !m_streaming) { - eDebug("Recording to %s...", m_filename.c_str()); ::remove(m_filename.c_str()); int fd = ::open(m_filename.c_str(), O_WRONLY|O_CREAT|O_LARGEFILE, 0644); if (fd == -1) { eDebug("eDVBServiceRecord - can't open recording file!"); - return -1; + m_error = errOpenRecordFile; + m_event((iRecordableService*)this, evRecordFailed); + return errOpenRecordFile; } - + /* turn off kernel caching strategies */ posix_fadvise(fd, 0, 0, POSIX_FADV_RANDOM); - + ePtr demux; if (m_service_handler.getDataDemux(demux)) { eDebug("eDVBServiceRecord - NO DEMUX available!"); - return -2; + m_error = errNoDemuxAvailable; + m_event((iRecordableService*)this, evRecordFailed); + return errNoDemuxAvailable; } demux->createTSRecorder(m_record); if (!m_record) { eDebug("eDVBServiceRecord - no ts recorder available."); - return -3; + m_error = errNoTsRecorderAvailable; + m_event((iRecordableService*)this, evRecordFailed); + return errNoTsRecorderAvailable; } m_record->setTargetFD(fd); m_record->setTargetFilename(m_filename.c_str()); + m_record->connectEvent(slot(*this, &eDVBServiceRecord::recordEvent), m_con_record_event); + m_target_fd = fd; } - eDebug("starting recording.."); - eDVBServicePMTHandler::program program; - if (m_service_handler.getProgramInfo(program)) - eDebug("getting program info failed."); - else + if (m_streaming) { - std::set pids_to_record; - - pids_to_record.insert(0); // PAT - - if (program.pmtPid != -1) - pids_to_record.insert(program.pmtPid); // PMT - - int timing_pid = -1; - - eDebugNoNewLine("RECORD: have %d video stream(s)", program.videoStreams.size()); - if (!program.videoStreams.empty()) + m_state = stateRecording; + eDebug("start streaming..."); + } else + { + eDebug("start recording..."); + + eDVBServicePMTHandler::program program; + if (m_service_handler.getProgramInfo(program)) + eDebug("getting program info failed."); + else { - eDebugNoNewLine(" ("); - for (std::vector::const_iterator - i(program.videoStreams.begin()); - i != program.videoStreams.end(); ++i) + std::set pids_to_record; + + pids_to_record.insert(0); // PAT + + if (program.pmtPid != -1) + pids_to_record.insert(program.pmtPid); // PMT + + int timing_pid = -1; + + eDebugNoNewLine("RECORD: have %d video stream(s)", program.videoStreams.size()); + if (!program.videoStreams.empty()) { - pids_to_record.insert(i->pid); - - if (timing_pid == -1) - timing_pid = i->pid; + eDebugNoNewLine(" ("); + for (std::vector::const_iterator + i(program.videoStreams.begin()); + i != program.videoStreams.end(); ++i) + { + pids_to_record.insert(i->pid); + + if (timing_pid == -1) + timing_pid = i->pid; + + if (i != program.videoStreams.begin()) + eDebugNoNewLine(", "); + eDebugNoNewLine("%04x", i->pid); + } + eDebugNoNewLine(")"); + } + eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size()); + if (!program.audioStreams.empty()) + { + eDebugNoNewLine(" ("); + for (std::vector::const_iterator + i(program.audioStreams.begin()); + i != program.audioStreams.end(); ++i) + { + pids_to_record.insert(i->pid); + + if (timing_pid == -1) + timing_pid = i->pid; - if (i != program.videoStreams.begin()) - eDebugNoNewLine(", "); - eDebugNoNewLine("%04x", i->pid); + if (i != program.audioStreams.begin()) + eDebugNoNewLine(", "); + eDebugNoNewLine("%04x", i->pid); + } + eDebugNoNewLine(")"); } - eDebugNoNewLine(")"); - } - eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size()); - if (!program.audioStreams.empty()) - { - eDebugNoNewLine(" ("); - for (std::vector::const_iterator - i(program.audioStreams.begin()); - i != program.audioStreams.end(); ++i) + if (!program.subtitleStreams.empty()) { - pids_to_record.insert(i->pid); + eDebugNoNewLine(" ("); + for (std::vector::const_iterator + i(program.subtitleStreams.begin()); + i != program.subtitleStreams.end(); ++i) + { + pids_to_record.insert(i->pid); + + if (i != program.subtitleStreams.begin()) + eDebugNoNewLine(", "); + eDebugNoNewLine("%04x", i->pid); + } + eDebugNoNewLine(")"); + } + eDebugNoNewLine(", and the pcr pid is %04x", program.pcrPid); + if (program.pcrPid != 0x1fff) + pids_to_record.insert(program.pcrPid); + eDebug(", and the text pid is %04x", program.textPid); + if (program.textPid != -1) + pids_to_record.insert(program.textPid); // Videotext - if (timing_pid == -1) - timing_pid = i->pid; - - if (i != program.audioStreams.begin()) - eDebugNoNewLine(", "); - eDebugNoNewLine("%04x", i->pid); + /* find out which pids are NEW and which pids are obsolete.. */ + std::set new_pids, obsolete_pids; + + std::set_difference(pids_to_record.begin(), pids_to_record.end(), + m_pids_active.begin(), m_pids_active.end(), + std::inserter(new_pids, new_pids.begin())); + + std::set_difference( + m_pids_active.begin(), m_pids_active.end(), + pids_to_record.begin(), pids_to_record.end(), + std::inserter(new_pids, new_pids.begin()) + ); + + for (std::set::iterator i(new_pids.begin()); i != new_pids.end(); ++i) + { + eDebug("ADD PID: %04x", *i); + m_record->addPID(*i); + } + + for (std::set::iterator i(obsolete_pids.begin()); i != obsolete_pids.end(); ++i) + { + eDebug("REMOVED PID: %04x", *i); + m_record->removePID(*i); + } + + if (timing_pid != -1) + m_record->setTimingPID(timing_pid); + + m_pids_active = pids_to_record; + + if (m_state != stateRecording) + { + m_record->start(); + m_state = stateRecording; } - eDebugNoNewLine(")"); - } - eDebugNoNewLine(", and the pcr pid is %04x", program.pcrPid); - if (program.pcrPid != 0x1fff) - pids_to_record.insert(program.pcrPid); - eDebug(", and the text pid is %04x", program.textPid); - if (program.textPid != -1) - pids_to_record.insert(program.textPid); // Videotext - - /* find out which pids are NEW and which pids are obsolete.. */ - std::set new_pids, obsolete_pids; - - std::set_difference(pids_to_record.begin(), pids_to_record.end(), - m_pids_active.begin(), m_pids_active.end(), - std::inserter(new_pids, new_pids.begin())); - - std::set_difference( - m_pids_active.begin(), m_pids_active.end(), - pids_to_record.begin(), pids_to_record.end(), - std::inserter(new_pids, new_pids.begin()) - ); - - for (std::set::iterator i(new_pids.begin()); i != new_pids.end(); ++i) - { - eDebug("ADD PID: %04x", *i); - m_record->addPID(*i); - } - for (std::set::iterator i(obsolete_pids.begin()); i != obsolete_pids.end(); ++i) - { - eDebug("REMOVED PID: %04x", *i); - m_record->removePID(*i); - } - - if (timing_pid != -1) - m_record->setTimingPID(timing_pid); - - m_pids_active = pids_to_record; - - if (m_state != stateRecording) - { - m_record->start(); - m_state = stateRecording; } } + m_error = 0; + m_event((iRecordableService*)this, evRecordRunning); return 0; } @@ -282,3 +341,51 @@ RESULT eDVBServiceRecord::frontendInfo(ePtr &ptr) ptr = this; return 0; } + +RESULT eDVBServiceRecord::connectEvent(const Slot2 &event, ePtr &connection) +{ + connection = new eConnection((iRecordableService*)this, m_event.connect(event)); + return 0; +} + +RESULT eDVBServiceRecord::stream(ePtr &ptr) +{ + ptr = this; + return 0; +} + +PyObject *eDVBServiceRecord::getStreamingData() +{ + eDVBServicePMTHandler::program program; + if (!m_tuned || m_service_handler.getProgramInfo(program)) + { + Py_INCREF(Py_None); + return Py_None; + } + + PyObject *r = program.createPythonObject(); + ePtr demux; + if (!m_service_handler.getDataDemux(demux)) + { + uint8_t demux_id; + demux->getCADemuxID(demux_id); + + PyDict_SetItemString(r, "demux", PyInt_FromLong(demux_id)); + } + + return r; +} + +void eDVBServiceRecord::recordEvent(int event) +{ + switch (event) + { + case iDVBTSRecorder::eventWriteError: + eWarning("[eDVBServiceRecord] record write error"); + stop(); + m_event((iRecordableService*)this, evRecordWriteError); + return; + default: + eDebug("unhandled record event %d", event); + } +}