September 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

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

r19836 - trunk/libmpcodecs/vf_yadif.c
by lorenm 28 Nov '06

28 Nov '06

Author: lorenm Date: Thu Sep 14 06:00:49 2006 New Revision: 19836 Modified: trunk/libmpcodecs/vf_yadif.c Log: mmx implementation of yadif. 3.5x faster. Modified: trunk/libmpcodecs/vf_yadif.c ============================================================================== --- trunk/libmpcodecs/vf_yadif.c (original) +++ trunk/libmpcodecs/vf_yadif.c Thu Sep 14 06:00:49 2006 @@ -23,6 +23,7 @@ #include <math.h> #include "config.h" +#include "cpudetect.h" #include "mp_msg.h" @@ -55,6 +56,8 @@ uint8_t *ref[4][3]; }; +static void (*filter_line)(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int refs, int parity); + static void store_ref(struct vf_priv_s *p, uint8_t *src[3], int src_stride[3], int width, int height){ int i; @@ -68,7 +71,226 @@ } } -static void filter_line(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int refs, int parity){ +#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ == 0) +#undef HAVE_MMX +#endif + +#ifdef HAVE_MMX + +#define LOAD4(mem,dst) \ + "movd "mem", "#dst" \n\t"\ + "punpcklbw %%mm7, "#dst" \n\t" + +#define PABS(tmp,dst) \ + "pxor "#tmp", "#tmp" \n\t"\ + "psubw "#dst", "#tmp" \n\t"\ + "pmaxsw "#tmp", "#dst" \n\t" + +#define CHECK(pj,mj) \ + "movq "#pj"-1(%[cur],%[mrefs]), %%mm2 \n\t" /* cur[x-refs-1+j] */\ + "movq "#mj"-1(%[cur],%[prefs]), %%mm3 \n\t" /* cur[x+refs-1-j] */\ + "movq %%mm2, %%mm4 \n\t"\ + "movq %%mm2, %%mm5 \n\t"\ + "pxor %%mm3, %%mm4 \n\t"\ + "pavgb %%mm3, %%mm5 \n\t"\ + "pand %[pb1], %%mm4 \n\t"\ + "psubusb %%mm4, %%mm5 \n\t"\ + "psrlq $8, %%mm5 \n\t"\ + "punpcklbw %%mm7, %%mm5 \n\t" /* (cur[x-refs+j] + cur[x+refs-j])>>1 */\ + "movq %%mm2, %%mm4 \n\t"\ + "psubusb %%mm3, %%mm2 \n\t"\ + "psubusb %%mm4, %%mm3 \n\t"\ + "pmaxub %%mm3, %%mm2 \n\t"\ + "movq %%mm2, %%mm3 \n\t"\ + "movq %%mm2, %%mm4 \n\t" /* ABS(cur[x-refs-1+j] - cur[x+refs-1-j]) */\ + "psrlq $8, %%mm3 \n\t" /* ABS(cur[x-refs +j] - cur[x+refs -j]) */\ + "psrlq $16, %%mm4 \n\t" /* ABS(cur[x-refs+1+j] - cur[x+refs+1-j]) */\ + "punpcklbw %%mm7, %%mm2 \n\t"\ + "punpcklbw %%mm7, %%mm3 \n\t"\ + "punpcklbw %%mm7, %%mm4 \n\t"\ + "paddw %%mm3, %%mm2 \n\t"\ + "paddw %%mm4, %%mm2 \n\t" /* score */ + +#define CHECK1 \ + "movq %%mm0, %%mm3 \n\t"\ + "pcmpgtw %%mm2, %%mm3 \n\t" /* if(score < spatial_score) */\ + "pminsw %%mm2, %%mm0 \n\t" /* spatial_score= score; */\ + "movq %%mm3, %%mm6 \n\t"\ + "pand %%mm3, %%mm5 \n\t"\ + "pandn %%mm1, %%mm3 \n\t"\ + "por %%mm5, %%mm3 \n\t"\ + "movq %%mm3, %%mm1 \n\t" /* spatial_pred= (cur[x-refs+j] + cur[x+refs-j])>>1; */ + +#define CHECK2 /* pretend not to have checked dir=2 if dir=1 was bad.\ + hurts both quality and speed, but matches the C version. */\ + "paddw %[pw1], %%mm6 \n\t"\ + "psllw $14, %%mm6 \n\t"\ + "paddsw %%mm6, %%mm2 \n\t"\ + "movq %%mm0, %%mm3 \n\t"\ + "pcmpgtw %%mm2, %%mm3 \n\t"\ + "pminsw %%mm2, %%mm0 \n\t"\ + "pand %%mm3, %%mm5 \n\t"\ + "pandn %%mm1, %%mm3 \n\t"\ + "por %%mm5, %%mm3 \n\t"\ + "movq %%mm3, %%mm1 \n\t" + +static void filter_line_mmx2(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int refs, int parity){ + static const uint64_t pw_1 = 0x0001000100010001ULL; + static const uint64_t pb_1 = 0x0101010101010101ULL; + const int mode = p->mode; + uint64_t tmp0, tmp1, tmp2, tmp3; + int x; + +#define FILTER\ + for(x=0; x<w; x+=4){\ + asm volatile(\ + "pxor %%mm7, %%mm7 \n\t"\ + LOAD4("(%[cur],%[mrefs])", %%mm0) /* c = cur[x-refs] */\ + LOAD4("(%[cur],%[prefs])", %%mm1) /* e = cur[x+refs] */\ + LOAD4("(%["prev2"])", %%mm2) /* prev2[x] */\ + LOAD4("(%["next2"])", %%mm3) /* next2[x] */\ + "movq %%mm3, %%mm4 \n\t"\ + "paddw %%mm2, %%mm3 \n\t"\ + "psraw $1, %%mm3 \n\t" /* d = (prev2[x] + next2[x])>>1 */\ + "movq %%mm0, %[tmp0] \n\t" /* c */\ + "movq %%mm3, %[tmp1] \n\t" /* d */\ + "movq %%mm1, %[tmp2] \n\t" /* e */\ + "psubw %%mm4, %%mm2 \n\t"\ + PABS( %%mm4, %%mm2) /* temporal_diff0 */\ + LOAD4("(%[prev],%[mrefs])", %%mm3) /* prev[x-refs] */\ + LOAD4("(%[prev],%[prefs])", %%mm4) /* prev[x+refs] */\ + "psubw %%mm0, %%mm3 \n\t"\ + "psubw %%mm1, %%mm4 \n\t"\ + PABS( %%mm5, %%mm3)\ + PABS( %%mm5, %%mm4)\ + "paddw %%mm4, %%mm3 \n\t" /* temporal_diff1 */\ + "psrlw $1, %%mm2 \n\t"\ + "psrlw $1, %%mm3 \n\t"\ + "pmaxsw %%mm3, %%mm2 \n\t"\ + LOAD4("(%[next],%[mrefs])", %%mm3) /* next[x-refs] */\ + LOAD4("(%[next],%[prefs])", %%mm4) /* next[x+refs] */\ + "psubw %%mm0, %%mm3 \n\t"\ + "psubw %%mm1, %%mm4 \n\t"\ + PABS( %%mm5, %%mm3)\ + PABS( %%mm5, %%mm4)\ + "paddw %%mm4, %%mm3 \n\t" /* temporal_diff2 */\ + "psrlw $1, %%mm3 \n\t"\ + "pmaxsw %%mm3, %%mm2 \n\t"\ + "movq %%mm2, %[tmp3] \n\t" /* diff */\ +\ + "paddw %%mm0, %%mm1 \n\t"\ + "paddw %%mm0, %%mm0 \n\t"\ + "psubw %%mm1, %%mm0 \n\t"\ + "psrlw $1, %%mm1 \n\t" /* spatial_pred */\ + PABS( %%mm2, %%mm0) /* ABS(c-e) */\ +\ + "movq -1(%[cur],%[mrefs]), %%mm2 \n\t" /* cur[x-refs-1] */\ + "movq -1(%[cur],%[prefs]), %%mm3 \n\t" /* cur[x+refs-1] */\ + "movq %%mm2, %%mm4 \n\t"\ + "psubusb %%mm3, %%mm2 \n\t"\ + "psubusb %%mm4, %%mm3 \n\t"\ + "pmaxub %%mm3, %%mm2 \n\t"\ + "pshufw $9,%%mm2, %%mm3 \n\t"\ + "punpcklbw %%mm7, %%mm2 \n\t" /* ABS(cur[x-refs-1] - cur[x+refs-1]) */\ + "punpcklbw %%mm7, %%mm3 \n\t" /* ABS(cur[x-refs+1] - cur[x+refs+1]) */\ + "paddw %%mm2, %%mm0 \n\t"\ + "paddw %%mm3, %%mm0 \n\t"\ + "psubw %[pw1], %%mm0 \n\t" /* spatial_score */\ +\ + CHECK(-1,1)\ + CHECK1\ + CHECK(-2,2)\ + CHECK2\ + CHECK(1,-1)\ + CHECK1\ + CHECK(2,-2)\ + CHECK2\ +\ + /* if(p->mode<2) ... */\ + "movq %[tmp3], %%mm6 \n\t" /* diff */\ + "cmp $2, %[mode] \n\t"\ + "jge 1f \n\t"\ + LOAD4("(%["prev2"],%[mrefs],2)", %%mm2) /* prev2[x-2*refs] */\ + LOAD4("(%["next2"],%[mrefs],2)", %%mm4) /* next2[x-2*refs] */\ + LOAD4("(%["prev2"],%[prefs],2)", %%mm3) /* prev2[x+2*refs] */\ + LOAD4("(%["next2"],%[prefs],2)", %%mm5) /* next2[x+2*refs] */\ + "paddw %%mm4, %%mm2 \n\t"\ + "paddw %%mm5, %%mm3 \n\t"\ + "psrlw $1, %%mm2 \n\t" /* b */\ + "psrlw $1, %%mm3 \n\t" /* f */\ + "movq %[tmp0], %%mm4 \n\t" /* c */\ + "movq %[tmp1], %%mm5 \n\t" /* d */\ + "movq %[tmp2], %%mm7 \n\t" /* e */\ + "psubw %%mm4, %%mm2 \n\t" /* b-c */\ + "psubw %%mm7, %%mm3 \n\t" /* f-e */\ + "movq %%mm5, %%mm0 \n\t"\ + "psubw %%mm4, %%mm5 \n\t" /* d-c */\ + "psubw %%mm7, %%mm0 \n\t" /* d-e */\ + "movq %%mm2, %%mm4 \n\t"\ + "pminsw %%mm3, %%mm2 \n\t"\ + "pmaxsw %%mm4, %%mm3 \n\t"\ + "pmaxsw %%mm5, %%mm2 \n\t"\ + "pminsw %%mm5, %%mm3 \n\t"\ + "pmaxsw %%mm0, %%mm2 \n\t" /* max */\ + "pminsw %%mm0, %%mm3 \n\t" /* min */\ + "pxor %%mm4, %%mm4 \n\t"\ + "pmaxsw %%mm3, %%mm6 \n\t"\ + "psubw %%mm2, %%mm4 \n\t" /* -max */\ + "pmaxsw %%mm4, %%mm6 \n\t" /* diff= MAX3(diff, min, -max); */\ + "1: \n\t"\ +\ + "movq %[tmp1], %%mm2 \n\t" /* d */\ + "movq %%mm2, %%mm3 \n\t"\ + "psubw %%mm6, %%mm2 \n\t" /* d-diff */\ + "paddw %%mm6, %%mm3 \n\t" /* d+diff */\ + "pmaxsw %%mm2, %%mm1 \n\t"\ + "pminsw %%mm3, %%mm1 \n\t" /* d = clip(spatial_pred, d-diff, d+diff); */\ + "packuswb %%mm1, %%mm1 \n\t"\ +\ + :[tmp0]"=m"(tmp0),\ + [tmp1]"=m"(tmp1),\ + [tmp2]"=m"(tmp2),\ + [tmp3]"=m"(tmp3)\ + :[prev] "r"(prev),\ + [cur] "r"(cur),\ + [next] "r"(next),\ + [prefs]"r"((long)refs),\ + [mrefs]"r"((long)-refs),\ + [pw1] "m"(pw_1),\ + [pb1] "m"(pb_1),\ + [mode] "g"(mode)\ + );\ + asm volatile("movd %%mm1, %0" :"=m"(*dst));\ + dst += 4;\ + prev+= 4;\ + cur += 4;\ + next+= 4;\ + } + + if(parity){ +#define prev2 "prev" +#define next2 "cur" + FILTER +#undef prev2 +#undef next2 + }else{ +#define prev2 "cur" +#define next2 "next" + FILTER +#undef prev2 +#undef next2 + } +} +#undef LOAD4 +#undef PABS +#undef CHECK +#undef CHECK1 +#undef CHECK2 +#undef FILTER + +#endif // HAVE_MMX + +static void filter_line_c(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int refs, int parity){ int x; uint8_t *prev2= parity ? prev : cur ; uint8_t *next2= parity ? cur : next; @@ -262,6 +484,11 @@ if (args) sscanf(args, "%d:%d", &vf->priv->mode, &vf->priv->parity); + filter_line = filter_line_c; +#ifdef HAVE_MMX + if(gCpuCaps.hasMMX2) filter_line = filter_line_mmx2; +#endif + return 1; }

