[Inputstream] Add IChapter interface #16581

peak3d · 2019-09-07T14:48:35Z

Description

This PR adds the CDVDInputStream::IChapter interface to inputstream API interface

Motivation and Context

Mpeg DASH manifests can contain multiple periods. Each period is an independent stream, even DRM protection can differ between periods. Often periods contain advertisment.
Issue: xbmc/inputstream.adaptive#287

How Has This Been Tested?

plugin.video.vtm.go
some other multi-period test files

Note

inputstream.adaptive 2.5.1 is minimum requirement.
API change is backwards compatible, PR doesn't touch minVersion of inputstream api

Types of change

Bug fix (non-breaking change which fixes an issue)
Clean up (non-breaking change which removes non-working, unmaintained functionality)
Improvement (non-breaking change which improves existing functionality)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that will cause existing functionality to change)
Cosmetic change (non-breaking change that doesn't touch code)
None of the above (please explain below)

xbmc/cores/VideoPlayer/DVDFileInfo.cpp

xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h

dagwieers · 2019-09-07T20:07:17Z

@peak3d I would like to make you aware of another need we have in Kodi to add (outside) support for chapters in VOD streams. We have a stream, we have some chapter metadata with names and offsets, and we would like to add this information to the ListItem (in Python) so the player can take them into account.

VRT NU add-on: Add chapter support #485

The feature request in the Kodi forums is here:

Python interface to add chapters to a video stream

(Not completely sure how that relates to this PR though)

peak3d · 2019-09-07T20:10:21Z

I guess that this is already working somehow, but this is not my real area (ffmpeg demuxer)

dagwieers · 2019-09-07T20:12:42Z

AFAIR it is only supported if the (local) file has existing markers in the video. At least there is no Python interface to add this to a ListItem that is documented. But I also did not open a feature request either, it was on my TODO list.

peak3d · 2019-09-07T21:01:43Z

@dagwieers I haven't found any python inerface for this, too, so a feature request would be the best way to step forward.

da-anda · 2019-09-08T11:24:50Z

xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h

@@ -61,6 +61,9 @@ extern "C"

      /// supports interface ITime
      SUPPORTS_ITIME = (1 << 5),
+
+      /// supports interface ITime


the comment needs to be changed

Rechi

Code style looks okay now.
Would be great if you could run git clang-format yourself for future PRs.

peak3d · 2019-09-18T15:22:25Z

xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -1919,7 +1919,8 @@ void CVideoPlayer::HandlePlaySpeed()
      m_VideoPlayerAudio->SendMessage(new CDVDMsgDouble(CDVDMsg::GENERAL_RESYNC, m_clock.GetClock()), 1);
    }
    else if (m_CurrentVideo.syncState == IDVDStreamPlayer::SYNC_WAITSYNC &&
-             m_CurrentVideo.avsync == CCurrentStream::AV_SYNC_CONT)
+             (m_CurrentVideo.avsync == CCurrentStream::AV_SYNC_CONT ||
+              m_CurrentAudio.syncState == IDVDStreamPlayer::SYNC_INSYNC))


@FernetMenta need your opinion here: I play stream with chapters from inputstream.adaptive, each chapter devided with an DMX_SPECIALID_STREAMCHANGE. Syncinc stalls between the chapters (depending the stream length up to ~10 seconds). In this case m_CurrentVideo.avsync is CCurrentStream::AV_SYNC_NONE during stall, means that it will never be set to CONT.
The code change is identical to what is done some lines above for Audio. What do you think?

This change is definitely wrong. If your video stream stalls, you are most like doing something wrong setting the stream parameters. OpenDefaultStream / OpenVideoStream won't reopen video stream if config did not change.

btw. this is another example where you hide non trivial changes in some PR with a title nobody would expect those kind of changes in.

@FernetMenta I doubt that this error is caused by flags passed from outside.
Even if it would be like that, the combination m_CurrentVideo.syncState == IDVDStreamPlayer::SYNC_WAITSYNC and m_CurrentVideo.avsync == CCurrentStream::AV_SYNC_NONE should never happen, right?

Edit: If you have some spare time, It would be nice if you reproduce and break execution during the wait. kodi + this PR / inputstream.adaptive master branch (not Matrix) and VTM go addon (it provides chapter based streams). I have already checked PTS, they are fine.

Edit2: You'll have to revert this second commit to see the stall, and yes, it will be an own PR if things are clarified.

Even if it would be like that, the combination m_CurrentVideo.syncState == IDVDStreamPlayer::SYNC_WAITSYNC and m_CurrentVideo.avsync == CCurrentStream::AV_SYNC_NONE should never happen, right?

Wrong, this is quite a common state.

You should investigate why your streamchange puts VPV into state SYNC_WAITSYNC. In general that happens when a new video stream is opened. Why does this happen if parameters do not change?

the state of avsync should not change that often as it does in your log.

Ok, I'll first try to figure out why it changes that often

https://paste.ubuntu.com/p/TQVrbD7mHv/
The old log was not ok, sry.

The stall ist now here:
2019-09-21 21:51:40.834 T:4294967294 DEBUG: CVideoPlayer::HandleMessages - player started 2

Maybe the issue is caused by the very short length of the stream 2001/2, it is only a few seconds, but right ahead the stream which have the 7sec stall

Can VP handle the situation that 3 streams are in "queue" ? we have 1001 playing, 2001 is very short, and we start already with 3001.

@FernetMenta I created an example for reproduction, maybe it helps:
https://paste.ubuntu.com/p/JMqb4ptWCJ/, instructions in the paste.

ksooo · 2019-09-24T06:32:58Z

inputstream.adaptive 2.5.1 is minimum requirement.

