May 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r34919 - trunk/libmpdemux/mp3_hdr.c
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 19:23:44 2012 New Revision: 34919 Log: Some minor simplifications. Modified: trunk/libmpdemux/mp3_hdr.c Modified: trunk/libmpdemux/mp3_hdr.c ============================================================================== --- trunk/libmpdemux/mp3_hdr.c Fri May 18 19:18:31 2012 (r34918) +++ trunk/libmpdemux/mp3_hdr.c Fri May 18 19:23:44 2012 (r34919) @@ -67,7 +67,7 @@ int mp_get_mp3_header(unsigned char* hbu return -1; } - sampling_frequency = ((newhead>>10)&0x3); // valid: 0..2 + sampling_frequency = (newhead>>10)&0x3; // valid: 0..2 if(sampling_frequency==3){ mp_msg(MSGT_DEMUXER,MSGL_DBG2,"invalid sampling_frequency\n"); return -1; @@ -75,8 +75,8 @@ int mp_get_mp3_header(unsigned char* hbu if( newhead & (1<<20) ) { // MPEG 1.0 (lsf==0) or MPEG 2.0 (lsf==1) - lsf = (newhead & (1<<19)) ? 0x0 : 0x1; - sampling_frequency += (lsf*3); + lsf = !(newhead & (1<<19)); + sampling_frequency += lsf*3; } else { // MPEG 2.5 lsf = 1; @@ -84,16 +84,16 @@ int mp_get_mp3_header(unsigned char* hbu } // crc = ((newhead>>16)&0x1)^0x1; - bitrate_index = ((newhead>>12)&0xf); // valid: 1..14 - padding = ((newhead>>9)&0x1); -// fr->extension = ((newhead>>8)&0x1); -// fr->mode = ((newhead>>6)&0x3); -// fr->mode_ext = ((newhead>>4)&0x3); -// fr->copyright = ((newhead>>3)&0x1); -// fr->original = ((newhead>>2)&0x1); + bitrate_index = (newhead>>12)&0xf; // valid: 1..14 + padding = (newhead>>9)&0x1; +// fr->extension = (newhead>>8)&0x1; +// fr->mode = (newhead>>6)&0x3; +// fr->mode_ext = (newhead>>4)&0x3; +// fr->copyright = (newhead>>3)&0x1; +// fr->original = (newhead>>2)&0x1; // fr->emphasis = newhead & 0x3; - stereo = ( (((newhead>>6)&0x3)) == 3) ? 1 : 2; + stereo = ( ((newhead>>6)&0x3) == 3) ? 1 : 2; // !checked later through tabsel_123[]! // if(!bitrate_index || bitrate_index==15){ @@ -105,7 +105,7 @@ int mp_get_mp3_header(unsigned char* hbu ssize = (stereo == 1) ? 9 : 17; else ssize = (stereo == 1) ? 17 : 32; - if(!((newhead>>16)&0x1)) ssize += 2; // CRC + if(!(newhead & (1 << 16))) ssize += 2; // CRC bitrate = tabsel_123[lsf][layer-1][bitrate_index]; framesize = bitrate * mult[layer-1]; @@ -117,12 +117,11 @@ int mp_get_mp3_header(unsigned char* hbu return -1; } - divisor = (layer == 3 ? (freqs[sampling_frequency] << lsf) : freqs[sampling_frequency]); + divisor = layer == 3 ? (freqs[sampling_frequency] << lsf) : freqs[sampling_frequency]; framesize /= divisor; + framesize += padding; if(layer==1) - framesize = (framesize+padding)*4; - else - framesize += padding; + framesize *= 4; // if(framesize<=0 || framesize>MAXFRAMESIZE) return FALSE; if(srate)

1 0

