[ffmpeg] Add support for libdcadec #7102

popcornmix · 2015-05-09T18:28:19Z

This enables libdcadec support in ffmpeg which means you get the 8 channel, lossless decode of DTS-HD tracks.

Just pushing this out in case anyone would find it useful to cherry-pick for now, but we might want to include it in Isenguard+1

fritsch · 2015-05-10T07:44:06Z

@UniversaI says who?

fritsch · 2015-05-10T07:50:38Z

Besides that - I think that all platforms should have the opportunity to use dcadec when we compile it. It's also worth it on linux, windows and so on.

Let me PR you something.

MartijnKaijser · 2015-05-10T07:54:26Z

@fritsch it's DTS-HD as said by the DTS company

fritsch · 2015-05-10T07:59:21Z

@MartijnKaijser I know - but there are other things to be discussed here first. I will open the BikeShedding Process with a green lamp, when ready.

fritsch · 2015-05-10T08:02:49Z

via: popcornmix#11

un1versal · 2015-05-10T08:36:38Z

@fritsch to add what @MartijnKaijser already said.

You have currently this sentence

+msgid "This option supports 8 channel DTS HD decoding, but may use more CPU. It is only available when DTS and DTS-HD audio passthrough is disabled"

You use both DTS HD* and _DTS-HD_ on same sentence.
Also All existing entries refer only to _DTS-HD_ only https://github.com/xbmc/xbmc/search?utf8=%E2%9C%93&q=DTS-hd

So why are we causing more inconsistencies? Why cant it all be consistent and uniform when referring to same thing?

FYI its not bikeshedding, it genuine review.

addons/resource.language.en_gb/resources/strings.po

+
+#: system/settings/rbp.xml system/settings/imx6.xml
+msgctxt "#38120"
+msgid "Support 8 channel DTS HD audio decoding"


wsnipex · 2015-05-10T09:30:15Z

Please don't add ffmpeg patches in depends, they should go to our ffmpeg repo instead(or come in automatically with the next rebase)

addons/resource.language.en_gb/resources/strings.po

+
+#: system/settings/rbp.xml system/settings/imx6.xml
+msgctxt "#38121"
+msgid "This option supports 8 channel DTS HD decoding, but may use more CPU. It is only available when DTS and DTS-HD audio passthrough is disabled"


jjd-uk · 2015-05-10T17:56:54Z

I'm curious why a new setting is being introduced? as we don't have a similar setting for TrueHD, we simply automatically decode to PCM if TrueHD is not enabled. I'm asking as in my view the methods for TrueHD and DTS-HD should be consistent from a UI point of view.

fritsch · 2015-05-10T18:05:05Z

Reason: IMX (2 core), Raspberry Pi A, B+ might be too slow to get that decoded.

On all other platforms it is default enabled.

popcornmix · 2015-05-13T13:17:35Z

Squashed existing commits.

@wsnipex Looks like there are no tags on https://github.com/foo86/dcadec
and it's pretty active. Milhouse builds have been rebuilding with latest package every day for about six weeks with no reports of regressions so it seems quite stable. If you can upload a version (e.g. from now) as a point in the sand, I can make the PR use that, so we don't forget.

Agreed the first commit should be dropped and added to our ffmpeg repo. Depending on when this gets merged one of our ffmpeg bumps might pick it up (the commits are from master of ffmpeg).

fritsch · 2015-07-26T17:21:13Z

@popcornmix we need something additional here? What is needed to get that one in?

popcornmix · 2015-07-26T17:28:48Z

I think it's virtually there. The ffmpeg patches have been dropped (they are in current master version).
We are currently using this as the source:
https://github.com/foo86/dcadec/archive/master.tar.gz

I suspect we need to pick a version and host it ourselves.
There are no releases/tags for libdcadec, but as it hasn't changed for six weeks and as the current version seems fine (e.g. in Milhouse build) I'd suggest we just grab the current master version.

If someone can upload the tarball to a suitable place I can update the URL in the makefile.

wsnipex · 2015-07-26T17:44:26Z

what happend to the changes from popcornmix#14

popcornmix · 2015-07-26T17:45:59Z

@wsnipex they were there... Let me have a look.

popcornmix · 2015-07-26T17:55:47Z

Okay, I've added back the @wsnipex commits.
Might be worth bumping the version - there are a couple of dozen commits since 396e75652.

fritsch · 2015-07-26T17:57:39Z

You mean bumping ffmpeg? and then we are done?

popcornmix · 2015-07-26T18:00:35Z

No, ffmpeg is okay. The tarball from https://github.com/foo86/dcadec is a little old.