7 7

r19409 - trunk/libmpcodecs/dec_audio.c
by ivo 06 Oct '06

06 Oct '06

Author: ivo Date: Tue Aug 15 22:06:31 2006 New Revision: 19409 Modified: trunk/libmpcodecs/dec_audio.c Log: display correct audio bitrate, samplerate and number of channels once they are known for mplayer -identify Modified: trunk/libmpcodecs/dec_audio.c ============================================================================== --- trunk/libmpcodecs/dec_audio.c (original) +++ trunk/libmpcodecs/dec_audio.c Tue Aug 15 22:06:31 2006 @@ -112,6 +112,9 @@ af_fmt2str_short(sh_audio->sample_format), sh_audio->i_bps*8*0.001,((float)sh_audio->i_bps/sh_audio->o_bps)*100.0, sh_audio->i_bps,sh_audio->o_bps); + mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_BITRATE=%d\nID_AUDIO_RATE=%d\n" + "ID_AUDIO_NCH=%d\n", sh_audio->i_bps, sh_audio->samplerate, + sh_audio->channels ); sh_audio->a_out_buffer_size=sh_audio->a_buffer_size; sh_audio->a_out_buffer=sh_audio->a_buffer;

3 2

r20009 - trunk/m_option.c
by reimar 29 Sep '06

