Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from Mar 11, 2016

Conversation

@ace20022
Copy link
Member

ace20022 commented Mar 6, 2016

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

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 6, 2016

jenkins build this please

@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 6, 2016

@mapfau, @FernetMenta fyi

@ghost

This comment has been minimized.

Copy link

ghost commented Mar 6, 2016

great!

@FernetMenta

This comment has been minimized.

Copy link
Member

FernetMenta commented Mar 7, 2016

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

@FernetMenta

This comment has been minimized.

Copy link
Member

FernetMenta commented Mar 7, 2016

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

@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 7, 2016

"DVDPlayer"

Lol, the first attempt dates back to 2012 ;)

OK if I do this first?

Okay

@ace20022 ace20022 force-pushed the ace20022:multiStreams branch 2 times, most recently from 42330fc to 68e90d5 Mar 7, 2016
@ace20022 ace20022 force-pushed the ace20022:multiStreams branch 3 times, most recently from 57a9cc1 to 95c485f Mar 8, 2016
@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 8, 2016

jenkins build this please

@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 8, 2016

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

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

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 8, 2016

jenkins build this please

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

This comment has been minimized.

Copy link
@afedchin

This comment has been minimized.

Copy link
@ace20022

ace20022 Mar 8, 2016

Author Member

Damn, thx

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

This comment has been minimized.

Copy link
@afedchin

afedchin Mar 8, 2016

Member

same as above

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

This comment has been minimized.

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

This comment has been minimized.

Copy link
@afedchin

afedchin Mar 8, 2016

Member

and here :)

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

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 9, 2016

jenkins build this please

|| !item.IsVideo())
return;

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

This comment has been minimized.

Copy link
@FernetMenta

FernetMenta Mar 9, 2016

Member

please remove

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));

This comment has been minimized.

Copy link
@FernetMenta

FernetMenta Mar 9, 2016

Member

final version should not include debug code

This comment has been minimized.

Copy link
@ace20022

ace20022 Mar 9, 2016

Author Member

That's c&p from the subs code

This comment has been minimized.

Copy link
@FernetMenta

FernetMenta Mar 9, 2016

Member

that doesn't make it better :)

This comment has been minimized.

Copy link
@ace20022

ace20022 Mar 9, 2016

Author Member

Haven't said that ;)

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

This comment has been minimized.

Copy link
@FernetMenta

FernetMenta Mar 9, 2016

Member

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

This comment has been minimized.

Copy link
@ace20022

ace20022 Mar 9, 2016

Author Member

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?

This comment has been minimized.

Copy link
@FernetMenta

FernetMenta Mar 9, 2016

Member

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

@FernetMenta

This comment has been minimized.

Copy link
Member

FernetMenta commented Mar 9, 2016

+1

@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 10, 2016

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

@Rechi

This comment has been minimized.

Copy link
Member

Rechi commented Mar 10, 2016

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

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

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 10, 2016

@Rechi thanks again!

jenkins build this please

@Rechi

This comment has been minimized.

Copy link
Member

Rechi commented Mar 10, 2016

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

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 10, 2016

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

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

This comment has been minimized.

Copy link
Member

FernetMenta commented Mar 10, 2016

@ace20022 anything left I can help with?

@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 10, 2016

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

@FernetMenta thanks for the offer, currently not.

jenkins build this please

@Rechi

This comment has been minimized.

Copy link
Member

Rechi commented Mar 10, 2016

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

@FernetMenta

This comment has been minimized.

Copy link
Member

FernetMenta commented Mar 11, 2016

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

This comment has been minimized.

Copy link
Member Author

ace20022 commented Mar 11, 2016

jenkins build this please

@ace20022 ace20022 added v17 Krypton and removed WIP labels Mar 11, 2016
@ace20022 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
[videoplayer][demuxer] Add multi source input stream/demuxer
@ace20022 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 ace20022 deleted the ace20022:multiStreams branch Mar 11, 2016
@kaileu kaileu mentioned this pull request Jun 7, 2016
@kaefert

This comment has been minimized.

Copy link

kaefert commented Jan 18, 2018

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

This comment has been minimized.

Copy link

Badb0yBadb0y commented May 24, 2018

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

@kaefert

This comment has been minimized.

Copy link

kaefert commented May 24, 2018

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

This comment has been minimized.

Copy link
Member

FernetMenta commented May 24, 2018

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.