Mercurial > mplayer.hg
view libmpdemux/demux_smjpeg.c @ 23572:a00685941686
demux_mkv very long seek fix
The seek code searching for the closest position in the index used
"int64_t min_diff=0xFFFFFFFL" as the initial "further from the goal
than any real alternative" value. The unit is milliseconds so seeks more
than about 75 hours past the end of the file would fail to recognize the
last index position as the best match. This was triggered in practice by
chapter seek code which apparently uses a seek of 1000000000 seconds
forward to mean "seek to the end". The practical effect was that trying
to seek to the next chapter in a file without chapters made MPlayer
block until it finished reading the file from the current position to
the end.
Fixed by increasing the initial value from FFFFFFF to FFFFFFFFFFFFFFF.
author | uau |
---|---|
date | Wed, 20 Jun 2007 18:19:03 +0000 |
parents | 4d81dbdf46b9 |
children | d4fe6e23283e |
line wrap: on
line source
/* SMJPEG file parser by Alex Beregszaszi Only for testing some files. Commited only for Nexus' request. Based on text by Arpi (SMJPEG-format.txt) and later on http://www.lokigames.com/development/download/smjpeg/SMJPEG.txt */ #include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <string.h> /* strtok */ #include "config.h" #include "mp_msg.h" #include "help_mp.h" #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" static int smjpeg_check_file(demuxer_t* demuxer){ int orig_pos = stream_tell(demuxer->stream); char buf[8]; int version; mp_msg(MSGT_DEMUX, MSGL_V, "Checking for SMJPEG\n"); if (stream_read_word(demuxer->stream) == 0xA) { stream_read(demuxer->stream, buf, 6); buf[7] = 0; if (strncmp("SMJPEG", buf, 6)) { mp_msg(MSGT_DEMUX, MSGL_DBG2, "Failed: SMJPEG\n"); return 0; } } else return 0; version = stream_read_dword(demuxer->stream); if (version != 0) { mp_msg(MSGT_DEMUX, MSGL_ERR, "Unknown version (%d) of SMJPEG. Please report!\n", version); return 0; } stream_seek(demuxer->stream, orig_pos); return DEMUXER_TYPE_SMJPEG; } // return value: // 0 = EOF or no stream found // 1 = successfully read a packet static int demux_smjpeg_fill_buffer(demuxer_t *demux, demux_stream_t *ds) { int dtype, dsize, dpts; demux->filepos = stream_tell(demux->stream); dtype = stream_read_dword_le(demux->stream); dpts = stream_read_dword(demux->stream); dsize = stream_read_dword(demux->stream); switch(dtype) { case mmioFOURCC('s','n','d','D'): /* fixme, but no decoder implemented yet */ ds_read_packet(demux->audio, demux->stream, dsize, (float)dpts/1000.0, demux->filepos, 0); break; case mmioFOURCC('v','i','d','D'): ds_read_packet(demux->video, demux->stream, dsize, (float)dpts/1000.0, demux->filepos, 0); break; case mmioFOURCC('D','O','N','E'): return 1; default: return 0; } return 1; } static demuxer_t* demux_open_smjpeg(demuxer_t* demuxer){ sh_video_t* sh_video; sh_audio_t* sh_audio; unsigned int htype = 0, hleng; int i = 0; /* file header */ stream_skip(demuxer->stream, 8); /* \x00\x0aSMJPEG */ stream_skip(demuxer->stream, 4); mp_msg(MSGT_DEMUX, MSGL_INFO, "This clip is %d seconds\n", stream_read_dword(demuxer->stream)); /* stream header */ while (i < 3) { i++; htype = stream_read_dword_le(demuxer->stream); if (htype == mmioFOURCC('H','E','N','D')) break; hleng = (stream_read_word(demuxer->stream)<<16)|stream_read_word(demuxer->stream); switch(htype) { case mmioFOURCC('_','V','I','D'): sh_video = new_sh_video(demuxer, 0); demuxer->video->sh = sh_video; sh_video->ds = demuxer->video; sh_video->bih = malloc(sizeof(BITMAPINFOHEADER)); memset(sh_video->bih, 0, sizeof(BITMAPINFOHEADER)); stream_skip(demuxer->stream, 4); /* number of frames */ // sh_video->fps = 24; // sh_video->frametime = 1.0f/sh_video->fps; sh_video->disp_w = stream_read_word(demuxer->stream); sh_video->disp_h = stream_read_word(demuxer->stream); sh_video->format = stream_read_dword_le(demuxer->stream); /* these are false values */ sh_video->bih->biSize = 40; sh_video->bih->biWidth = sh_video->disp_w; sh_video->bih->biHeight = sh_video->disp_h; sh_video->bih->biPlanes = 3; sh_video->bih->biBitCount = 12; sh_video->bih->biCompression = sh_video->format; sh_video->bih->biSizeImage = sh_video->disp_w*sh_video->disp_h; break; case mmioFOURCC('_','S','N','D'): sh_audio = new_sh_audio(demuxer, 0); demuxer->audio->sh = sh_audio; sh_audio->ds = demuxer->audio; sh_audio->wf = malloc(sizeof(WAVEFORMATEX)); memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX)); sh_audio->samplerate = stream_read_word(demuxer->stream); sh_audio->wf->wBitsPerSample = stream_read_char(demuxer->stream); sh_audio->channels = stream_read_char(demuxer->stream); sh_audio->format = stream_read_dword_le(demuxer->stream); sh_audio->wf->wFormatTag = sh_audio->format; sh_audio->wf->nChannels = sh_audio->channels; sh_audio->wf->nSamplesPerSec = sh_audio->samplerate; sh_audio->wf->nAvgBytesPerSec = sh_audio->wf->nChannels* sh_audio->wf->wBitsPerSample*sh_audio->wf->nSamplesPerSec/8; sh_audio->wf->nBlockAlign = sh_audio->channels *2; sh_audio->wf->cbSize = 0; break; case mmioFOURCC('_','T','X','T'): stream_skip(demuxer->stream, stream_read_dword(demuxer->stream)); break; } } demuxer->seekable = 0; return demuxer; } static void demux_close_smjpeg(demuxer_t *demuxer) { return; } demuxer_desc_t demuxer_desc_smjpeg = { "smjpeg demuxer", "smjpeg", "SMJPEG", "Alex Beregszasi", "", DEMUXER_TYPE_SMJPEG, 1, // safe autodetect smjpeg_check_file, demux_smjpeg_fill_buffer, demux_open_smjpeg, demux_close_smjpeg, NULL, NULL };