Pvrfix #1460

Merged
merged 3 commits into from Sep 22, 2012

Conversation

Projects
None yet
6 participants
Member

elupus commented Sep 21, 2012

This resolves some of the issues that have surfaced with the parsing of demux streams for PVR. This should preferable go in as before next RC since at least one of the fixes is for potential seg faults. The other avoid hammering codec re-open (causing AE faults on macmini).

Note this could quite easily be extended to also parse for interlaced flags and similar from PVR backends.

elupus added some commits Sep 21, 2012

@elupus elupus dvdplayer: allow demuxer signal to player that stream info has changed 3661ddb
@elupus elupus pvr: fixed invalid usage of m_dllAvCodec before open
RequestStreams can call for a parser, this could cause crashes
and undefined behavior.
a1a5742
@elupus elupus pvr: rework parsing of stream to not hammer re-open of codecs
Old code would cause dvdplayer to thrash around closing and re-opening
codecs while a stream was being parse. And if it never found extradata
it would never open any codec.
41ca644

elupus was assigned Sep 21, 2012

Member

opdenkamp commented Sep 21, 2012

+1, fixes the issue on my test systems

Op 21-09-12 22:04, Joakim Plate schreef:

This resolves some of the issues that have surfaced with the parsing
of demux streams for PVR. This should preferable go in as before next
RC since at least one of the fixes is for potential seg faults. The
other avoid hammering codec re-open (causing AE faults on macmini).

Note this could quite easily be extended to also parse for interlaced
flags and similar from PVR backends.


    You can merge this Pull Request by running:

git pull https://github.com/elupus/xbmc pvrfix

Or view, comment on, or merge it at:

#1460

    Commit Summary
  • dvdplayer: allow demuxer signal to player that stream info has changed

  • pvr: fixed invalid usage of m_dllAvCodec before open

  • pvr: rework parsing of stream to not hammer re-open of codecs

    File Changes
    
  • M xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h (3)

  • M xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp (262)

  • M xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h (44)

  • M xbmc/cores/dvdplayer/DVDPlayer.cpp (12)

  • M xbmc/cores/dvdplayer/DVDPlayer.h (2)

    Patch Links
    
  • https://github.com/xbmc/xbmc/pull/1460.patch

  • https://github.com/xbmc/xbmc/pull/1460.diff


Reply to this email directly or view it on GitHub
#1460.

Lars Op den Kamp
Lead Developer
Pulse-Eight Limited
T: +31 (0) 6 50736506
Pulse-Eight Limited is a company registered in England & Wales. Registered Number: 07382422. Registered Offices: 13 The Metro Centre, Peterborough, PE2 7UH, United Kingdom.

Contributor

amet commented Sep 21, 2012

as I said on IRC, fixes the issue I had with some HD channels

Member

FernetMenta commented Sep 22, 2012

Unparsed streams go to player now, right?
@elupus don't you think it is a good idea to ignore streams until they are parsed? In the past we had trouble with e.g. incorrect hints coming from backends and made the system crash.

Member

elupus commented Sep 22, 2012

There is no guarantee it will find anything. If something crash, we should
fix that instead.

Member

elupus commented Sep 22, 2012

And yes they go through to players. I suppose extradata might be
available from first packet, then it can make sense to delay by one
packet. However that means we have to re-write OpenDefaultStreams
again. Ie we can't open streams after opening demuxer. Or demuxer must
start reading data on open.

I think it's better that we end up switching codecs when we figure out
something better.

On Sat, Sep 22, 2012 at 3:34 PM, Joakim Plate elupus@ecce.se wrote:

There is no guarantee it will find anything. If something crash, we should
fix that instead.

Member

FernetMenta commented Sep 22, 2012

Thanks for explaining this. I was not aware of those constraints.

@elupus elupus added a commit that referenced this pull request Sep 22, 2012

@elupus elupus Merge pull request #1460 from elupus/pvrfix
pvr: fixed the constant re-open of video/audio codecs while probing stream
8b2d36e

@elupus elupus merged commit 8b2d36e into xbmc:master Sep 22, 2012

Member

elupus commented Sep 22, 2012

No large voiced no's on this yet. So i'm merging.

EricV commented Sep 23, 2012

I can even add it fixes #13350

Member

Voyager1 commented on 3661ddb Oct 17, 2012

@elupus - I don't see where the "changes" member is being incremented, could it be that part of the commit was left out?

Member

elupus replied Oct 17, 2012

@LongChair LongChair added a commit to plexinc/plex-home-theater-public that referenced this pull request Dec 15, 2014

@LongChair LongChair Let ratingKey parser be a string parser, fixes #1460
key parser will convert the key to an url, therefore screwing progress report.

We want it to be a string so that Queue watched states can be updated properly, but we dont want it to change it to anything else :)
8c21202
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment