September 2007 - MPlayer-dev-eng

patch backlog maintenance
by Diego Biurrun 19 Jun '08

19 Jun '08

Folks, I'm awfully overloaded. Could somebody take over the maintenance of the patch backlog that I took over from Attila some time ago? All you need to do is keep track of all unapplied patches in an mbox or something and make it available from time to time. Sending out periodic reminders from time to time is a plus. Thanks Diego

3 13

Synchronization of players in LAN
by J.A. Gutierrez 18 Jun '08

18 Jun '08

Hello I'm trying to synchronise several players running on several computers connected to a dedicated 10/100 Ethernet switch. Each one reads a different movie (video only) from its internal hard disk, and resolution will be 768x576. I'm thinking of a simple solution: - Add some code at mplayer startup so it will wait for an UDP broadcast packet (sent by a central master in the LAN). This way all the players would start at the same time. - Use NTP to keep in sync all the computers' clocks, and trust mplayer's rtc synchronisation feature. With this simple setup, could we be sure all the players would keep the synchronisation? Or should the master computer track them all and take control on their speeds? How difficult would be to add code so all the player synchronise using the LAN? Or should I use some external clock connected to all serial ports? Or use a totally different approach? Thanks. -- finger spd(a)shiva.cps.unizar.es for PGP / .mailcap tip of the day: / La vida es una carcel application/ms-tnef; cat '%s' > /dev/null / con las puertas abiertas text/x-vcard; cat '%s' > /dev/null / (A. Calamaro)

14 40

[PATCH] libmpeg2 - bogus output qscales for interlaced content
by Jindrich Makovicka 19 Feb '08

19 Feb '08

Hi, Currently, MPEG2 postprocessing corrupts the image when the content is interlaced. The reason is that our patched libmpeg2 stores the qscales _twice_ into the top half of the quant_store, while the bottom one contains only garbage, which results in ugly artifacting in the bottom half of the image. The attached patch fixes this issue. The filters should be also adjusted to process interlaced content properly (maybe later), but at least the worst artifacting is gone and resulting video is watchable. Regards, -- Jindrich Makovicka

2 1

[PATCH] Recursively Nested ASX Playlists
by Mrc Gran 17 Feb '08

17 Feb '08

Hello, I'm sending a patch to make mplayer capable of playing recursively nested asx playlists. A nested asx playlist is one whose refs point to further asx list files instead of real media files such as wmv. (This patch is not to be confused with processing of entryrefs which seems to be already implemented at asxparser.c.) Both asx playlists and wmv files are of mime type x-ms-asf. This patches modifies stream/asf_streaming.c so that it looks for a file ending with '.asx' which, if found, returns a demux_type_playlist to mplayer.c instead of the expected demuxer_type_asf. This triggers mplayer.c to synchronously follow the recursive nested playlists. A new streaming type ASF_ASXPlaylist_e is added to asf.h to control the new code branch. The function play_tree_parser_get_line() also receives a new code branch to deal with buffered streams which is necessary in order to parse the playlist, buffered when the asf stream was opened. I felt the necessity to develop this patch because there are sites which use nested asx playlists, such as video.globo.com (see discussions at http://sourceforge.net/forum/forum.php?thread_id=1668761&forum_id=242727 and http://sourceforge.net/mailarchive/forum.php?thread_id=31642270&forum_id=21…) and nested playlists are part of the microsoft specification for asx ( http://msdn2.microsoft.com/en-us/library/bb262812.aspx) I also tested the patch against www.bbc.co.uk, www.cnn.com, http://wptv.wp.pl/news.html (mplayer -playlist http://i.wp.pl/a/f/asx/11771/wptvnews.asx) and all worked fine. Extra care was taken to modify the minimum amount of code and to minimize potential regressions. In case this patch is approved for inclusion in mplayer, I would be grateful if my name was cited in the list of contributors. All comments welcome. Thanks, Marcus C. Granado mrc [d-o-t] gran [a-t] gmail [d-o-t] com --

