updated libdvdcss, read and nav to the latest versions #2128

Merged
merged 2 commits into from Feb 8, 2013

Conversation

Projects
None yet
9 participants
@Paxxi
Member

Paxxi commented Jan 27, 2013

I'm not sure about the etiquette about this, I saw PR 2048 doing part of this but not sure how to ammend his PR.

All XBMC modifications kept intact, even the old xbox stuff.

Built and tested in Win32, tested with/without css and from dvd/image

@davilla

This comment has been minimized.

Show comment
Hide comment
@davilla

davilla Jan 27, 2013

Contributor

"This pull request cannot be automatically merged." :)

Contributor

davilla commented Jan 27, 2013

"This pull request cannot be automatically merged." :)

@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Jan 27, 2013

Member

oh crap, spent more time with git than merging trying to get a clean PR. Back to the git fighting then :)

Member

Paxxi commented Jan 27, 2013

oh crap, spent more time with git than merging trying to get a clean PR. Back to the git fighting then :)

@jmarshallnz

This comment has been minimized.

Show comment
Hide comment
@jmarshallnz

jmarshallnz Jan 27, 2013

Member

git pull --rebase upstream/master
git push -f <your_branch_on_github>

Member

jmarshallnz commented Jan 27, 2013

git pull --rebase upstream/master
git push -f <your_branch_on_github>

@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Jan 27, 2013

Member

Thanks jmarshall, commit should be OK now. I noticed though that there's copies of the libdvdnav header files in xbmc/cores/dvdplayer/DVDInputStream/dvdnav/. I guess these should be updated as well to be kept in sync, or would it be better to just get rid of them and use the headers in lib/libdvd/libdvdnav/src/dvdnav

Member

Paxxi commented Jan 27, 2013

Thanks jmarshall, commit should be OK now. I noticed though that there's copies of the libdvdnav header files in xbmc/cores/dvdplayer/DVDInputStream/dvdnav/. I guess these should be updated as well to be kept in sync, or would it be better to just get rid of them and use the headers in lib/libdvd/libdvdnav/src/dvdnav

@elupus

This comment has been minimized.

Show comment
Hide comment
@elupus

elupus Jan 27, 2013

Member

Update them for now. i think we have them since we need internal state. but
i can't fully remember.

On Sun, Jan 27, 2013 at 11:24 PM, Paxxi notifications@github.com wrote:

Thanks jmarshall, commit should be OK now. I noticed though that there's
copies of the libdvdnav header files in
xbmc/cores/dvdplayer/DVDInputStream/dvdnav/. I guess these should be
updated as well to be kept in sync, or would it be better to just get rid
of them and use the headers in lib/libdvd/libdvdnav/src/dvdnav


Reply to this email directly or view it on GitHubhttps://github.com/xbmc/xbmc/pull/2128#issuecomment-12763001.

Member

elupus commented Jan 27, 2013

Update them for now. i think we have them since we need internal state. but
i can't fully remember.

On Sun, Jan 27, 2013 at 11:24 PM, Paxxi notifications@github.com wrote:

Thanks jmarshall, commit should be OK now. I noticed though that there's
copies of the libdvdnav header files in
xbmc/cores/dvdplayer/DVDInputStream/dvdnav/. I guess these should be
updated as well to be kept in sync, or would it be better to just get rid
of them and use the headers in lib/libdvd/libdvdnav/src/dvdnav


Reply to this email directly or view it on GitHubhttps://github.com/xbmc/xbmc/pull/2128#issuecomment-12763001.

@MartijnKaijser

This comment has been minimized.

Show comment
Hide comment
@MartijnKaijser

MartijnKaijser Jan 28, 2013

Member

Can't the old xbox code be removed as well in an additional commit?

Member

MartijnKaijser commented Jan 28, 2013

Can't the old xbox code be removed as well in an additional commit?

@davilla

This comment has been minimized.

Show comment
Hide comment
@davilla

davilla Jan 28, 2013

Contributor

You have to be very careful in what is removed here. The changes are not obvious.

Contributor

davilla commented Jan 28, 2013

