[videoplayer][demuxer] Add multi source input stream/demuxer #9286

ace20022 · 2016-03-06T19:55:47Z

TODO:

~~- [ ] Add enableStream~~ (this needs more work)

Testbuilds

Future work (not part of this pr):

Add enableStream
Handle all special demuxers/streams (ext. subs, CC subs) with this demuxer
Remove source mask from player
Rewrite Selection Stream

ace20022 · 2016-03-06T19:56:28Z

jenkins build this please

ace20022 · 2016-03-06T19:58:47Z

@mapfau, @FernetMenta fyi

ghost · 2016-03-06T20:00:28Z

great!

FernetMenta · 2016-03-07T06:55:44Z

some commit messages include "DVDPlayer"
dvdplayer is gone. Please don't prefix new files and classes with "DVD"

FernetMenta · 2016-03-07T06:58:58Z

@ace20022 I would like to drop CDemuxer::iId first. OK if I do this first?

ace20022 · 2016-03-07T07:10:42Z

"DVDPlayer"

Lol, the first attempt dates back to 2012 ;)

OK if I do this first?

Okay

ace20022 · 2016-03-08T21:07:26Z

jenkins build this please

ace20022 · 2016-03-08T21:30:59Z

@FernetMenta Could you please have another look at it? I want to merge it asap.

ace20022 · 2016-03-08T21:36:47Z

jenkins build this please

xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt

@@ -4,6 +4,7 @@ set(SOURCES DVDDemux.cpp
            DVDDemuxCDDA.cpp
            DVDDemuxClient.cpp
            DVDDemuxFFmpeg.cpp
+            DVDDemuxMultiSource.cpp


ace20022 · 2016-03-09T06:33:21Z

jenkins build this please

xbmc/Util.cpp

+   || !item.IsVideo()) 
+    return;
+
+  //std::vector<std::string> strLookInPaths;


FernetMenta · 2016-03-09T07:15:15Z

+1

ace20022 · 2016-03-10T14:23:43Z

@Rechi seems it's still missing from the ios project? (http://jenkins.kodi.tv/job/BuildMulti-PR/4632/)

Rechi · 2016-03-10T15:52:34Z

@ace20022 sorry, forgot to add the files to the ios target
Rechi@dd747a6
Rechi@271ce17

ace20022 · 2016-03-10T16:17:35Z

@Rechi thanks again!

jenkins build this please

Rechi · 2016-03-10T17:42:43Z