3 3

[PATCH] color SPU with ass (EOSD)
by Ötvös Attila 06 Jan '08

06 Jan '08

Hi All! 1. Implemet image render with ass: The ass-fmt_and_gen-eosd.patch is 2in1: gen-eosd.patch, ass-fmt.patch of Evgeniy Stepanov. http://archives.free.net.ph/message/20070811.210648.9e74a56d.en.html http://archives.free.net.ph/message/20070812.132830.c65272d4.en.html Thank you for Evgeniy Stepanov. 2. ass-unregister_and_scaler.pacth I add unregister eosd_generator, check ass image size and add scaler (dxs, dys). 3. My main color SPU patch with ass (EOSD): color-spu-with-ass.patch If ass enabled then MPlayer use ass with color SPU. Best regards. Attila

5 16

[PATCH] Use XScreenSaverSuspend if supported
by Ismail Donmez 28 Dec '07

28 Dec '07

Hi, X.org 7.1 will feature a new function called, XScreenSaverSuspend which can suspend/resume screensavers. This is way more better than the current hacks we have. The patch is by Fredrik Höglund ( fredrik at kde.org ), I am proxying for him since he is not subscribed. Please review/comment or just apply :-) Regards, ismail -- <Terwou> \\o \o> <o/ o//

8 29

xvidix threading
by Howard Chu 26 Dec '07

26 Dec '07