You have to be very careful in what is removed here. The changes are not obvious.

@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Jan 28, 2013

Member

Updated the files in core/dvdplayer as well. Removed the big endian defines, data is already read in big endian format and then byteswapped.

Member

Paxxi commented Jan 28, 2013

Updated the files in core/dvdplayer as well. Removed the big endian defines, data is already read in big endian format and then byteswapped.

@Voyager1

View changes

lib/libdvd/libdvdnav/src/dvdnav_internal.h
- * Resume playback state
- */
-dvdnav_status_t dvdnav_set_state(dvdnav_t *this, dvd_state_t *save_state);
-

This comment has been minimized.

@Voyager1

Voyager1 Feb 3, 2013

Member

why are get/setstate being removed here?

@Voyager1

Voyager1 Feb 3, 2013

Member

why are get/setstate being removed here?

This comment has been minimized.

@Paxxi

Paxxi Feb 4, 2013

Member

That seems to be a mistake, going to re-add them but found some oddness along the way

@Paxxi

Paxxi Feb 4, 2013

Member

That seems to be a mistake, going to re-add them but found some oddness along the way

This comment has been minimized.

@Voyager1

Voyager1 Feb 4, 2013

Member

I was just asking - it compiles fine without. Could it be related to the added functions in xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h (vm_get_state / vm_set_state) ? I'm not sure.

@Voyager1

Voyager1 Feb 4, 2013

Member

I was just asking - it compiles fine without. Could it be related to the added functions in xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h (vm_get_state / vm_set_state) ? I'm not sure.

This comment has been minimized.

@Paxxi

Paxxi Feb 4, 2013

Member

dvdnav_set/get_state was removed from dvd_internals.h but this didn't affect the build of the library because the actual functions were still there. Then because dvdnav_get/set_state were declared in core/dvdplayer../vm.h XBMC found the functions and the build succeeded. It works but for maintenance it's quite a horrible situation :)

@Paxxi

Paxxi Feb 4, 2013

Member

dvdnav_set/get_state was removed from dvd_internals.h but this didn't affect the build of the library because the actual functions were still there. Then because dvdnav_get/set_state were declared in core/dvdplayer../vm.h XBMC found the functions and the build succeeded. It works but for maintenance it's quite a horrible situation :)

-#else
- dvd_read_name(vm->dvd_name, dvdroot);
-#endif
- vm->map = remap_loadmap(vm->dvd_name);

This comment has been minimized.

@Voyager1

Voyager1 Feb 3, 2013

Member

why are we getting rid of the _XBMC ifdef here? I'm not sure what the original intent was of this... it seems it's used to populate vm->dvd_name, so is this patch no longer needed?

@Voyager1

Voyager1 Feb 3, 2013

Member

why are we getting rid of the _XBMC ifdef here? I'm not sure what the original intent was of this... it seems it's used to populate vm->dvd_name, so is this patch no longer needed?

This comment has been minimized.

@Voyager1

Voyager1 Feb 3, 2013

Member

disregard - just saw that it has been moved down.

@Voyager1

Voyager1 Feb 3, 2013

Member

disregard - just saw that it has been moved down.

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 3, 2013

Member

First of all thanks Paxxi for taking on the effort to update to latest libdvd. I have extensively tested this work with several DVD ISOs (with menus etc.) as well as physical DVDs, and am pleased with the result. Some discs/isos that didn't entirely play correctly before, now do!
We need to have this tested on the other platforms too, otherwise for Windows this is good to go!

Member

Voyager1 commented Feb 3, 2013

First of all thanks Paxxi for taking on the effort to update to latest libdvd. I have extensively tested this work with several DVD ISOs (with menus etc.) as well as physical DVDs, and am pleased with the result. Some discs/isos that didn't entirely play correctly before, now do!
We need to have this tested on the other platforms too, otherwise for Windows this is good to go!

@ace20022

This comment has been minimized.

Show comment
Hide comment
@ace20022

ace20022 Feb 4, 2013

Member

Big thanks to @Paxxi! This seems to fix a huge bug in get_audio_info, now all relevant info can be queried at once again.

