November 2006 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/input input.c,1.125,1.126
by syncmail＠mplayerhq.hu 24 Dec '06

24 Dec '06

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main/input In directory mail:/var2/tmp/cvs-serv3818/input Modified Files: input.c Log Message: libvo input cleanup: remove the dependency on libinput, remove most of the crappy mappings (like O->o or ESC->q). Index: input.c =================================================================== RCS file: /cvsroot/mplayer/main/input/input.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- input.c 25 Oct 2005 21:23:45 -0000 1.125 +++ input.c 2 Nov 2005 21:50:54 -0000 1.126 @@ -240,10 +240,27 @@ { JOY_BTN8, "JOY_BTN8" }, { JOY_BTN9, "JOY_BTN9" }, - { KEY_XF86_PAUSE, "XF86_PAUSE" }, - { KEY_XF86_STOP, "XF86_STOP" }, - { KEY_XF86_PREV, "XF86_PREV" }, - { KEY_XF86_NEXT, "XF86_NEXT" }, + { KEY_POWER, "POWER" }, + { KEY_MENU, "MENU" }, + { KEY_PLAY, "PLAY" }, + { KEY_PAUSE, "PAUSE" }, + { KEY_PLAYPAUSE, "PLAYPAUSE" }, + { KEY_STOP, "STOP" }, + { KEY_FORWARD, "FORWARD" }, + { KEY_REWIND, "REWIND" }, + { KEY_NEXT, "NEXT" }, + { KEY_PREV, "PREV" }, + { KEY_VOLUME_UP, "VOLUME_UP" }, + { KEY_VOLUME_DOWN, "VOLUME_DOWN" }, + { KEY_MUTE, "MUTE" }, + + // These are kept for backward compatibility + { KEY_PAUSE, "XF86_PAUSE" }, + { KEY_STOP, "XF86_STOP" }, + { KEY_PREV, "XF86_PREV" }, + { KEY_NEXT, "XF86_NEXT" }, + + { KEY_CLOSE_WIN, "CLOSE_WIN" }, { 0, NULL } }; @@ -282,9 +299,11 @@ { { '}', 0 }, "speed_mult 2.0" }, { { KEY_BACKSPACE, 0 }, "speed_set 1.0" }, { { 'q', 0 }, "quit" }, + { { 'Q', 0 }, "quit" }, #ifndef HAVE_NEW_GUI { { KEY_ESC, 0 }, "quit" }, { { 'p', 0 }, "pause" }, + { { 'P', 0 }, "pause" }, #endif { { ' ', 0 }, "pause" }, { { '.', 0 }, "frame_step" }, @@ -298,6 +317,7 @@ { { KEY_INS, 0 }, "alt_src_step 1" }, { { KEY_DEL, 0 }, "alt_src_step -1" }, { { 'o', 0 }, "osd" }, + { { 'O', 0 }, "osd" }, { { 'z', 0 }, "sub_delay -0.1" }, { { 'x', 0 }, "sub_delay +0.1" }, { { 'g', 0 }, "sub_step -1" }, @@ -307,6 +327,7 @@ { { '0', 0 }, "volume 1" }, { { '*', 0 }, "volume 1" }, { { 'm', 0 }, "mute" }, + { { 'M', 0 }, "mute" }, { { '1', 0 }, "contrast -1" }, { { '2', 0 }, "contrast 1" }, { { '3', 0 }, "brightness -1" }, @@ -358,10 +379,21 @@ { { 'w', 0 }, "panscan -0.1" }, { { 'e', 0 }, "panscan +0.1" }, - { { KEY_XF86_PAUSE, 0 }, "pause" }, - { { KEY_XF86_STOP, 0 }, "quit" }, - { { KEY_XF86_PREV, 0 }, "seek -60" }, - { { KEY_XF86_NEXT, 0 }, "seek +60" }, + { { KEY_POWER, 0 }, "quit" }, + { { KEY_MENU, 0 }, "osd" }, + { { KEY_PLAY, 0 }, "pause" }, + { { KEY_PAUSE, 0 }, "pause" }, + { { KEY_PLAYPAUSE, 0 }, "pause" }, + { { KEY_STOP, 0 }, "quit" }, + { { KEY_FORWARD, 0 }, "seek 60" }, + { { KEY_REWIND, 0 }, "seek -60" }, + { { KEY_NEXT, 0 }, "pt_step 1" }, + { { KEY_PREV, 0 }, "pt_step -1" }, + { { KEY_VOLUME_UP, 0 }, "volume 1" }, + { { KEY_VOLUME_DOWN, 0 }, "volume -1" }, + { { KEY_MUTE, 0 }, "mute" }, + + { { KEY_CLOSE_WIN, 0 }, "quit" }, { { 0 }, NULL } };

3 3

r19649 - in trunk: libass/ass_mp.c libass/ass_mp.h libmpdemux/demux_mkv.c
by eugeni 21 Dec '06

21 Dec '06