(Resending after subscribing...) I've been messing around with my Dvico FusionHDTV tuner card and running into performance problems. Playing standard-definition channels is easy enough, but playing a full 1920x1080i channel was just too much. Using xvidix/radeon for output... oprofile showed that the bulk of the execution time is in memcpy, from vidix_draw_slice: CPU: AMD64 processors, speed 2600 MHz (estimated) Counted CPU_CLK_UNHALTED events (Cycles outside of halt state) with a unit mask of 0x00 (No unit mask) count 50000 samples % image name app name symbol name 179887 40.7671 mplayer mplayer fast_memcpy 49657 11.2536 mplayer mplayer swScale_MMX2 29557 6.6984 mplayer mplayer mmxext_idct 20101 4.5554 mplayer mplayer hcscale_MMX2 15602 3.5358 mplayer mplayer slice_intra_DCT 15397 3.4894 mplayer mplayer MC_put_o_16_mmxext 14941 3.3860 mplayer mplayer mpeg2_slice 11475 2.6005 mplayer mplayer motion_fr_frame_420 9799 2.2207 mplayer mplayer get_non_intra_block CPU: AMD64 processors, speed 2600 MHz (estimated) Counted CPU_CLK_UNHALTED events (Cycles outside of halt state) with a unit mask of 0x00 (No unit mask) count 50000 samples % image name app name symbol name ------------------------------------------------------------------------------- 142 0.4817 mplayer mplayer vidix_draw_slice_420 29337 99.5183 mplayer mplayer fast_memcpy 29479 22.3475 mplayer mplayer fast_memcpy_SSE 29479 100.000 mplayer mplayer fast_memcpy_SSE [self] ------------------------------------------------------------------------------- 73 0.9778 mplayer mplayer mpeg2_slice 7393 99.0222 mplayer mplayer slice_non_intra_DCT 7466 5.6598 mplayer mplayer get_non_intra_block 7466 100.000 mplayer mplayer get_non_intra_block [self] ------------------------------------------------------------------------------- I tried scaling it down to 960x540 which was enough to bring the CPU usage down to around 95% or so, but it was still maxing out occasionally. Since I've got a dual core processor and the other core was idle, I tried moving the draw_slice function into a separate thread. This turned out to work pretty well; instead of maxing out at 100% of one core I can now manage higher resolutions without any frame losses (using both cores). (I also tried to use the -dr option but it only worked at a few choices of image sizes. Not sure what the story is there.) The attached diff (against current svn) is just for your consideration, for real use it would need a commandline switch to toggle it on/off. By the way, it seems to have some sync problems when used without the scale filter. -- -- Howard Chu Chief Architect, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/ Index: vosub_vidix.c =================================================================== --- vosub_vidix.c (revision 24537) +++ vosub_vidix.c (working copy) @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <pthread.h> #include "config.h" #include "mp_msg.h" @@ -49,9 +50,14 @@ static vidix_playback_t vidix_play; static vidix_fourcc_t vidix_fourcc; static vo_functions_t * vo_server; +static vo_functions_t vo_local; static vidix_yuv_t dstrides; /*static uint32_t (*server_control)(uint32_t request, void *data, ...);*/ +static pthread_mutex_t vidix_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t vidix_cond = PTHREAD_COND_INITIALIZER; +static pthread_t vidix_thread; + int vidix_start(void) { int err; @@ -96,7 +102,7 @@ dest += dstrides.y*y + x; src = image[0]; for(i=0;i<h;i++){ - memcpy(dest,src,w); + mem2agpcpy(dest,src,w); src+=stride[0]; dest += dstrides.y; } @@ -122,6 +128,7 @@ src += stride[1]; src2+= stride[2]; } + i = -1; } else { @@ -130,7 +137,7 @@ dest += dstrides.v*y/4 + x; src = image[1]; for(i=0;i<h/2;i++){ - memcpy(dest,src,w/2); + mem2agpcpy(dest,src,w/2); src+=stride[1]; dest+=dstrides.v/2; } @@ -140,13 +147,13 @@ dest += dstrides.u*y/4 + x; src = image[2]; for(i=0;i<h/2;i++){ - memcpy(dest,src,w/2); + mem2agpcpy(dest,src,w/2); src+=stride[2]; dest += dstrides.u/2; } - return 0; + i = 0; } - return -1; + return i; } static uint32_t vidix_draw_slice_410(uint8_t *image[], int stride[], int w,int h,int x,int y) @@ -241,10 +248,38 @@ return 0; } +static uint8_t *vds_image[3]; +static int vds_stride[3], vds_w, vds_h, vds_x, vds_y; + +static void vidix_task() +{ + pthread_mutex_lock(&vidix_mutex); + pthread_cond_signal(&vidix_cond); + + for(;;) { + pthread_cond_wait(&vidix_cond, &vidix_mutex); + if (!vds_image[0]) break; + vo_local.draw_slice(vds_image, vds_stride, vds_w, vds_h, vds_x, vds_y); + vds_image[0] = NULL; + } +} + uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) { - mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawsliceWasCalled); - return -1; + pthread_mutex_lock(&vidix_mutex); + vds_image[0] = image[0]; + vds_image[1] = image[1]; + vds_image[2] = image[2]; + vds_stride[0] = stride[0]; + vds_stride[1] = stride[1]; + vds_stride[2] = stride[2]; + vds_w = w; + vds_h = h; + vds_x = x; + vds_y = y; + pthread_cond_signal(&vidix_cond); + pthread_mutex_unlock(&vidix_mutex); + return 0; } static uint32_t vidix_draw_image(mp_image_t *mpi){ @@ -279,7 +314,7 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride) { uint32_t apitch,bespitch; - void *lvo_mem; + char *lvo_mem; lvo_mem = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y; apitch = vidix_play.dest.pitch.y-1; switch(vidix_play.fourcc){ @@ -557,11 +592,17 @@ is_422_planes_eq = sstride == dstrides.y; if(src_format == IMGFMT_YV12 || src_format == IMGFMT_I420 || src_format == IMGFMT_IYUV) - vo_server->draw_slice = vidix_draw_slice_420; + vo_local.draw_slice = vidix_draw_slice_420; else if (src_format == IMGFMT_YVU9 || src_format == IMGFMT_IF09) - vo_server->draw_slice = vidix_draw_slice_410; - else vo_server->draw_slice = vidix_draw_slice_packed; + vo_local.draw_slice = vidix_draw_slice_410; + else vo_local.draw_slice = vidix_draw_slice_packed; } + if (!vidix_thread) { + pthread_mutex_lock(&vidix_mutex); + pthread_create(&vidix_thread, NULL, vidix_task, NULL); + pthread_cond_wait(&vidix_cond, &vidix_mutex); + pthread_mutex_unlock(&vidix_mutex); + } return 0; }