r34918 - trunk/libmpdemux/mp3_hdr.c
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 19:18:31 2012 New Revision: 34918 Log: Use more appropriate types. Modified: trunk/libmpdemux/mp3_hdr.c Modified: trunk/libmpdemux/mp3_hdr.c ============================================================================== --- trunk/libmpdemux/mp3_hdr.c Fri May 18 19:16:35 2012 (r34917) +++ trunk/libmpdemux/mp3_hdr.c Fri May 18 19:18:31 2012 (r34918) @@ -47,7 +47,7 @@ int mp_get_mp3_header(unsigned char* hbu int bitrate; int layer; static const int mult[3] = { 12000, 144000, 144000 }; - unsigned long newhead = + uint32_t newhead = hbuf[0] << 24 | hbuf[1] << 16 | hbuf[2] << 8 | @@ -73,9 +73,9 @@ int mp_get_mp3_header(unsigned char* hbu return -1; } - if( newhead & ((long)1<<20) ) { + if( newhead & (1<<20) ) { // MPEG 1.0 (lsf==0) or MPEG 2.0 (lsf==1) - lsf = (newhead & ((long)1<<19)) ? 0x0 : 0x1; + lsf = (newhead & (1<<19)) ? 0x0 : 0x1; sampling_frequency += (lsf*3); } else { // MPEG 2.5

1 0

r34917 - trunk/libmpdemux/mp3_hdr.c
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 19:16:35 2012 New Revision: 34917 Log: Make some tables const. Modified: trunk/libmpdemux/mp3_hdr.c Modified: trunk/libmpdemux/mp3_hdr.c ============================================================================== --- trunk/libmpdemux/mp3_hdr.c Fri May 18 19:14:04 2012 (r34916) +++ trunk/libmpdemux/mp3_hdr.c Fri May 18 19:16:35 2012 (r34917) @@ -17,6 +17,7 @@ */ #include <stdio.h> +#include <stdint.h> #include "config.h" #include "mp_msg.h" @@ -24,7 +25,7 @@ //----------------------- mp3 audio frame header parser ----------------------- -static int tabsel_123[2][3][16] = { +static const uint16_t tabsel_123[2][3][16] = { { {0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,0}, {0,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,0}, {0,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,0} }, @@ -34,7 +35,7 @@ static int tabsel_123[2][3][16] = { {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,0} } }; -static long freqs[9] = { 44100, 48000, 32000, // MPEG 1.0 +static const int freqs[9] = { 44100, 48000, 32000, // MPEG 1.0 22050, 24000, 16000, // MPEG 2.0 11025, 12000, 8000}; // MPEG 2.5 @@ -44,7 +45,8 @@ static long freqs[9] = { 44100, 48000, 3 int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* srate, int* spf, int* mpa_layer, int* br){ int stereo,ssize,lsf,framesize,padding,bitrate_index,sampling_frequency, divisor; int bitrate; - int layer, mult[3] = { 12000, 144000, 144000 }; + int layer; + static const int mult[3] = { 12000, 144000, 144000 }; unsigned long newhead = hbuf[0] << 24 | hbuf[1] << 16 |

1 0

r34916 - trunk/libmpdemux/mp3_hdr.c
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 19:14:04 2012 New Revision: 34916 Log: Return a spf value even when srate is NULL. Based on patch by Benoît Thébaudeau [benoit thebaudeau advansee com] Modified: trunk/libmpdemux/mp3_hdr.c Modified: trunk/libmpdemux/mp3_hdr.c ============================================================================== --- trunk/libmpdemux/mp3_hdr.c Fri May 18 19:03:09 2012 (r34915) +++ trunk/libmpdemux/mp3_hdr.c Fri May 18 19:14:04 2012 (r34916) @@ -123,19 +123,18 @@ int mp_get_mp3_header(unsigned char* hbu framesize += padding; // if(framesize<=0 || framesize>MAXFRAMESIZE) return FALSE; - if(srate) { + if(srate) *srate = freqs[sampling_frequency]; if(spf) { if(layer == 1) *spf = 384; else if(layer == 2) *spf = 1152; - else if(*srate < 32000) + else if(sampling_frequency > 2) // not 1.0 *spf = 576; else *spf = 1152; } - } if(mpa_layer) *mpa_layer = layer; if(chans) *chans = stereo; if(br) *br = bitrate;

1 0

r34915 - trunk/libmpdemux/demux_audio.c
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 19:03:09 2012 New Revision: 34915 Log: Take start offset into account when calculating amount of audio data. Patch by Benoît Thébaudeau [benoit thebaudeau advansee com] Modified: trunk/libmpdemux/demux_audio.c Modified: trunk/libmpdemux/demux_audio.c ============================================================================== --- trunk/libmpdemux/demux_audio.c Fri May 18 19:01:13 2012 (r34914) +++ trunk/libmpdemux/demux_audio.c Fri May 18 19:03:09 2012 (r34915) @@ -792,7 +792,8 @@ static void demux_close_audio(demuxer_t* static int demux_audio_control(demuxer_t *demuxer,int cmd, void *arg){ sh_audio_t *sh_audio=demuxer->audio->sh; - int audio_length = sh_audio->i_bps ? demuxer->movi_end / sh_audio->i_bps : 0; + int audio_length = sh_audio->i_bps && demuxer->movi_end > demuxer->movi_start ? + (demuxer->movi_end - demuxer->movi_start) / sh_audio->i_bps : 0; da_priv_t* priv = demuxer->priv; switch(cmd) {

1 0

r34914 - trunk/libmpdemux/demux_audio.c
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 19:01:13 2012 New Revision: 34914 Log: Add some additional checks to ensure subtractions do not overflow. Patch by Benoît Thébaudeau [benoit thebaudeau advansee com]. Modified: trunk/libmpdemux/demux_audio.c Modified: trunk/libmpdemux/demux_audio.c ============================================================================== --- trunk/libmpdemux/demux_audio.c Fri May 18 00:10:19 2012 (r34913) +++ trunk/libmpdemux/demux_audio.c Fri May 18 19:01:13 2012 (r34914) @@ -440,13 +440,14 @@ static int demux_audio_open(demuxer_t* d duration = (double) mp3_vbr_frames(s, demuxer->movi_start) * mp3_found->mpa_spf / mp3_found->mp3_freq; free(mp3_found); mp3_found = NULL; - if(s->end_pos && (s->flags & MP_STREAM_SEEK) == MP_STREAM_SEEK) { - stream_seek(s,s->end_pos-128); + if(demuxer->movi_end && (s->flags & MP_STREAM_SEEK) == MP_STREAM_SEEK) { + if(demuxer->movi_end >= 128) { + stream_seek(s,demuxer->movi_end-128); stream_read(s,hdr,3); if(!memcmp(hdr,"TAG",3)) { char buf[31]; uint8_t g; - demuxer->movi_end = stream_tell(s)-3; + demuxer->movi_end -= 128; stream_read(s,buf,30); buf[30] = '\0'; demux_info_add(demuxer,"Title",buf); @@ -470,6 +471,8 @@ static int demux_audio_open(demuxer_t* d g = stream_read_char(s); demux_info_add(demuxer,"Genre",genres[g]); } + } + if(demuxer->movi_end >= 10) { stream_seek(s,demuxer->movi_end-10); stream_read(s,hdr,4); if(!memcmp(hdr,"3DI",3) && hdr[3] >= 4 && hdr[3] != 0xff) { @@ -490,6 +493,7 @@ static int demux_audio_open(demuxer_t* d } } } + } if (duration && demuxer->movi_end && demuxer->movi_end > demuxer->movi_start) sh_audio->wf->nAvgBytesPerSec = (demuxer->movi_end - demuxer->movi_start) / duration; sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec; break;

1 0

r34913 - trunk/libvo/vo_corevideo.m
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 00:10:19 2012 New Revision: 34913 Log: Remove pointless global variables. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Thu May 17 23:45:24 2012 (r34912) +++ trunk/libvo/vo_corevideo.m Fri May 18 00:10:19 2012 (r34913) @@ -75,7 +75,6 @@ static unsigned char *image_datas[2]; static uint32_t image_width; static uint32_t image_height; -static uint32_t image_depth; static uint32_t image_bytes; static uint32_t image_format; @@ -85,7 +84,6 @@ static int isOntop; static int isRootwin; static float winAlpha = 1; -static int int_pause = 0; static BOOL isLeopardOrLater; @@ -173,17 +171,16 @@ static int config(uint32_t width, uint32 switch (image_format) { case IMGFMT_RGB24: - image_depth = 24; + image_bytes = 3; break; case IMGFMT_ARGB: case IMGFMT_BGRA: - image_depth = 32; + image_bytes = 4; break; case IMGFMT_YUY2: - image_depth = 16; + image_bytes = 2; break; } - image_bytes = (image_depth + 7) / 8; if(!shared_buffer) { @@ -424,8 +421,9 @@ static int control(uint32_t request, voi switch (request) { case VOCTRL_DRAW_IMAGE: return draw_image(data); - case VOCTRL_PAUSE: return int_pause = 1; - case VOCTRL_RESUME: return int_pause = 0; + case VOCTRL_PAUSE: + case VOCTRL_RESUME: + return VO_TRUE; case VOCTRL_QUERY_FORMAT: return query_format(*(uint32_t*)data); case VOCTRL_ONTOP: vo_ontop = !vo_ontop; if(!shared_buffer){ [mpGLView ontop]; } else { [mplayerosxProto ontop]; } return VO_TRUE; case VOCTRL_ROOTWIN: vo_rootwin = !vo_rootwin; [mpGLView rootwin]; return VO_TRUE;

1 0

r34912 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 17 May '12

17 May '12

Author: reimar Date: Thu May 17 23:45:24 2012 New Revision: 34912 Log: Fix hardware-acceleration broken by nonref_dr support. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Wed May 16 23:30:07 2012 (r34911) +++ trunk/libmpcodecs/vd_ffmpeg.c Thu May 17 23:45:24 2012 (r34912) @@ -197,6 +197,7 @@ static void set_format_params(struct AVC sh_video_t *sh = avctx->opaque; vd_ffmpeg_ctx *ctx = sh->context; ctx->do_dr1 = 1; + ctx->nonref_dr = 0; ctx->do_slices = 1; // HACK: FFmpeg thread handling is a major mess and // hinders any attempt to decide on hwaccel after the

1 0

r34911 - trunk/sub/font_load_ft.c
by reimar 16 May '12

16 May '12

Author: reimar Date: Wed May 16 23:30:07 2012 New Revision: 34911 Log: Initialize "result" variable since FcFontMatch only sets it on failure. This is currently kind of pointless since we don't actually use the result, but it is better to not take any risks. Modified: trunk/sub/font_load_ft.c Modified: trunk/sub/font_load_ft.c ============================================================================== --- trunk/sub/font_load_ft.c Wed May 16 23:30:06 2012 (r34910) +++ trunk/sub/font_load_ft.c Wed May 16 23:30:07 2012 (r34911) @@ -1130,7 +1130,7 @@ void load_font_ft(int width, int height, FcChar8 *s; int face_index; FcBool scalable; - FcResult result; + FcResult result = FcResultMatch; #endif font_desc_t *vo_font = *fontp; vo_image_width = width;

1 0

r34910 - trunk/sub/font_load_ft.c
by reimar 16 May '12

16 May '12

Author: reimar Date: Wed May 16 23:30:06 2012 New Revision: 34910 Log: Add result argument to second FcFontMatch argument, just like for the first. Fixes a possible assertion in fontconfig. Modified: trunk/sub/font_load_ft.c Modified: trunk/sub/font_load_ft.c ============================================================================== --- trunk/sub/font_load_ft.c Wed May 16 16:27:57 2012 (r34909) +++ trunk/sub/font_load_ft.c Wed May 16 23:30:06 2012 (r34910) @@ -1159,7 +1159,7 @@ void load_font_ft(int width, int height, FcConfigSubstitute(0, fc_pattern, FcMatchPattern); FcDefaultSubstitute(fc_pattern); fc_pattern2 = fc_pattern; - fc_pattern = FcFontMatch(0, fc_pattern, 0); + fc_pattern = FcFontMatch(0, fc_pattern, &result); FcPatternDestroy(fc_pattern2); } // s doesn't need to be freed according to fontconfig docs

1 0