From 7a5009d9eda392c724b5b165f1c3b16e2dc27aa8 Mon Sep 17 00:00:00 2001 From: gabucino Date: Mon, 4 Jun 2001 08:06:20 +0000 Subject: [PATCH] commitus interruptus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@987 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/mplayer.1 | 22 ++++++++++++++++++--- DOCS/tech/general.txt | 43 ++++++++++++++++++++++++++++++++++++++++++ DOCS/tech/tech-hun.txt | 2 +- 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1 index c2e2a9d3f9..eaaf194e7e 100644 --- a/DOCS/mplayer.1 +++ b/DOCS/mplayer.1 @@ -7,6 +7,7 @@ mplayer \- Movie Player for Linux .SH SYNOPSIS .B mplayer .RB [ \-vo\ output\ driver ] +.RB [ \-ao\ output\ driver ] .RB [ \-vcd\ track\ number ] .RB [ \-sb\ byte\ position ] .RB [ \-nosound\ ] @@ -37,6 +38,7 @@ mplayer \- Movie Player for Linux .RB [ \-forceidx ] .RB [ \-nodshow ] .RB [ \-sdl\ driver ] +.RB [ \-sdla\ driver ] .RB [ \-noxv ] .RB [ \-forcexv ] .RB [ \-ss\ sec ] @@ -48,6 +50,7 @@ mplayer \- Movie Player for Linux .RB [ \-hardframedrop ] .RB [ \-dvdkey\ key ] .RB [ \-stereo\ mode ] +.RB [ \-srate\ Hz ] .I - or file .PP .SH DESCRIPTION @@ -69,12 +72,19 @@ any options. .I NOTE Every "flag" option has "noflag" pair, e.g. -fs opposite is -nofs .TP -.BI \-vo\ output\ driver -select output driver +.B \-vo\ video\ output\ driver +select video output driver you can get the list of available drivers executing .I mplayer -vo help +.TP +.B \-ao\ audio\ output\ driver +select audio output driver + +you can get the list of available drivers executing +.I mplayer -ao help + .TP .B \-vcd\ track play video cd track from device instead of plain file @@ -204,7 +214,10 @@ indexes. disables usage of DirectShow video codecs .TP .B \-sdl\ driver -specify SDL driver to use. For example: aalib, dga, fbdev, svga, x11, ggi +specify SDL video driver to use. For example: aalib, dga, fbdev, svga, x11, ggi +.TP +.B \-sdla\ driver +specify SDL audio driver to use. For example: esd .TP .B \-noxv disable XVideo hardware acceleration (with SDL only!) @@ -237,6 +250,9 @@ select type of MPEG1 stereo output. Mode may be 0:stereo 1:left 2:right Left channel 1 Right channel 2 +.TP +.B \-srate Hz +specifies Hz to playback audio on. Has effect on playback speed! .IP .SH "ALPHA/BETA CODE" .TP diff --git a/DOCS/tech/general.txt b/DOCS/tech/general.txt index ff32fe7825..90bd695220 100644 --- a/DOCS/tech/general.txt +++ b/DOCS/tech/general.txt @@ -232,4 +232,47 @@ Now, go on: flip_page(): this is called after each frame, this diplays the buffer for real. This is 'swapbuffers' when double-buffering. +6. libao2: this control audio playing + + As in libvo (see 5.) also here are some drivers, based on the same API: + +statis int control(int cmd, int arg); + This is for reading/setting driver-specific and other special parameters. + Not really used for now. + +static int init(int rate,int channels,int format,int flags); + The init of driver, opens device, sets sample rate, channels, sample format + parameters. + Sample format: usually AFMT_S16_LE or AFMT_U8, for more definitions see + dec_audio.c and linux/soundcards.h files! + +static void uninit(); + Guess what. + Ok I help: closes the device, not (yet) called when exit. + +statis void reset(); + Resets device. To be exact, it's for deleting buffers' contents, + so after reset() the previously received stuff won't be output. + (called if pause or seek) + +static int get_space(); + Returns how many bytes can be written into the audio buffer without + blocking (making caller process wait). If the buffer is (nearly) full, + has to return 0! + If it never gives 0, MPlayer won't work! + +static int play(void* data,int len,int flags); + Plays a bit of audio, which is received throught the "data" memory area, with + a size of "len". The "flags" isn't used yet. It has to copy the data, because + they can be overwritten after the call is made. Doesn't really have to use + all the bytes, it has to give back how many have been used (copied to + buffer). + +static int get_delay(); + Has to return how many bytes are in the audio buffer. Be exact, if possible, + since the whole timing depends on this! In the worst case, return the size + of the buffer. + +!!! Because the video is synchronized to the audio (card), it's very important +!!! that the get_space and get_delay are working! diff --git a/DOCS/tech/tech-hun.txt b/DOCS/tech/tech-hun.txt index 2af4283498..0798bec3dc 100644 --- a/DOCS/tech/tech-hun.txt +++ b/DOCS/tech/tech-hun.txt @@ -285,5 +285,5 @@ static int get_delay(); legrosszabb esetben adja vissza a buffer meretet. !!! Mivel a kep a hanghoz (hangkartyahoz) van szinkronizalva, igy nagyon -!!! fontos hogy a get-space ill. get_delay fuggvenyek korrektul legyenek megirva! +!!! fontos hogy a get_space ill. get_delay fuggvenyek korrektul legyenek megirva!