3 2

[patch] turn wordsize check from runtime to compile time
by Mike Frysinger 08 Dec '07

08 Dec '07

attached patch changes the sizeof(size_t) discovery process from a runtime check (which doesnt work when cross-compiling) to a compile time check (which does work when cross-compiling) tested on ppc/linux and blackfin/linux -mike

4 8

[PATCH] vobsub fix for empty useless streams
by Ulion 03 Dec '07

03 Dec '07

Hello, I found when switch between subs, empty vobsub streams are also rotated. For example, the vobsub in following link: https://www.shooter.cn/files/?fileid=29025&filename=Gladiator-Subs-oTo It has two valid streams, one's vobsub id is 0, another's is 13. There are lots of vobsubs with gaps between vobsub ids like this, mainly caused by removing some unwanted streams from vobsub with many streams. When play movie with such vobsub files, if we switch subs, it will take much our time to switch between many empty useless vobsub streams. This does not make sense. I made a patch for it to resolve the problem. Indeed, only two things are changed: 1. When mplayer ask vobsub total index count, it return only valid stream count instead of total stream count. 2. In old codes, if current using vobsubs, mpctx->global_sub_pos - mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] is just the vobsub_id. Now, it's the index of current sub in valid vobsub streams, I add two functions to convert between vobsub_id and the index in valid streams. After applied the patch, when rotate subs, only valid vobsub streams will be rotated. That's just what we want. PS: Valid vobsub is judged by whether it has a id (language name), If has no id, a stream will never be seeked by current code. So it's totally useless. -- Ulion

6 30

[PATCH] audio channel remapping
by Corey Hickey 17 Nov '07

17 Nov '07

Hello, This patch makes mplayer and mencoder auto-insert the channels filter when necessary in order to maintain the proper order. Remapping is necessary when reading from or writing to formats that have a different native order from what mplayer and mencoder use internally. There was some recent discussion on this matter in the thread "[RFC] 6-channel AAC and channel reordering". I'm going to be gone on a camping trip until late Monday. If nobody has objected by then, then I'll start applying this patch in independent pieces. Since this is the first draft I've submitted for inclusion, though, I wouldn't be surprised if there are any corrections I need to make. Thanks, Corey Index: libmpcodecs/ae_faac.c =================================================================== --- libmpcodecs/ae_faac.c (revision 20811) +++ libmpcodecs/ae_faac.c (working copy) @@ -68,6 +68,23 @@ ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nBlockSize = mux_a->wf->nBlockAlign; ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nFramesPerBlock = 1; ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nCodecDelay = 0; + + /* remap channels */ + switch (mux_a->wf->nChannels) { + case 1: /* FC, no action needed */ + case 2: /* FL FR, no action needed */ + case 3: /* no suitable default behavior? */ + case 4: /* FL FR BL BR, no action needed */ + break; + case 5: /* FC FL FR BL BR */ + encoder->output_chan_map = "40" "01" "12" "23" "34"; + break; + case 6: /* FC FL FR BL BR LFE */ + encoder->output_chan_map = "40" "01" "12" "23" "34" "55"; + break; + default: + break; + } // Fix allocation mux_a->wf = realloc(mux_a->wf, sizeof(WAVEFORMATEX)+mux_a->wf->cbSize); Index: libmpcodecs/ae_pcm.c =================================================================== --- libmpcodecs/ae_pcm.c (revision 20811) +++ libmpcodecs/ae_pcm.c (working copy) @@ -27,6 +27,23 @@ mux_a->wf->wBitsPerSample=16; mux_a->wf->cbSize=0; // FIXME for l3codeca.acm + /* re-map channels */ + switch (mux_a->wf->nChannels) { + case 1: /* FC, no action needed */ + case 2: /* FL FR, no action needed */ + case 3: /* unknown; may not exist */ + case 4: /* FL FR BL BR, no action needed */ + break; + case 5: /* FL FR C BL BR */ + encoder->output_chan_map = "00" "11" "42" "23" "34"; + break; + case 6: /* FL FR C LFE BL BR */ + encoder->output_chan_map = "00" "11" "42" "53" "24" "35"; + break; + default: + break; + } + encoder->input_format = (mux_a->wf->wBitsPerSample==8) ? AF_FORMAT_U8 : AF_FORMAT_S16_LE; encoder->min_buffer_size = 16384; encoder->max_buffer_size = mux_a->wf->nAvgBytesPerSec; Index: libmpcodecs/ad_pcm.c =================================================================== --- libmpcodecs/ad_pcm.c (revision 20811) +++ libmpcodecs/ad_pcm.c (working copy) @@ -22,6 +22,22 @@ WAVEFORMATEX *h=sh_audio->wf; sh_audio->i_bps=h->nAvgBytesPerSec; sh_audio->channels=h->nChannels; + /* re-map channels */ + switch (sh_audio->channels) { + case 1: /* FC, no action needed */ + case 2: /* FL FR, no action needed */ + case 3: /* unknown; may not exist */ + case 4: /* FL FR BL BR, no action needed */ + break; + case 5: /* FL FR C BL BR */ + sh_audio->input_chan_map = "00" "11" "24" "32" "43"; + break; + case 6: /* FL FR C LFE BL BR */ + sh_audio->input_chan_map = "00" "11" "24" "35" "42" "53"; + break; + default: + break; + } sh_audio->samplerate=h->nSamplesPerSec; sh_audio->samplesize=(h->wBitsPerSample+7)/8; sh_audio->sample_format=AF_FORMAT_S16_LE; // default Index: libmpcodecs/ad_faad.c =================================================================== --- libmpcodecs/ad_faad.c (revision 20811) +++ libmpcodecs/ad_faad.c (working copy) @@ -152,6 +152,24 @@ mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %ldHz channels: %d\n", faac_samplerate, faac_channels); sh->channels = faac_channels; if (audio_output_channels <= 2) sh->channels = faac_channels > 1 ? 2 : 1; + + /* re-map channels */ + switch (sh->channels) { + case 1: /* FC, no action needed */ + case 2: /* FL FR, no action needed */ + case 3: /* no suitable default behavior? */ + case 4: /* FL FR BL BR, no action needed */ + break; + case 5: /* FC FL FR BL BR */ + sh->input_chan_map = "04" "10" "21" "32" "43"; + break; + case 6: /* FC FL FR BL BR LFE */ + sh->input_chan_map = "04" "10" "21" "32" "43" "55"; + break; + default: + break; + } + sh->samplerate = faac_samplerate; sh->samplesize=2; //sh->o_bps = sh->samplesize*faac_channels*faac_samplerate; Index: libmpcodecs/ad_dmo.c =================================================================== --- libmpcodecs/ad_dmo.c (revision 20811) +++ libmpcodecs/ad_dmo.c (working copy) @@ -40,6 +40,22 @@ } sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; sh_audio->channels=chans; + /* re-map channels */ + switch (chans) { + case 1: /* FC, no action needed */ + case 2: /* FL FR, no action needed */ + case 3: /* apparently does not exist */ + case 4: /* FL FR BL BR, no action needed */ + break; + case 5: /* FL FR FC BL BR */ + sh_audio->input_chan_map = "00" "11" "23" "34" "42"; + break; + case 6: /* FL FR FC LFE BL BR */ + sh_audio->input_chan_map = "00" "11" "24" "35" "42" "53"; + break; + default: + break; + } sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; sh_audio->samplesize=2; sh_audio->audio_in_minsize=4*sh_audio->wf->nBlockAlign; Index: libmpcodecs/dec_audio.c =================================================================== --- libmpcodecs/dec_audio.c (revision 20811) +++ libmpcodecs/dec_audio.c (working copy) @@ -311,6 +311,8 @@ // filter config: memcpy(&afs->cfg,&af_cfg,sizeof(af_cfg_t)); + afs->input_chan_map = sh_audio->input_chan_map; + afs->output_chan_map = sh_audio->output_chan_map; mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_BuildingAudioFilterChain, afs->input.rate,afs->input.nch,af_fmt2str_short(afs->input.format), Index: libmpcodecs/ae.h =================================================================== --- libmpcodecs/ae.h (revision 20811) +++ libmpcodecs/ae.h (working copy) @@ -39,6 +39,7 @@ int (*encode)(struct audio_encoder_s *encoder, uint8_t *dest, void *src, int nsamples, int max_size); void (*fixup)(struct audio_encoder_s *encoder); int (*close)(struct audio_encoder_s *encoder); + char *output_chan_map; } audio_encoder_t; audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params); Index: libmpcodecs/ae_lavc.c =================================================================== --- libmpcodecs/ae_lavc.c (revision 20811) +++ libmpcodecs/ae_lavc.c (working copy) @@ -40,6 +40,22 @@ mux_a->wf->nAvgBytesPerSec = (lavc_actx->bit_rate / 8); mux_a->avg_rate= lavc_actx->bit_rate; mux_a->h.dwRate = mux_a->wf->nAvgBytesPerSec; + /* remap channels */ + switch (lavc_actx->channels) { + case 1: /* FC, no action needed */ + case 2: /* FL FR, no action needed */ + case 3: /* unknown */ + case 4: /* FL FR BL BR, no action needed */ + break; + case 5: /* FL FC FR BL BR */ + encoder->output_chan_map = "00" "21" "32" "43" "14"; + break; + case 6: /* FL FC FR BL BR LFE */ + encoder->output_chan_map = "00" "21" "32" "43" "14" "55"; + break; + default: + break; + } if(lavc_actx->block_align) mux_a->h.dwSampleSize = mux_a->h.dwScale = lavc_actx->block_align; else Index: libao2/ao_pcm.c =================================================================== --- libao2/ao_pcm.c (revision 20811) +++ libao2/ao_pcm.c (working copy) @@ -120,6 +120,23 @@ ao_data.samplerate=rate; ao_data.format=format; ao_data.bps=channels*rate*(bits/8); + + /* re-map channels */ + switch (ao_data.channels) { + case 1: /* FC, no action needed */ + case 2: /* FL FR, no action needed */ + case 3: /* unknown; may not exist */ + case 4: /* FL FR BL BR, no action needed */ + break; + case 5: /* FL FR C BL BR */ + ao_data.output_chan_map = "00" "11" "42" "23" "34"; + break; + case 6: /* FL FR C LFE BL BR */ + ao_data.output_chan_map = "00" "11" "42" "53" "24" "35"; + break; + default: + break; + } wavhdr.channels = le2me_16(ao_data.channels); wavhdr.sample_rate = le2me_32(ao_data.samplerate); Index: libao2/audio_out.h =================================================================== --- libao2/audio_out.h (revision 20811) +++ libao2/audio_out.h (working copy) @@ -39,6 +39,7 @@ int outburst; int buffersize; int pts; + char *output_chan_map; } ao_data_t; extern char *ao_subdevice; Index: DOCS/man/en/mplayer.1 =================================================================== --- DOCS/man/en/mplayer.1 (revision 20811) +++ DOCS/man/en/mplayer.1 (working copy) @@ -1377,6 +1377,14 @@ Always falls back on content-based demuxer selection. . .TP +.B \-noremap-channels +Some audio formats have a different channel order than MPlayer and +MEncoder use internally. +Normally, the channels audio filter is automatically inserted to remap +the channels as necessary. +This option disables the remapping. +. +.TP .B \-passwd <password> (also see \-user) (network only) Specify password for HTTP authentication. . Index: mplayer.c =================================================================== --- mplayer.c (revision 20811) +++ mplayer.c (working copy) @@ -311,6 +311,7 @@ float force_fps=0; static int force_srate=0; +static int remap_channels=1; static int audio_output_format=-1; // AF_FORMAT_UNKNOWN int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode static int play_n_frames=-1; @@ -1203,6 +1204,8 @@ new_srate = 192000; playback_speed = (float)new_srate / (float)sh_audio->samplerate; } + if (!remap_channels) + sh_audio->input_chan_map = sh_audio->output_chan_map = NULL; result = init_audio_filters(sh_audio, new_srate, sh_audio->channels, sh_audio->sample_format, &ao_data->samplerate, &ao_data->channels, &ao_data->format, @@ -2645,6 +2648,8 @@ ao_data.format=audio_output_format; #if 1 // first init to detect best values + if (!remap_channels) + sh_audio->input_chan_map = sh_audio->output_chan_map = NULL; if(!preinit_audio_filters(sh_audio, // input: (int)(sh_audio->samplerate*playback_speed), @@ -2682,6 +2687,7 @@ // init audio filters: #if 1 current_module="af_init"; + sh_audio->output_chan_map = ao_data.output_chan_map; if(!build_afilter_chain(sh_audio, &ao_data)) { mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); // mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n"); Index: cfg-common.h =================================================================== --- cfg-common.h (revision 20811) +++ cfg-common.h (working copy) @@ -169,6 +169,8 @@ {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, {"srate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL}, {"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 1, 6, NULL}, + {"remap-channels", &remap_channels, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"noremap-channels", &remap_channels, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"format", &audio_output_format, CONF_TYPE_AFMT, 0, 0, 0, NULL}, {"speed", &playback_speed, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, NULL}, Index: libmpdemux/stheader.h =================================================================== --- libmpdemux/stheader.h (revision 20811) +++ libmpdemux/stheader.h (working copy) @@ -19,6 +19,8 @@ int samplerate; int samplesize; int channels; + char *input_chan_map; + char *output_chan_map; int o_bps; // == samplerate*samplesize*channels (uncompr. bytes/sec) int i_bps; // == bitrate (compressed bytes/sec) // in buffers: Index: mencoder.c =================================================================== --- mencoder.c (revision 20811) +++ mencoder.c (working copy) @@ -167,6 +167,7 @@ float playback_speed=1.0; static int force_srate=0; +static int remap_channels=1; static int audio_output_format=0; char *vobsub_out=NULL; @@ -406,7 +407,7 @@ int new_srate=0; unsigned int timer_start=0; -ao_data_t ao_data = {0,0,0,0,OUTBURST,-1,0}; +ao_data_t ao_data = {0,0,0,0,OUTBURST,-1,0,NULL}; audio_encoding_params_t aparams; audio_encoder_t *aencoder = NULL; @@ -909,6 +910,8 @@ ao_data.samplerate = force_srate; ao_data.channels = 0; ao_data.format = audio_output_format; +if (!remap_channels) + sh_audio->input_chan_map = sh_audio->output_chan_map = NULL; if(!preinit_audio_filters(sh_audio, // input: new_srate, @@ -926,6 +929,9 @@ aencoder = new_audio_encoder(mux_a, &aparams); if(!aencoder) mencoder_exit(1, NULL); + sh_audio->output_chan_map = aencoder->output_chan_map; + if (!remap_channels) + sh_audio->input_chan_map = sh_audio->output_chan_map = NULL; if(!init_audio_filters(sh_audio, new_srate, sh_audio->channels, sh_audio->sample_format, &aparams.sample_rate, &aparams.channels, &aencoder->input_format, Index: libaf/af.c =================================================================== --- libaf/af.c (revision 20811) +++ libaf/af.c (working copy) @@ -359,12 +359,12 @@ // Check if this is the first call if(!s->first){ + /* remap input channels if the codec/demuxer provides a map */ + if (s->input_chan_map) + if (AF_OK != af_append_channel_map(s, s->first, s->input_chan_map)) + return -1; // Add all filters in the list (if there are any) - if(!s->cfg.list){ // To make automatic format conversion work - if(!af_append(s,s->first,"dummy")) - return -1; - } - else{ + if (s->cfg.list) { while(s->cfg.list[i]){ if(!af_append(s,s->last,s->cfg.list[i++])) return -1; @@ -372,6 +372,20 @@ } } + /* remap output channels if the codec/ao provides a map */ + if (s->output_chan_map) { + if (AF_OK != af_append_channel_map(s, s->last, s->output_chan_map)) + return -1; + /* make sure we don't append this more than once */ + s->output_chan_map = NULL; + } + + // To make automatic format conversion work + if (!s->first){ + if(!af_append(s,s->first,"dummy")) + return -1; + } + // Init filters if(AF_OK != af_reinit(s,s->first)) return -1; @@ -711,3 +725,36 @@ { data->bps = af_fmt2bits(data->format)/8; } + +int af_append_channel_map(af_stream_t *s, af_instance_t *af_prev, char *chan_map){ + af_control_ext_t arg; + af_instance_t *af = NULL; + int channels, route[2]; + channels = af_prev ? af_prev->data->nch : s->input.nch; + /* check input */ + if (strlen(chan_map) != 2*channels) { + af_msg(AF_MSG_ERROR, "channel map: num. of routes does not match num. of channels\n"); + return AF_ERROR; + } + /* set up af_channels to route */ + af = af_append(s, af_prev, "channels"); + if (!af || (AF_OK != af->control(af, AF_CONTROL_CHANNELS_ROUTER, &channels))) + return AF_ERROR; + if (!af || (AF_OK != af->control(af, AF_CONTROL_CHANNELS_NR, &channels))) + return AF_ERROR; + /* pass each route to af_channels */ + for (arg.ch = 0; arg.ch < channels; ++arg.ch) { + /* two by two... */ + route[0] = *chan_map++ - '0'; + route[1] = *chan_map++ - '0'; + arg.arg = route; + if (!af || (AF_OK != af->control(af, AF_CONTROL_CHANNELS_ROUTING, &arg))) + return AF_ERROR; + } + /* try it! */ + if (!af || (AF_OK != af->control(af, AF_CONTROL_CHANNELS, &channels))) + return AF_ERROR; + if (AF_OK != af_reinit(s,af)) + return AF_ERROR; + return AF_OK; +} Index: libaf/af.h =================================================================== --- libaf/af.h (revision 20811) +++ libaf/af.h (working copy) @@ -104,6 +104,8 @@ af_data_t output; // Configuration for this stream af_cfg_t cfg; + char *input_chan_map; + char *output_chan_map; }af_stream_t; /********************************************* @@ -329,6 +331,18 @@ */ void af_fix_parameters(af_data_t *data); +/** + * \brief set up channel remapping + * \param af_stream + * \param af_instance to append this instance after + * \param string of channel routes + * \return AF_OK if ok, AF_ERROR otherwise + * + * Checks that the number of routes matches channels, and creates an instance + * of af_channels with the routes specified in *chan_map. + */ +int af_append_channel_map(af_stream_t *s, af_instance_t *af_prev, char *chan_map); + /** Memory reallocation macro: if a local buffer is used (i.e. if the filter doesn't operate on the incoming buffer this macro must be called to ensure the buffer is big enough.

3 7