Index: libs/libmythtv/NuppelVideoPlayer.cpp =================================================================== --- libs/libmythtv/NuppelVideoPlayer.cpp.orig 2006-05-24 11:43:00.000000000 +0300 +++ libs/libmythtv/NuppelVideoPlayer.cpp 2006-05-25 18:43:06.000000000 +0300 @@ -119,7 +119,7 @@ uint track_type_to_display_mode[kTrackTypeCount+2] = { kDisplayNone, - kDisplaySubtitle, + kDisplayAVSubtitle, kDisplayCC608, kDisplayCC708, kDisplayTeletextCaptions, @@ -288,7 +288,7 @@ if (weMadeBuffer) delete ringBuffer; - if (osdHasSubtitles || nonDisplayedSubtitles.size() > 0) + if (osdHasSubtitles || nonDisplayedAVSubtitles.size() > 0) ClearSubtitles(); if (osd) @@ -1424,11 +1424,15 @@ DisableTeletext(); } - if (kDisplaySubtitle & mode) + if (kDisplayAVSubtitle & mode) { msg += decoder->GetTrackDesc(kTrackTypeSubtitle, GetTrack(kTrackTypeSubtitle)); } + if (kDisplayTextSubtitle & mode) + { + msg += QObject::tr("Text subtitles"); + } if (kDisplayCC608 & mode) { msg += decoder->GetTrackDesc(kTrackTypeCC608, @@ -1451,11 +1455,15 @@ void NuppelVideoPlayer::EnableCaptions(uint mode) { QString msg = ""; - if (kDisplaySubtitle & mode) + if (kDisplayAVSubtitle & mode) { msg += decoder->GetTrackDesc(kTrackTypeSubtitle, GetTrack(kTrackTypeSubtitle)); } + if (kDisplayTextSubtitle & mode) + { + msg += QObject::tr("Text Subtitles"); + } if (kDisplayNUVTeletextCaptions & mode) msg += QObject::tr("TXT") + QString(" %1").arg(ttPageNum, 3, 16); if (kDisplayCC608 & mode) @@ -1565,12 +1573,15 @@ if (kDisplayCC708 & mode) EnableCaptions(kDisplayCC708); - if (kDisplaySubtitle & mode) - EnableCaptions(kDisplaySubtitle); - + if (kDisplayAVSubtitle & mode) + EnableCaptions(kDisplayAVSubtitle); + + if (kDisplayTextSubtitle & mode) + EnableCaptions(kDisplayTextSubtitle); + if (kDisplayTeletextCaptions & mode) EnableCaptions(kDisplayTeletextCaptions); - + return textDisplayMode; } @@ -1589,7 +1600,9 @@ // figure out which text type to enable.. bool captions_found = true; if (decoder->GetTrackCount(kTrackTypeSubtitle)) - EnableCaptions(kDisplaySubtitle); + EnableCaptions(kDisplayAVSubtitle); + else if (textSubtitles.GetSubtitleCount() > 0) + EnableCaptions(kDisplayTextSubtitle); else if (decoder->GetTrackCount(kTrackTypeCC708)) EnableCaptions(kDisplayCC708); else if (decoder->GetTrackCount(kTrackTypeTeletextCaptions)) @@ -2390,10 +2403,12 @@ if (textDisplayMode & kDisplayNUVCaptions) ShowText(); - // handle with DVB/DVD subtitles - if (textDisplayMode & kDisplaySubtitle) - DisplaySubtitles(); - else if (osdHasSubtitles) + // handle DVB/DVD subtitles decoded by ffmpeg (in AVSubtitle format) + if (textDisplayMode & kDisplayAVSubtitle) + DisplayAVSubtitles(); + else if (textDisplayMode & kDisplayTextSubtitle) + DisplayTextSubtitles(); + else if (osdHasSubtitles) ClearSubtitles(); else ExpireSubtitles(); @@ -2630,7 +2645,7 @@ if (fftime <= 0) fftime = (int)(seconds * video_frame_rate); - if (osdHasSubtitles || nonDisplayedSubtitles.size() > 0) + if (osdHasSubtitles || nonDisplayedAVSubtitles.size() > 0) ClearSubtitles(); return fftime > CalcMaxFFTime(fftime, false); @@ -2644,7 +2659,7 @@ if (rewindtime <= 0) rewindtime = (int)(seconds * video_frame_rate); - if (osdHasSubtitles || nonDisplayedSubtitles.size() > 0) + if (osdHasSubtitles || nonDisplayedAVSubtitles.size() > 0) ClearSubtitles(); return rewindtime >= framesPlayed; @@ -5582,7 +5597,7 @@ if (kTrackTypeSubtitle == type) { DisableCaptions(textDisplayMode, false); - EnableCaptions(kDisplaySubtitle); + EnableCaptions(kDisplayAVSubtitle); } else if (kTrackTypeCC708 == type) { @@ -5738,7 +5753,7 @@ SetTrack(kTrackTypeSubtitle, 0); } } - else if ((textDisplayMode & kDisplaySubtitle) && + else if ((textDisplayMode & kDisplayAVSubtitle) && (vbimode == VBIMode::PAL_TT)) { if ((uint)GetTrack(kTrackTypeSubtitle) + 1 < @@ -5798,7 +5813,7 @@ else SetCaptionsEnabled(false); } - else if ((textDisplayMode & kDisplaySubtitle) && + else if ((textDisplayMode & kDisplayAVSubtitle) && (vbimode == VBIMode::NTSC_CC)) { if ((uint)GetTrack(kTrackTypeSubtitle) + 1 < @@ -5811,8 +5826,14 @@ } } -// updates new subtitles to the screen and clears old ones -void NuppelVideoPlayer::DisplaySubtitles() +#define MAX_SUBTITLE_DISPLAY_TIME_MS 4500 +/** \fn NuppelVideoPlayer::DisplayAVSubtitles(void) + * \brief Displays new subtitles and removes old ones. + * + * This version is for AVSubtitles which are added with AddAVSubtitles() + * when found in the input stream. + */ +void NuppelVideoPlayer::DisplayAVSubtitles() { OSDSet *subtitleOSD; bool setVisible = false; @@ -5836,15 +5857,15 @@ osdHasSubtitles = false; } - while (nonDisplayedSubtitles.size() > 0) + while (nonDisplayedAVSubtitles.size() > 0) { - const AVSubtitle subtitlePage = nonDisplayedSubtitles.front(); - + const AVSubtitle subtitlePage = nonDisplayedAVSubtitles.front(); + if (subtitlePage.start_display_time > currentFrame->timecode) break; - - nonDisplayedSubtitles.pop_front(); - + + nonDisplayedAVSubtitles.pop_front(); + // clear old subtitles if (osdHasSubtitles) { @@ -5852,15 +5873,15 @@ osd->ClearAll("subtitles"); osdHasSubtitles = false; } - + // draw the subtitle bitmap(s) to the OSD for (std::size_t i = 0; i < subtitlePage.num_rects; ++i) { AVSubtitleRect* rect = &subtitlePage.rects[i]; bool displaysub = true; - if (nonDisplayedSubtitles.size() > 0 && - nonDisplayedSubtitles.front().end_display_time < + if (nonDisplayedAVSubtitles.size() > 0 && + nonDisplayedAVSubtitles.front().end_display_time < currentFrame->timecode) { displaysub = false; @@ -5881,16 +5902,16 @@ qImage.setPixel(x, y, pixel); } } - + // scale the subtitle images which are scaled and positioned for // a 720x576 video resolution to fit the current OSD resolution float vsize = 576.0; if (ringBuffer->isDVD()) vsize = (float)video_height; - + float hmult = osd->GetSubtitleBounds().width() / 720.0; float vmult = osd->GetSubtitleBounds().height() / vsize; - + rect->x = (int)(rect->x * hmult); rect->y = (int)(rect->y * vmult); rect->w = (int)(rect->w * hmult); @@ -5898,22 +5919,23 @@ if (hmult < 0.98 || hmult > 1.02 || vmult < 0.98 || hmult > 1.02) qImage = qImage.smoothScale(rect->w, rect->h); - + OSDTypeImage* image = new OSDTypeImage(); image->SetPosition(QPoint(rect->x, rect->y), hmult, vmult); image->LoadFromQImage(qImage); - + subtitleOSD->AddType(image); - + osdSubtitlesExpireAt = subtitlePage.end_display_time; // fix subtitles that don't display for very long (if at all). if (subtitlePage.end_display_time <= subtitlePage.start_display_time) { - if (nonDisplayedSubtitles.size() > 0) - osdSubtitlesExpireAt = nonDisplayedSubtitles.front().start_display_time; + if (nonDisplayedAVSubtitles.size() > 0) + osdSubtitlesExpireAt = + nonDisplayedAVSubtitles.front().start_display_time; else - osdSubtitlesExpireAt += 4500; + osdSubtitlesExpireAt += MAX_SUBTITLE_DISPLAY_TIME_MS; } setVisible = true; @@ -5940,6 +5962,56 @@ } } +/** \fn NuppelVideoPlayer::DisplayTextSubtitles(void) + * \brief Displays subtitles in textual format. + * + * This version is for subtitles that are loaded from an external subtitle + * file by using the LoadExternalSubtitles() method. Subtitles are not + * deleted after displaying so they can be displayed again after seeking. + */ +void NuppelVideoPlayer::DisplayTextSubtitles() +{ + VideoFrame *currentFrame = videoOutput->GetLastShownFrame(); + + if (!osd || !currentFrame) + { + VERBOSE(VB_PLAYBACK, "osd or current video frame not found"); + return; + } + + QMutexLocker locker(&subtitleLock); + + // frame time code in frames shown or millisecs from the start + // depending on the timing type of the subtitles + uint64_t playPos = 0; + if (textSubtitles.IsFrameBasedTiming()) + { + // frame based subtitles get out of synch after running mythcommflag + // for the file, i.e., the following number is wrong and does not + // match the subtitle frame numbers: + playPos = currentFrame->frameNumber; + } + else + { + playPos = currentFrame->timecode; + } + + if (!textSubtitles.SubtitleChanged(playPos)) + return; + + QStringList subtitlesToShow = textSubtitles.Subtitles(playPos); + + if (subtitlesToShow.size() == 0) + { + osd->ClearTextSubtitles(); + osdHasSubtitles = false; + return; + } + + osd->SetTextSubtitles(subtitlesToShow); + osdHasSubtitles = true; +} + /** \fn NuppelVideoPlayer::ExpireSubtitles(void) * \brief Discard non-displayed subtitles. */ @@ -5952,15 +6024,15 @@ VideoFrame *currentFrame = videoOutput->GetLastShownFrame(); - while (nonDisplayedSubtitles.size() > 0) + while (nonDisplayedAVSubtitles.size() > 0) { - const AVSubtitle subtitlePage = nonDisplayedSubtitles.front(); + const AVSubtitle subtitlePage = nonDisplayedAVSubtitles.front(); // Stop when we hit one old enough if (subtitlePage.end_display_time > currentFrame->timecode) break; - nonDisplayedSubtitles.pop_front(); + nonDisplayedAVSubtitles.pop_front(); for (std::size_t i = 0; i < subtitlePage.num_rects; ++i) { @@ -5980,9 +6052,9 @@ { subtitleLock.lock(); - while (nonDisplayedSubtitles.size() > 0) + while (nonDisplayedAVSubtitles.size() > 0) { - AVSubtitle& subtitle = nonDisplayedSubtitles.front(); + AVSubtitle& subtitle = nonDisplayedAVSubtitles.front(); // Because the subtitles were not displayed, OSDSet does not // free the OSDTypeImages in ClearAll(), so we have to free @@ -5997,7 +6069,7 @@ if (subtitle.num_rects > 0) av_free(subtitle.rects); - nonDisplayedSubtitles.pop_front(); + nonDisplayedAVSubtitles.pop_front(); } subtitleLock.unlock(); @@ -6014,12 +6086,13 @@ } } -// adds a new subtitle to be shown +// adds a new AVSubtitle to be shown, assumes the subtitles are pushed in +// the order they should be shown // FIXME: Need to fix subtitles to use a 64bit timestamp -void NuppelVideoPlayer::AddSubtitle(const AVSubtitle &subtitle) +void NuppelVideoPlayer::AddAVSubtitle(const AVSubtitle &subtitle) { subtitleLock.lock(); - nonDisplayedSubtitles.push_back(subtitle); + nonDisplayedAVSubtitles.push_back(subtitle); subtitleLock.unlock(); } @@ -6039,6 +6112,19 @@ } } +/** \fn NuppelVideoPlayer::LoadExternalSubtitles(QString) + * \brief Loads subtitles from an external file. + * + * \return True in case the subtitle file format was detected and subtitles + * were loaded successfully, false otherwise. + */ +bool NuppelVideoPlayer::LoadExternalSubtitles(QString subtitleFileName) +{ + QMutexLocker locker(&subtitleLock); + textSubtitles.Clear(); + return TextSubtitleParser::LoadSubtitles(subtitleFileName, textSubtitles); +} + void NuppelVideoPlayer::ChangeDVDTrack(bool ffw) { if (!ringBuffer->isDVD()) Index: libs/libmythtv/avformatdecoder.cpp =================================================================== --- libs/libmythtv/avformatdecoder.cpp.orig 2006-05-24 11:43:01.000000000 +0300 +++ libs/libmythtv/avformatdecoder.cpp 2006-05-24 11:46:53.000000000 +0300 @@ -3061,7 +3061,7 @@ { subtitle.start_display_time += pts; subtitle.end_display_time += pts; - GetNVP()->AddSubtitle(subtitle); + GetNVP()->AddAVSubtitle(subtitle); } break; Index: libs/libmythtv/libmythtv.pro =================================================================== --- libs/libmythtv/libmythtv.pro.orig 2006-05-24 11:43:01.000000000 +0300 +++ libs/libmythtv/libmythtv.pro 2006-05-24 11:46:53.000000000 +0300 @@ -203,6 +203,10 @@ SOURCES += tv_play.cpp NuppelVideoPlayer.cpp SOURCES += DVDRingBuffer.cpp + # Text subtitle parser + HEADERS += textsubtitleparser.h xine_demux_sputext.h + SOURCES += textsubtitleparser.cpp xine_demux_sputext.c + # A/V decoders HEADERS += decoderbase.h HEADERS += nuppeldecoder.h avformatdecoder.h Index: libs/libmythtv/osdtypes.h =================================================================== --- libs/libmythtv/osdtypes.h.orig 2006-05-15 23:25:36.000000000 +0300 +++ libs/libmythtv/osdtypes.h 2006-05-25 02:56:56.000000000 +0300 @@ -285,7 +285,7 @@ mutable uint m_draw_info_len; mutable vector m_draw_info; }; - + class OSDTypeImage : public OSDType { public: Index: libs/libmythtv/tv_play.h =================================================================== --- libs/libmythtv/tv_play.h.orig 2006-05-24 11:43:01.000000000 +0300 +++ libs/libmythtv/tv_play.h 2006-05-25 02:57:10.000000000 +0300 @@ -347,6 +347,8 @@ void ITVRestart(bool isLive); + void FindAndLoadExternalSubs(NuppelVideoPlayer& target, QString videoFile); + static QStringList GetValidRecorderList(uint chanid); static QStringList GetValidRecorderList(const QString &channum); static QStringList GetValidRecorderList(uint, const QString&); Index: libs/libmythtv/NuppelVideoPlayer.h =================================================================== --- libs/libmythtv/NuppelVideoPlayer.h.orig 2006-05-24 11:43:01.000000000 +0300 +++ libs/libmythtv/NuppelVideoPlayer.h 2006-05-24 11:46:53.000000000 +0300 @@ -14,6 +14,7 @@ #include "recordingprofile.h" #include "videooutbase.h" #include "teletextdecoder.h" +#include "textsubtitleparser.h" #include "tv_play.h" #include "yuv2rgb.h" #include "cc608decoder.h" @@ -70,12 +71,11 @@ enum { kTrackTypeAudio = 0, - kTrackTypeSubtitle, + kTrackTypeSubtitle, // subtitle track from ffmpeg kTrackTypeCC608, kTrackTypeCC708, kTrackTypeTeletextCaptions, kTrackTypeCount, - kTrackTypeTeletextMenu, }; QString track_type_to_string(uint type); @@ -87,12 +87,13 @@ kDisplayNone = 0x00, kDisplayNUVTeletextCaptions = 0x01, kDisplayTeletextCaptions = 0x02, - kDisplaySubtitle = 0x04, + kDisplayAVSubtitle = 0x04, kDisplayCC608 = 0x08, kDisplayCC708 = 0x10, kDisplayNUVCaptions = kDisplayNUVTeletextCaptions | kDisplayCC608, - kDisplayAllCaptions = 0x1f, - kDisplayTeletextMenu = 0x20, + kDisplayTextSubtitle = 0x20, + kDisplayAllCaptions = 0x3f, + kDisplayTeletextMenu = 0x40, }; class NuppelVideoPlayer : public CC608Reader, public CC708Reader @@ -278,7 +279,7 @@ long long timecode); void AddTextData(unsigned char *buffer, int len, long long timecode, char type); - void AddSubtitle(const AVSubtitle& subtitle); + void AddAVSubtitle(const AVSubtitle& subtitle); // Closed caption and teletext stuff uint GetCaptionMode(void) const { return textDisplayMode; } @@ -288,6 +289,7 @@ bool ToggleCaptions(void); bool ToggleCaptions(uint mode); void SetCaptionsEnabled(bool); + bool LoadExternalSubtitles(QString subtitleFileName); // Teletext Menu and non-NUV teletext decoder void EnableTeletext(void); @@ -478,7 +480,8 @@ void UpdateCC(unsigned char *inpos); // Private subtitle stuff - void DisplaySubtitles(void); + void DisplayAVSubtitles(void); + void DisplayTextSubtitles(void); void ClearSubtitles(void); void ExpireSubtitles(void); @@ -613,7 +616,18 @@ bool textDesired; bool osdHasSubtitles; long long osdSubtitlesExpireAt; - MythDeque nonDisplayedSubtitles; + + /// Subtitles loaded from the video stream by libavcodec. + /// This should contain only undisplayed subtitles, old + /// ones are deleted after displayed. + MythDeque nonDisplayedAVSubtitles; + + /// Subtitles loaded from an external subtitle file. + /// This contains all subtitles in textual format. No + /// subtitles are deleted after displaying (so they can + /// be displayed again after seeking). The list is ordered + /// by the subtitle display start time. + TextSubtitles textSubtitles; CC708Service CC708services[64]; QString osdfontname; Index: libs/libmythtv/textsubtitleparser.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ libs/libmythtv/textsubtitleparser.h 2006-05-30 22:10:28.000000000 +0300 @@ -0,0 +1,78 @@ +// -*- Mode: c++ -*- +/** TextSubtitles + * Copyright (c) 2006 by Pekka Jääskeläinen + * Distributed as part of MythTV under GPL v2 and later. + */ + +#ifndef TEXT_SUBTITLE_PARSER_H +#define TEXT_SUBTITLE_PARSER_H + +#include +using namespace std; + +#include +#include +#include +#include + +#define MAX_TEXT_SUBTITLE_LINES 5 + +class text_subtitle_t +{ +public: + text_subtitle_t(long start_, long end_) : start(start_), end(end_) {} + text_subtitle_t() : start(0), end(0) {} + text_subtitle_t(const text_subtitle_t &other) : + start(other.start), end(other.end), + textLines(QDeepCopy(other.textLines)) {} + +public: + uint64_t start; ///< Starting time in msec or starting frame + uint64_t end; ///< Ending time in msec or ending frame + QStringList textLines; +}; + +typedef std::vector TextSubtitleList; + +class TextSubtitles +{ +public: + TextSubtitles() : m_frameBasedTiming(false) {} + + virtual ~TextSubtitles() {} + + bool SubtitleChanged(uint64_t timecode) const; + QStringList Subtitles(uint64_t timecode) const; + + /** \fn TextSubtitles::IsFrameBasedTiming(void) const + * \brief Returns true in case the subtitle timing data is frame-based. + * + * If the timing is frame-based, the client should use frame counts as + * timecodes for the SubtitleChanged() and Subtitles() methods, otherwise + * the timecode is milliseconds from the video start. + */ + bool IsFrameBasedTiming(void) const + { return m_frameBasedTiming; } + + void SetFrameBasedTiming(bool frameBasedTiming) + { m_frameBasedTiming = frameBasedTiming; } + + void AddSubtitle(const text_subtitle_t& newSub); + void Clear(void); + + uint GetSubtitleCount(void) const + { return m_subtitles.size(); } + +private: + TextSubtitleList m_subtitles; + mutable text_subtitle_t m_lastReturnedSubtitle; + bool m_frameBasedTiming; +}; + +class TextSubtitleParser +{ +public: + static bool LoadSubtitles(QString fileName, TextSubtitles& target); +}; + +#endif Index: libs/libmythtv/osd.h =================================================================== --- libs/libmythtv/osd.h.orig 2006-04-30 13:42:51.000000000 +0300 +++ libs/libmythtv/osd.h 2006-05-25 02:59:22.000000000 +0300 @@ -40,6 +40,7 @@ class OSDTypeImage; class OSDTypePositionIndicator; class OSDSurface; +class OSDTypeText; class TV; class UDPNotifyOSDSet; class OSDListTreeType; @@ -151,12 +152,14 @@ bool HasSet(const QString &name); QRect GetSubtitleBounds(); + void SetTextSubtitles(const QStringList& lines); + void ClearTextSubtitles(); private: bool InitDefaults(void); bool InitCC608(void); bool InitCC708(void); bool InitTeletext(void); - bool InitDVBSub(void); + bool InitSubtitles(void); bool InitMenu(void); bool InitInteractiveTV(void); Index: libs/libmythtv/xine_demux_sputext.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ libs/libmythtv/xine_demux_sputext.c 2006-05-24 11:46:53.000000000 +0300 @@ -0,0 +1,1182 @@ +/* + * Copyright (C) 2000-2003 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * $Id: demux_sputext.c,v 1.47 2006/02/14 18:44:08 dsalt Exp $ + * + * code based on old libsputext/xine_decoder.c + * + * code based on mplayer module: + * + * Subtitle reader with format autodetection + * + * Written by laaz + * Some code cleanup & realloc() by A'rpi/ESP-team + * dunnowhat sub format by szabi + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include "xine_demux_sputext.h" + +#define LOG_MODULE "demux_sputext" +#define LOG_VERBOSE +/* +#define LOG +*/ + +#define ERR (void *)-1 +#define LINE_LEN 1000 +#define LINE_LEN_QUOT "1000" + +/* + * Demuxer code start + */ + +#define FORMAT_UNKNOWN -1 +#define FORMAT_MICRODVD 0 +#define FORMAT_SUBRIP 1 +#define FORMAT_SUBVIEWER 2 +#define FORMAT_SAMI 3 +#define FORMAT_VPLAYER 4 +#define FORMAT_RT 5 +#define FORMAT_SSA 6 /* Sub Station Alpha */ +#define FORMAT_PJS 7 +#define FORMAT_MPSUB 8 +#define FORMAT_AQTITLE 9 +#define FORMAT_JACOBSUB 10 +#define FORMAT_SUBVIEWER2 11 +#define FORMAT_SUBRIP09 12 +#define FORMAT_MPL2 13 /*Mplayer sub 2 ?*/ + +static int eol(char p) { + return (p=='\r' || p=='\n' || p=='\0'); +} + +static inline void trail_space(char *s) { + int i; + while (isspace(*s)) { + char *copy = s; + do { + copy[0] = copy[1]; + copy++; + } while(*copy); + } + i = strlen(s) - 1; + while (i > 0 && isspace(s[i])) + s[i--] = '\0'; +} + +/* + * Reimplementation of fgets() using the input->read() method. + */ +static char *read_line_from_input(demux_sputext_t *this, char *line, off_t len) { + off_t nread = 0; + char *s; + int linelen; + + if ((len - this->buflen) > 512) { + if((nread = fread( + &this->buf[this->buflen], 1, + len - this->buflen, this->file_ptr)) < 0) { + printf("read failed.\n"); + return NULL; + } + } + + this->buflen += nread; + this->buf[this->buflen] = '\0'; + + s = strchr(this->buf, '\n'); + + if (line && (s || this->buflen)) { + + linelen = s ? (s - this->buf) + 1 : this->buflen; + + memcpy(line, this->buf, linelen); + line[linelen] = '\0'; + + memmove(this->buf, &this->buf[linelen], SUB_BUFSIZE - linelen); + this->buflen -= linelen; + + return line; + } + + return NULL; +} + + +static subtitle_t *sub_read_line_sami(demux_sputext_t *this, subtitle_t *current) { + + static char line[LINE_LEN + 1]; + static char *s = NULL; + char text[LINE_LEN + 1], *p, *q; + int state; + + p = NULL; + current->lines = current->start = 0; + current->end = -1; + state = 0; + + /* read the first line */ + if (!s) + if (!(s = read_line_from_input(this, line, LINE_LEN))) return 0; + + do { + switch (state) { + + case 0: /* find "START=" */ + s = strstr (s, "Start="); + if (s) { + current->start = strtol (s + 6, &s, 0) / 10; + state = 1; continue; + } + break; + + case 1: /* find "" */ + if ((s = strchr (s, '>'))) { s++; state = 3; p = text; continue; } + break; + + case 3: /* get all text until '<' appears */ + if (*s == '\0') { break; } + else if (*s == '<') { state = 4; } + else if (!strncasecmp (s, " ", 6)) { *p++ = ' '; s += 6; } + else if (*s == '\r') { s++; } + else if (!strncasecmp (s, "
", 4) || *s == '\n') { + *p = '\0'; p = text; trail_space (text); + if (text[0] != '\0') + current->text[current->lines++] = strdup (text); + if (*s == '\n') s++; else s += 4; + } + else *p++ = *s++; + continue; + + case 4: /* get current->end or skip */ + q = strstr (s, "Start="); + if (q) { + current->end = strtol (q + 6, &q, 0) / 10 - 1; + *p = '\0'; trail_space (text); + if (text[0] != '\0') + current->text[current->lines++] = strdup (text); + if (current->lines > 0) { state = 99; break; } + state = 0; continue; + } + s = strchr (s, '>'); + if (s) { s++; state = 3; continue; } + break; + } + + /* read next line */ + if (state != 99 && !(s = read_line_from_input (this, line, LINE_LEN))) + return 0; + + } while (state != 99); + + return current; +} + + +static char *sub_readtext(char *source, char **dest) { + int len=0; + char *p=source; + + while ( !eol(*p) && *p!= '|' ) { + p++,len++; + } + + *dest= (char *)malloc (len+1); + if (!dest) + return ERR; + + strncpy(*dest, source, len); + (*dest)[len]=0; + + while (*p=='\r' || *p=='\n' || *p=='|') + p++; + + if (*p) return p; /* not-last text field */ + else return NULL; /* last text field */ +} + +static subtitle_t *sub_read_line_microdvd(demux_sputext_t *this, subtitle_t *current) { + + char line[LINE_LEN + 1]; + char line2[LINE_LEN + 1]; + char *p, *next; + int i; + + memset (current, 0, sizeof(subtitle_t)); + + current->end=-1; + do { + if (!read_line_from_input (this, line, LINE_LEN)) return NULL; + } while ((sscanf (line, "{%ld}{}%" LINE_LEN_QUOT "[^\r\n]", &(current->start), line2) !=2) && + (sscanf (line, "{%ld}{%ld}%" LINE_LEN_QUOT "[^\r\n]", &(current->start), &(current->end),line2) !=3) + ); + + p=line2; + + next=p, i=0; + while ((next =sub_readtext (next, &(current->text[i])))) { + if (current->text[i]==ERR) return ERR; + i++; + if (i>=SUB_MAX_TEXT) { + printf ("Too many lines in a subtitle\n"); + current->lines=i; + return current; + } + } + current->lines= ++i; + + return current; +} + +static subtitle_t *sub_read_line_subviewer(demux_sputext_t *this, subtitle_t *current) { + + char line[LINE_LEN + 1]; + int a1,a2,a3,a4,b1,b2,b3,b4; + char *p=NULL, *q=NULL; + int len; + + memset (current, 0, sizeof(subtitle_t)); + + while (1) { + if (!read_line_from_input(this, line, LINE_LEN)) return NULL; + if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4) < 8) { + if (sscanf (line, "%d:%d:%d,%d,%d:%d:%d,%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4) < 8) + continue; + } + current->start = a1*360000+a2*6000+a3*100+a4; + current->end = b1*360000+b2*6000+b3*100+b4; + + if (!read_line_from_input(this, line, LINE_LEN)) + return NULL; + + p=q=line; + for (current->lines=1; current->lines <= SUB_MAX_TEXT; current->lines++) { + for (q=p,len=0; *p && *p!='\r' && *p!='\n' && *p!='|' && strncasecmp(p,"[br]",4); p++,len++); + current->text[current->lines-1]=(char *)malloc (len+1); + if (!current->text[current->lines-1]) return ERR; + strncpy (current->text[current->lines-1], q, len); + current->text[current->lines-1][len]='\0'; + if (!*p || *p=='\r' || *p=='\n') break; + if (*p=='[') while (*p++!=']'); + if (*p=='|') p++; + } + if (current->lines > SUB_MAX_TEXT) current->lines = SUB_MAX_TEXT; + break; + } + return current; +} + +static subtitle_t *sub_read_line_subrip(demux_sputext_t *this,subtitle_t *current) { + char line[LINE_LEN + 1]; + int a1,a2,a3,a4,b1,b2,b3,b4; + int i,end_sub; + + memset(current,0,sizeof(subtitle_t)); + do { + if(!read_line_from_input(this,line,LINE_LEN)) + return NULL; + i = sscanf(line,"%d:%d:%d%*[,.]%d --> %d:%d:%d%*[,.]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4); + } while(i < 8); + current->start = a1*360000+a2*6000+a3*100+a4/10; + current->end = b1*360000+b2*6000+b3*100+b4/10; + i=0; + end_sub=0; + do { + char *p; /* pointer to the curently read char */ + char temp_line[SUB_BUFSIZE]; /* subtitle line that will be transfered to current->text[i] */ + int temp_index; /* ... and its index wich 'points' to the first EMPTY place -> last read char is at temp_index-1 if temp_index>0 */ + temp_line[SUB_BUFSIZE-1]='\0'; /* just in case... */ + if(!read_line_from_input(this,line,LINE_LEN)) { + if(i) + break; /* if something was read, transmit it */ + else + return NULL; /* if not, repport EOF */ + } + for(temp_index=0,p=line;*p!='\0' && !end_sub && temp_index0) { + if(temp_index==SUB_BUFSIZE) + printf("Too many characters in a subtitle line\n"); + if(temp_line[temp_index-1]=='\0' || temp_index==SUB_BUFSIZE) { + if(temp_index>1) { /* more than 1 char (including '\0') -> that is a valid one */ + current->text[i]=(char *)malloc(temp_index); + if(!current->text[i]) + return ERR; + strncpy(current->text[i],temp_line,temp_index); /* temp_index<=SUB_BUFSIZE is always true here */ + i++; + temp_index=0; + } else + end_sub=1; + } + } + } + } while(i=SUB_MAX_TEXT) + printf("Too many lines in a subtitle\n"); + current->lines=i; + return current; +} + +static subtitle_t *sub_read_line_vplayer(demux_sputext_t *this,subtitle_t *current) { + char line[LINE_LEN + 1]; + int a1,a2,a3,b1,b2,b3; + char *p=NULL, *next, *p2; + int i; + + memset (current, 0, sizeof(subtitle_t)); + + while (!current->text[0]) { + if( this->next_line[0] == '\0' ) { /* if the buffer is empty.... */ + if( !read_line_from_input(this, line, LINE_LEN) ) return NULL; + } else { + /* ... get the current line from buffer. */ + strncpy( line, this->next_line, LINE_LEN); + line[LINE_LEN] = '\0'; /* I'm scared. This makes me feel better. */ + this->next_line[0] = '\0'; /* mark the buffer as empty. */ + } + /* Initialize buffer with next line */ + if( ! read_line_from_input( this, this->next_line, LINE_LEN) ) { + this->next_line[0] = '\0'; + return NULL; + } + if( (sscanf( line, "%d:%d:%d:", &a1, &a2, &a3) < 3) || + (sscanf( this->next_line, "%d:%d:%d:", &b1, &b2, &b3) < 3) ) + continue; + current->start = a1*360000+a2*6000+a3*100; + current->end = b1*360000+b2*6000+b3*100; + if ((current->end - current->start) > LINE_LEN) + current->end = current->start + LINE_LEN; /* not too long though. */ + /* teraz czas na wkopiowanie stringu */ + p=line; + /* finds the body of the subtitle_t */ + for (i=0; i<3; i++){ + p2=strchr( p, ':'); + if( p2 == NULL ) break; + p=p2+1; + } + + next=p; + i=0; + while( (next = sub_readtext( next, &(current->text[i]))) ) { + if (current->text[i]==ERR) + return ERR; + i++; + if (i>=SUB_MAX_TEXT) { + printf("Too many lines in a subtitle\n"); + current->lines=i; + return current; + } + } + current->lines=++i; + } + return current; +} + +static subtitle_t *sub_read_line_rt(demux_sputext_t *this,subtitle_t *current) { + /* + * TODO: This format uses quite rich (sub/super)set of xhtml + * I couldn't check it since DTD is not included. + * WARNING: full XML parses can be required for proper parsing + */ + char line[LINE_LEN + 1]; + int a1,a2,a3,a4,b1,b2,b3,b4; + char *p=NULL,*next=NULL; + int i,len,plen; + + memset (current, 0, sizeof(subtitle_t)); + + while (!current->text[0]) { + if (!read_line_from_input(this, line, LINE_LEN)) return NULL; + /* + * TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0 + * to describe the same moment in time. Maybe there are even more formats in use. + */ + if ((len=sscanf (line, "