Author: eugeni Date: Sat Sep 2 22:46:26 2006 New Revision: 19649 Modified: trunk/libass/ass_mp.c trunk/libass/ass_mp.h trunk/libmpdemux/demux_mkv.c Log: Add support for rendering matroska plaintext subtitles with libass. Modified: trunk/libass/ass_mp.c ============================================================================== --- trunk/libass/ass_mp.c (original) +++ trunk/libass/ass_mp.c Sat Sep 2 22:46:26 2006 @@ -2,6 +2,8 @@ #include <string.h> #include <stdlib.h> +#include "mp_msg.h" + #include "ass.h" #include "ass_mp.h" @@ -23,23 +25,13 @@ extern double ass_internal_font_size_coeff; extern void process_force_style(ass_track_t* track); -/** - * \brief Convert subdata to ass_track - * \param subdata subtitles struct from subreader - * \param fps video framerate - * \return newly allocated ass_track, filled with subtitles from subdata - */ -ass_track_t* ass_read_subdata(sub_data* subdata, double fps) { +ass_track_t* ass_default_track() { ass_track_t* track = ass_new_track(); ass_style_t* style; - ass_event_t* event; - subtitle* sub; - int sid, eid; - int i; + int sid; double fs; track->track_type = TRACK_TYPE_ASS; - track->name = subdata->filename ? strdup(subdata->filename) : 0; track->Timer = 100.; track->PlayResX = 384; track->PlayResY = 288; @@ -71,22 +63,44 @@ style->ScaleX = 1.; style->ScaleY = 1.; - for (i = 0; i < subdata->sub_num; ++i) { - int len = 0, j; - char* p; - char* end; - sub = subdata->subtitles + i; - eid = ass_alloc_event(track); - event = track->events + eid; + return track; +} - event->Start = sub->start * 10; - event->Duration = (sub->end - sub->start) * 10; - if (!subdata->sub_uses_time) { - event->Start *= 100. / fps; - event->Duration *= 100. / fps; - } +static int check_duplicate_plaintext_event(ass_track_t* track) +{ + int i; + ass_event_t* evt = track->events + track->n_events - 1; - event->Style = sid; + for (i = 0; i<track->n_events - 1; ++i) // ignoring last event, it is the one we are comparing with + if (track->events[i].Start == evt->Start && + track->events[i].Duration == evt->Duration && + strcmp(track->events[i].Text, evt->Text) == 0) + return 1; + return 0; +} + +/** + * \brief Convert subtitle to ass_event_t for the given track + * \param ass_track_t track + * \param sub subtitle to convert + * \return event id + * note: assumes that subtitle is _not_ fps-based; caller must manually correct + * Start and Duration in other case. + **/ +int ass_process_subtitle(ass_track_t* track, subtitle* sub) +{ + int eid; + ass_event_t* event; + int len = 0, j; + char* p; + char* end; + + eid = ass_alloc_event(track); + event = track->events + eid; + + event->Start = sub->start * 10; + event->Duration = (sub->end - sub->start) * 10; + event->Style = 0; for (j = 0; j < sub->lines; ++j) len += sub->text[j] ? strlen(sub->text[j]) : 0; @@ -107,6 +121,41 @@ p--; // remove last ' ' *p = 0; + + if (check_duplicate_plaintext_event(track)) { + ass_free_event(track, eid); + track->n_events--; + return -1; + } + + mp_msg(MSGT_GLOBAL, MSGL_V, "plaintext event at %" PRId64 ", +%" PRId64 ": %s \n", + (int64_t)event->Start, (int64_t)event->Duration, event->Text); + + return eid; +} + + +/** + * \brief Convert subdata to ass_track + * \param subdata subtitles struct from subreader + * \param fps video framerate + * \return newly allocated ass_track, filled with subtitles from subdata + */ +ass_track_t* ass_read_subdata(sub_data* subdata, double fps) { + ass_track_t* track; + int i; + + track = ass_default_track(); + track->name = subdata->filename ? strdup(subdata->filename) : 0; + + for (i = 0; i < subdata->sub_num; ++i) { + int eid = ass_process_subtitle(track, subdata->subtitles + i); + if (eid < 0) + continue; + if (!subdata->sub_uses_time) { + track->events[eid].Start *= 100. / fps; + track->events[eid].Duration *= 100. / fps; + } } process_force_style(track); return track; Modified: trunk/libass/ass_mp.h ============================================================================== --- trunk/libass/ass_mp.h (original) +++ trunk/libass/ass_mp.h Sat Sep 2 22:46:26 2006 @@ -12,6 +12,8 @@ extern char **ass_force_style_list; extern int ass_use_margins; +ass_track_t* ass_default_track(); +int ass_process_subtitle(ass_track_t* track, subtitle* sub); ass_track_t* ass_read_subdata(sub_data* subdata, double fps); #endif Modified: trunk/libmpdemux/demux_mkv.c ============================================================================== --- trunk/libmpdemux/demux_mkv.c (original) +++ trunk/libmpdemux/demux_mkv.c Sat Sep 2 22:46:26 2006 @@ -2323,10 +2323,14 @@ for (i = 0; i < mkv_d->num_tracks; i++) { track = mkv_d->tracks[i]; - if ((track->type != MATROSKA_TRACK_SUBTITLE) || - (track->subtitle_type != MATROSKA_SUBTYPE_SSA)) + if (track->type != MATROSKA_TRACK_SUBTITLE) continue; + track->sh_sub.type = 'a'; + + if (track->subtitle_type == MATROSKA_SUBTYPE_SSA) + { + track->sh_sub.ass_track = ass_new_track(); size = track->private_size; m = demux_mkv_decode (track,track->private_data,&buffer,&size,2); if (buffer && m) @@ -2335,9 +2339,12 @@ track->private_data = buffer; track->private_size = size; } - track->sh_sub.type = 'a'; - track->sh_sub.ass_track = ass_new_track(); ass_process_codec_private(track->sh_sub.ass_track, track->private_data, track->private_size); + } + else + { + track->sh_sub.ass_track = ass_default_track(); + } } } #endif @@ -2812,6 +2819,9 @@ } static void +clear_subtitles(demuxer_t *demuxer, uint64_t timecode, int clear_all); + +static void handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block, int64_t size, uint64_t block_duration, uint64_t timecode) { @@ -2831,6 +2841,7 @@ ass_process_chunk(track->sh_sub.ass_track, block, size, (long long)timecode, (long long)block_duration); return; } + clear_subtitles(demuxer, timecode, 1); #endif ptr1 = block; @@ -2942,6 +2953,13 @@ mkv_d->clear_subs_at[mkv_d->subs.lines++] = timecode + block_duration; sub_utf8 = 1; +#ifdef USE_ASS + if (ass_enabled) { + mkv_d->subs.start = timecode / 10; + mkv_d->subs.end = (timecode + block_duration) / 10; + ass_process_subtitle(track->sh_sub.ass_track, &mkv_d->subs); + } else +#endif vo_sub = &mkv_d->subs; vo_osd_changed (OSDTYPE_SUBTITLE); } @@ -2958,6 +2976,9 @@ { lines_cut = mkv_d->subs.lines; mkv_d->subs.lines = 0; +#ifdef USE_ASS + if (!ass_enabled) +#endif if (lines_cut) { vo_sub = &mkv_d->subs; @@ -2981,6 +3002,9 @@ lines_cut = 1; } } +#ifdef USE_ASS + if (!ass_enabled) +#endif if (lines_cut) { vo_sub = &mkv_d->subs;

