[MPlayer-dev-eng] [PATCH] Bluray support through libbluray

[Diego Biurrun]

On Sat, Jul 03, 2010 at 10:47:56PM +0200, Benjamin Zores wrote:
> 
> See attached #3 if needed.
> 
> --- stream/stream_bluray.c	(revision 0)
> +++ stream/stream_bluray.c	(revision 0)
> @@ -0,0 +1,237 @@
> +/*
> + * This file is part of MPlayer.

You may wish to add yourself as author...

> +    if (title_count == 0) {

if (!title_count) {

> --- Makefile	(revision 31588)
> +++ Makefile	(working copy)
> @@ -28,6 +28,7 @@
>  SRCS_AUDIO_INPUT-$(OSS)              += stream/ai_oss.c
>  SRCS_COMMON-$(AUDIO_INPUT)           += $(SRCS_AUDIO_INPUT-yes)
>  SRCS_COMMON-$(BITMAP_FONT)           += libvo/font_load.c
> +SRCS_COMMON-$(LIBBLURAY)             += stream/stream_bluray.c
>  SRCS_COMMON-$(CDDA)                  += stream/stream_cdda.c \

alphabetical order

> --- configure	(revision 31588)
> +++ configure	(working copy)
> @@ -6039,6 +6043,21 @@
>  
> +echocheck "bluray support"
> +if test "$_bluray" = auto ; then
> +  _bluray=no
> +  header_check libbluray/bluray.h -lbluray && _bluray=yes

Ah, I see that the function I implemented is already paying off :)

> --- DOCS/man/en/mplayer.1	(revision 31588)
> +++ DOCS/man/en/mplayer.1	(working copy)
> @@ -1246,6 +1251,19 @@
>  bandwidth allowing faster cache filling and stream dumping.
>  .
>  .TP
> +.B \-bluray\-device <path to disc> (Bluray only)
> +Specify the Bluray disc location. Must be a directory with Bluray structure.
> +.
> +.TP
> +.B \-bluray-angle <angle ID> (Bluray only)
> +Some Bluray discs contain scenes that can be viewed from multiple angles.
> +Here you can tell MPlayer which angles to use (default: 1).
> +.
> +.TP
> +.B \-bluray-chapter <chapter ID> (Bluray only)
> +Tells MPlayer which Bluray chapter to start the current title from (default: 1).

alphabetical order

> --- help/help_mp-en.h	(revision 31588)
> +++ help/help_mp-en.h	(working copy)
> @@ -1966,6 +1967,11 @@
>  
> +// stream_bluray.c
> +#define MSGTR_BlurayNoDevice "No Bluray device/location was specified ...\n"
> +#define MSGTR_BlurayNoTitles "Can't find any Bluray compatible title here.\n"

Bluray-compatible

Diego