Seems there is no version 2.5.1 available?!

AlwinEsch · 2019-12-07T19:35:19Z

Had overlooked this request. The comments on #16977 (review) also then related to here.

Maybe leave it then on Leia like on request, but on Matrix change to std::string if OK.

[Backport][Inputstream] Add IChapter interface #16581

This reverts commit da9b5f1. The API change on Leia has destroyed all after them created addon to use on older Leia versions.

Revert "[Backport][Inputstream] Add IChapter interface #16581"

peak3d added Type: Improvement non-breaking change which improves existing functionality Component: Binary add-ons API change: Binary add-ons v19 Matrix labels Sep 7, 2019

peak3d added this to the Matrix 19.0-alpha 1 milestone Sep 7, 2019

Rechi reviewed Sep 7, 2019

View reviewed changes

peak3d force-pushed the chapter branch from fe736f4 to 604fe24 Compare September 7, 2019 20:04

peak3d requested a review from Rechi September 7, 2019 21:04

da-anda reviewed Sep 8, 2019

View reviewed changes

Rechi reviewed Sep 8, 2019

View reviewed changes

[Inlutstream] Add IChapter interface

c38104d

peak3d force-pushed the chapter branch from 604fe24 to c38104d Compare September 8, 2019 15:06

dagwieers mentioned this pull request Sep 9, 2019

Add chapter support add-ons/plugin.video.vrt.nu#485

Open

peak3d mentioned this pull request Sep 9, 2019

[binary addons] use VERSION_MIN instead VERSION for dependency checks #16591

Merged

7 tasks

peak3d force-pushed the chapter branch from e000034 to df001bf Compare September 11, 2019 19:28

This was referenced Sep 15, 2019

Multiple Periods/IChapter interface: external subtitles get out of sync when seeking forward with mouse on progress bar xbmc/inputstream.adaptive#324

Closed

Subtitles out of sync in VOD streams with commercials. add-ons/plugin.video.vtm.go#51

Closed

peak3d force-pushed the chapter branch from df001bf to 6df4e8e Compare September 18, 2019 15:18

peak3d commented Sep 18, 2019

View reviewed changes

peak3d force-pushed the chapter branch from 6df4e8e to c38104d Compare September 22, 2019 17:00

peak3d merged commit a34bfcd into xbmc:master Sep 23, 2019

peak3d deleted the chapter branch September 23, 2019 19:28

peak3d mentioned this pull request Sep 23, 2019

[Inputstream] Make API backwards compatible to old addons #16667

Merged

7 tasks

peak3d added a commit to peak3d/xbmc that referenced this pull request Nov 29, 2019

[Backport][Inputstream] Add IChapter interface xbmc#16581

c233f2c

peak3d mentioned this pull request Nov 29, 2019

[Backport][Inputstream] Add IChapter interface #16581 #16977

Merged

7 tasks

peak3d added a commit to peak3d/xbmc that referenced this pull request Nov 29, 2019

[Backport][Inputstream] Add IChapter interface xbmc#16581

47b0353

peak3d added a commit to peak3d/xbmc that referenced this pull request Nov 29, 2019

[Backport][Inputstream] Add IChapter interface xbmc#16581

5ba2606

peak3d added a commit to peak3d/xbmc that referenced this pull request Dec 13, 2019

[Backport][Inputstream] Add IChapter interface xbmc#16581

da9b5f1

peak3d added a commit that referenced this pull request Dec 25, 2019

Merge pull request #16977 from peak3d/leia_chapter

efc8ec8

[Backport][Inputstream] Add IChapter interface #16581

AlwinEsch added a commit to AlwinEsch/kodi that referenced this pull request Jan 30, 2020

Revert "[Backport][Inputstream] Add IChapter interface xbmc#16581"

8ff9864

This reverts commit da9b5f1. The API change on Leia has destroyed all after them created addon to use on older Leia versions.

AlwinEsch added a commit that referenced this pull request Jan 30, 2020

Merge pull request #17297 from AlwinEsch/revert-leia-inputstream-change

e1e1874

Revert "[Backport][Inputstream] Add IChapter interface #16581"

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Inputstream] Add IChapter interface #16581

[Inputstream] Add IChapter interface #16581

peak3d commented Sep 7, 2019 •

edited

dagwieers commented Sep 7, 2019 •

edited

peak3d commented Sep 7, 2019

dagwieers commented Sep 7, 2019

peak3d commented Sep 7, 2019

da-anda Sep 8, 2019

Rechi left a comment

peak3d Sep 18, 2019

FernetMenta Sep 19, 2019

FernetMenta Sep 19, 2019

peak3d Sep 19, 2019 •

edited

FernetMenta Sep 19, 2019

FernetMenta Sep 21, 2019

peak3d Sep 21, 2019

peak3d Sep 21, 2019

peak3d Sep 21, 2019

peak3d Sep 21, 2019

ksooo commented Sep 24, 2019

AlwinEsch commented Dec 7, 2019

[Inputstream] Add IChapter interface #16581

[Inputstream] Add IChapter interface #16581

Conversation

peak3d commented Sep 7, 2019 • edited

Description

Motivation and Context

How Has This Been Tested?

Note

Types of change

dagwieers commented Sep 7, 2019 • edited

peak3d commented Sep 7, 2019

dagwieers commented Sep 7, 2019

peak3d commented Sep 7, 2019

Choose a reason for hiding this comment

Rechi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

peak3d Sep 19, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ksooo commented Sep 24, 2019

AlwinEsch commented Dec 7, 2019

peak3d commented Sep 7, 2019 •

edited

dagwieers commented Sep 7, 2019 •

edited

peak3d Sep 19, 2019 •

edited