Member

ace20022 commented Feb 4, 2013

Big thanks to @Paxxi! This seems to fix a huge bug in get_audio_info, now all relevant info can be queried at once again.

@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Feb 4, 2013

Member

Fixed the things mentioned by @ace20022 and @Voyager1 .

Found that dvdnav_get_state and dvdnav_set_state were declared in vm.h in the includes copied to dvdplayer, moved them to dvdnav_internal.h to match where they are in libdvd folder.

Member

Paxxi commented Feb 4, 2013

Fixed the things mentioned by @ace20022 and @Voyager1 .

Found that dvdnav_get_state and dvdnav_set_state were declared in vm.h in the includes copied to dvdplayer, moved them to dvdnav_internal.h to match where they are in libdvd folder.

@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Feb 4, 2013

Member

Hopefully that should be the last fix

Member

Paxxi commented Feb 4, 2013

Hopefully that should be the last fix

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 4, 2013

Member

minor mistake, causing compiler error:
xbmc\xbmc\cores\dvdplayer\dvdinputstreams\dvdnav\dvdnav_internal.h(196): error C2143: syntax error : missing ';' before 'this'
xbmc\xbmc\cores\dvdplayer\dvdinputstreams\dvdnav\dvdnav_internal.h(201): error C2143: syntax error : missing ')' before 'this'

you can't use the reserved keyword "this" here since it's a C++ compiler :-)

I suggest you use "self" like in vm.h where you moved it from.

Member

Voyager1 commented Feb 4, 2013

minor mistake, causing compiler error:
xbmc\xbmc\cores\dvdplayer\dvdinputstreams\dvdnav\dvdnav_internal.h(196): error C2143: syntax error : missing ';' before 'this'
xbmc\xbmc\cores\dvdplayer\dvdinputstreams\dvdnav\dvdnav_internal.h(201): error C2143: syntax error : missing ')' before 'this'

you can't use the reserved keyword "this" here since it's a C++ compiler :-)

I suggest you use "self" like in vm.h where you moved it from.

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 4, 2013

Member

after that, I suggest that @Memphiz and @arnova (or other platform devs) test it out under IOS/OSX/ATV2 and Linux in order sign this off to be merged.

Member

Voyager1 commented Feb 4, 2013

after that, I suggest that @Memphiz and @arnova (or other platform devs) test it out under IOS/OSX/ATV2 and Linux in order sign this off to be merged.

@MartijnKaijser

This comment has been minimized.

Show comment
Hide comment
@MartijnKaijser

MartijnKaijser Feb 4, 2013

Member

Let's throw it through Buildbot too and see if it compiles on all platforms. ios needs some special handling first?

Member

MartijnKaijser commented Feb 4, 2013

Let's throw it through Buildbot too and see if it compiles on all platforms. ios needs some special handling first?

@davilla

This comment has been minimized.

Show comment
Hide comment
@davilla

davilla Feb 4, 2013

Contributor

Should be fine unless the existing stuff in configure.in/makefiles was removed. buildbot will show if there's a problem.

Contributor

davilla commented Feb 4, 2013

Should be fine unless the existing stuff in configure.in/makefiles was removed. buildbot will show if there's a problem.

@Memphiz

This comment has been minimized.

Show comment
Hide comment
@Memphiz

Memphiz Feb 4, 2013

Member

Stop - don't inject yet! There is something wrong ...

Member

Memphiz commented Feb 4, 2013

Stop - don't inject yet! There is something wrong ...

@davilla

This comment has been minimized.

Show comment
Hide comment
@davilla

davilla Feb 4, 2013

Contributor

buildbot can build from a user's github branch :)

Contributor

davilla commented Feb 4, 2013

buildbot can build from a user's github branch :)

@Memphiz

This comment has been minimized.

Show comment
Hide comment
@Memphiz

Memphiz Feb 4, 2013

Member

This patch is needed for getting it compiled for osx/ios (was lost somehow?)

http://pastebin.com/vKeyJ4EE

The win32 guard is not sufficient cause WIN32 gets "force" defined in

