[Mplayer-cvslog] CVS: main/libmpdemux demux_smjpeg.c,NONE,1.1 Makefile,1.36,1.37 demuxer.c,1.111,1.112 demuxer.h,1.46,1.47
Alex Beregszaszi
alex at mplayerhq.hu
Fri Sep 13 20:58:31 CEST 2002
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv9355
Modified Files:
Makefile demuxer.c demuxer.h
Added Files:
demux_smjpeg.c
Log Message:
added smjpeg demuxer only for nexus' request
--- NEW FILE ---
/*
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.h"
#include "demuxer.h"
#include "stheader.h"
#include "bswap.h"
int smjpeg_check_file(demuxer_t* demuxer){
int orig_pos = stream_tell(demuxer->stream);
char buf[7];
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 1;
}
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
int demux_smjpeg_fill_buffer(demuxer_t *demux)
{
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;
}
int 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 1;
}
void demux_close_smjpeg(demuxer_t *demuxer)
{
return;
}
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile 10 Sep 2002 21:50:03 -0000 1.36
+++ Makefile 13 Sep 2002 18:58:14 -0000 1.37
@@ -3,7 +3,7 @@
include ../config.mak
-SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c opt-reg.c mpdemux.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c
+SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c opt-reg.c mpdemux.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c
ifeq ($(STREAMING),yes)
SRCS += asf_streaming.c url.c http.c network.c asf_mmst_streaming.c
ifeq ($(STREAMING_LIVE_DOT_COM),yes)
Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- demuxer.c 10 Sep 2002 21:50:03 -0000 1.111
+++ demuxer.c 13 Sep 2002 18:58:14 -0000 1.112
@@ -155,6 +155,7 @@
extern void demux_close_avi(demuxer_t *demuxer);
extern void demux_close_rawdv(demuxer_t* demuxer);
extern void demux_close_pva(demuxer_t* demuxer);
+extern void demux_close_smjpeg(demuxer_t* demuxer);
#ifdef USE_TV
#include "tv.h"
@@ -207,6 +208,8 @@
case DEMUXER_TYPE_RTP:
demux_close_rtp(demuxer); break;
#endif
+ case DEMUXER_TYPE_SMJPEG:
+ demux_close_smjpeg(demuxer); return;
case DEMUXER_TYPE_DEMUXERS:
demux_close_demuxers(demuxer); return;
case DEMUXER_TYPE_AVI:
@@ -292,6 +295,7 @@
extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
extern int demux_ogg_fill_buffer(demuxer_t *d);
extern int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds);
+extern int demux_smjpeg_fill_buffer(demuxer_t* demux);
int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
// Note: parameter 'ds' can be NULL!
@@ -327,6 +331,7 @@
#ifdef STREAMING_LIVE_DOT_COM
case DEMUXER_TYPE_RTP: return demux_rtp_fill_buffer(demux, ds);
#endif
+ case DEMUXER_TYPE_SMJPEG: return demux_smjpeg_fill_buffer(demux);
}
return 0;
}
@@ -546,6 +551,8 @@
extern int demux_audio_open(demuxer_t* demuxer);
extern int demux_ogg_open(demuxer_t* demuxer);
extern int demux_rawaudio_open(demuxer_t* demuxer);
+extern int smjpeg_check_file(demuxer_t *demuxer);
+extern int demux_open_smjpeg(demuxer_t* demuxer);
extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer);
@@ -734,6 +741,17 @@
demuxer = NULL;
}
}
+//=============== Try to open as SMJPEG file: =================
+if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_SMJPEG){
+ demuxer=new_demuxer(stream,DEMUXER_TYPE_SMJPEG,audio_id,video_id,dvdsub_id);
+ if(smjpeg_check_file(demuxer)){
+ mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected SMJPEG file!\n");
+ file_format=DEMUXER_TYPE_SMJPEG;
+ } else {
+ free_demuxer(demuxer);
+ demuxer = NULL;
+ }
+}
//=============== Try to open as Ogg file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_OGG){
demuxer=new_demuxer(stream,DEMUXER_TYPE_OGG,audio_id,video_id,dvdsub_id);
@@ -897,6 +915,10 @@
}
case DEMUXER_TYPE_ROQ: {
if (!demux_open_roq(demuxer)) return NULL;
+ break;
+ }
+ case DEMUXER_TYPE_SMJPEG: {
+ if (!demux_open_smjpeg(demuxer)) return NULL;
break;
}
case DEMUXER_TYPE_MOV: {
Index: demuxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- demuxer.h 10 Sep 2002 21:50:03 -0000 1.46
+++ demuxer.h 13 Sep 2002 18:58:14 -0000 1.47
@@ -32,6 +32,8 @@
#define DEMUXER_TYPE_RTP 21
#define DEMUXER_TYPE_RAWDV 22
#define DEMUXER_TYPE_PVA 23
+#define DEMUXER_TYPE_SMJPEG 24
+
// This should always match the higest demuxer type number.
// Unless you want to disallow users to force the demuxer to some types
#define DEMUXER_TYPE_MIN 0
More information about the MPlayer-cvslog
mailing list