Skip to content
This repository has been archived by the owner on Sep 30, 2018. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
[droid] add new internal player for amlogic based SoCs
  • Loading branch information
davilla authored and Cory Fields committed Aug 3, 2012
1 parent e03fe6c commit 3639fee
Show file tree
Hide file tree
Showing 16 changed files with 2,997 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -536,6 +536,7 @@ lib/cmyth/Makefile
/xbmc/cores/VideoRenderers/Makefile

/xbmc/cores/dvdplayer/Makefile
/xbmc/cores/amlplayer/Makefile

# /lib/ffmpeg/
/lib/ffmpeg/config.h
Expand Down
4 changes: 4 additions & 0 deletions Makefile.in 100755 → 100644
Expand Up @@ -139,6 +139,10 @@ DIRECTORY_ARCHIVES += xbmc/windowing/android/windowing_android.a
DIRECTORY_ARCHIVES += xbmc/android/activity/activity.a
endif

ifeq (@USE_AMLPLAYER@,1)
DIRECTORY_ARCHIVES += xbmc/cores/amlplayer/amlplayer.a
endif

PAPCODECS_DIRS= \
lib/xbadpcm \
lib/nosefart \
Expand Down
11 changes: 10 additions & 1 deletion configure.in
Expand Up @@ -475,7 +475,7 @@ AC_ARG_ENABLE([libcap],

AC_ARG_ENABLE([player],
[AS_HELP_STRING([--enable-player],
[enable additional players from a list of comma separated names, (default is none)])],
[enable additional players from a list of comma separated names, (default is none, choices are amlplayer)])],
[add_players=$enableval],
[add_players=no])

Expand Down Expand Up @@ -1648,6 +1648,14 @@ AC_CHECK_HEADERS([yajl/yajl_version.h], [], [
AC_DEFINE(YAJL_MAJOR, 1, [yajl version 1])
], [])

# additional internal players
case $add_players in
*amlplayer*)
AC_CHECK_HEADER([amlplayer/amports/amstream.h],, AC_MSG_ERROR($missing_headers))
XB_ADD_PLAYER([AMLPLAYER], [amlplayer])
;;
esac

# platform specific bin utilities
if test "$host_vendor" != "apple" ; then
AC_CHECK_PROG(HAVE_GAWK,gawk,"yes","no",)
Expand Down Expand Up @@ -2114,6 +2122,7 @@ OUTPUT_FILES="Makefile \
xbmc/cores/dvdplayer/DVDSubtitles/Makefile \
xbmc/cores/AudioEngine/Makefile \
xbmc/cores/paplayer/Makefile \
xbmc/cores/amlplayer/Makefile \
lib/timidity/Makefile \
lib/xbadpcm/Makefile \
lib/asap/Makefile \
Expand Down
6 changes: 3 additions & 3 deletions system/playercorefactory.xml
Expand Up @@ -24,9 +24,9 @@
</rule>

<!-- DVDs -->
<rule name="dvd" dvd="true" player="videodefaultdvdplayer" />
<rule name="dvdfile" dvdfile="true" player="videodefaultdvdplayer" />
<rule name="dvdimage" dvdimage="true" player="videodefaultdvdplayer" />
<rule name="dvd" dvd="true" player="DVDPlayer" />
<rule name="dvdfile" dvdfile="true" player="DVDPlayer" />
<rule name="dvdimage" dvdimage="true" player="DVDPlayer" />

<!-- Only dvdplayer can handle these normally -->
<rule name="sdp/asf" filetypes="sdp|asf" player="DVDPlayer" />
Expand Down

0 comments on commit 3639fee

Please sign in to comment.