X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FExtensions%2FDVDPlayer%2Fsrc%2Fservicedvd.cpp;h=074b31850ad723727c8af59e0d9bbcc0ab5a8b96;hp=30ebaecd154b6fff9d242ac54df2069d1126bccc;hb=5a9972a248f0a75bb131af270b62673a497ec551;hpb=0a97ffcb515605aea8ced414b65dbaed4ce0cfae diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp index 30ebaec..074b318 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp @@ -1,5 +1,4 @@ /* yes, it's dvd */ -#include "servicedvd.h" #include #include #include @@ -20,6 +19,7 @@ extern "C" { #include } +#include "servicedvd.h" // eServiceFactoryDVD @@ -51,7 +51,7 @@ DEFINE_REF(eServiceFactoryDVD) RESULT eServiceFactoryDVD::play(const eServiceReference &ref, ePtr &ptr) { // check resources... - ptr = new eServiceDVD(ref.path.c_str()); + ptr = new eServiceDVD(ref); return 0; } @@ -84,37 +84,59 @@ RESULT eServiceFactoryDVD::offlineOperations(const eServiceReference &, ePtrsurface->data, 720, 576, 4, 720*4); - CONNECT(m_sn.activated, eServiceDVD::gotMessage); + std::string ddvd_language; + if (!ePythonConfigQuery::getConfigValue("config.osd.language", ddvd_language)) + ddvd_set_language(m_ddvdconfig, (ddvd_language.substr(0,2)).c_str()); + + int fd = open("/proc/stb/video/aspect", O_RDONLY); + if (fd > -1) + { + rd = read(fd, tmp, 255); + if (rd > 2 && !strncmp(tmp, "4:3", 3)) + aspect = DDVD_4_3; + else if (rd > 4 && !strncmp(tmp, "16:10", 5)) + aspect = DDVD_16_10; + close(fd); + } + + fd = open("/proc/stb/video/policy", O_RDONLY); + if (fd > -1) + { + rd = read(fd, tmp, 255); + if (rd > 6 && !strncmp(tmp, "bestfit", 7)) + policy = DDVD_JUSTSCALE; + else if (rd > 8 && !strncmp(tmp, "letterbox", 9)) + policy = DDVD_LETTERBOX; + close(fd); + } + + ddvd_set_video(m_ddvdconfig, aspect, policy, DDVD_PAL /*unused*/); + + CONNECT(m_sn->activated, eServiceDVD::gotMessage); CONNECT(m_pump.recv_msg, eServiceDVD::gotThreadMessage); strcpy(m_ddvd_titlestring,""); m_cue_pts = 0; + pause(); } void eServiceDVD::gotThreadMessage(const int &msg) @@ -157,8 +179,23 @@ void eServiceDVD::gotMessage(int /*what*/) } case DDVD_SCREEN_UPDATE: eDebug("DVD_SCREEN_UPDATE!"); - if (m_subtitle_widget) - m_subtitle_widget->setPixmap(m_pixmap, eRect(0, 0, 720, 576)); + if (m_subtitle_widget) { + int x1,x2,y1,y2; + ddvd_get_last_blit_area(m_ddvdconfig, &x1, &x2, &y1, &y2); + + int x_offset = 0, y_offset = 0, width = 720, height = 576; + +#ifdef DDVD_SUPPORTS_GET_BLIT_DESTINATION + ddvd_get_blit_destination(m_ddvdconfig, &x_offset, &y_offset, &width, &height); + eDebug("values got from ddvd: %d %d %d %d", x_offset, y_offset, width, height); + width -= x_offset * 2; + height -= y_offset * 2; +#endif + eRect dest(x_offset, y_offset, width, height); + + if (dest.width() && dest.height()) + m_subtitle_widget->setPixmap(m_pixmap, eRect(x1, y1, (x2-x1)+1, (y2-y1)+1), dest); + } break; case DDVD_SHOWOSD_STATE_PLAY: { @@ -212,6 +249,14 @@ void eServiceDVD::gotMessage(int /*what*/) eDebug("DVD_SOF_REACHED!"); m_event(this, evSOF); break; + case DDVD_SHOWOSD_ANGLE: + { + int current, num; + ddvd_get_angle_info(m_ddvdconfig, ¤t, &num); + eDebug("DVD_ANGLE_INFO: %d / %d", current, num); + m_event(this, evUser+13); + break; + } case DDVD_SHOWOSD_TIME: { static struct ddvd_time last_info; @@ -230,6 +275,8 @@ void eServiceDVD::gotMessage(int /*what*/) ddvd_get_title_string(m_ddvdconfig, m_ddvd_titlestring); eDebug("DDVD_SHOWOSD_TITLESTRING: %s",m_ddvd_titlestring); loadCuesheet(); + if (!m_cue_pts) + unpause(); m_event(this, evStart); break; } @@ -254,7 +301,9 @@ eServiceDVD::~eServiceDVD() { eDebug("SERVICEDVD destruct!"); kill(); + saveCuesheet(); ddvd_close(m_ddvdconfig); + disableSubtitles(0); } RESULT eServiceDVD::connectEvent(const Slot2 &event, ePtr &connection) @@ -265,37 +314,22 @@ RESULT eServiceDVD::connectEvent(const Slot2 &event, RESULT eServiceDVD::start() { - assert(m_state == stIdle); + ASSERT(m_state == stIdle); m_state = stRunning; eDebug("eServiceDVD starting"); - run(); // m_event(this, evStart); return 0; } RESULT eServiceDVD::stop() { - assert(m_state != stIdle); + ASSERT(m_state != stIdle); if (m_state == stStopped) return -1; - eDebug("DVD: stop %s", m_filename.c_str()); + eDebug("DVD: stop %s", m_ref.path.c_str()); m_state = stStopped; ddvd_send_key(m_ddvdconfig, DDVD_KEY_EXIT); - struct ddvd_time info; - ddvd_get_last_time(m_ddvdconfig, &info); - if ( info.pos_chapter < info.end_chapter ) - { - pts_t pos; - pos = info.pos_hours * 3600; - pos += info.pos_minutes * 60; - pos += info.pos_seconds; - pos *= 90000; - pos += info.pos_title * 256; - pos += info.pos_chapter; - m_cue_pts = pos; - eDebug("POS %llu\n", m_cue_pts); - } - saveCuesheet(); + return 0; } @@ -406,21 +440,14 @@ RESULT eServiceDVD::getName(std::string &name) if ( m_ddvd_titlestring[0] != '\0' ) name = m_ddvd_titlestring; else - name = m_filename; + name = m_ref.path; return 0; } int eServiceDVD::getInfo(int w) { switch (w) - { - case sUser: - case sArtist: - case sAlbum: - return resIsPyObject; // then getInfoObject should be called - case sComment: - case sGenre: - return resIsString; // then getInfoString should be called + { case sCurrentChapter: { struct ddvd_time info; @@ -452,6 +479,10 @@ int eServiceDVD::getInfo(int w) ddvd_get_last_spu(m_ddvdconfig, &spu_id, &spu_lang); return spu_id; } + case sUser+6: + case sUser+7: + case sUser+8: + return resIsPyObject; default: return resNA; } @@ -461,57 +492,75 @@ std::string eServiceDVD::getInfoString(int w) { switch(w) { - case sUser+7: { - int spu_id; - uint16_t spu_lang; - ddvd_get_last_spu(m_ddvdconfig, &spu_id, &spu_lang); - unsigned char spu_string[3]={spu_lang >> 8, spu_lang, 0}; - char osd[100]; - if (spu_id == -1) - sprintf(osd,""); - else - sprintf(osd,"%d - %s",spu_id+1,spu_string); -// lbo_changed=1; - return osd; - } + case sServiceref: + return m_ref.toString(); + default: + eDebug("unhandled getInfoString(%d)", w); + } + return ""; +} + +PyObject *eServiceDVD::getInfoObject(int w) +{ + switch(w) + { case sUser+6: - { + { + ePyObject tuple = PyTuple_New(3); int audio_id,audio_type; uint16_t audio_lang; ddvd_get_last_audio(m_ddvdconfig, &audio_id, &audio_lang, &audio_type); char audio_string[3]={audio_lang >> 8, audio_lang, 0}; - char audio_form[5]; + PyTuple_SetItem(tuple, 0, PyInt_FromLong(audio_id+1)); + PyTuple_SetItem(tuple, 1, PyString_FromString(audio_string)); switch(audio_type) { case DDVD_MPEG: - sprintf(audio_form,"MPEG"); + PyTuple_SetItem(tuple, 2, PyString_FromString("MPEG")); break; case DDVD_AC3: - sprintf(audio_form,"AC3"); + PyTuple_SetItem(tuple, 2, PyString_FromString("AC3")); break; case DDVD_DTS: - sprintf(audio_form,"DTS"); + PyTuple_SetItem(tuple, 2, PyString_FromString("DTS")); break; case DDVD_LPCM: - sprintf(audio_form,"LPCM"); + PyTuple_SetItem(tuple, 2, PyString_FromString("LPCM")); break; default: - sprintf(audio_form,"-"); + PyTuple_SetItem(tuple, 2, PyString_FromString("")); } - char osd[100]; - sprintf(osd,"%d - %s (%s)",audio_id+1,audio_string,audio_form); - return osd; + return tuple; + } + case sUser+7: + { + ePyObject tuple = PyTuple_New(2); + int spu_id; + uint16_t spu_lang; + ddvd_get_last_spu(m_ddvdconfig, &spu_id, &spu_lang); + char spu_string[3]={spu_lang >> 8, spu_lang, 0}; + if (spu_id == -1) + { + PyTuple_SetItem(tuple, 0, PyInt_FromLong(0)); + PyTuple_SetItem(tuple, 1, PyString_FromString("")); } - default: - eDebug("unhandled getInfoString(%d)", w); - } - return ""; -} + else + { + PyTuple_SetItem(tuple, 0, PyInt_FromLong(spu_id+1)); + PyTuple_SetItem(tuple, 1, PyString_FromString(spu_string)); + } + return tuple; + } + case sUser+8: + { + ePyObject tuple = PyTuple_New(2); + int current, num; + ddvd_get_angle_info(m_ddvdconfig, ¤t, &num); + PyTuple_SetItem(tuple, 0, PyInt_FromLong(current)); + PyTuple_SetItem(tuple, 1, PyInt_FromLong(num)); -PyObject *eServiceDVD::getInfoObject(int w) -{ - switch(w) - { + return tuple; + } default: eDebug("unhandled getInfoObject(%d)", w); } @@ -520,13 +569,28 @@ PyObject *eServiceDVD::getInfoObject(int w) RESULT eServiceDVD::enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) /*entry*/) { - if (m_subtitle_widget) - delete m_subtitle_widget; + delete m_subtitle_widget; + m_subtitle_widget = new eSubtitleWidget(parent); m_subtitle_widget->resize(parent->size()); - m_subtitle_widget->setPixmap(m_pixmap, eRect(0, 0, 720, 576)); + + eSize size = eSize(720, 576); + + if (!m_pixmap) + { + m_pixmap = new gPixmap(size, 32, 1); /* allocate accel surface (if possible) */ +#ifdef DDVD_SUPPORTS_GET_BLIT_DESTINATION + ddvd_set_lfb_ex(m_ddvdconfig, (unsigned char *)m_pixmap->surface->data, size.width(), size.height(), 4, size.width()*4, 1); +#else + ddvd_set_lfb(m_ddvdconfig, (unsigned char *)m_pixmap->surface->data, size.width(), size.height(), 4, size.width()*4); +#warning please update libdreamdvd for fast scaling +#endif + run(); // start the thread + } + m_subtitle_widget->setZPosition(-1); m_subtitle_widget->show(); + return 0; } @@ -563,15 +627,12 @@ RESULT eServiceDVD::getLength(pts_t &len) RESULT eServiceDVD::seekTo(pts_t to) { - struct ddvd_time info; - to /= 90000; - int cur; - ddvd_get_last_time(m_ddvdconfig, &info); - cur = info.pos_hours * 3600; - cur += info.pos_minutes * 60; - cur += info.pos_seconds; - eDebug("seekTo %lld, cur %d, diff %lld", to, cur, to - cur); - ddvd_skip_seconds(m_ddvdconfig, to - cur); + eDebug("eServiceDVD::seekTo(%lld)",to); + if ( to > 0 ) + { + eDebug("set_resume_pos: resume_info.title=%d, chapter=%d, block=%lu, audio_id=%d, audio_lock=%d, spu_id=%d, spu_lock=%d",m_resume_info.title,m_resume_info.chapter,m_resume_info.block,m_resume_info.audio_id, m_resume_info.audio_lock, m_resume_info.spu_id, m_resume_info.spu_lock); + ddvd_set_resume_pos(m_ddvdconfig, m_resume_info); + } return 0; } @@ -664,6 +725,9 @@ RESULT eServiceDVD::keyPressed(int key) case iServiceKeys::keyUser+7: ddvd_send_key(m_ddvdconfig, DDVD_KEY_MENU); break; + case iServiceKeys::keyUser+8: + ddvd_send_key(m_ddvdconfig, DDVD_KEY_ANGLE); + break; default: return -1; } @@ -701,10 +765,11 @@ void eServiceDVD::setCutListEnable(int /*enable*/) void eServiceDVD::loadCuesheet() { - eDebug("eServiceDVD::loadCuesheet()"); char filename[128]; if ( m_ddvd_titlestring[0] != '\0' ) snprintf(filename, 128, "/home/root/dvd-%s.cuts", m_ddvd_titlestring); + else + snprintf(filename, 128, "%s/dvd.cuts", m_ref.path.c_str()); eDebug("eServiceDVD::loadCuesheet() filename=%s",filename); @@ -712,38 +777,70 @@ void eServiceDVD::loadCuesheet() if (f) { - eDebug("loading cuts.."); unsigned long long where; unsigned int what; if (!fread(&where, sizeof(where), 1, f)) return; - if (!fread(&what, sizeof(what), 1, f)) return; - #if BYTE_ORDER == LITTLE_ENDIAN where = bswap_64(where); #endif what = ntohl(what); - m_cue_pts = where; + if (!fread(&m_resume_info, sizeof(struct ddvd_resume), 1, f)) + return; + if (!fread(&what, sizeof(what), 1, f)) + return; + + what = ntohl(what); + if (what != 4 ) + return; + + m_cue_pts = where; + fclose(f); } else eDebug("cutfile not found!"); - eDebug("eServiceDVD::loadCuesheet() pts=%lld",m_cue_pts); - if (m_cue_pts) + { m_event((iPlayableService*)this, evCuesheetChanged); + eDebug("eServiceDVD::loadCuesheet() pts=%lld",m_cue_pts); + } } void eServiceDVD::saveCuesheet() { - eDebug("eServiceDVD::saveCuesheet() pts=%lld",m_cue_pts); + eDebug("eServiceDVD::saveCuesheet()"); + + struct ddvd_resume resume_info; + ddvd_get_resume_pos(m_ddvdconfig, &resume_info); + + if (resume_info.title) + { + struct ddvd_time info; + ddvd_get_last_time(m_ddvdconfig, &info); + pts_t pos; + pos = info.pos_hours * 3600; + pos += info.pos_minutes * 60; + pos += info.pos_seconds; + pos *= 90000; + m_cue_pts = pos; + eDebug("ddvd_get_resume_pos resume_info.title=%d, chapter=%d, block=%lu, audio_id=%d, audio_lock=%d, spu_id=%d, spu_lock=%d (pts=%llu)",resume_info.title,resume_info.chapter,resume_info.block,resume_info.audio_id, resume_info.audio_lock, resume_info.spu_id, resume_info.spu_lock,m_cue_pts); + } + else + { + eDebug("we're in a menu or somewhere else funny. so save cuesheet with pts=0"); + m_cue_pts = 0; + } + char filename[128]; if ( m_ddvd_titlestring[0] != '\0' ) snprintf(filename, 128, "/home/root/dvd-%s.cuts", m_ddvd_titlestring); + else + snprintf(filename, 128, "%s/dvd.cuts", m_ref.path.c_str()); FILE *f = fopen(filename, "wb"); @@ -752,16 +849,19 @@ void eServiceDVD::saveCuesheet() unsigned long long where; int what; - { #if BYTE_ORDER == BIG_ENDIAN - where = m_cue_pts; + where = m_cue_pts; #else - where = bswap_64(m_cue_pts); + where = bswap_64(m_cue_pts); #endif - what = 3; - fwrite(&where, sizeof(where), 1, f); - fwrite(&what, sizeof(what), 1, f); - } + what = htonl(3); + fwrite(&where, sizeof(where), 1, f); + fwrite(&what, sizeof(what), 1, f); + + what = htonl(4); + fwrite(&resume_info, sizeof(struct ddvd_resume), 1, f); + fwrite(&what, sizeof(what), 1, f); + fclose(f); } }