diff mbox

updated slavemode patch for mplayer plugin

Message ID 45FF8B1B.2020908@errror.org
State New
Headers

Commit Message

Patrick Cernko March 20, 2007, 7:19 a.m. UTC 
  Hi List,

Stone wrote:
> After building the latest SVN today of the mplayer source, I noticed
> that the slavemode patch from the vdr-mp3-plugin did not apply anymore. 
> Here is an attached working version of the patch for current SVN of
> mplayer.
>  

seems like the mplayer people are heavily working on their code. Again a
slight update to the diff, to make it working.

So long,

Comments

Pasi Juppo March 20, 2007, 8:18 p.m. UTC | #1 
Hi,

Is there any plans to have subtitle support for streamdev plugin? Or is
there by any chance a patch that provides it?

And are there any plans for streamdev to support HDTV (h.264 or similar)?

Br, Pasi
Frank Schmirler March 22, 2007, 12:03 p.m. UTC | #2 
On Tue, 20 Mar 2007 22:18:31 +0200, Pasi Juppo wrote
> Hi,
> 
> Is there any plans to have subtitle support for streamdev plugin? Or 
> is there by any chance a patch that provides it?

AFAIC no plans for that at the moment - sorry.

> And are there any plans for streamdev to support HDTV (h.264 or 
> similar)?

AFAIK mpeg2 based HDTV works right out of the box. I will probably start
working on H.264 if all of the following conditions are met:
- Linux and VDR support for DVB-S2 and H.264
- H.264 FTA channels on Astra which are halfway worth the effort
- Affordable way to decode it in hardware without generating to much noise
- Component output of HDTV not threatened by broadcast flag / DRM

Cheers,
Frank
Anssi Hannula March 23, 2007, 1:33 p.m. UTC | #3 
Pasi Juppo wrote:
> Hi,
> 
> Is there any plans to have subtitle support for streamdev plugin? Or is
> there by any chance a patch that provides it?

What do you mean?

1) DVB Subtitles sent in the HTTP datastream:
http://users.tkk.fi/~rahrenbe/vdr/vdr-streamdev-cvs-subtitles.diff.gz

2) DVB Subtitles on a VDR VTP client using vdr-plugin-subtitles:
Seems to work, but streamdev seems to be buggy and crashes often when
used like this (works better when you enable the "AllowSuspend" option
in the server).
Arthur Konovalov March 23, 2007, 1:51 p.m. UTC | #4 
Anssi Hannula wrote:
> 1) DVB Subtitles sent in the HTTP datastream:
> http://users.tkk.fi/~rahrenbe/vdr/vdr-streamdev-cvs-subtitles.diff.gz

Forbidden:
You don't have permission to access 
/~rahrenbe/vdr/vdr-streamdev-cvs-subtitles.diff.gz on this server



AK
Anssi Hannula March 23, 2007, 1:59 p.m. UTC | #5 
Arthur Konovalov wrote:
> Anssi Hannula wrote:
>> 1) DVB Subtitles sent in the HTTP datastream:
>> http://users.tkk.fi/~rahrenbe/vdr/vdr-streamdev-cvs-subtitles.diff.gz
> 
> Forbidden:
> You don't have permission to access
> /~rahrenbe/vdr/vdr-streamdev-cvs-subtitles.diff.gz on this server

Oh.

Well, an older version of the patch is available here as well:
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/vdr-plugin-streamdev/current/SOURCES/vdr-streamdev-cvs-20060823-dvbsubtitles.diff?revision=70921
Pasi Juppo March 23, 2007, 5:12 p.m. UTC | #6 
Anssi Hannula wrote:
> Pasi Juppo wrote:
>> Hi,
>>
>> Is there any plans to have subtitle support for streamdev plugin? Or is
>> there by any chance a patch that provides it?
> 
> What do you mean?
> 
> 1) DVB Subtitles sent in the HTTP datastream:
> http://users.tkk.fi/~rahrenbe/vdr/vdr-streamdev-cvs-subtitles.diff.gz

I applied this one and now I have subtitles on remote computer
(vdr+streamdev+xineliboutput). Thanks goes to RoFa.


> 2) DVB Subtitles on a VDR VTP client using vdr-plugin-subtitles:
> Seems to work, but streamdev seems to be buggy and crashes often when
> used like this (works better when you enable the "AllowSuspend" option
> in the server).

Haven't tried this one (didn't know that there was already support for
this). But if this is somewhat buggy then I'll stick with the patch.


But, seems that there can be multiple clients but they all have the same
channel and OSD (local can also have own channel and OSD). To have
centralized solution via streamdev it would require either multiple
instances of VDR or streamdev server (internally preferably instead of
multiple plugins). Multiple instances of VDR would not be nice solution
thus streamdev should do this.

Any plans regarding the support of multiple clients?

Br, Pasi
Seppo Ingalsuo March 23, 2007, 5:26 p.m. UTC | #7 
Hi,

Pasi Juppo wrote:
> Is there any plans to have subtitle support for streamdev plugin? Or is
> there by any chance a patch that provides it?

I got dvb subtitles to work thanks to this tip (in Finnish) 
http://www.linuxtv.fi/viewtopic.php?t=2029&start=30&sid=29c463b7f0abe6a3c18ef54d9142cdbd

Using multipid streaming and manual copying of plugins/subchannels.conf 
from server to client seems to do the trick!

