diff options
Diffstat (limited to 'DOCS/tech')
-rw-r--r-- | DOCS/tech/MAINTAINERS | 2 | ||||
-rw-r--r-- | DOCS/tech/binary-packaging.txt | 22 | ||||
-rw-r--r-- | DOCS/tech/general.txt | 1 | ||||
-rw-r--r-- | DOCS/tech/libmpcodecs.txt | 22 | ||||
-rw-r--r-- | DOCS/tech/libvo.txt | 1 | ||||
-rw-r--r-- | DOCS/tech/realcodecs/TODO | 2 | ||||
-rw-r--r-- | DOCS/tech/realcodecs/audio-codecs.txt | 3 | ||||
-rw-r--r-- | DOCS/tech/realcodecs/video-codecs.txt | 2 | ||||
-rw-r--r-- | DOCS/tech/slave.txt | 1 | ||||
-rw-r--r-- | DOCS/tech/snow.txt | 1 | ||||
-rw-r--r-- | DOCS/tech/subcp.txt | 2 | ||||
-rw-r--r-- | DOCS/tech/swscaler_methods.txt | 1 |
12 files changed, 15 insertions, 45 deletions
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS index 680906e4e2..fcd4566c41 100644 --- a/DOCS/tech/MAINTAINERS +++ b/DOCS/tech/MAINTAINERS @@ -84,8 +84,6 @@ MPlayer code: * playtree, input layer: Alban Bedel * libswscale: Michael Niedermayer, Luca Abeni * DVB support: Nico Sabbi - * GUI: None - * GUI skins: Diego Biurrun * EDL code: Reynaldo H. Verdejo Pinochet, Oded Shimon Imported libs/projects: diff --git a/DOCS/tech/binary-packaging.txt b/DOCS/tech/binary-packaging.txt index 9d852372db..974a20d46f 100644 --- a/DOCS/tech/binary-packaging.txt +++ b/DOCS/tech/binary-packaging.txt @@ -66,9 +66,6 @@ the following features MUST be included in any official binary package: (*) if available for your OS/hardware -There is great demand for the GUI, so it SHOULD be included, but it MUST -come as a separate package (see Tips and Tricks for details). - Including other features, like LIVE.COM streaming or JACK support, is acceptable. They SHOULD, however, be build-time configurable, with the default build configuration containing the above set. @@ -111,7 +108,6 @@ for Red Hat and Fedora RPMs I am using FHS-compliant paths: /usr/share/doc/mplayer-version/ docs /usr/share/man/man1/ man page /usr/share/man/XX/man1/ translated man page -/usr/share/mplayer/skins/ GUI skins You MUST NOT include the codecs.conf file in your package. It is useful only for development purposes and often causes obscure problems for users. @@ -129,13 +125,9 @@ install only what you need. This is the layout I am using for Red Hat and Fedora RPMs: mencoder contains MEncoder binary (mencoder) -mplayer contains MPlayer binary without GUI (mplayer), - config files, man pages and documentation; - required by mplayer-gui +mplayer contains MPlayer binary config files, man pages and + documentation; mplayer-codecs-* contain binary codecs available from MPlayer's site -mplayer-gui contains MPlayer binary with GUI (gmplayer); - contains default skin (Blue) -mplayer-skin-* contain various MPlayer GUI skins There is no strict policy for now, just use your common sense. @@ -200,14 +192,8 @@ ao=alsa, Tips and tricks ~~~~~~~~~~~~~~~ -In my package layout, mplayer and mplayer-gui can be installed at the same -time, because they contain differently named binaries and there is no -conflict. The trick is to build MPlayer once with --enable-gui, rename the -resulting binary to "gmplayer" and then build it again, without GUI, but -keeping the rest of ./configure options the same. - -To provide man pages for all MPlayer suite binaries (mplayer, gmplayer, -mencoder), you can use man-links instead of regular symbolic links. +To provide man pages for all MPlayer suite binaries (mplayer, mencoder), you +can use man-links instead of regular symbolic links. Creating a mencoder man page linked to mplayer is as simple as: echo ".so mplayer.1" >> mencoder.1 diff --git a/DOCS/tech/general.txt b/DOCS/tech/general.txt index f4b7f0d713..631ee3f9de 100644 --- a/DOCS/tech/general.txt +++ b/DOCS/tech/general.txt @@ -226,4 +226,3 @@ Now, go on: 6.a audio plugins for details on this, read libao2.txt - diff --git a/DOCS/tech/libmpcodecs.txt b/DOCS/tech/libmpcodecs.txt index 22d29aaf98..5015f5dcc0 100644 --- a/DOCS/tech/libmpcodecs.txt +++ b/DOCS/tech/libmpcodecs.txt @@ -153,7 +153,7 @@ vf_info_t* info; const char *name; // short name of the filter, must be FILTERNAME const char *author; // name and email/URL of the author(s) const char *comment; // comment, URL to papers describing algorithm etc. - int (*open)(struct vf_instance_s* vf,char* args); + int (*open)(struct vf_instance* vf,char* args); // pointer to the open() function: Sample: @@ -197,13 +197,13 @@ static int open(vf_instance_t *vf, char* args) return 1; } -Functions in vf_instance_s: +Functions in vf_instance: NOTE: All these are optional, their function pointer is either NULL or points to a default implementation. If you implement them, don't forget to set vf->FUNCNAME in your open() ! - int (*query_format)(struct vf_instance_s* vf, unsigned int fmt); + int (*query_format)(struct vf_instance* vf, unsigned int fmt); The query_format() function is called one or more times before the config(), to find out the capabilities and/or support status of a given colorspace (fmt). @@ -216,7 +216,7 @@ next filter will accept at least one of your possible output colorspaces! Sample: -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance* vf, unsigned int fmt) { switch(fmt){ case IMGFMT_YV12: @@ -232,7 +232,7 @@ For the more complex case, when you have an N -> M colorspace mapping matrix, see vf_scale or vf_rgb2bgr for examples. - int (*config)(struct vf_instance_s* vf, + int (*config)(struct vf_instance* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt); @@ -257,7 +257,7 @@ Its parameters are already well-known from libvo: Sample: -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -272,12 +272,12 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,outfmt); } - void (*uninit)(struct vf_instance_s* vf); + void (*uninit)(struct vf_instance* vf); Okay, uninit() is the simplest, it's called at the end. You can free your private buffers etc here. - int (*put_image)(struct vf_instance_s* vf, mp_image_t *mpi); + int (*put_image)(struct vf_instance* vf, mp_image_t *mpi); Ah, put_image(). This is the main filter function, it should convert/filter/ transform the image data from one format/size/color/whatever to another. @@ -332,7 +332,7 @@ image: Ok, the rest is for advanced functionality only: - int (*control)(struct vf_instance_s* vf, int request, void* data); + int (*control)(struct vf_instance* vf, int request, void* data); You can control the filter at runtime from MPlayer/MEncoder/dec_video: #define VFCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */ @@ -343,7 +343,7 @@ You can control the filter at runtime from MPlayer/MEncoder/dec_video: #define VFCTRL_CHANGE_RECTANGLE 9 /* Change the rectangle boundaries */ - void (*get_image)(struct vf_instance_s* vf, mp_image_t *mpi); + void (*get_image)(struct vf_instance* vf, mp_image_t *mpi); This is for direct rendering support, works the same way as in libvo drivers. It makes in-place pixel modifications possible. @@ -359,7 +359,7 @@ order, while put_image is called for display) so the only safe place to save it is in the mpi struct itself: mpi->priv=(void*)dmpi; - void (*draw_slice)(struct vf_instance_s* vf, unsigned char** src, + void (*draw_slice)(struct vf_instance* vf, unsigned char** src, int* stride, int w,int h, int x, int y); It's the good old draw_slice callback, already known from libvo. diff --git a/DOCS/tech/libvo.txt b/DOCS/tech/libvo.txt index e80f80d2fb..945aeab952 100644 --- a/DOCS/tech/libvo.txt +++ b/DOCS/tech/libvo.txt @@ -171,4 +171,3 @@ Each vo driver _has_ to implement these: real. This is 'swapbuffers' when doublebuffering. Try to do as little work here as possible, since that affect jitter/ A-V sync. - diff --git a/DOCS/tech/realcodecs/TODO b/DOCS/tech/realcodecs/TODO index 00f20f13ac..5ba035bfdd 100644 --- a/DOCS/tech/realcodecs/TODO +++ b/DOCS/tech/realcodecs/TODO @@ -20,5 +20,3 @@ TODO: also statistics->streams->video->POST FILTER: ON (i've found that custommessage calls differ wiht pp on/off, but adding these calls to mplayer didn't make a pixel difference between outputs) - - diff --git a/DOCS/tech/realcodecs/audio-codecs.txt b/DOCS/tech/realcodecs/audio-codecs.txt index 6d79815ac0..8a0d958354 100644 --- a/DOCS/tech/realcodecs/audio-codecs.txt +++ b/DOCS/tech/realcodecs/audio-codecs.txt @@ -153,6 +153,3 @@ output_buffer points to the output buffer from the last decode operation. retval is unknown, returning always 0x18 in a specific sample -> further investigation needed - - - diff --git a/DOCS/tech/realcodecs/video-codecs.txt b/DOCS/tech/realcodecs/video-codecs.txt index 5ef9a51961..2bef957172 100644 --- a/DOCS/tech/realcodecs/video-codecs.txt +++ b/DOCS/tech/realcodecs/video-codecs.txt @@ -183,5 +183,3 @@ Transform (internally calls (0x1c,x,y)) ] Free - - diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt index c15a3a7fa8..e1fed7edee 100644 --- a/DOCS/tech/slave.txt +++ b/DOCS/tech/slave.txt @@ -546,4 +546,3 @@ teletext_format int 0 3 X X X 0 - opaque, 3 - transp. inv. teletext_half_page int 0 2 X X X 0 - off, 1 - top half, 2- bottom half - diff --git a/DOCS/tech/snow.txt b/DOCS/tech/snow.txt index db1b558cb9..be531fcb5c 100644 --- a/DOCS/tech/snow.txt +++ b/DOCS/tech/snow.txt @@ -87,4 +87,3 @@ vcodec=snow:vstrict=-2:vpass=2:vbitrate=$B:pred=0:cmp=12:subcmp=12:mbcmp=1:qpel: Decent, fast options are vcodec=snow:vstrict=-2:vpass=1:vbitrate=$B:pred=0:cmp=1:subcmp=1:mbcmp=1 vcodec=snow:vstrict=-2:vpass=2:vbitrate=$B:pred=0:cmp=2:subcmp=2:mbcmp=1:refs=2 - diff --git a/DOCS/tech/subcp.txt b/DOCS/tech/subcp.txt index df96f31e80..60c370771c 100644 --- a/DOCS/tech/subcp.txt +++ b/DOCS/tech/subcp.txt @@ -40,5 +40,3 @@ I tested charmap2enc script only with /usr/share/i18n/charmaps/EUC-KR.gz -- Artur Zaprzala - - diff --git a/DOCS/tech/swscaler_methods.txt b/DOCS/tech/swscaler_methods.txt index e37227b982..b2c7077652 100644 --- a/DOCS/tech/swscaler_methods.txt +++ b/DOCS/tech/swscaler_methods.txt @@ -66,4 +66,3 @@ m mosaic (blocky) (upscale only) Notes: area upscale is identical to bilinear - |