tools/depends/target/ffmpeg/Makefile

@@ -56,6 +56,7 @@ endif
 ifeq ($(Configuration), Release)
  ffmpg_config += --disable-debug
 endif
+ffmpg_config += --enable-libdcadec


fritsch · 2015-07-26T18:04:28Z

@popcornmix thx. @wsnipex could you bump the tar? then we could continue this here to get it merged?

wsnipex · 2015-07-26T18:30:20Z

current master tarball uploaded to mirrors as libdcadec-git-2a9186e3.tar.gz
might take a bit to propagate.

popcornmix · 2015-08-19T13:03:12Z

squashed in @stefansaraev's latest patch. jenkins build this please

Paxxi · 2015-08-20T05:58:27Z

Spoke with @stefansaraev in IRC and agreed to do the win32 work, tonight if time permits or over the weekend

Paxxi · 2015-08-20T19:18:26Z

@popcornmix pick Paxxi/xbmc@4fad9d8 for win32 work.
someone needs to upload http://delusional.nu/libdcadec-git-396e75652-win32.zip to build-deps/win32/mingw-msys/ and it should be good to go. Not runtime tested as I don't have anything to test with but ffmpeg built fine

popcornmix · 2015-08-21T13:05:15Z

@Paxxi added your commit to PR.

MartijnKaijser · 2015-08-21T14:33:38Z

file uploaded. will take some time to be available

stefansaraev · 2015-08-21T16:59:49Z

jenkins build this please

stefansaraev · 2015-09-01T10:06:55Z

mind rebasing ?

MartijnKaijser · 2015-09-01T12:00:19Z

jenkins build this please

popcornmix · 2015-09-01T12:25:14Z

I updated the string numbers and added a comment about where the settings strings were from during the rebase, so would be useful if someone just sanity checks that looks okay.

stefansaraev · 2015-09-01T12:31:17Z

strings look good to me @popcornmix thanks.

popcornmix · 2015-09-01T16:32:40Z

Android-x86 and win32 failed, but doesn't look related to this PR.

stefansaraev · 2015-09-01T17:09:00Z

jenkins error unrelated. triggered manual builds (just in case) - all green. @MartijnKaijser your button

[ffmpeg] Add support for libdcadec

metaron-uk · 2015-09-04T18:27:42Z

I've a problem:

andrew@blackbox ~/saturn/ksoo-kodi/kodi $ git checkout master && git pull
andrew@blackbox ~/saturn/ksoo-kodi/kodi $ git clean -xfd
andrew@blackbox ~/saturn/ksoo-kodi/kodi $ ./bootstrap && ./configure
...
checking ogg/ogg.h presence... yes
checking for ogg/ogg.h... yes
checking vorbis/vorbisfile.h usability... yes
checking vorbis/vorbisfile.h presence... yes
checking for vorbis/vorbisfile.h... yes
checking for LIBDCADEC... no
configure: error: libdcadec not found
andrew@blackbox ~/saturn/ksoo-kodi/kodi $ make -C tools/depends/target/libdcadec PREFIX=/usr/local
make: Entering directory '/mnt/saturn/home/andrew/ksoo-kodi/kodi/tools/depends/target/libdcadec'
Makefile:1: ../../Makefile.include: No such file or directory
make: *** No rule to make target '../../Makefile.include'.  Stop.
make: Leaving directory '/mnt/saturn/home/andrew/ksoo-kodi/kodi/tools/depends/target/libdcadec'

any clues?

MilhouseVH · 2015-09-04T19:42:54Z

any clues?

On Ubuntu I added the nightly PPA:

https://launchpad.net/~team-xbmc/+archive/ubuntu/xbmc-nightly

then apt-get install dcadec-dev.

metaron-uk · 2015-09-05T08:52:52Z

My solution:

cd tools/depends
su
./configure --with-toolchain=/usr --prefix=/usr/local
cd ../..
make -C tools/depends/target/libdcadec PREFIX=/usr/local