4 3

r20779 - trunk/liba52/parse.c
by gpoirier 05 Dec '06

05 Dec '06

Author: gpoirier Date: Wed Nov 8 15:48:36 2006 New Revision: 20779 Modified: trunk/liba52/parse.c Log: symplify aligned memory allocation on mingw32 by using ffmpeg's av_malloc/av_free Patch by Emanuele Giaquinta % e P giaquinta A glauco P it % Original thread: Subject: [MPlayer-dev-eng] [PATCH] liba52/parse.c: avoid dirty hack on mingw32 Date: 10/25/2006 03:19 AM Modified: trunk/liba52/parse.c ============================================================================== --- trunk/liba52/parse.c (original) +++ trunk/liba52/parse.c Wed Nov 8 15:48:36 2006 @@ -37,6 +37,7 @@ #include "bitstream.h" #include "tables.h" #include "mm_accel.h" +#include "libavutil/avutil.h" #ifdef HAVE_MEMALIGN /* some systems have memalign() but no declaration for it */ @@ -63,16 +64,10 @@ if (state == NULL) return NULL; - state->samples = memalign (16, 256 * 12 * sizeof (sample_t)); #if defined(__MINGW32__) && defined(HAVE_SSE) - for(i=0;i<10;i++){ - if((int)state->samples%16){ - sample_t* samplestmp=malloc(256 * 12 * sizeof (sample_t)); - free(state->samples); - state->samples = samplestmp; - } - else break; - } + state->samples = av_malloc(256 * 12 * sizeof (sample_t)); +#else + state->samples = memalign (16, 256 * 12 * sizeof (sample_t)); #endif if(((int)state->samples%16) && (mm_accel&MM_ACCEL_X86_SSE)){ mm_accel &=~MM_ACCEL_X86_SSE; @@ -915,6 +910,10 @@ void a52_free (a52_state_t * state) { - free (state->samples); +#if defined(__MINGW32__) && defined(HAVE_SSE) + av_free (state->samples); +#else + free (state->samples); +#endif free (state); }

3 2

r21381 - trunk/loader/win32.c
by reimar 03 Dec '06

03 Dec '06