https://github.com/xbmc/xbmc/blob/master/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h#L29

Member

Memphiz commented Feb 4, 2013

This patch is needed for getting it compiled for osx/ios (was lost somehow?)

http://pastebin.com/vKeyJ4EE

The win32 guard is not sufficient cause WIN32 gets "force" defined in

https://github.com/xbmc/xbmc/blob/master/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h#L29

@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Feb 4, 2013

Member

new commit up, actually made sure it compiles this time

Member

Paxxi commented Feb 4, 2013

new commit up, actually made sure it compiles this time

@Memphiz

This comment has been minimized.

Show comment
Hide comment
@Memphiz

Memphiz Feb 4, 2013

Member

don't use self - its a keyword in objc (like this in c++) and gets highlighted in xcode ... use "me" or something. (see my patch)

Member

Memphiz commented Feb 4, 2013

don't use self - its a keyword in objc (like this in c++) and gets highlighted in xcode ... use "me" or something. (see my patch)

@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Feb 4, 2013

Member

@Memphiz just saw your patch, didn't know about objc. Anyway it's bedtime so I'll go over this tomorrow and make the needed changes

Member

Paxxi commented Feb 4, 2013

@Memphiz just saw your patch, didn't know about objc. Anyway it's bedtime so I'll go over this tomorrow and make the needed changes

@Memphiz

This comment has been minimized.

Show comment
Hide comment
@Memphiz

Memphiz Feb 4, 2013

Member

After applying my patch it still plays a dvd iso from my nfs nas - so yay fine i guess :D

Member

Memphiz commented Feb 4, 2013

After applying my patch it still plays a dvd iso from my nfs nas - so yay fine i guess :D

@davilla

This comment has been minimized.

Show comment
Hide comment
@davilla

davilla Feb 4, 2013

Contributor

use TARGET_xxxx in XBMC code, _LINUX, WIN32, APPLE should not be used.

Contributor

davilla commented Feb 4, 2013

use TARGET_xxxx in XBMC code, _LINUX, WIN32, APPLE should not be used.

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 4, 2013

Member

@Memphiz it's weird what you say about self. Current codebase has it like this... (see xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h) ... but me's good too :-)

edit: it took a while for me to get it (it's late!) - you're concerned about the syntax highlighting in xcode.

Member

Voyager1 commented Feb 4, 2013

@Memphiz it's weird what you say about self. Current codebase has it like this... (see xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h) ... but me's good too :-)