(Gentoo's media-sound/dcadec package isn't ready for primetime yet: https://bugs.gentoo.org/buglist.cgi?quicksearch=dcadec )

addons/resource.language.en_gb/resources/strings.po

+#. Description of setting #38118 Settings -> System -> Audio output -> Support 8 channel DTS-HD audio decoding
+#: system/settings/settings.xml
+msgctxt "#38119"
+msgid "Enables decoding of high quality DTS-HD audio streams. Note: This increases CPU load and is only available when DTS and DTS-HD audio passthrough are disabled."


metaron-uk · 2015-09-05T14:50:12Z

Unfortunately I still can't get configure to find libdecadec (see http://forum.kodi.tv/showthread.php?tid=229552&pid=2098454#pid2098454)

fritsch · 2015-09-05T15:26:21Z

Sorry - this is not place to answer gentoo build system issues. The Ubuntu way, that we support is supported via our ppa.

configure.ac

@@ -1139,6 +1140,7 @@ PKG_CHECK_MODULES([GNUTLS], [gnutls], [have_gnutls=yes];AC_DEFINE([HAVE_GNUTLS],
 AC_CHECK_LIB([bz2],         [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([jpeg],        [main],, AC_MSG_ERROR($missing_library)) # check for cximage
 AC_CHECK_LIB([tiff],        [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([dcadec],      [main],, AC_MSG_ERROR($missing_library))


popcornmix added the v16 Jarvis label May 9, 2015

da-anda reviewed May 10, 2015
View reviewed changes

popcornmix force-pushed the dcadec branch 2 times, most recently from ba83587 to bdf128d Compare May 13, 2015 13:06

popcornmix force-pushed the dcadec branch from ca73368 to d509139 Compare July 11, 2015 22:49

popcornmix force-pushed the dcadec branch from d509139 to 7ba6981 Compare July 26, 2015 17:54

MartijnKaijser reviewed Jul 26, 2015
View reviewed changes

tools/depends/target/ffmpeg/Makefile

@@ -56,6 +56,7 @@ endif

ifeq ($(Configuration), Release)

ffmpg_config += --disable-debug

endif

ffmpg_config += --enable-libdcadec

This comment was marked as spam.

Sign in to view

popcornmix force-pushed the dcadec branch from 1456cb1 to 2ac9988 Compare August 19, 2015 13:03

popcornmix force-pushed the dcadec branch from 2ac9988 to 68793ac Compare August 21, 2015 13:04

MartijnKaijser added this to the Jarvis 16.0-alpha3 milestone Sep 1, 2015

popcornmix and others added 2 commits September 1, 2015 12:36

[ffmpeg] Add support for libdcadec

0997117

Added prebuilt libdcadec from same source as linux version

8936a6c

popcornmix force-pushed the dcadec branch from 68793ac to 8936a6c Compare September 1, 2015 11:37

MartijnKaijser added a commit that referenced this pull request Sep 1, 2015

Merge pull request #7102 from popcornmix/dcadec

7500b5d

[ffmpeg] Add support for libdcadec

MartijnKaijser merged commit 7500b5d into xbmc:master Sep 1, 2015

un1versal reviewed Sep 5, 2015
View reviewed changes

wsnipex reviewed Sep 5, 2015
View reviewed changes

FernetMenta referenced this pull request in FernetMenta/xbmc Dec 6, 2015

videoplayer: drop SETTING_AUDIOOUTPUT_SUPPORTSDTSHDCPUDECODING

ca8bce8

[ffmpeg] Add support for libdcadec #7102

[ffmpeg] Add support for libdcadec #7102

Conversation

popcornmix commented May 9, 2015

fritsch commented May 10, 2015

fritsch commented May 10, 2015

MartijnKaijser commented May 10, 2015

fritsch commented May 10, 2015

fritsch commented May 10, 2015

un1versal commented May 10, 2015

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

wsnipex commented May 10, 2015

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

jjd-uk commented May 10, 2015

fritsch commented May 10, 2015

popcornmix commented May 13, 2015

fritsch commented Jul 26, 2015

popcornmix commented Jul 26, 2015

wsnipex commented Jul 26, 2015

popcornmix commented Jul 26, 2015

popcornmix commented Jul 26, 2015

fritsch commented Jul 26, 2015

popcornmix commented Jul 26, 2015

This comment was marked as spam.

fritsch commented Jul 26, 2015

wsnipex commented Jul 26, 2015

popcornmix commented Aug 19, 2015

Paxxi commented Aug 20, 2015

Paxxi commented Aug 20, 2015

popcornmix commented Aug 21, 2015

MartijnKaijser commented Aug 21, 2015

stefansaraev commented Aug 21, 2015

stefansaraev commented Sep 1, 2015

MartijnKaijser commented Sep 1, 2015

popcornmix commented Sep 1, 2015

stefansaraev commented Sep 1, 2015

popcornmix commented Sep 1, 2015

stefansaraev commented Sep 1, 2015

metaron-uk commented Sep 4, 2015

MilhouseVH commented Sep 4, 2015

metaron-uk commented Sep 5, 2015

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

metaron-uk commented Sep 5, 2015

fritsch commented Sep 5, 2015

This comment was marked as spam.