Mercurial > mplayer.hg
view libmpcodecs/ad_mp3lib.c @ 17279:600d0b740940
"Currently mplayer looks for only one MP3 frame sync. The attached
patch makes it to look for two consecutive valid MP3 frame headers,
reducing the probability of false positives, which causes Bug 380.
Funny that the fix is so simple. Seems that someone has forgotten to
initialize MP3_resync correctly.
Also this is the recommended way to sync MP3 frames. See
http://www.dv.co.yu/mpgscript/mpeghdr.htm. "
Original thread:
Date: Dec 31, 2005 10:15 AM
Subject: [MPlayer-dev-eng] [PATCH] Try twice when searching for MP3 frame header, fixes Bug 380
author | gpoirier |
---|---|
date | Sat, 31 Dec 2005 18:56:35 +0000 |
parents | 6ff3379a0862 |
children | a1807995e2ab |
line wrap: on
line source
#include <stdio.h> #include <stdlib.h> #include <unistd.h> #include "config.h" #ifdef USE_MP3LIB #include "ad_internal.h" static ad_info_t info = { "MPEG layer-2, layer-3", "mp3lib", "Nick Kurshev", "mpg123", "Optimized to MMX/SSE/3Dnow!" }; LIBAD_EXTERN(mp3lib) #include "mp3lib/mp3.h" extern int fakemono; static sh_audio_t* dec_audio_sh=NULL; // MP3 decoder buffer callback: int mplayer_audio_read(char *buf,int size){ return demux_read_data(dec_audio_sh->ds,buf,size); } static int preinit(sh_audio_t *sh) { sh->audio_out_minsize=32*36*2*2; //4608; return 1; } static int init(sh_audio_t *sh) { // MPEG Audio: dec_audio_sh=sh; // save sh_audio for the callback: // MP3_Init(fakemono,mplayer_accel,&mplayer_audio_read); // TODO!!! #ifdef USE_FAKE_MONO MP3_Init(fakemono); #else MP3_Init(); #endif MP3_samplerate=MP3_channels=0; sh->a_buffer_len=MP3_DecodeFrame(sh->a_buffer,-1); if(!sh->a_buffer_len) return 0; // unsupported layer/format sh->channels=2; // hack sh->samplesize=2; sh->samplerate=MP3_samplerate; sh->i_bps=MP3_bitrate*(1000/8); MP3_PrintHeader(); return 1; } static void uninit(sh_audio_t *sh) { } static int control(sh_audio_t *sh,int cmd,void* arg, ...) { switch(cmd) { case ADCTRL_RESYNC_STREAM: MP3_DecodeFrame(NULL,-2); // resync MP3_DecodeFrame(NULL,-2); // resync MP3_DecodeFrame(NULL,-2); // resync return CONTROL_TRUE; case ADCTRL_SKIP_FRAME: MP3_DecodeFrame(NULL,-2); // skip MPEG frame return CONTROL_TRUE; } return CONTROL_UNKNOWN; } static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) { return MP3_DecodeFrame(buf,-1); } #endif