Cheers,
Seppo
Petri Hintukainen March 23, 2007, 7:09 p.m. UTC | #8 
On Fri, 23 Mar 2007, Anssi Hannula wrote:
>
> 2) DVB Subtitles on a VDR VTP client using vdr-plugin-subtitles:
> Seems to work, but streamdev seems to be buggy and crashes often when
> used like this (works better when you enable the "AllowSuspend" option
> in the server).
>

What streamdev version and where is it available ? 
(there are n+1 different patched versions around...)

With current CVS version (vdr-developer.org) I have working 
subtitles, I just had to copy config files channels.conf and
plugins/subchannels.conf from server to client.
(I guess this is because of missing section filters ?).


- Petri
Petri Hintukainen March 28, 2007, 6:43 p.m. UTC | #9 
On Fri, 23 Mar 2007, Seppo Ingalsuo wrote:
>
> I got dvb subtitles to work thanks to this tip (in Finnish) 
> http://www.linuxtv.fi/viewtopic.php?t=2029&start=30&sid=29c463b7f0abe6a3c18ef54d9142cdbd
>
> Using multipid streaming and manual copying of plugins/subchannels.conf from 
> server to client seems to do the trick!
>

No need for copying anymore: there's a patch to enable section filtering 
in streamdev (http://phivdr.dyndns.org/vdr/vdr-streamdev-patches/).
Now clients can do full EPG scans and automatic channel list updates work :)


- Petri
Petri Hintukainen April 3, 2007, 11:31 a.m. UTC | #10 
On Tue, 20 Mar 2007 22:18:31 +0200, Pasi Juppo wrote
>
> And are there any plans for streamdev to support HDTV (h.264 or 
> similar)?

It should be possible to watch H.264 HDTV using HTTP TS streaming with
the patch from
http://phivdr.dyndns.org/vdr/vdr-streamdev-patches/testing/


- Petri
syrius.ml@no-log.org April 3, 2007, 1:20 p.m. UTC | #11 
Petri Hintukainen <phintuka@users.sourceforge.net> writes:

>> And are there any plans for streamdev to support HDTV (h.264 or 
>> similar)?
>
> It should be possible to watch H.264 HDTV using HTTP TS streaming with
> the patch from
> http://phivdr.dyndns.org/vdr/vdr-streamdev-patches/testing/

Hmm what about section filtering ?
it seems section_filters-0.2.patch doesn't apply well on cvs version.
is it possible to have both ?

--
Petri Hintukainen April 3, 2007, 2:42 p.m. UTC | #12 
On Tue, 2007-04-03 at 15:20 +0200, syrius.ml@no-log.org wrote:
> Petri Hintukainen <phintuka@users.sourceforge.net> writes:
> 
> Hmm what about section filtering ?
> it seems section_filters-0.2.patch doesn't apply well on cvs version.
> is it possible to have both ?
> 

I generated new patch against current CVS (section_filters-0.3.patch).

It includes also HTTP TS PAT/PMT patch (it was quite impossible to
create separate patches without collisions).


- Petri
syrius.ml@no-log.org April 3, 2007, 3:44 p.m. UTC | #13 
Petri Hintukainen <phintuka@users.sourceforge.net> writes:

> On Tue, 2007-04-03 at 15:20 +0200, syrius.ml@no-log.org wrote:
>> Petri Hintukainen <phintuka@users.sourceforge.net> writes:
>> 
>> Hmm what about section filtering ?
>> it seems section_filters-0.2.patch doesn't apply well on cvs version.
>> is it possible to have both ?
>> 
>
> I generated new patch against current CVS (section_filters-0.3.patch).
>
> It includes also HTTP TS PAT/PMT patch (it was quite impossible to
> create separate patches without collisions).

Ok, Thanks a lot for this very quick patch.

Unfortunatly it doesn't solve the issues i have with vtp.
I'll have a look at the bug tracker to see if it has already been
reported.

Cheers

--
syrius.ml@no-log.org April 3, 2007, 6:16 p.m. UTC | #14 
syrius.ml@no-log.org writes:

> Ok, Thanks a lot for this very quick patch.
>
> Unfortunatly it doesn't solve the issues i have with vtp.
> I'll have a look at the bug tracker to see if it has already been
> reported.

Hm in fact the issues I have are with vdr 1.5.1 and VTP.
I went back to 1.4 and vtp seems quite stable.

thanks again.

--
diff mbox

Patch

--- mplayer.c	(revision 22763)
+++ mplayer.c	(working copy)
@@ -3548,6 +3548,25 @@ 
   edl_decision = 0;
 }
 
+#if 1
+  if(slave_mode){
+    float position=0.0;
+    float time=0.0;
+    if(mpctx->demuxer->file_format==DEMUXER_TYPE_AVI && mpctx->sh_video->video.dwLength>2) {
+      // get pos from frame number / total frames
+      position=(float)mpctx->d_video->pack_no*100.0/(float)mpctx->sh_video->video.dwLength;
+      }
+    else {
+      off_t len = ( mpctx->demuxer->movi_end - mpctx->demuxer->movi_start );
+      off_t pos = ( mpctx->demuxer->file_format == DEMUXER_TYPE_AUDIO?mpctx->stream->pos:mpctx->demuxer->filepos );
+      if(len>0) position=( pos - mpctx->demuxer->movi_start ) * 100.0 / len;
+      }
+    if(mpctx->sh_video) time=mpctx->d_video->pts;
+    else if(mpctx->sh_audio) time=mpctx->delay;
+    mp_msg(MSGT_OSD,MSGL_ERR,"SLAVE: time=%.2f position=%.2f\r",time,position);
+    }
+#endif
+
 #ifdef HAVE_NEW_GUI
       if(use_gui){
         guiEventHandling();