Author: reimar Date: Wed Nov 29 13:20:05 2006 New Revision: 21381 Modified: trunk/loader/win32.c Log: Change add_stub code to also work without -fomit-frame-pointer Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c (original) +++ trunk/loader/win32.c Wed Nov 29 13:20:05 2006 @@ -5272,67 +5272,30 @@ static void ext_stubs(void) { - // expects: - // ax position index - // cx address of printf function -#if 1 - __asm__ __volatile__ - ( - "push %%edx \n\t" - "movl $0xdeadbeef, %%eax \n\t" - "movl $0xdeadbeef, %%edx \n\t" - "shl $5, %%eax \n\t" // ax * 32 - "addl $0xdeadbeef, %%eax \n\t" // overwrite export_names - "pushl %%eax \n\t" - "pushl $0xdeadbeef \n\t" // overwrite called_unk - "call *%%edx \n\t" // printf (via dx) - "addl $8, %%esp \n\t" - "xorl %%eax, %%eax \n\t" - "pop %%edx \n\t" - : - : - : "eax" - ); -#else - __asm__ __volatile__ - ( - "push %%edx \n\t" - "movl $0, %%eax \n\t" - "movl $0, %%edx \n\t" - "shl $5, %%eax \n\t" // ax * 32 - "addl %0, %%eax \n\t" - "pushl %%eax \n\t" - "pushl %1 \n\t" - "call *%%edx \n\t" // printf (via dx) - "addl $8, %%esp \n\t" - "xorl %%eax, %%eax \n\t" - "pop %%edx \n\t" - ::"m"(*export_names), "m"(*called_unk) - : "memory", "edx", "eax" - ); -#endif - + volatile int idx = 0xdeadabcd; + printf("Called unk_%s\n", export_names[idx]); } //static void add_stub(int pos) static int pos=0; static char extcode[20000];// place for 200 unresolved exports -static const char* called_unk = "Called unk_%s\n"; static void* add_stub(void) { + int i; // generated code in runtime! char* answ = (char*)extcode+pos*0x30; memcpy(answ, ext_stubs, 0x2f); // 0x2c is current size - //answ[4] = 0xb8; // movl $0, eax (0xb8 0x00000000) - *((int*) (answ + 5)) = pos; - //answ[9] = 0xba; // movl $0, edx (0xba 0x00000000) - *((long*) (answ + 10)) = (long)printf; - //answ[17] = 0x05; // addl $0, eax (0x05 0x00000000) - *((long*) (answ + 18)) = (long)export_names; - //answ[23] = 0x68; // pushl $0 (0x68 0x00000000) - *((long*) (answ + 24)) = (long)called_unk; + for (i = 0; i < 0x30 - 3; i++) { + if (*(int*)(answ + i) == 0xdeadabcd) + break; + } + if (*(int*)(answ + i) != 0xdeadabcd) { + printf("magic code not found in ext_subs, expect crash\n"); + return NULL; + } + *(int*)(answ + i) = pos; pos++; return (void*)answ; }

2 1

r21385 - trunk/libvo/osd_template.c
by reimar 02 Dec '06

02 Dec '06

Author: reimar Date: Wed Nov 29 14:49:48 2006 New Revision: 21385 Modified: trunk/libvo/osd_template.c Log: Avoid compiling code using %ah etc. on AMD64, since that will not work (problems only occur with -O0 or -Os, see also http://bugs.gentoo.org/show_bug.cgi?id=156375) Modified: trunk/libvo/osd_template.c ============================================================================== --- trunk/libvo/osd_template.c (original) +++ trunk/libvo/osd_template.c Wed Nov 29 14:49:48 2006 @@ -204,7 +204,7 @@ for(y=0;y<h;y++){ register unsigned char *dst = dstbase; register int x; -#ifdef ARCH_X86 +#if defined(ARCH_X86) && (!defined(ARCH_X86_64) || defined(HAVE_MMX)) #ifdef HAVE_MMX asm volatile( PREFETCHW" %0\n\t" @@ -277,7 +277,7 @@ dst += 3; } #endif /* !HAVE_MMX */ -#else /*non x86 arch*/ +#else /*non x86 arch or x86_64 with MMX disabled */ for(x=0;x<w;x++){ if(srca[x]){ #ifdef FAST_OSD @@ -324,7 +324,7 @@ #endif /* HAVE_MMX */ for(y=0;y<h;y++){ register int x; -#ifdef ARCH_X86 +#if defined(ARCH_X86) && (!defined(ARCH_X86_64) || defined(HAVE_MMX)) #ifdef HAVE_MMX #ifdef HAVE_3DNOW asm volatile( @@ -443,7 +443,7 @@ } } #endif /* HAVE_MMX */ -#else /*non x86 arch*/ +#else /*non x86 arch or x86_64 with MMX disabled */ for(x=0;x<w;x++){ if(srca[x]){ #ifdef FAST_OSD

4 7

r20272 - in trunk/libmpcodecs: Makefile vf.c vf_geq.c
by michael 02 Dec '06

02 Dec '06

Author: michael Date: Mon Oct 16 17:47:32 2006 New Revision: 20272 Added: trunk/libmpcodecs/vf_geq.c - copied, changed from r20265, /trunk/libmpcodecs/vf_qp.c Modified: trunk/libmpcodecs/Makefile trunk/libmpcodecs/vf.c Log: generic equation filter example: -vf 'geq=(p(X\,Y)+p(mod(Y*2-X*2\,W)\,mod(Y*2+X*2+sin((X-Y)/10/SW+N)*SW*20\,H)))/2' Modified: trunk/libmpcodecs/Makefile ============================================================================== --- trunk/libmpcodecs/Makefile (original) +++ trunk/libmpcodecs/Makefile Mon Oct 16 17:47:32 2006 @@ -188,6 +188,7 @@ VFILTER_LAVC_DSPUTIL_SRCS += vf_uspp.c \ vf_fspp.c \ vf_qp.c \ + vf_geq.c \ vf_spp.c \ vf_mcdeint.c \ Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c (original) +++ trunk/libmpcodecs/vf.c Mon Oct 16 17:47:32 2006 @@ -98,6 +98,7 @@ extern vf_info_t vf_info_mcdeint; extern vf_info_t vf_info_yadif; extern vf_info_t vf_info_blackframe; +extern vf_info_t vf_info_geq; // list of available filters: static vf_info_t* filter_list[]={ @@ -195,6 +196,9 @@ #endif &vf_info_yadif, &vf_info_blackframe, +#ifdef USE_LIBAVCODEC_DSPUTIL + &vf_info_geq, +#endif NULL }; Copied: trunk/libmpcodecs/vf_geq.c (from r20265, /trunk/libmpcodecs/vf_qp.c) ============================================================================== --- /trunk/libmpcodecs/vf_qp.c (original) +++ trunk/libmpcodecs/vf_geq.c Mon Oct 16 17:47:32 2006 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Michael Niedermayer <michaelni(a)gmx.at> + Copyright (C) 2006 Michael Niedermayer <michaelni(a)gmx.at> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -57,40 +57,16 @@ struct vf_priv_s { - char eq[200]; - int8_t *qp; - int8_t lut[257]; - int qp_stride; + char eq[3][200]; + int framenum; + mp_image_t *mpi; }; static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ - int h= (height+15)>>4; int i; - vf->priv->qp_stride= (width+15)>>4; - vf->priv->qp= av_malloc(vf->priv->qp_stride*h*sizeof(int8_t)); - - for(i=-129; i<128; i++){ - double const_values[]={ - M_PI, - M_E, - i != -129, - i, - 0 - }; - static const char *const_names[]={ - "PI", - "E", - "known", - "qp", - NULL - }; - - vf->priv->lut[i+129]= lrintf(ff_eval(vf->priv->eq, const_values, const_names, NULL, NULL, NULL, NULL, NULL)); - } - return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } @@ -111,9 +87,51 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } +//FIXME spatial interpolate +//FIXME keep the last few frames +static double lum(struct vf_instance_s* vf, double x, double y){ + mp_image_t *mpi= vf->priv->mpi; + x= clip(x, 0, vf->priv->mpi->w-1); + y= clip(y, 0, vf->priv->mpi->h-1); + return mpi->planes[0][(int)x + (int)y * mpi->stride[0]]; +} + +static double cb(struct vf_instance_s* vf, double x, double y){ + mp_image_t *mpi= vf->priv->mpi; + x= clip(x, 0, (vf->priv->mpi->w >> mpi->chroma_x_shift)-1); + y= clip(y, 0, (vf->priv->mpi->h >> mpi->chroma_y_shift)-1); + return mpi->planes[1][(int)x + (int)y * mpi->stride[1]]; +} + +static double cr(struct vf_instance_s* vf, double x, double y){ + mp_image_t *mpi= vf->priv->mpi; + x= clip(x, 0, (vf->priv->mpi->w >> mpi->chroma_x_shift)-1); + y= clip(y, 0, (vf->priv->mpi->h >> mpi->chroma_y_shift)-1); + return mpi->planes[2][(int)x + (int)y * mpi->stride[2]]; +} + static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; - int x,y; + int x,y, plane; + static const char *const_names[]={ + "PI", + "E", + "X", + "Y", + "W", + "H", + "N", + "SW", + "SH", + NULL + }; + static const char *func2_names[]={ + "lum", + "cb", + "cr", + "p", + NULL + }; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // no DR, so get a new image! hope we'll get DR buffer: @@ -123,43 +141,51 @@ } dmpi= vf->dmpi; - - if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ - memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h, dmpi->stride[0], mpi->stride[0]); - if(mpi->flags&MP_IMGFLAG_PLANAR){ - memcpy_pic(dmpi->planes[1], mpi->planes[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[1], mpi->stride[1]); - memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[2], mpi->stride[2]); - } - } + vf->priv->mpi= mpi; + vf_clone_mpi_attributes(dmpi, mpi); - - dmpi->qscale = vf->priv->qp; - dmpi->qstride= vf->priv->qp_stride; - if(mpi->qscale){ - for(y=0; y<((dmpi->h+15)>>4); y++){ - for(x=0; x<vf->priv->qp_stride; x++){ - dmpi->qscale[x + dmpi->qstride*y]= - vf->priv->lut[ 129 + ((int8_t)mpi->qscale[x + mpi->qstride*y]) ]; - } - } - }else{ - int qp= vf->priv->lut[0]; - for(y=0; y<((dmpi->h+15)>>4); y++){ - for(x=0; x<vf->priv->qp_stride; x++){ - dmpi->qscale[x + dmpi->qstride*y]= qp; + + for(plane=0; plane<3; plane++){ + int w= mpi->w >> (plane ? mpi->chroma_x_shift : 0); + int h= mpi->h >> (plane ? mpi->chroma_y_shift : 0); + uint8_t *dst = dmpi->planes[plane]; + int dst_stride= dmpi->stride[plane]; + double (*func2[])(void *, double, double)={ + lum, + cb, + cr, + plane==0 ? lum : (plane==1 ? cb : cr), + NULL + }; + double const_values[]={ + M_PI, + M_E, + 0, + 0, + w, + h, + vf->priv->framenum, + w/(double)mpi->w, + h/(double)mpi->h, + 0 + }; + for(y=0; y<h; y++){ + const_values[3]=y; + for(x=0; x<w; x++){ + const_values[2]=x; + dst[x+y* dst_stride]= ff_eval(vf->priv->eq[plane], const_values, const_names, NULL, NULL, func2, func2_names, vf); } } } + vf->priv->framenum++; + return vf_next_put_image(vf,dmpi, pts); } static void uninit(struct vf_instance_s* vf){ if(!vf->priv) return; - if(vf->priv->qp) av_free(vf->priv->qp); - vf->priv->qp= NULL; - av_free(vf->priv); vf->priv=NULL; } @@ -168,21 +194,22 @@ static int open(vf_instance_t *vf, char* args){ vf->config=config; vf->put_image=put_image; - vf->get_image=get_image; +// vf->get_image=get_image; vf->uninit=uninit; vf->priv=av_malloc(sizeof(struct vf_priv_s)); memset(vf->priv, 0, sizeof(struct vf_priv_s)); - -// avcodec_init(); - if (args) strncpy(vf->priv->eq, args, 199); - + if (args) sscanf(args, "%199s:%199s:%199s", vf->priv->eq[0], vf->priv->eq[1], vf->priv->eq[2]); + + if(!vf->priv->eq[1][0]) strncpy(vf->priv->eq[1], vf->priv->eq[0], 199); + if(!vf->priv->eq[2][0]) strncpy(vf->priv->eq[2], vf->priv->eq[1], 199); + return 1; } -vf_info_t vf_info_qp = { - "QP changer", - "qp", +vf_info_t vf_info_geq = { + "generic equation filter", + "geq", "Michael Niedermayer", "", open,

4 6

r19258 - trunk/DOCS/tech/oggless-xiph-codecs.txt
by michael 02 Dec '06

02 Dec '06

Author: michael Date: Sun Jul 30 11:13:01 2006 New Revision: 19258 Added: trunk/DOCS/tech/oggless-xiph-codecs.txt Log: alex didnt commit his (very incomplete) rfc conversation of my proposal so i commit mine here dont hesitate to fix typos, do rewordimg and so on for controversical changes please disscuss at nut-devel@mphq first Added: trunk/DOCS/tech/oggless-xiph-codecs.txt ============================================================================== --- (empty file) +++ trunk/DOCS/tech/oggless-xiph-codecs.txt Sun Jul 30 11:13:01 2006 @@ -0,0 +1,127 @@ +Title Embedding xiph codecs like vorbis in containers other then ogg +Version 2006-07-30 (draft) +Status this is not a standard or otherwise accepted by xiph or any other + group, one day when we have a fully working implementation, did + enough testing and so on we might submit it to IETF? to become an + RFC ... + furthermore this document has been submitted to vorbis-dev and + so far has been ignored, maybe they where too busy maybe xiph + wants to prevent their open codecs from being used in containers + other then their own? +Author Michael Niedermayer (michaelni at gmx dot at) +License GPL + GFDL + anything neeeded to turn this into a open standard + like a RFC + +Minimum container requirments: +This appendix only explains how to store xiph codecs in containers which +support at least one global header per stream, can seperate individual codec +packets and in principle support the codec, so for example in the case of +vorbis that would be variable bitrate and variable number of samples/packet +Storage in other containers is outside the scope of this appendix + + +FIXME non vorbis +Global header: +If the container can store 3 headers per stream in an unambiguos and ordered +way then they shall be stored in that way, if OTOH the container is only +capable to store a single global header then the 3 codec headers shall be +concatenated without any additional header, footer or seperator between them +to recover the 3 headers from such a global header the following procedure +shall be used: + +1) search for the 1st occurance of 01,'v','o','r','b','i','s' + the found match and the following 23 bytes are the 1st header packet +2) search for the 1st occurance of 03,'v','o','r','b','i','s' after here + 3) read an unsigned integer of 32 bits and skip that many bytes + 4) [user_comment_list_length] = read an unsigned integer of 32 bits + 5) iterate [user_comment_list_length] times { + 6) read an unsigned integer of 32 bits and skip that many bytes + } + 7) skip 1 byte +8) the match in 2) and what follows until here is the 2nd header packet +9) search for the 1st occurance of 05,'v','o','r','b','i','s' after here + the matching part and what follows is the 3rd header packet +if the container needs an identifer for the global header, for example a 4cc +for a global header chunk then glbl shall be used + + +Storing packets: +Each codec packet shall be stored in exactly one "container packet" +and one "container packet" must not contain more then one codec packet +"container packet" here means the smallest seperateable unit of data in the +container + + +Codec Identifer: +xiph-codec 4-cc id long id +Vorbis vrbs vorbis +Theora ther theora +Tarkin trkn tarkin +Flac flac flac +Speex spex speex + +if the container uses 4-character codes 4-cc identifer from the table above +shall be used +if the container uses arbitrary length strings as identifers then the long +id from the table above shall be used + + +Examples and Disscussions about specific containers +What follows are some notes about specific containers, these notes are just +informative as they just repeat what is written above or in the +specification of the specific container + + +Example and Disscussion of the avi container +avi supports everything needed to store vorbis, this does not mean that all +application will support vorbis in avi as vorbis is rather different from +other audio codecs commonly stored in avi ... +avi supports a single global header like wav does, the 3 vorbis headers +shall be stored in it and only in it as described above +dwSampleSize must be set to zero as vorbis is vbr, many applications do +this incorrectly for other vbr codecs and consequently vbr audio in avi +becomes problematic +avi does not have timestamps but each chunk has a constant duration, while +vorbis packets can have one of 2 durations, if now the avi header is setup +so that each avi chunk has the same duration as the smaller duration of +the 2 possibilities in vorbis then simply inserting empty avi chunks will +allow every avi chunk to have the correct duration, this is of course +not the most beautifull solution but it is the only way to keep things +exact, additionally note, that empty chunks have been used since ages +in avi to lengthen the duration of video chunks + + +Example and Disscussion of the asf container +asf supports a single global header per stream and has timestamps so +storing xiph codecs in it should be possible but asf is patented and +microsoft has already threatened individuals so we strongly urge you to +avoid this container + + +Example and Disscussion of the matroska container +matroska supports storing 3 headers using a codec specific +format, which should be used for storing the 3 headers +Note, the above procedure to split one header into 3 works with the +vorbis-matroska specific format too + + +Example and Disscussion of the nut container +nut supports a single global header per stream so the 1<->3 merge/split +procedure above must be used, except that theres nothing special with +storing xiph codecs in nut + + +Example and Disscussion of mpeg-ps / mpeg-ts container +These containers neither support a global header nor provide the neccessary +packet seperation / framing, so storing xiph codecs in them is outside the +scope of this appendix + + +Example and Disscussion of wav container +wav does not provide the neccessary packet seperation / framing, so storing +xiph codecs in it is outside the scope of this appendix + + +Example and Disscussion of the mov container +a single glbl atom shall be placed in the stsd atom in which the the global +header shall be stored

