[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

afedchin · 2016-03-08T22:40:47Z

xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt

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


afedchin · 2016-03-08T22:40:57Z

xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt

@@ -14,6 +15,7 @@ set(HEADERS DVDDemux.h
            DVDDemuxCDDA.h
            DVDDemuxClient.h
            DVDDemuxFFmpeg.h
+            DVDDemuxMultiSource.h


same as above

afedchin · 2016-03-08T22:41:11Z

xbmc/cores/VideoPlayer/DVDDemuxers/Makefile.in

@@ -5,6 +5,7 @@ SRCS += DVDDemuxBXA.cpp
 SRCS += DVDDemuxCDDA.cpp
 SRCS += DVDDemuxFFmpeg.cpp
 SRCS += DVDDemuxClient.cpp
+SRCS += DVDDemuxMultiSource.cpp


afedchin · 2016-03-08T22:41:22Z

xbmc/cores/VideoPlayer/DVDInputStreams/CMakeLists.txt

@@ -3,6 +3,7 @@ set(SOURCES DVDFactoryInputStream.cpp
            DVDInputStreamFFmpeg.cpp
            DVDInputStreamFile.cpp
            DVDInputStreamMemory.cpp
+            DVDInputStreamMultiSource.cpp


and here :)

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

jenkins build this please

FernetMenta · 2016-03-09T06:42:55Z

xbmc/Util.cpp

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


please remove

FernetMenta · 2016-03-09T06:44:47Z

xbmc/Util.cpp

+  std::vector<std::string> exts = StringUtils::Split(g_advancedSettings.GetMusicExtensions(), "|");
+  ScanPathsForAssociatedItems(strAudio, items, exts, vecAudio);
+
+  CLog::Log(LOGDEBUG,"%s: END (total time: %i ms)", __FUNCTION__, (int)(XbmcThreads::SystemClockMillis() - startTimer));


final version should not include debug code

That's c&p from the subs code

that doesn't make it better :)

Haven't said that ;)

FernetMenta · 2016-03-09T06:47:43Z

xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.cpp

 {
  std::string file = fileitem.GetPath();
+  if (scanforextaudio)


you seem to be concerned about performance. I wondering if this should be optional and activated by a setting.

No new setting. It's because of the details extraction in DVDFileInfo. Maybe I should remove the bool and also consider ext. audio in DVDFileInfo. What do you think?

If you are not concerned about about performance, I am fine with how it is now.

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


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

…emuxers manages several demuxers by themselves.


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


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


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

… from multiple sources (at once).


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

…/files at once.


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

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

jenkins build this please


        Merge pull request #9286 from ace20022/multiStreams

[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 WIP Component: Video labels Mar 6, 2016

ace20022 assigned FernetMenta Mar 6, 2016

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

FernetMenta mentioned this pull request Mar 8, 2016

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

Merged

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

ace20022 force-pushed the ace20022:multiStreams branch from 95c485f to f793b4c Mar 8, 2016

afedchin reviewed Mar 8, 2016
View changes

xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt Outdated

@@ -14,6 +15,7 @@ set(HEADERS DVDDemux.h

DVDDemuxCDDA.h

DVDDemuxClient.h

DVDDemuxFFmpeg.h

DVDDemuxMultiSource.h

This comment has been minimized.

Sign in to view

Copy link

afedchin Mar 8, 2016
Member

same as above

afedchin reviewed Mar 8, 2016
View changes

ace20022 force-pushed the ace20022:multiStreams branch from f793b4c to f6367a6 Mar 9, 2016

FernetMenta reviewed Mar 9, 2016
View changes

xbmc/Util.cpp Outdated

|| !item.IsVideo())

return;

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

This comment has been minimized.

Sign in to view

Copy link

FernetMenta Mar 9, 2016
Member

please remove

FernetMenta reviewed Mar 9, 2016
View changes

ace20022 force-pushed the ace20022:multiStreams branch from a05d4ce to ffa6b2f Mar 10, 2016

ace20022 force-pushed the ace20022:multiStreams branch from ffa6b2f to 04b62c4 Mar 10, 2016

ace20022 added 6 commits Feb 23, 2016

[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).

Loading status checks…

71f50b3

ace20022 force-pushed the ace20022:multiStreams branch from 04b62c4 to 71f50b3 Mar 11, 2016

ace20022 added v17 Krypton and removed WIP 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
1 of 2 checks passed

1 of 2 checks passed

default Merged build finished.
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

ace20022 deleted the ace20022:multiStreams branch Mar 11, 2016

kaileu mentioned this pull request Jun 7, 2016

Kodi 17 (Krypton) support #234

Closed

Sponsor xbmc/xbmc

xbmc/xbmc

Join GitHub today

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

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

Conversation

ace20022 commented Mar 6, 2016

This comment has been minimized.

ace20022 commented Mar 6, 2016

This comment has been minimized.

ace20022 commented Mar 6, 2016

This comment has been minimized.

ghost commented Mar 6, 2016

This comment has been minimized.

FernetMenta commented Mar 7, 2016

This comment has been minimized.

FernetMenta commented Mar 7, 2016

This comment has been minimized.

ace20022 commented Mar 7, 2016

This comment has been minimized.

ace20022 commented Mar 8, 2016

This comment has been minimized.

ace20022 commented Mar 8, 2016

This comment has been minimized.

ace20022 commented Mar 8, 2016

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ace20022 commented Mar 9, 2016

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

FernetMenta commented Mar 9, 2016

This comment has been minimized.

ace20022 commented Mar 10, 2016

This comment has been minimized.

Rechi commented Mar 10, 2016

This comment has been minimized.

ace20022 commented Mar 10, 2016

This comment has been minimized.

Rechi commented Mar 10, 2016

This comment has been minimized.

ace20022 commented Mar 10, 2016

This comment has been minimized.

FernetMenta commented Mar 10, 2016

This comment has been minimized.

ace20022 commented Mar 10, 2016

This comment has been minimized.

Rechi commented Mar 10, 2016

This comment has been minimized.

FernetMenta commented Mar 11, 2016

This comment has been minimized.

ace20022 commented Mar 11, 2016

This comment has been minimized.

kaefert commented Jan 18, 2018

This comment has been minimized.

Badb0yBadb0y commented May 24, 2018

This comment has been minimized.

kaefert commented May 24, 2018

This comment has been minimized.

FernetMenta commented May 24, 2018