From af0c41e162725b0edcd6c3d066a2dbef05a3b896 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 7 Jul 2013 23:54:11 +0200 Subject: Remove old demuxers Delete demux_avi, demux_asf, demux_mpg, demux_ts. libavformat does better than them (except in rare corner cases), and the demuxers have a bad influence on the rest of the code. Often they don't output proper packets, and require additional audio and video parsing. Most work only in --no-correct-pts mode. Remove them to facilitate further cleanups. --- demux/demux_avi.c | 899 ------------------------------------------------------ 1 file changed, 899 deletions(-) delete mode 100644 demux/demux_avi.c (limited to 'demux/demux_avi.c') diff --git a/demux/demux_avi.c b/demux/demux_avi.c deleted file mode 100644 index a07f022cde..0000000000 --- a/demux/demux_avi.c +++ /dev/null @@ -1,899 +0,0 @@ -/* - * AVI file parser for DEMUXER v2.9 - * Copyright (c) 2001 A'rpi/ESP-team - * - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include - -#include "config.h" -#include "core/mp_msg.h" - -#include "stream/stream.h" -#include "demux.h" -#include "stheader.h" -#include "aviheader.h" - -extern const demuxer_desc_t demuxer_desc_avi_ni; -extern const demuxer_desc_t demuxer_desc_avi_nini; - -// PTS: 0=interleaved 1=BPS-based -int pts_from_bps=1; - -static void update_audio_block_size(demuxer_t *demux) -{ - avi_priv_t *priv = demux->priv; - sh_audio_t *sh = demux->audio->sh; - if (!sh) - return; - priv->audio_block_size = sh->audio.dwSampleSize; - if (sh->wf) { - priv->audio_block_size = sh->wf->nBlockAlign; - if (!priv->audio_block_size) { - // for PCM audio we can calculate the blocksize: - if (sh->format == 1) - priv->audio_block_size = sh->wf->nChannels*(sh->wf->wBitsPerSample/8); - else - priv->audio_block_size = 1; // hope the best... - } else { - // workaround old mencoder bug: - if (sh->audio.dwSampleSize == 1 && sh->audio.dwScale == 1 && - (sh->wf->nBlockAlign == 1152 || sh->wf->nBlockAlign == 576)) { - mp_tmsg(MSGT_DEMUX,MSGL_WARN,"AVI: Working around CBR-MP3 nBlockAlign header bug!\n"); - priv->audio_block_size = 1; - } - } - } -} - -// Select ds from ID -static demux_stream_t *demux_avi_select_stream(demuxer_t *demux, - unsigned int id) -{ - int stream_id=avi_stream_id(id); - - - if(demux->video->id==-1) - if(demux->v_streams[stream_id]) - demux->video->id=stream_id; - - if(demux->audio->id==-1) - if(demux->a_streams[stream_id]) - demux->audio->id=stream_id; - - if(stream_id==demux->audio->id){ - if(!demux->audio->sh){ - demux->audio->sh=demux->a_streams[stream_id]; - mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected AVI audio ID = %d\n",demux->audio->id); - update_audio_block_size(demux); - } - return demux->audio; - } - if(stream_id==demux->video->id){ - if(!demux->video->sh){ - demux->video->sh=demux->v_streams[stream_id]; - mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected AVI video ID = %d\n",demux->video->id); - } - return demux->video; - } - if(id!=mmioFOURCC('J','U','N','K')){ - // unknown - mp_msg(MSGT_DEMUX,MSGL_DBG2,"Unknown chunk: %.4s (%X)\n",(char *) &id,id); - //abort(); - } - return NULL; -} - -static int valid_fourcc(unsigned int id){ - static const char valid[] = "0123456789abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ_"; - unsigned char* fcc=(unsigned char*)(&id); - return strchr(valid, fcc[0]) && strchr(valid, fcc[1]) && - strchr(valid, fcc[2]) && strchr(valid, fcc[3]); -} - -static int valid_stream_id(unsigned int id) { - unsigned char* fcc=(unsigned char*)(&id); - return fcc[0] >= '0' && fcc[0] <= '9' && fcc[1] >= '0' && fcc[1] <= '9' && - ((fcc[2] == 'w' && fcc[3] == 'b') || (fcc[2] == 'd' && fcc[3] == 'c')); -} - -static int choose_chunk_len(unsigned int len1,unsigned int len2){ - // len1 has a bit more priority than len2. len1!=len2 - // Note: this is a first-idea-logic, may be wrong. comments welcomed. - - // prefer small frames rather than 0 - if(!len1) return (len2>0x80000) ? len1 : len2; - if(!len2) return (len1>0x100000) ? len2 : len1; - - // choose the smaller value: - return (len1priv; - int skip; - float pts=0; - - mp_dbg(MSGT_DEMUX,MSGL_DBG3,"demux_avi.read_packet: %X\n",id); - - if(ds==demux->audio){ - if(priv->pts_corrected==0){ - if(priv->pts_has_video){ - // we have video pts now - float delay=0; - if(((sh_audio_t*)(ds->sh))->wf->nAvgBytesPerSec) - delay=(float)priv->pts_corr_bytes/((sh_audio_t*)(ds->sh))->wf->nAvgBytesPerSec; - mp_msg(MSGT_DEMUX,MSGL_V,"XXX initial v_pts=%5.3f a_pos=%d (%5.3f) \n",priv->avi_audio_pts,priv->pts_corr_bytes,delay); - //priv->pts_correction=-priv->avi_audio_pts+delay; - priv->pts_correction=delay-priv->avi_audio_pts; - priv->avi_audio_pts+=priv->pts_correction; - priv->pts_corrected=1; - } else - priv->pts_corr_bytes+=len; - } - if(pts_from_bps){ - pts = priv->audio_block_no * - (float)((sh_audio_t*)demux->audio->sh)->audio.dwScale / - (float)((sh_audio_t*)demux->audio->sh)->audio.dwRate; - } else - pts=priv->avi_audio_pts; //+priv->pts_correction; - priv->avi_audio_pts=0; - // update blockcount: - priv->audio_block_no+= - (len+priv->audio_block_size-1)/priv->audio_block_size; - } else - if(ds==demux->video){ - // video - if(priv->skip_video_frames>0){ - // drop frame (seeking) - --priv->skip_video_frames; - ds=NULL; - } - - pts = priv->avi_video_pts = priv->video_pack_no * - (float)((sh_video_t*)demux->video->sh)->video.dwScale / - (float)((sh_video_t*)demux->video->sh)->video.dwRate; - - priv->avi_audio_pts=priv->avi_video_pts+priv->pts_correction; - priv->pts_has_video=1; - - if(ds) ++priv->video_pack_no; - - } - - skip=(len+1)&(~1); // total bytes in this chunk - - if(ds){ - mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_AVI: Read %d data bytes from packet %04X\n",len,id); - ds_read_packet(ds,demux->stream,len,pts,idxpos,flags); - skip-=len; - } - skip = FFMAX(skip, 0); - if (avi_stream_id(id) > 99 && id != mmioFOURCC('J','U','N','K')) - skip = FFMIN(skip, 65536); - if(skip){ - mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_AVI: Skipping %d bytes from packet %04X\n",skip,id); - stream_skip(demux->stream,skip); - } - return ds?1:0; -} - -static uint32_t avi_find_id(stream_t *stream) { - uint32_t id = stream_read_dword_le(stream); - if (!id) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "Incomplete stream? Trying resync.\n"); - do { - id = stream_read_dword_le(stream); - if (stream_eof(stream)) return 0; - } while (avi_stream_id(id) > 99); - } - return id; -} - -// return value: -// 0 = EOF or no stream found -// 1 = successfully read a packet -static int demux_avi_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){ -avi_priv_t *priv=demux->priv; -unsigned int id=0; -unsigned int len; -int ret=0; -demux_stream_t *ds; - -do{ - int flags=1; - AVIINDEXENTRY *idx=NULL; - if(priv->idx_size>0 && priv->idx_posidx_size){ - int64_t pos; - - idx=&((AVIINDEXENTRY *)priv->idx)[priv->idx_pos++]; - - if(idx->dwFlags&AVIIF_LIST){ - if (!valid_stream_id(idx->ckid)) - // LIST - continue; - if (!priv->warned_unaligned) - mp_msg(MSGT_DEMUX, MSGL_WARN, "Looks like unaligned chunk in index, broken AVI file!\n"); - priv->warned_unaligned = 1; - } - if(!demux_avi_select_stream(demux,idx->ckid)){ - mp_dbg(MSGT_DEMUX,MSGL_DBG3,"Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid); - continue; // skip this chunk - } - - pos = (int64_t)priv->idx_offset+AVI_IDX_OFFSET(idx); - if((posmovi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & MP_STREAM_SEEK)){ - mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%"PRIX64" \n",(int64_t)pos); - continue; - } - stream_seek(demux->stream,pos); - demux->filepos=stream_tell(demux->stream); - id=stream_read_dword_le(demux->stream); - if(stream_eof(demux->stream)) return 0; // EOF! - - if(id!=idx->ckid){ - mp_msg(MSGT_DEMUX,MSGL_V,"ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid); - if(valid_fourcc(idx->ckid)) - id=idx->ckid; // use index if valid - else - if(!valid_fourcc(id)) continue; // drop chunk if both id and idx bad - } - len=stream_read_dword_le(demux->stream); - if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){ - mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%d \n",len,idx->dwChunkLength); - if(len>0x200000 && idx->dwChunkLength>0x200000) continue; // both values bad :( - len=choose_chunk_len(idx->dwChunkLength,len); - } - if(!(idx->dwFlags&AVIIF_KEYFRAME)) flags=0; - } else { - demux->filepos=stream_tell(demux->stream); - if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->flags & MP_STREAM_SEEK)){ - demux->stream->eof=1; - return 0; - } - id=avi_find_id(demux->stream); - len=stream_read_dword_le(demux->stream); - if(stream_eof(demux->stream)) return 0; // EOF! - - if(id==mmioFOURCC('L','I','S','T') || id==mmioFOURCC('R', 'I', 'F', 'F')){ - id=stream_read_dword_le(demux->stream); // list or RIFF type - continue; - } - } - - ds=demux_avi_select_stream(demux,id); - if(ds) - if(ds->packs+1>=MAX_PACKS || ds->bytes+len>=MAX_PACK_BYTES){ - // this packet will cause a buffer overflow, switch to -ni mode!!! - mp_tmsg(MSGT_DEMUX,MSGL_WARN,"\nBadly interleaved AVI file detected - switching to --avi-ni mode...\n"); - if(priv->idx_size>0){ - // has index - demux->type=DEMUXER_TYPE_AVI_NI; - demux->desc=&demuxer_desc_avi_ni; - --priv->idx_pos; // hack - } else { - // no index - demux->type=DEMUXER_TYPE_AVI_NINI; - demux->desc=&demuxer_desc_avi_nini; - priv->idx_pos=demux->filepos; // hack - } - priv->idx_pos_v=priv->idx_pos_a=priv->idx_pos; - // quit now, we can't even (no enough buffer memory) read this packet :( - return -1; - } - - ret=demux_avi_read_packet(demux,ds,id,len,priv->idx_pos-1,flags); -} while(ret!=1); - return 1; -} - - -// return value: -// 0 = EOF or no stream found -// 1 = successfully read a packet -static int demux_avi_fill_buffer_ni(demuxer_t *demux, demux_stream_t *ds) -{ -avi_priv_t *priv=demux->priv; -unsigned int id=0; -unsigned int len; -int ret=0; - -do{ - int flags=1; - AVIINDEXENTRY *idx=NULL; - int idx_pos=0; - demux->filepos=stream_tell(demux->stream); - - if(ds==demux->video) idx_pos=priv->idx_pos_v++; else - if(ds==demux->audio) idx_pos=priv->idx_pos_a++; else - idx_pos=priv->idx_pos++; - - if(priv->idx_size>0 && idx_posidx_size){ - int64_t pos; - idx=&((AVIINDEXENTRY *)priv->idx)[idx_pos]; - - if(idx->dwFlags&AVIIF_LIST){ - if (!valid_stream_id(idx->ckid)) - // LIST - continue; - if (!priv->warned_unaligned) - mp_msg(MSGT_DEMUX, MSGL_WARN, "Looks like unaligned chunk in index, broken AVI file!\n"); - priv->warned_unaligned = 1; - } - if(ds && demux_avi_select_stream(demux,idx->ckid)!=ds){ - mp_dbg(MSGT_DEMUX,MSGL_DBG3,"Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid); - continue; // skip this chunk - } - - pos = priv->idx_offset+AVI_IDX_OFFSET(idx); - if((posmovi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start)){ - mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! current=0x%"PRIX64" idx=0x%"PRIX64" \n",(int64_t)demux->filepos,(int64_t)pos); - continue; - } - stream_seek(demux->stream,pos); - - id=stream_read_dword_le(demux->stream); - - if(stream_eof(demux->stream)) return 0; - - if(id!=idx->ckid){ - mp_msg(MSGT_DEMUX,MSGL_V,"ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid); - if(valid_fourcc(idx->ckid)) - id=idx->ckid; // use index if valid - else - if(!valid_fourcc(id)) continue; // drop chunk if both id and idx bad - } - len=stream_read_dword_le(demux->stream); - if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){ - mp_msg(MSGT_DEMUX,MSGL_V,"ChunkSize mismatch! raw=%d idx=%d \n",len,idx->dwChunkLength); - if(len>0x200000 && idx->dwChunkLength>0x200000) continue; // both values bad :( - len=choose_chunk_len(idx->dwChunkLength,len); - } - if(!(idx->dwFlags&AVIIF_KEYFRAME)) flags=0; - } else return 0; - ret=demux_avi_read_packet(demux,demux_avi_select_stream(demux,id),id,len,idx_pos,flags); -} while(ret!=1); - return 1; -} - - -// return value: -// 0 = EOF or no stream found -// 1 = successfully read a packet -static int demux_avi_fill_buffer_nini(demuxer_t *demux, demux_stream_t *ds) -{ -avi_priv_t *priv=demux->priv; -unsigned int id=0; -unsigned int len; -int ret=0; -int64_t *fpos=NULL; - - if(ds==demux->video) fpos=&priv->idx_pos_v; else - if(ds==demux->audio) fpos=&priv->idx_pos_a; else - return 0; - - stream_seek(demux->stream,fpos[0]); - -do{ - - demux->filepos=stream_tell(demux->stream); - if(demux->filepos>=demux->movi_end && (demux->movi_end>demux->movi_start)){ - ds->eof=1; - return 0; - } - - id=avi_find_id(demux->stream); - len=stream_read_dword_le(demux->stream); - - if(stream_eof(demux->stream)) return 0; - - if(id==mmioFOURCC('L','I','S','T')){ - id=stream_read_dword_le(demux->stream); // list type - continue; - } - - if(id==mmioFOURCC('R','I','F','F')){ - mp_msg(MSGT_DEMUX,MSGL_V,"additional RIFF header...\n"); - id=stream_read_dword_le(demux->stream); // "AVIX" - continue; - } - - if(ds==demux_avi_select_stream(demux,id)){ - // read it! - ret=demux_avi_read_packet(demux,ds,id,len,priv->idx_pos-1,0); - } else { - // skip it! - int skip=(len+1)&(~1); // total bytes in this chunk - stream_skip(demux->stream,skip); - } - -} while(ret!=1); - fpos[0]=stream_tell(demux->stream); - return 1; -} - -// AVI demuxer parameters: -int index_mode=-1; // -1=untouched 0=don't use index 1=use (generate) index -int force_ni=0; // force non-interleaved AVI parsing - -static demuxer_t* demux_open_avi(demuxer_t* demuxer){ - demux_stream_t *d_audio=demuxer->audio; - demux_stream_t *d_video=demuxer->video; - sh_audio_t *sh_audio=NULL; - sh_video_t *sh_video=NULL; - avi_priv_t* priv=calloc(1, sizeof(avi_priv_t)); - - demuxer->priv=(void*)priv; - - //---- AVI header: - read_avi_header(demuxer,(demuxer->stream->flags & MP_STREAM_SEEK_BW)?index_mode:-2); - update_audio_block_size(demuxer); - - if(demuxer->audio->id>=0 && !demuxer->a_streams[demuxer->audio->id]){ - mp_tmsg(MSGT_DEMUX,MSGL_WARN,"AVI: invalid audio stream ID: %d - ignoring (nosound)\n",demuxer->audio->id); - demuxer->audio->id=-2; // disabled - } - if(demuxer->video->id>=0 && !demuxer->v_streams[demuxer->video->id]){ - mp_tmsg(MSGT_DEMUX,MSGL_WARN,"AVI: invalid video stream ID: %d - ignoring (using default)\n",demuxer->video->id); - demuxer->video->id=-1; // autodetect - } - - stream_seek(demuxer->stream,demuxer->movi_start); - if(priv->idx_size>1){ - // decide index format: -#if 1 - if((AVI_IDX_OFFSET(&((AVIINDEXENTRY *)priv->idx)[0])movi_start || - AVI_IDX_OFFSET(&((AVIINDEXENTRY *)priv->idx)[1])movi_start )&& !priv->isodml) - priv->idx_offset=demuxer->movi_start-4; -#else - if(AVI_IDX_OFFSET(&((AVIINDEXENTRY *)priv->idx)[0])movi_start) - priv->idx_offset=demuxer->movi_start-4; -#endif - mp_msg(MSGT_DEMUX,MSGL_V,"AVI index offset: 0x%X (movi=0x%X idx0=0x%X idx1=0x%X)\n", - (int)priv->idx_offset,(int)demuxer->movi_start, - (int)((AVIINDEXENTRY *)priv->idx)[0].dwChunkOffset, - (int)((AVIINDEXENTRY *)priv->idx)[1].dwChunkOffset); - } - - if(priv->idx_size>0){ - // check that file is non-interleaved: - int i; - int64_t a_pos=-1; - int64_t v_pos=-1; - for(i=0;iidx_size;i++){ - AVIINDEXENTRY* idx=&((AVIINDEXENTRY *)priv->idx)[i]; - demux_stream_t* ds=demux_avi_select_stream(demuxer,idx->ckid); - int64_t pos = priv->idx_offset + AVI_IDX_OFFSET(idx); - if(a_pos==-1 && ds==demuxer->audio){ - a_pos=pos; - if(v_pos!=-1) break; - } - if(v_pos==-1 && ds==demuxer->video){ - v_pos=pos; - if(a_pos!=-1) break; - } - } - if(v_pos==-1){ - mp_msg(MSGT_DEMUX, MSGL_ERR, "AVI_NI: %s", - mp_gtext("No video stream found.\n")); - return NULL; - } - if(a_pos==-1){ - d_audio->sh=sh_audio=NULL; - } else { - if(force_ni || abs(a_pos-v_pos)>0x100000){ // distance > 1MB - mp_tmsg(MSGT_DEMUX,MSGL_INFO,"%s NON-INTERLEAVED AVI file format.\n",force_ni?"Forced":"Detected"); - demuxer->type=DEMUXER_TYPE_AVI_NI; // HACK!!!! - demuxer->desc=&demuxer_desc_avi_ni; // HACK!!!! - pts_from_bps=1; // force BPS sync! - } - } - } else { - // no index - if(force_ni){ - mp_tmsg(MSGT_DEMUX,MSGL_INFO,"Using NON-INTERLEAVED broken AVI file format.\n"); - demuxer->type=DEMUXER_TYPE_AVI_NINI; // HACK!!!! - demuxer->desc=&demuxer_desc_avi_nini; // HACK!!!! - priv->idx_pos_a= - priv->idx_pos_v=demuxer->movi_start; - pts_from_bps=1; // force BPS sync! - } - demuxer->seekable=0; - } - if(!ds_fill_buffer(d_video)){ - mp_msg(MSGT_DEMUX, MSGL_ERR, "AVI: %s", - mp_gtext("Missing video stream!? Contact the author, " - "it may be a bug :(\n")); - return NULL; - } - sh_video=d_video->sh;sh_video->ds=d_video; - if(d_audio->id!=-2){ - mp_msg(MSGT_DEMUX,MSGL_V,"AVI: Searching for audio stream (id:%d)\n",d_audio->id); - if(!priv->audio_streams || !ds_fill_buffer(d_audio)){ - mp_msg(MSGT_DEMUX, MSGL_INFO, "AVI: %s", - mp_gtext("No audio stream found -> no sound.\n")); - d_audio->sh=sh_audio=NULL; - } else { - sh_audio=d_audio->sh;sh_audio->ds=d_audio; - } - } - - // calculating audio/video bitrate: - if(priv->idx_size>0){ - // we have index, let's count 'em! - AVIINDEXENTRY *idx = priv->idx; - int64_t vsize=0; - int64_t asize=0; - size_t vsamples=0; - size_t asamples=0; - int i; - for(i=0;iidx_size;i++){ - int id=avi_stream_id(idx[i].ckid); - unsigned len=idx[i].dwChunkLength; - if(sh_video->ds->id == id) { - vsize+=len; - ++vsamples; - } - else if(sh_audio && sh_audio->ds->id == id) { - asize+=len; - asamples+=(len+priv->audio_block_size-1)/priv->audio_block_size; - } - } - mp_msg(MSGT_DEMUX, MSGL_V, - "AVI video size=%"PRId64" (%zu) audio size=%"PRId64" (%zu)\n", - vsize, vsamples, asize, asamples); - priv->numberofframes=vsamples; - sh_video->i_bps=((float)vsize/(float)vsamples)*(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; - if(sh_audio) sh_audio->i_bps=((float)asize/(float)asamples)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale; - } else { - // guessing, results may be inaccurate: - int64_t vsize; - int64_t asize=0; - - if((priv->numberofframes=sh_video->video.dwLength)<=1) - // bad video header, try to get number of frames from audio - if(sh_audio && sh_audio->wf->nAvgBytesPerSec) priv->numberofframes=sh_video->fps*sh_audio->audio.dwLength/sh_audio->audio.dwRate*sh_audio->audio.dwScale; - if(priv->numberofframes<=1){ - mp_tmsg(MSGT_SEEK,MSGL_WARN,"Could not determine number of frames (for absolute seek).\n"); - priv->numberofframes=0; - } - - 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; - } else { - asize=sh_audio->audio.dwLength; - sh_audio->i_bps=(float)asize/(sh_video->frametime*priv->numberofframes); - } - } - vsize=demuxer->movi_end-demuxer->movi_start-asize-8*priv->numberofframes; - mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%"PRId64" (%u) audio size=%"PRId64"\n",vsize,priv->numberofframes,asize); - sh_video->i_bps=(float)vsize/(sh_video->frametime*priv->numberofframes); - } - - return demuxer; - -} - - -static void demux_seek_avi(demuxer_t *demuxer, float rel_seek_secs, - float audio_delay, int flags) -{ - avi_priv_t *priv=demuxer->priv; - demux_stream_t *d_audio=demuxer->audio; - demux_stream_t *d_video=demuxer->video; - sh_audio_t *sh_audio=d_audio->sh; - sh_video_t *sh_video=d_video->sh; - float skip_audio_secs=0; - - //FIXME: OFF_T - Didn't check AVI case yet (avi files can't be >2G anyway?) - //================= seek in AVI ========================== - int rel_seek_frames=rel_seek_secs*sh_video->fps; - int video_chunk_pos=d_video->pos; - int i; - - if(flags&SEEK_ABSOLUTE){ - // seek absolute - video_chunk_pos=0; - } - - if(flags&SEEK_FACTOR){ - rel_seek_frames=rel_seek_secs*priv->numberofframes; - } - - priv->skip_video_frames=0; - priv->avi_audio_pts=0; - -// ------------ STEP 1: find nearest video keyframe chunk ------------ - // find nearest video keyframe chunk pos: - if(rel_seek_frames>0){ - // seek forward - while(video_chunk_posidx_size-1){ - int id=((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].ckid; - if(avi_stream_id(id)==d_video->id){ // video frame - if((--rel_seek_frames)<0 && ((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break; - } - ++video_chunk_pos; - } - } else { - // seek backward - while(video_chunk_pos>0){ - int id=((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].ckid; - if(avi_stream_id(id)==d_video->id){ // video frame - if((++rel_seek_frames)>0 && ((AVIINDEXENTRY *)priv->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break; - } - --video_chunk_pos; - } - } - priv->idx_pos_a=priv->idx_pos_v=priv->idx_pos=video_chunk_pos; - - // re-calc video pts: - d_video->pack_no=0; - for(i=0;iidx)[i].ckid; - if(avi_stream_id(id)==d_video->id) ++d_video->pack_no; - } - priv->video_pack_no=d_video->pack_no; - priv->avi_video_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; - d_video->pos=video_chunk_pos; - - mp_msg(MSGT_SEEK,MSGL_DBG2,"V_SEEK: pack=%d pts=%5.3f chunk=%d \n",d_video->pack_no,priv->avi_video_pts,video_chunk_pos); - -// ------------ STEP 2: seek audio, find the right chunk & pos ------------ - - d_audio->pack_no=0; - priv->audio_block_no=0; - d_audio->dpos=0; - - if(sh_audio){ - int i; - int len=0; - int skip_audio_bytes=0; - int curr_audio_pos=-1; - int audio_chunk_pos=-1; - int chunk_max=(demuxer->type==DEMUXER_TYPE_AVI)?video_chunk_pos:priv->idx_size; - - if(sh_audio->audio.dwSampleSize){ - // constant rate audio stream - /* immediate seeking to audio position, including when streams are delayed */ - curr_audio_pos=(priv->avi_video_pts + audio_delay)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale; - curr_audio_pos*=sh_audio->audio.dwSampleSize; - - // find audio chunk pos: - for(i=0;iidx)[i].ckid; - if(avi_stream_id(id)==d_audio->id){ - len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength; - if(d_audio->dpos<=curr_audio_pos && curr_audio_pos<(d_audio->dpos+len)){ - break; - } - ++d_audio->pack_no; - priv->audio_block_no+= - (len+priv->audio_block_size-1)/priv->audio_block_size; - d_audio->dpos+=len; - } - } - audio_chunk_pos=i; - skip_audio_bytes=curr_audio_pos-d_audio->dpos; - - mp_msg(MSGT_SEEK,MSGL_V,"SEEK: i=%d (max:%d) dpos=%d (wanted:%d) \n", - i,chunk_max,(int)d_audio->dpos,curr_audio_pos); - - } else { - // VBR audio - /* immediate seeking to audio position, including when streams are delayed */ - int chunks=(priv->avi_video_pts + audio_delay)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale; - audio_chunk_pos=0; - - // find audio chunk pos: - for(i=0;iidx_size && chunks>0;i++){ - int id=((AVIINDEXENTRY *)priv->idx)[i].ckid; - if(avi_stream_id(id)==d_audio->id){ - len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength; - if(i>chunk_max){ - skip_audio_bytes+=len; - } else { - ++d_audio->pack_no; - priv->audio_block_no+= - (len+priv->audio_block_size-1)/priv->audio_block_size; - d_audio->dpos+=len; - audio_chunk_pos=i; - } - chunks-=(len+priv->audio_block_size-1)/priv->audio_block_size; - } - } - } - - // Now we have: - // audio_chunk_pos = chunk no in index table (it's <=chunk_max) - // skip_audio_bytes = bytes to be skipped after chunk seek - // d-audio->pack_no = chunk_no in stream at audio_chunk_pos - // d_audio->dpos = bytepos in stream at audio_chunk_pos - // let's seek! - - // update stream position: - d_audio->pos=audio_chunk_pos; - - if(demuxer->type==DEMUXER_TYPE_AVI){ - // interleaved stream: - if(audio_chunk_posskip_video_frames & adjust video pts counter: - for(i=audio_chunk_pos;iidx)[i].ckid; - if(avi_stream_id(id)==d_video->id) ++priv->skip_video_frames; - } - // requires for correct audio pts calculation (demuxer): - priv->avi_video_pts-=priv->skip_video_frames*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; - priv->avi_audio_pts=priv->avi_video_pts; - // set index position: - priv->idx_pos_a=priv->idx_pos_v=priv->idx_pos=audio_chunk_pos; - } - } else { - // non-interleaved stream: - priv->idx_pos_a=audio_chunk_pos; - priv->idx_pos_v=video_chunk_pos; - priv->idx_pos=(audio_chunk_posidx_pos,audio_chunk_pos,video_chunk_pos, - (int)priv->skip_video_frames,skip_audio_bytes,skip_audio_secs); - - if(skip_audio_bytes){ - demux_read_data(d_audio,NULL,skip_audio_bytes); - } - - } - d_video->pts=priv->avi_video_pts; // OSD - -} - - -static void demux_close_avi(demuxer_t *demuxer) -{ - avi_priv_t* priv=demuxer->priv; - - if(!priv) - return; - - if(priv->idx_size > 0) - free(priv->idx); - free(priv); -} - - -static int demux_avi_control(demuxer_t *demuxer,int cmd, void *arg){ - avi_priv_t *priv=demuxer->priv; - demux_stream_t *d_video=demuxer->video; - sh_video_t *sh_video=d_video->sh; - - switch(cmd) { - case DEMUXER_CTRL_GET_TIME_LENGTH: - if (!priv->numberofframes || !sh_video) return DEMUXER_CTRL_DONTKNOW; - *((double *)arg)=(double)priv->numberofframes/sh_video->fps; - if (sh_video->video.dwLength<=1) return DEMUXER_CTRL_GUESS; - return DEMUXER_CTRL_OK; - - case DEMUXER_CTRL_SWITCH_AUDIO: - case DEMUXER_CTRL_SWITCH_VIDEO: { - int audio = (cmd == DEMUXER_CTRL_SWITCH_AUDIO); - demux_stream_t *ds = audio ? demuxer->audio : demuxer->video; - void **streams = audio ? (void **)demuxer->a_streams : (void **)demuxer->v_streams; - int maxid = FFMIN(100, audio ? MAX_A_STREAMS : MAX_V_STREAMS); - int chunkid; - if (ds->id < -1) - ds->id = -1; - - if (*(int *)arg >= 0) - ds->id = *(int *)arg; - else { - int i; - for (i = 0; i < maxid; i++) { - if (++ds->id >= maxid) ds->id = 0; - if (streams[ds->id]) break; - } - } - - chunkid = (ds->id / 10 + '0') | (ds->id % 10 + '0') << 8; - ds->sh = NULL; - if (!streams[ds->id]) // stream not available - ds->id = -1; - else - demux_avi_select_stream(demuxer, chunkid); - *(int *)arg = ds->id; - return DEMUXER_CTRL_OK; - } - - default: - return DEMUXER_CTRL_NOTIMPL; - } -} - - -static int avi_check_file(demuxer_t *demuxer) -{ - int id=stream_read_dword_le(demuxer->stream); // "RIFF" - - if((id==mmioFOURCC('R','I','F','F')) || (id==mmioFOURCC('O','N','2',' '))) { - stream_read_dword_le(demuxer->stream); //filesize - id=stream_read_dword_le(demuxer->stream); // "AVI " - if(id==formtypeAVI) - return DEMUXER_TYPE_AVI; - // "Samsung Digimax i6 PMP" crap according to bug 742 - if(id==mmioFOURCC('A','V','I',0x19)) - return DEMUXER_TYPE_AVI; - if(id==mmioFOURCC('O','N','2','f')){ - mp_tmsg(MSGT_DEMUXER,MSGL_INFO,"ON2 AVI format"); - return DEMUXER_TYPE_AVI; - } - } - - return 0; -} - - -const demuxer_desc_t demuxer_desc_avi = { - "AVI demuxer", - "avi", - "AVI", - "Arpi?", - "AVI files, including non interleaved files", - DEMUXER_TYPE_AVI, - 1, // safe autodetect - avi_check_file, - demux_avi_fill_buffer, - demux_open_avi, - demux_close_avi, - demux_seek_avi, - demux_avi_control -}; - -const demuxer_desc_t demuxer_desc_avi_ni = { - "AVI demuxer, non-interleaved", - "avini", - "AVI", - "Arpi?", - "AVI files, including non interleaved files", - DEMUXER_TYPE_AVI, - 1, // safe autodetect - avi_check_file, - demux_avi_fill_buffer_ni, - demux_open_avi, - demux_close_avi, - demux_seek_avi, - demux_avi_control -}; - -const demuxer_desc_t demuxer_desc_avi_nini = { - "AVI demuxer, non-interleaved and no index", - "avinini", - "AVI", - "Arpi?", - "AVI files, including non interleaved files", - DEMUXER_TYPE_AVI, - 1, // safe autodetect - avi_check_file, - demux_avi_fill_buffer_nini, - demux_open_avi, - demux_close_avi, - demux_seek_avi, - demux_avi_control -}; -- cgit v1.2.3