10 50

r21213 - in trunk/stream: stream_dvdnav.c stream_dvdnav.h
by nicodvb 01 Dec '06

01 Dec '06

Author: nicodvb Date: Sat Nov 25 13:17:34 2006 New Revision: 21213 Modified: trunk/stream/stream_dvdnav.c trunk/stream/stream_dvdnav.h Log: added code to identify subs language and count; needed for forthcoming support for -slang Modified: trunk/stream/stream_dvdnav.c ============================================================================== --- trunk/stream/stream_dvdnav.c (original) +++ trunk/stream/stream_dvdnav.c Sat Nov 25 13:17:34 2006 @@ -476,6 +476,34 @@ priv->mousey = y; } +int dvdnav_sid_from_lang(stream_t *stream, unsigned char *language) { + dvdnav_priv_t * priv=(dvdnav_priv_t*)stream->priv; + uint8_t format, lg, k; + uint16_t lang, lcode = (language[0] << 8) | (language[1]); + + for(k=0; k<32; k++) { + lg = dvdnav_get_spu_logical_stream(priv->dvdnav, k); + if(lg == 0xff) continue; + lang = dvdnav_spu_stream_to_lang(priv->dvdnav, lg); + if(lang != 0xFFFF && lang == lcode) { + return k; + } + } + return -1; +} + +int dvdnav_number_of_subs(stream_t *stream) { + dvdnav_priv_t * priv=(dvdnav_priv_t*)stream->priv; + uint8_t lg, k, n=0; + + for(k=0; k<32; k++) { + lg = dvdnav_get_spu_logical_stream(priv->dvdnav, k); + if(lg == 0xff) continue; + n++; + } + return n; +} + stream_info_t stream_info_dvdnav = { "DVDNAV stream", Modified: trunk/stream/stream_dvdnav.h ============================================================================== --- trunk/stream/stream_dvdnav.h (original) +++ trunk/stream/stream_dvdnav.h Sat Nov 25 13:17:34 2006 @@ -33,6 +33,8 @@ extern int osd_show_dvd_nav_sy; extern int osd_show_dvd_nav_ey; +int dvdnav_number_of_subs(stream_t *stream); +int dvdnav_sid_from_lang(stream_t *stream, unsigned char *language); int mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button); void mp_dvdnav_update_mouse_pos(stream_t *stream, int32_t x, int32_t y, int* button);

3 3

r21404 - trunk/libmpdemux/ebml.c
by reimar 30 Nov '06

30 Nov '06

Author: reimar Date: Thu Nov 30 18:55:00 2006 New Revision: 21404 Modified: trunk/libmpdemux/ebml.c Log: Use av_int2flt/av_int2dbl to read float values. This is simpler and more correct since it also works for int endianness != float endianness. Modified: trunk/libmpdemux/ebml.c ============================================================================== --- trunk/libmpdemux/ebml.c (original) +++ trunk/libmpdemux/ebml.c Thu Nov 30 18:55:00 2006 @@ -13,6 +13,7 @@ #include "ebml.h" #include "libavutil/common.h" #include "libavutil/bswap.h" +#include "libavutil/intfloat_readwrite.h" #ifndef SIZE_MAX @@ -179,20 +180,12 @@ switch (len) { case 4: - { - union {uint32_t i; float f;} u; - u.i = stream_read_dword (s); - value = u.f; + value = av_int2flt(stream_read_dword(s)); break; - } case 8: - { - union {uint64_t i; double d;} u; - u.i = stream_read_qword (s); - value = u.d; + value = av_int2dbl(stream_read_qword(s)); break; - } default: return EBML_FLOAT_INVALID;

1 0

r21403 - in trunk/libmpdemux: aviheader.c demux_avi.c
by reimar 30 Nov '06