edit: it took a while for me to get it (it's late!) - you're concerned about the syntax highlighting in xcode.

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 4, 2013

Member

@davilla - agree with the TARGET_xxx for the copied includes under xbmc, but certainly not in libdvd code (compiled by mingw on win), right?

Member

Voyager1 commented Feb 4, 2013

@davilla - agree with the TARGET_xxx for the copied includes under xbmc, but certainly not in libdvd code (compiled by mingw on win), right?

@Memphiz

This comment has been minimized.

Show comment
Hide comment
@Memphiz

Memphiz Feb 4, 2013

Member

I'm just saying that "self" is highlighted in xcode which looks confusing. (saw it when it bombed out cause of the "this"). This is no compile issue of course but thought i mention it for preventing its usage somwhere deeper in our code in the future ;)

Member

Memphiz commented Feb 4, 2013

I'm just saying that "self" is highlighted in xcode which looks confusing. (saw it when it bombed out cause of the "this"). This is no compile issue of course but thought i mention it for preventing its usage somwhere deeper in our code in the future ;)

@davilla

This comment has been minimized.

Show comment
Hide comment
@davilla

davilla Feb 4, 2013

Contributor

@Voyager1 , you have to watch out of reserved keywords in any headers that might be included into obj-c code (extensions of .m or .mm), examples are 'id' and 'self'. When you view non-obj-c code in Xcode, those reserved keywords are highlighted like reserved keywords in c/c++ ( 'for', 'while', or 'if' ).

Contributor

davilla commented Feb 4, 2013

@Voyager1 , you have to watch out of reserved keywords in any headers that might be included into obj-c code (extensions of .m or .mm), examples are 'id' and 'self'. When you view non-obj-c code in Xcode, those reserved keywords are highlighted like reserved keywords in c/c++ ( 'for', 'while', or 'if' ).

Updated libdvdcss, read and nav to the latest versions
All XBMC modifications are kept intact

Moved get/set state functions from vm.h to dvdnav_internal.h where
they should be

Added comments to clarify which functions are added by XBMC
@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Feb 5, 2013

Member

fixed the _LINUX ifdef, re-added it as it were before instead of trying to change it to TARGET_xxx and how it would affect the forced win32 define.

Left "self" as is since it's used fairly often in the dvdnav sources and it doesn't cause any errors

Member

Paxxi commented Feb 5, 2013

fixed the _LINUX ifdef, re-added it as it were before instead of trying to change it to TARGET_xxx and how it would affect the forced win32 define.

Left "self" as is since it's used fairly often in the dvdnav sources and it doesn't cause any errors

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 5, 2013

Member

compiles fine on Windows, although I saw you didn't honor davilla's request to change the platform ifdefs (I see there may be a breakage risk in changing this). Regarding the self var I see the point as the other code is full of it. I hope everyone can settle on this and give the green light to merge it (perhaps have the buildbot run through it first?)

Member

Voyager1 commented Feb 5, 2013

compiles fine on Windows, although I saw you didn't honor davilla's request to change the platform ifdefs (I see there may be a breakage risk in changing this). Regarding the self var I see the point as the other code is full of it. I hope everyone can settle on this and give the green light to merge it (perhaps have the buildbot run through it first?)

@elupus

This comment has been minimized.

Show comment
Hide comment
@elupus

elupus Feb 5, 2013

Member

I'm just need to verify that the fix for multi angle dvds is still in
place. Not sure if it finally got merged upstream.

Member

elupus commented Feb 5, 2013

I'm just need to verify that the fix for multi angle dvds is still in
place. Not sure if it finally got merged upstream.

@Memphiz

This comment has been minimized.

Show comment
Hide comment
@Memphiz

Memphiz Feb 5, 2013

Member

Now its fine on osx/ios compile wise (and quick runtimetested).

Member

Memphiz commented Feb 5, 2013

Now its fine on osx/ios compile wise (and quick runtimetested).

@elupus

This comment has been minimized.

Show comment
Hide comment
@elupus

elupus Feb 6, 2013

Member

So the changes for multi angle stuff are still in. What is this updated based on thou? There apparently just showed up another fork for libdvdnav: http://git.videolan.org/?p=libdvdread.git;a=shortlog

http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2013-February/001874.html

Member

elupus commented Feb 6, 2013

So the changes for multi angle stuff are still in. What is this updated based on thou? There apparently just showed up another fork for libdvdnav: http://git.videolan.org/?p=libdvdread.git;a=shortlog

http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2013-February/001874.html

@elupus

This comment has been minimized.

Show comment
Hide comment
@elupus

elupus Feb 6, 2013

Member

Also I would also be very interested in seeing a diff against the source. Ie what patches we still add.

Member

elupus commented Feb 6, 2013

Also I would also be very interested in seeing a diff against the source. Ie what patches we still add.

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 6, 2013

Member

my assumption was this is based off http://dvdnav.mplayerhq.hu/ 4.2.0

Member

Voyager1 commented Feb 6, 2013

my assumption was this is based off http://dvdnav.mplayerhq.hu/ 4.2.0

@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Feb 7, 2013

Member

Voyager1 is correct, it's based on http://dvdnav.mplayerhq.hu/ . I didn't know about the new fork.

@elupus I'll fix you a diff tonight of the XBMC changes that are still in

Member

Paxxi commented Feb 7, 2013

Voyager1 is correct, it's based on http://dvdnav.mplayerhq.hu/ . I didn't know about the new fork.

@elupus I'll fix you a diff tonight of the XBMC changes that are still in

@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Feb 7, 2013

Member

@elupus Here's the diffs of the changes. I've split them up per lib to make it easier to check. cores.diff is the difference between the header files in /lib and /cores/dvdplayer

https://dl.dropbox.com/u/55118895/libdvdread.diff
https://dl.dropbox.com/u/55118895/libdvdnav.diff
https://dl.dropbox.com/u/55118895/libdvdcss.diff
https://dl.dropbox.com/u/55118895/cores.diff

Looking at the new fork over at videolan it probably shouldn't be that much work to update against that once these changes are in. Not sure if there's any immediate need though since the fork seem to be very new. With that said I'm more than willing to do the work if you think it would be better.

Member

Paxxi commented Feb 7, 2013

@elupus Here's the diffs of the changes. I've split them up per lib to make it easier to check. cores.diff is the difference between the header files in /lib and /cores/dvdplayer

https://dl.dropbox.com/u/55118895/libdvdread.diff
https://dl.dropbox.com/u/55118895/libdvdnav.diff
https://dl.dropbox.com/u/55118895/libdvdcss.diff
https://dl.dropbox.com/u/55118895/cores.diff

Looking at the new fork over at videolan it probably shouldn't be that much work to update against that once these changes are in. Not sure if there's any immediate need though since the fork seem to be very new. With that said I'm more than willing to do the work if you think it would be better.

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 7, 2013

Member

Thanks Paxxi. Very useful to have these diffs. Out of curiosity, all the changes/additions in libdvdnav, more specifically in searching.c and vm.c, that are not marked as "xbmc" additions, were these also xbmc changes/additions at the time of 4.1.3, and are these still needed?

Member

Voyager1 commented Feb 7, 2013

Thanks Paxxi. Very useful to have these diffs. Out of curiosity, all the changes/additions in libdvdnav, more specifically in searching.c and vm.c, that are not marked as "xbmc" additions, were these also xbmc changes/additions at the time of 4.1.3, and are these still needed?

@Paxxi

This comment has been minimized.

Show comment
Hide comment
@Paxxi

Paxxi Feb 7, 2013

Member

Those sections weren't marked as XBMC changes but they're not in the libdvdnav 4.1.3 sources. The best I've found for them is this checkin from @elupus . It would probably make sense to add some _XBMC ifdefs around them to make it easier to track in the future.

I'm not entirely sure wether they're still needed or not.

Member

Paxxi commented Feb 7, 2013

Those sections weren't marked as XBMC changes but they're not in the libdvdnav 4.1.3 sources. The best I've found for them is this checkin from @elupus . It would probably make sense to add some _XBMC ifdefs around them to make it easier to track in the future.

I'm not entirely sure wether they're still needed or not.

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 7, 2013

Member

Thanks for the detective work... eventually we will need to cleanly split up these changes into individual patches that make more sense (with some description) and that we can track. But that would require some expert help, and can be put on the back burner, IMO. For now, we could store these diffs under lib/libdvd/patches?

@elupus - as the merge window is closing in 3 days, agree to merge? It would be a good opportunity to get a bit larger testing base.

Member

Voyager1 commented Feb 7, 2013

Thanks for the detective work... eventually we will need to cleanly split up these changes into individual patches that make more sense (with some description) and that we can track. But that would require some expert help, and can be put on the back burner, IMO. For now, we could store these diffs under lib/libdvd/patches?

@elupus - as the merge window is closing in 3 days, agree to merge? It would be a good opportunity to get a bit larger testing base.

@davilla

This comment has been minimized.

Show comment
Hide comment
@davilla

davilla Feb 7, 2013

Contributor

store these diffs under lib/libdvd/patches, that way like with ffmpeg, we can track.
@elupus , ready for inject ?

Contributor

davilla commented Feb 7, 2013

store these diffs under lib/libdvd/patches, that way like with ffmpeg, we can track.
@elupus , ready for inject ?

@elupus

This comment has been minimized.

Show comment
Hide comment
@elupus

elupus Feb 7, 2013

Member

I suppose so.. It's based on something rather old thou. 4.2.0 was released at 10 Oct 2011.

Member

elupus commented Feb 7, 2013

I suppose so.. It's based on something rather old thou. 4.2.0 was released at 10 Oct 2011.

@davilla

This comment has been minimized.

Show comment
Hide comment
@davilla

davilla Feb 8, 2013

Contributor

well, I think that's the point of the new fork, nothing is happening at the old home. 4.2.0 was the last release.

Contributor

davilla commented Feb 8, 2013

well, I think that's the point of the new fork, nothing is happening at the old home. 4.2.0 was the last release.

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 8, 2013

Member

@Paxxi - happy to merge when you've added the diffs as a second commit.

Member

Voyager1 commented Feb 8, 2013

@Paxxi - happy to merge when you've added the diffs as a second commit.

Added diffs for XBMC changes to libdvd libs
cores.diff is the differences between include files in lib/libdvd
and xbmc/cores/dvdplayer/dvdinputstreams/dvdnav

Voyager1 added a commit that referenced this pull request Feb 8, 2013

Merge pull request #2128 from Paxxi/libdvd
updated libdvdcss, read and nav to the latest versions - 4.2.0

@Voyager1 Voyager1 merged commit 6a384a1 into xbmc:master Feb 8, 2013

@ralob

This comment has been minimized.

Show comment
Hide comment
@ralob

ralob Feb 9, 2013

This breaks Linux compile: http://xbmclogs.com/show.php?id=34202
Should I do a Trac ticket?

ralob commented Feb 9, 2013

This breaks Linux compile: http://xbmclogs.com/show.php?id=34202
Should I do a Trac ticket?

@ace20022

This comment has been minimized.

Show comment
Hide comment
@ace20022

ace20022 Feb 9, 2013

Member

No, see PR #2198 .

Member

ace20022 commented Feb 9, 2013

No, see PR #2198 .

@ralob

This comment has been minimized.

Show comment
Hide comment
@ralob

ralob Feb 9, 2013

That PR fixed it right up; sorry about the noise.

ralob commented Feb 9, 2013

That PR fixed it right up; sorry about the noise.

@Paxxi Paxxi deleted the Paxxi:libdvd branch Feb 9, 2013

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 17, 2013

Member

We're getting a bug report (see http://trac.xbmc.org/ticket/14115) on Linux. Can anyone test on Linux and see if this is legit?

Member

Voyager1 commented Feb 17, 2013

We're getting a bug report (see http://trac.xbmc.org/ticket/14115) on Linux. Can anyone test on Linux and see if this is legit?

@Memphiz

This comment has been minimized.

Show comment
Hide comment
@Memphiz

Memphiz Feb 17, 2013

Member

No problems playing a dvd iso on linux. (ubuntu 12.10).

Though from the ticket its not clear if it is dvd, or folder structure...

Member

Memphiz commented Feb 17, 2013

No problems playing a dvd iso on linux. (ubuntu 12.10).

Though from the ticket its not clear if it is dvd, or folder structure...

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Jan 27, 2014

Member

@elupus @Paxxi - I'm currently porting libdvdnav and libdvdread 4.2.1 to a development branch. I have a question regarding the two tests above in vm.c (function ifoOpenNewVTSI) which have been part of our xbmc added patches (already back in 4.1.3): if(!ifoRead_VTS_TMAPT(vm->vtsi)) and if(!ifoRead_TITLE_C_ADT(vm->vtsi)) - any idea why these were added? I'm trying to eliminate a couple of reasons why certain DVDs apparently play correctly with vanilla libdvd 4.2.x but not with our patched version...

@elupus @Paxxi - I'm currently porting libdvdnav and libdvdread 4.2.1 to a development branch. I have a question regarding the two tests above in vm.c (function ifoOpenNewVTSI) which have been part of our xbmc added patches (already back in 4.1.3): if(!ifoRead_VTS_TMAPT(vm->vtsi)) and if(!ifoRead_TITLE_C_ADT(vm->vtsi)) - any idea why these were added? I'm trying to eliminate a couple of reasons why certain DVDs apparently play correctly with vanilla libdvd 4.2.x but not with our patched version...

This comment has been minimized.

Show comment
Hide comment
@elupus

elupus Jan 27, 2014

Member
Member

elupus replied Jan 27, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment