[MPlayer-DOCS] r31631 - in trunk: Changelog DOCS/man/en/mplayer.1 DOCS/tech/MAINTAINERS Makefile cfg-common.h configure help/help_mp-en.h stream/stream.c stream/stream.h stream/stream_bluray.c

[ben]

Author: ben
Date: Mon Jul  5 19:04:46 2010
New Revision: 31631

Log:
Support for unencrypted Blu-ray playback through libbluray.
  Use it through: mplayer br:////path/to/disc

Modified:
   trunk/DOCS/man/en/mplayer.1
   trunk/help/help_mp-en.h

Changes in other areas also in this revision:
Added:
   trunk/stream/stream_bluray.c
Modified:
   trunk/Changelog
   trunk/DOCS/tech/MAINTAINERS
   trunk/Makefile
   trunk/cfg-common.h
   trunk/configure
   trunk/stream/stream.c
   trunk/stream/stream.h

Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	Sun Jul  4 09:13:18 2010	(r31630)
+++ trunk/DOCS/man/en/mplayer.1	Mon Jul  5 19:04:46 2010	(r31631)
@@ -61,6 +61,11 @@ mencoder \- movie encoder
 .
 .br
 .B mplayer
+[br]://[title][/device]
+[options]
+.
+.br
+.B mplayer
 [dvd|dvdnav]://[title|[start_title]\-end_title][/device]
 [options]
 .
@@ -151,7 +156,7 @@ architectures, see the documentation).
 It plays most MPEG/\:VOB, AVI, ASF/\:WMA/\:WMV, RM, QT/\:MOV/\:MP4, Ogg/\:OGM,
 MKV, VIVO, FLI, NuppelVideo, yuv4mpeg, FILM and RoQ files, supported by many
 native and binary codecs.
-You can watch VCD, SVCD, DVD, 3ivx, DivX 3/4/5, WMV and even H.264 movies,
+You can watch VCD, SVCD, DVD, Blu\-ray, 3ivx, DivX 3/4/5, WMV and even H.264 movies,
 too.
 .PP
 MPlayer supports a wide range of video and audio output drivers.
@@ -249,7 +254,7 @@ Adjust audio balance in favor of left/\:
 Mute sound.
 .IPs "_ (MPEG-TS, AVI and libavformat only)"
 Cycle through the available video tracks.
-.IPs "# (DVD, MPEG, Matroska, AVI and libavformat only)"
+.IPs "# (DVD, Blu-ray, MPEG, Matroska, AVI and libavformat only)"
 Cycle through the available audio tracks.
 .IPs "TAB (MPEG-TS and libavformat only)"
 Cycle through the available programs.
@@ -940,8 +945,8 @@ Show file parameters in an easily parsea
 Also prints more detailed information about subtitle and audio
 track languages and IDs.
 In some cases you can get more information by using \-msglevel identify=6.
-For example, for a DVD it will list the chapters and time length of each title,
-as well as a disk ID.
+For example, for a DVD or Blu\-ray it will list the chapters and time length
+of each title, as well as a disk ID.
 Combine this with \-frames 0 to suppress all video output.
 The wrapper script TOOLS/\:midentify.sh suppresses the other MPlayer output and
 (hopefully) shellescapes the filenames.
@@ -1246,6 +1251,19 @@ With Real RTSP streaming, it is also use
 bandwidth allowing faster cache filling and stream dumping.
 .
 .TP
+.B \-bluray\-angle <angle ID> (Blu\-ray only)
+Some Blu\-ray 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> (Blu\-ray only)
+Tells MPlayer which Blu\-ray chapter to start the current title from (default: 1).
+.
+.TP
+.B \-bluray\-device <path to disc> (Blu\-ray only)
+Specify the Blu\-ray disc location. Must be a directory with Blu\-ray structure.
+.
+.TP
 .B \-cache <kBytes>
 This option specifies how much memory (in kBytes) to use when precaching a
 file or URL.
@@ -11492,6 +11510,13 @@ in this order:
 .SH EXAMPLES OF MPLAYER USAGE
 .
 .PP
+.B Quickstart Blu\-ray playing:
+.nf
+mplayer br:////path/to/disc
+mplayer br:// \-bluray\-device /path/to/disc
+.fi
+.
+.PP
 .B Quickstart DVD playing:
 .nf
 mplayer dvd://1

Modified: trunk/help/help_mp-en.h
==============================================================================
--- trunk/help/help_mp-en.h	Sun Jul  4 09:13:18 2010	(r31630)
+++ trunk/help/help_mp-en.h	Mon Jul  5 19:04:46 2010	(r31631)
@@ -1895,6 +1895,7 @@ static const char help_text[]=
 #define MSGTR_SMBFileNotFound "Could not open from LAN: '%s'\n"
 #define MSGTR_SMBNotCompiled "MPlayer was not compiled with SMB reading support.\n"
 
+#define MSGTR_CantOpenBluray "Couldn't open Blu-ray device: %s\n"
 #define MSGTR_CantOpenDVD "Couldn't open DVD device: %s (%s)\n"
 
 // stream_cdda.c
@@ -1966,6 +1967,11 @@ static const char help_text[]=
 #define MSGTR_DVDsubtitleLanguage "subtitle ( sid ): %d language: %s\n"
 #define MSGTR_DVDnumSubtitles "number of subtitles on disk: %d\n"
 
+// stream_bluray.c
+#define MSGTR_BlurayNoDevice "No Blu-ray device/location was specified ...\n"
+#define MSGTR_BlurayNoTitles "Can't find any Blu-ray-compatible title here.\n"
+#define MSGTR_BlurayOK "Blu-ray successfully opened.\n"
+
 // stream_radio.c
 #define MSGTR_RADIO_ChannelNamesDetected "[radio] Radio channel names detected.\n"
 #define MSGTR_RADIO_FreqRange "[radio] Allowed frequency range is %.2f-%.2f MHz.\n"