30 Nov '06

Author: reimar Date: Thu Nov 30 18:48:00 2006 New Revision: 21403 Modified: trunk/libmpdemux/aviheader.c trunk/libmpdemux/demux_avi.c Log: Move initialization of sh_audio/sh_video members to aviheader where possible so that all a_streams[]/v_streams[] are initialized and switching becomes simpler. Modified: trunk/libmpdemux/aviheader.c ============================================================================== --- trunk/libmpdemux/aviheader.c (original) +++ trunk/libmpdemux/aviheader.c Thu Nov 30 18:48:00 2006 @@ -195,10 +195,12 @@ if(h.fccType==streamtypeVIDEO){ sh_video=new_sh_video(demuxer,stream_id); memcpy(&sh_video->video,&h,sizeof(h)); + sh_video->stream_delay = (float)sh_video->video.dwStart * sh_video->video.dwScale/sh_video->video.dwRate; } else if(h.fccType==streamtypeAUDIO){ sh_audio=new_sh_audio(demuxer,stream_id); memcpy(&sh_audio->audio,&h,sizeof(h)); + sh_audio->stream_delay = (float)sh_audio->audio.dwStart * sh_audio->audio.dwScale/sh_audio->audio.dwRate; } last_fccType=h.fccType; if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_strh(&h,MSGL_V); @@ -264,8 +266,8 @@ sh_video->bih->biSize=chunksize; if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih,MSGL_V); chunksize=0; -// sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; -// sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; + sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; + sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; // if(demuxer->video->id==-1) demuxer->video->id=stream_id; // IdxFix: idxfix_videostream=stream_id; @@ -316,6 +318,8 @@ wf_size < sizeof(WAVEFORMATEX)+sh_audio->wf->cbSize) { sh_audio->wf=realloc(sh_audio->wf, sizeof(WAVEFORMATEX)+sh_audio->wf->cbSize); } + sh_audio->format=sh_audio->wf->wFormatTag; + sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; chunksize=0; if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf,MSGL_V); ++priv->audio_streams; Modified: trunk/libmpdemux/demux_avi.c ============================================================================== --- trunk/libmpdemux/demux_avi.c (original) +++ trunk/libmpdemux/demux_avi.c Thu Nov 30 18:48:00 2006 @@ -499,12 +499,8 @@ d_audio->sh=sh_audio=NULL; } else { sh_audio=d_audio->sh;sh_audio->ds=d_audio; - sh_audio->format=sh_audio->wf->wFormatTag; } } - // calc. FPS: - sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; - sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; // calculating audio/video bitrate: if(priv->idx_size>0){ @@ -546,7 +542,6 @@ if(sh_audio){ if(sh_audio->wf->nAvgBytesPerSec && sh_audio->audio.dwSampleSize!=1){ asize=(float)sh_audio->wf->nAvgBytesPerSec*sh_audio->audio.dwLength*sh_audio->audio.dwScale/sh_audio->audio.dwRate; - sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; } else { asize=sh_audio->audio.dwLength; sh_audio->i_bps=(float)asize/(sh_video->frametime*priv->numberofframes); @@ -557,11 +552,6 @@ sh_video->i_bps=(float)vsize/(sh_video->frametime*priv->numberofframes); } - if (sh_video) - sh_video->stream_delay = (float)sh_video->video.dwStart * sh_video->video.dwScale/sh_video->video.dwRate; - if (sh_audio) - sh_audio->stream_delay = (float)sh_audio->audio.dwStart * sh_audio->audio.dwScale/sh_audio->audio.dwRate; - return demuxer; }

1 0