29 Sep '06

Author: reimar Date: Sat Sep 30 01:23:41 2006 New Revision: 20009 Modified: trunk/m_option.c Log: Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice, e.g. "mplayer file -endpos 01" would try to play the file "01", too Modified: trunk/m_option.c ============================================================================== --- trunk/m_option.c (original) +++ trunk/m_option.c Sat Sep 30 01:23:41 2006 @@ -1178,13 +1178,7 @@ // Time or size (-endpos) static int parse_time_size(m_option_t* opt,char *name, char *param, void* dst, int src) { - - if (dst == NULL) - return 0; - - m_time_size_t* ts = dst; - ts->pos=0; - + m_time_size_t ts; char unit[4]; int a,b; float d; @@ -1193,9 +1187,10 @@ if (param == NULL || strlen(param) == 0) return M_OPT_MISSING_PARAM; + ts.pos=0; /* End at size parsing */ if(sscanf(param, "%lf%3s", &end_at, unit) == 2) { - ts->type = END_AT_SIZE; + ts.type = END_AT_SIZE; if(!strcasecmp(unit, "b")) ; else if(!strcasecmp(unit, "kb")) @@ -1205,11 +1200,11 @@ else if(!strcasecmp(unit, "gb")) end_at *= 1024*1024*1024; else - ts->type = END_AT_NONE; + ts.type = END_AT_NONE; - if (ts->type == END_AT_SIZE) { - ts->pos = end_at; - return 1; + if (ts.type == END_AT_SIZE) { + ts.pos = end_at; + goto out; } } @@ -1227,9 +1222,11 @@ return M_OPT_INVALID; } - ts->type = END_AT_TIME; - ts->pos = end_at; - + ts.type = END_AT_TIME; + ts.pos = end_at; +out: + if(dst) + *(m_time_size_t *)dst = ts; return 1; }