There is something with the previous jenkins build (http://jenkins.kodi.tv/job/BuildMulti-PR/4632/).
Windows build is running for over 4 hours.

ace20022 · 2016-03-10T18:07:15Z

I know, but I can't kill it, @MartijnKaijser maybe?

FernetMenta · 2016-03-10T20:31:58Z

@ace20022 anything left I can help with?

ace20022 · 2016-03-10T20:34:14Z

@Rechi thx! I hope I got it right this time.

@FernetMenta thanks for the offer, currently not.

jenkins build this please

Rechi · 2016-03-10T21:03:01Z

@FernetMenta maybe you can provide the xcode sync. It seems I've done something wrong again.

FernetMenta · 2016-03-11T06:17:40Z

FernetMenta@51d9664

…emuxers manages several demuxers by themselves.

… from multiple sources (at once).

…/files at once.

ace20022 · 2016-03-11T08:36:10Z

jenkins build this please

[videoplayer][demuxer] Add multi source input stream/demuxer

kaefert · 2018-01-18T15:50:04Z

Hi there!
I found this commit through this reddit post here:
https://www.reddit.com/r/kodi/comments/5sdlvh/separate_audio_files_for_films/

And I tried putting some *.m4a and *.ac3 files in a movie subfolder first named "tracks" then "audio" and always refreshing the movie in between. I don't see those audio tracks through the player api.

My Kodi says it's Build Kodi 17.6 Git:2017-11-16-484e823
Since this commit is from 2016-03 I thought I should have that feature. Am I doing anything wrong?

Badb0yBadb0y · 2018-05-24T02:43:49Z

@kaefert have you managed to solve it? If yes how?

kaefert · 2018-05-24T05:51:50Z

No. I found no solution other than to prepare a file that contains both the video and audio stream I want to play beforehand.

FernetMenta · 2018-05-24T06:08:17Z

This is a dev space. Please move those kind of discussions to the forum

ace20022 added Type: Feature non-breaking change which adds functionality WIP PR that is still being worked on Component: Video labels Mar 6, 2016

ace20022 assigned FernetMenta Mar 6, 2016

ace20022 force-pushed the multiStreams branch 2 times, most recently from 42330fc to 68e90d5 Compare March 7, 2016 16:09

FernetMenta mentioned this pull request Mar 8, 2016

VideoPlayer: identify DemuxStream by unique id, not by index #9290

Merged

ace20022 force-pushed the multiStreams branch 3 times, most recently from 57a9cc1 to 95c485f Compare March 8, 2016 21:06

ace20022 force-pushed the multiStreams branch from 95c485f to f793b4c Compare March 8, 2016 21:35

afedchin reviewed Mar 8, 2016
View reviewed changes

xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt

@@ -4,6 +4,7 @@ set(SOURCES DVDDemux.cpp

DVDDemuxCDDA.cpp

DVDDemuxClient.cpp

DVDDemuxFFmpeg.cpp

DVDDemuxMultiSource.cpp

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

ace20022 force-pushed the multiStreams branch from f793b4c to f6367a6 Compare March 9, 2016 06:32

FernetMenta reviewed Mar 9, 2016
View reviewed changes

xbmc/Util.cpp

|| !item.IsVideo())

return;

//std::vector<std::string> strLookInPaths;

This comment was marked as spam.

Sign in to view

ace20022 force-pushed the multiStreams branch from a05d4ce to ffa6b2f Compare March 10, 2016 16:16

ace20022 force-pushed the multiStreams branch from ffa6b2f to 04b62c4 Compare March 10, 2016 20:28

ace20022 added 6 commits March 11, 2016 09:19

[videoplayer][demuxer] Add an id for demuxers. This is useful since d…

61fdec4

…emuxers manages several demuxers by themselves.

[win32] Add DVDDemuxPacket.h to the project files.

ca9fecc

[Util] Add method to scan for external audio files.

351143a

[videoplayer] Add InputStreamMultiSource to open/handle input streams…

0ed08f6

… from multiple sources (at once).

[videoplayer] Add a demuxer that manages demuxing of multiple streams…

bf79585

…/files at once.

[demuxer] Multidemuxer: add external stream details (flag and language).

71f50b3

ace20022 force-pushed the multiStreams branch from 04b62c4 to 71f50b3 Compare March 11, 2016 08:35

ace20022 added v17 Krypton and removed WIP PR that is still being worked on labels Mar 11, 2016

ace20022 added this to the Krypton 17.0-alpha1 milestone Mar 11, 2016

ace20022 added a commit that referenced this pull request Mar 11, 2016

Merge pull request #9286 from ace20022/multiStreams

b47f406

[videoplayer][demuxer] Add multi source input stream/demuxer

ace20022 merged commit b47f406 into xbmc:master Mar 11, 2016

ace20022 deleted the multiStreams branch March 11, 2016 11:38

kaileu mentioned this pull request Jun 7, 2016

Kodi 17 (Krypton) support pigskin/kodi-gamepass#234

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[videoplayer][demuxer] Add multi source input stream/demuxer #9286

[videoplayer][demuxer] Add multi source input stream/demuxer #9286

ace20022 commented Mar 6, 2016

ace20022 commented Mar 6, 2016

ace20022 commented Mar 6, 2016

ghost commented Mar 6, 2016

FernetMenta commented Mar 7, 2016

FernetMenta commented Mar 7, 2016

ace20022 commented Mar 7, 2016

ace20022 commented Mar 8, 2016

ace20022 commented Mar 8, 2016

ace20022 commented Mar 8, 2016

This comment was marked as spam.

This comment was marked as spam.

ace20022 commented Mar 9, 2016

This comment was marked as spam.

FernetMenta commented Mar 9, 2016

ace20022 commented Mar 10, 2016

Rechi commented Mar 10, 2016

ace20022 commented Mar 10, 2016

Rechi commented Mar 10, 2016

ace20022 commented Mar 10, 2016

FernetMenta commented Mar 10, 2016

ace20022 commented Mar 10, 2016

Rechi commented Mar 10, 2016

FernetMenta commented Mar 11, 2016

ace20022 commented Mar 11, 2016

kaefert commented Jan 18, 2018

Badb0yBadb0y commented May 24, 2018

kaefert commented May 24, 2018

FernetMenta commented May 24, 2018

[videoplayer][demuxer] Add multi source input stream/demuxer #9286

[videoplayer][demuxer] Add multi source input stream/demuxer #9286

Conversation

ace20022 commented Mar 6, 2016

ace20022 commented Mar 6, 2016

ace20022 commented Mar 6, 2016

ghost commented Mar 6, 2016

FernetMenta commented Mar 7, 2016

FernetMenta commented Mar 7, 2016

ace20022 commented Mar 7, 2016

ace20022 commented Mar 8, 2016

ace20022 commented Mar 8, 2016

ace20022 commented Mar 8, 2016

This comment was marked as spam.

This comment was marked as spam.

ace20022 commented Mar 9, 2016

This comment was marked as spam.

FernetMenta commented Mar 9, 2016

ace20022 commented Mar 10, 2016

Rechi commented Mar 10, 2016

ace20022 commented Mar 10, 2016

Rechi commented Mar 10, 2016

ace20022 commented Mar 10, 2016

FernetMenta commented Mar 10, 2016

ace20022 commented Mar 10, 2016

Rechi commented Mar 10, 2016

FernetMenta commented Mar 11, 2016

ace20022 commented Mar 11, 2016

kaefert commented Jan 18, 2018

Badb0yBadb0y commented May 24, 2018

kaefert commented May 24, 2018

FernetMenta commented May 24, 2018