1 0

r20007 - trunk/TOOLS/cpuinfo.c
by reimar 29 Sep '06

29 Sep '06

Author: reimar Date: Fri Sep 29 17:35:29 2006 New Revision: 20007 Modified: trunk/TOOLS/cpuinfo.c Log: Remove another duplicate and useless ; Modified: trunk/TOOLS/cpuinfo.c ============================================================================== --- trunk/TOOLS/cpuinfo.c (original) +++ trunk/TOOLS/cpuinfo.c Fri Sep 29 17:35:29 2006 @@ -152,7 +152,7 @@ if (max_cpuid >= 1) { static struct { int bit; - char *desc;; + char *desc; } cap[] = { CPUID_FEATURE_DEF(0, "fpu", "Floating-point unit on-chip"), CPUID_FEATURE_DEF(1, "vme", "Virtual Mode Enhancements"),

1 0

r20006 - trunk/TOOLS/cpuinfo.c
by gpoirier 29 Sep '06

29 Sep '06

Author: gpoirier Date: Fri Sep 29 14:36:17 2006 New Revision: 20006 Modified: trunk/TOOLS/cpuinfo.c Log: Remove useless trailing ';' Modified: trunk/TOOLS/cpuinfo.c ============================================================================== --- trunk/TOOLS/cpuinfo.c (original) +++ trunk/TOOLS/cpuinfo.c Fri Sep 29 14:36:17 2006 @@ -203,7 +203,7 @@ }; static struct { int bit; - char *desc;; + char *desc; } cap_amd[] = { CPUID_FEATURE_DEF(11, "syscall", "SYSCALL and SYSRET"), CPUID_FEATURE_DEF(19, "mp", "MP Capable"),

1 0

r20005 - trunk/TOOLS/cpuinfo.c
by gpoirier 29 Sep '06

29 Sep '06

Author: gpoirier Date: Fri Sep 29 14:34:38 2006 New Revision: 20005 Modified: trunk/TOOLS/cpuinfo.c Log: Convert strings to comments since they're never used, patch by Zuxy Meng % zuxy P meng A gmail P com % Original thread: Date: Sep 19, 2006 7:33 AM Subject: [MPlayer-dev-eng] [PATCH] Cleanup of TOOLS/cpuinfo.c Modified: trunk/TOOLS/cpuinfo.c ============================================================================== --- trunk/TOOLS/cpuinfo.c (original) +++ trunk/TOOLS/cpuinfo.c Fri Sep 29 14:34:38 2006 @@ -33,6 +33,8 @@ #include <inttypes.h> #endif +#define CPUID_FEATURE_DEF(bit, desc, description) \ + { bit, desc } typedef struct cpuid_regs { unsigned int eax; @@ -151,81 +153,77 @@ static struct { int bit; char *desc;; - char *description; } cap[] = { - { 0, "fpu", "Floating-point unit on-chip" }, - { 1, "vme", "Virtual Mode Enhancements" }, - { 2, "de", "Debugging Extension" }, - { 3, "pse", "Page Size Extension" }, - { 4, "tsc", "Time Stamp Counter" }, - { 5, "msr", "Pentium Processor MSR" }, - { 6, "pae", "Physical Address Extension" }, - { 7, "mce", "Machine Check Exception" }, - { 8, "cx8", "CMPXCHG8B Instruction Supported" }, - { 9, "apic", "On-chip APIC Hardware Enabled" }, - { 11, "sep", "SYSENTER and SYSEXIT" }, - { 12, "mtrr", "Memory Type Range Registers" }, - { 13, "pge", "PTE Global Bit" }, - { 14, "mca", "Machine Check Architecture" }, - { 15, "cmov", "Conditional Move/Compare Instruction" }, - { 16, "pat", "Page Attribute Table" }, - { 17, "pse36", "Page Size Extension 36-bit" }, - { 18, "pn", "Processor Serial Number" }, - { 19, "cflsh", "CFLUSH instruction" }, - { 21, "dts", "Debug Store" }, - { 22, "acpi", "Thermal Monitor and Clock Ctrl" }, - { 23, "mmx", "MMX Technology" }, - { 24, "fxsr", "FXSAVE/FXRSTOR" }, - { 25, "sse", "SSE Extensions" }, - { 26, "sse2", "SSE2 Extensions" }, - { 27, "ss", "Self Snoop" }, - { 28, "ht", "Multi-threading" }, - { 29, "tm", "Therm. Monitor" }, - { 30, "ia64", "IA-64 Processor" }, - { 31, "pbe", "Pend. Brk. EN." }, + CPUID_FEATURE_DEF(0, "fpu", "Floating-point unit on-chip"), + CPUID_FEATURE_DEF(1, "vme", "Virtual Mode Enhancements"), + CPUID_FEATURE_DEF(2, "de", "Debugging Extension"), + CPUID_FEATURE_DEF(3, "pse", "Page Size Extension"), + CPUID_FEATURE_DEF(4, "tsc", "Time Stamp Counter"), + CPUID_FEATURE_DEF(5, "msr", "Pentium Processor MSR"), + CPUID_FEATURE_DEF(6, "pae", "Physical Address Extension"), + CPUID_FEATURE_DEF(7, "mce", "Machine Check Exception"), + CPUID_FEATURE_DEF(8, "cx8", "CMPXCHG8B Instruction Supported"), + CPUID_FEATURE_DEF(9, "apic", "On-chip APIC Hardware Enabled"), + CPUID_FEATURE_DEF(11, "sep", "SYSENTER and SYSEXIT"), + CPUID_FEATURE_DEF(12, "mtrr", "Memory Type Range Registers"), + CPUID_FEATURE_DEF(13, "pge", "PTE Global Bit"), + CPUID_FEATURE_DEF(14, "mca", "Machine Check Architecture"), + CPUID_FEATURE_DEF(15, "cmov", "Conditional Move/Compare Instruction"), + CPUID_FEATURE_DEF(16, "pat", "Page Attribute Table"), + CPUID_FEATURE_DEF(17, "pse36", "Page Size Extension 36-bit"), + CPUID_FEATURE_DEF(18, "pn", "Processor Serial Number"), + CPUID_FEATURE_DEF(19, "cflsh", "CFLUSH instruction"), + CPUID_FEATURE_DEF(21, "dts", "Debug Store"), + CPUID_FEATURE_DEF(22, "acpi", "Thermal Monitor and Clock Ctrl"), + CPUID_FEATURE_DEF(23, "mmx", "MMX Technology"), + CPUID_FEATURE_DEF(24, "fxsr", "FXSAVE/FXRSTOR"), + CPUID_FEATURE_DEF(25, "sse", "SSE Extensions"), + CPUID_FEATURE_DEF(26, "sse2", "SSE2 Extensions"), + CPUID_FEATURE_DEF(27, "ss", "Self Snoop"), + CPUID_FEATURE_DEF(28, "ht", "Multi-threading"), + CPUID_FEATURE_DEF(29, "tm", "Therm. Monitor"), + CPUID_FEATURE_DEF(30, "ia64", "IA-64 Processor"), + CPUID_FEATURE_DEF(31, "pbe", "Pend. Brk. EN."), { -1 } }; static struct { int bit; char *desc; - char *description; } cap2[] = { - { 0, "pni", "SSE3 Extensions" }, - { 3, "monitor", "MONITOR/MWAIT" }, - { 4, "ds_cpl", "CPL Qualified Debug Store" }, - { 5, "vmx", "Virtual Machine Extensions" }, - { 7, "est", "Enhanced Intel SpeedStep Technology" }, - { 8, "tm2", "Thermal Monitor 2" }, - { 10, "cid", "L1 Context ID" }, - { 13, "cx16", "CMPXCHG16B Available" }, - { 14, "xtpr", "xTPR Disable" }, + CPUID_FEATURE_DEF(0, "pni", "SSE3 Extensions"), + CPUID_FEATURE_DEF(3, "monitor", "MONITOR/MWAIT"), + CPUID_FEATURE_DEF(4, "ds_cpl", "CPL Qualified Debug Store"), + CPUID_FEATURE_DEF(5, "vmx", "Virtual Machine Extensions"), + CPUID_FEATURE_DEF(7, "est", "Enhanced Intel SpeedStep Technology"), + CPUID_FEATURE_DEF(8, "tm2", "Thermal Monitor 2"), + CPUID_FEATURE_DEF(10, "cid", "L1 Context ID"), + CPUID_FEATURE_DEF(13, "cx16", "CMPXCHG16B Available"), + CPUID_FEATURE_DEF(14, "xtpr", "xTPR Disable"), { -1 } }; static struct { int bit; char *desc;; - char *description; } cap_amd[] = { - { 11, "syscall", "SYSCALL and SYSRET" }, - { 19, "mp", "MP Capable" }, - { 20, "nx", "No-Execute Page Protection" }, - { 22, "mmxext","MMX Technology (AMD Extensions)" }, - { 25, "fxsr_opt", "Fast FXSAVE/FXRSTOR" }, - { 27, "rdtscp", "RDTSCP Instruction" }, - { 29, "lm", "Long Mode Capable" }, - { 30, "3dnowext","3DNow! Extensions" }, - { 31, "3dnow", "3DNow!" }, + CPUID_FEATURE_DEF(11, "syscall", "SYSCALL and SYSRET"), + CPUID_FEATURE_DEF(19, "mp", "MP Capable"), + CPUID_FEATURE_DEF(20, "nx", "No-Execute Page Protection"), + CPUID_FEATURE_DEF(22, "mmxext","MMX Technology (AMD Extensions)"), + CPUID_FEATURE_DEF(25, "fxsr_opt", "Fast FXSAVE/FXRSTOR"), + CPUID_FEATURE_DEF(27, "rdtscp", "RDTSCP Instruction"), + CPUID_FEATURE_DEF(29, "lm", "Long Mode Capable"), + CPUID_FEATURE_DEF(30, "3dnowext", "3DNow! Extensions"), + CPUID_FEATURE_DEF(31, "3dnow", "3DNow!"), { -1 } }; static struct { int bit; char *desc; - char *description; } cap_amd2[] = { - { 0, "lahf_lm", "LAHF/SAHF Supported in 64-bit Mode" }, - { 1, "cmp_legacy", "Chip Multi-Core" }, - { 2, "svm", "Secure Virtual Machine" }, - { 4, "cr8legacy", "CR8 Available in Legacy Mode" }, + CPUID_FEATURE_DEF(0, "lahf_lm", "LAHF/SAHF Supported in 64-bit Mode"), + CPUID_FEATURE_DEF(1, "cmp_legacy", "Chip Multi-Core"), + CPUID_FEATURE_DEF(2, "svm", "Secure Virtual Machine"), + CPUID_FEATURE_DEF(4, "cr8legacy", "CR8 Available in Legacy Mode"), { -1 } }; unsigned int family, model, stepping;

1 0

r20004 - trunk/Gui/Makefile
by diego 29 Sep '06

29 Sep '06

Author: diego Date: Fri Sep 29 11:46:06 2006 New Revision: 20004 Modified: trunk/Gui/Makefile Log: Do not compile with -DDEBUG by default. Modified: trunk/Gui/Makefile ============================================================================== --- trunk/Gui/Makefile (original) +++ trunk/Gui/Makefile Fri Sep 29 11:46:06 2006 @@ -4,7 +4,8 @@ INCDIR = -I. -I.. -I../loader -I./wm -I./skin -CFLAGS = $(INCDIR) $(OPTFLAGS) -DDEBUG +CFLAGS = $(INCDIR) $(OPTFLAGS) +#CFLAGS += -DDEBUG ifeq ($(TARGET_WIN32),yes) SRCS = win32/dialogs.c \

1 0