From 1fde09db6f4cee7347842261234082470dd3a2ca Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 30 Jul 2012 18:40:46 +0200 Subject: Remove some demuxers and decoders Most of these demuxers and decoders are provided in better form by libav, while the mplayer builtin ones are essentially unmaintained. The only legimitate use case for not using the libav ones was working around libav bugs or bugs related to the way mplayer uses libav. Instead of trying to keep dead code alive, development effort should go into improving libav or the mplayer libav glue code. Note that the libav demuxer have been preferred over the mplayer builtin ones for a while in mplayer2. There were some exceptions: playing DVDs with dvdnav or playing network sources. (That's because some stream modules and network.c requested explicit file formats, such as DEMUXER_TYPE_MPEG_PS, which mapped to builtin demuxers.) With this commit, they are switched to use libav. One caveat is that the requested format is not passed to libavformat, instead we rely on the auto probing to select the correct libav demuxer (see code in demux_open_stream()). --- libmpdemux/aac_hdr.c | 47 - libmpdemux/aac_hdr.h | 26 - libmpdemux/demux_aac.c | 260 ---- libmpdemux/demux_avi.c | 39 +- libmpdemux/demux_film.c | 490 ------- libmpdemux/demux_fli.c | 228 --- libmpdemux/demux_lmlm4.c | 385 ----- libmpdemux/demux_mov.c | 2350 ------------------------------ libmpdemux/demux_mov.h | 24 - libmpdemux/demux_mpc.c | 235 --- libmpdemux/demux_mpg.c | 1248 ---------------- libmpdemux/demux_nsv.c | 345 ----- libmpdemux/demux_nut.c | 321 ---- libmpdemux/demux_ogg.c | 1660 --------------------- libmpdemux/demux_ogg.h | 27 - libmpdemux/demux_pva.c | 536 ------- libmpdemux/demux_roq.c | 281 ---- libmpdemux/demux_smjpeg.c | 200 --- libmpdemux/demux_ts.c | 3533 --------------------------------------------- libmpdemux/demux_ts.h | 24 - libmpdemux/demux_ty.c | 899 ------------ libmpdemux/demux_ty_osd.c | 911 ------------ libmpdemux/demux_ty_osd.h | 25 - libmpdemux/demux_vqf.c | 240 --- libmpdemux/demux_y4m.c | 325 ----- libmpdemux/demuxer.c | 68 +- libmpdemux/demuxer.h | 17 - libmpdemux/extension.c | 23 +- libmpdemux/mpeg_hdr.c | 539 ------- libmpdemux/mpeg_hdr.h | 55 - libmpdemux/parse_es.c | 158 -- libmpdemux/parse_es.h | 45 - libmpdemux/parse_mp4.c | 173 --- libmpdemux/parse_mp4.h | 127 -- libmpdemux/video.c | 521 +------ 35 files changed, 32 insertions(+), 16353 deletions(-) delete mode 100644 libmpdemux/aac_hdr.c delete mode 100644 libmpdemux/aac_hdr.h delete mode 100644 libmpdemux/demux_aac.c delete mode 100644 libmpdemux/demux_film.c delete mode 100644 libmpdemux/demux_fli.c delete mode 100644 libmpdemux/demux_lmlm4.c delete mode 100644 libmpdemux/demux_mov.c delete mode 100644 libmpdemux/demux_mov.h delete mode 100644 libmpdemux/demux_mpc.c delete mode 100644 libmpdemux/demux_mpg.c delete mode 100644 libmpdemux/demux_nsv.c delete mode 100644 libmpdemux/demux_nut.c delete mode 100644 libmpdemux/demux_ogg.c delete mode 100644 libmpdemux/demux_ogg.h delete mode 100644 libmpdemux/demux_pva.c delete mode 100644 libmpdemux/demux_roq.c delete mode 100644 libmpdemux/demux_smjpeg.c delete mode 100644 libmpdemux/demux_ts.c delete mode 100644 libmpdemux/demux_ts.h delete mode 100644 libmpdemux/demux_ty.c delete mode 100644 libmpdemux/demux_ty_osd.c delete mode 100644 libmpdemux/demux_ty_osd.h delete mode 100644 libmpdemux/demux_vqf.c delete mode 100644 libmpdemux/demux_y4m.c delete mode 100644 libmpdemux/mpeg_hdr.c delete mode 100644 libmpdemux/mpeg_hdr.h delete mode 100644 libmpdemux/parse_es.c delete mode 100644 libmpdemux/parse_es.h delete mode 100644 libmpdemux/parse_mp4.c delete mode 100644 libmpdemux/parse_mp4.h (limited to 'libmpdemux') diff --git a/libmpdemux/aac_hdr.c b/libmpdemux/aac_hdr.c deleted file mode 100644 index 36991e27a2..0000000000 --- a/libmpdemux/aac_hdr.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2005 Nico Sabbi - * - * 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 "aac_hdr.h" -#include "libavutil/attributes.h" - -/// \param srate (out) sample rate -/// \param num (out) number of audio frames in this ADTS frame -/// \return size of the ADTS frame in bytes -/// aac_parse_frames needs a buffer at least 8 bytes long -int aac_parse_frame(uint8_t *buf, int *srate, int *num) -{ - int i = 0, sr, fl = 0, id av_unused; - static int srates[] = {96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 0, 0, 0}; - - if((buf[i] != 0xFF) || ((buf[i+1] & 0xF6) != 0xF0)) - return 0; - - id = (buf[i+1] >> 3) & 0x01; //id=1 mpeg2, 0: mpeg4 - sr = (buf[i+2] >> 2) & 0x0F; - if(sr > 11) - return 0; - *srate = srates[sr]; - - fl = ((buf[i+3] & 0x03) << 11) | (buf[i+4] << 3) | ((buf[i+5] >> 5) & 0x07); - *num = (buf[i+6] & 0x02) + 1; - - return fl; -} diff --git a/libmpdemux/aac_hdr.h b/libmpdemux/aac_hdr.h deleted file mode 100644 index be56368925..0000000000 --- a/libmpdemux/aac_hdr.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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. - */ - -#ifndef MPLAYER_AAC_HDR_H -#define MPLAYER_AAC_HDR_H - -#include - -int aac_parse_frame(uint8_t *buf, int *srate, int *num); - -#endif /* MPLAYER_AAC_HDR_H */ diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c deleted file mode 100644 index 9d37d75cf8..0000000000 --- a/libmpdemux/demux_aac.c +++ /dev/null @@ -1,260 +0,0 @@ -/* - * 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 "mp_msg.h" - -#include "stream/stream.h" -#include "demuxer.h" -#include "parse_es.h" -#include "stheader.h" -#include "aac_hdr.h" -#include "ms_hdr.h" - -typedef struct { - uint8_t *buf; - uint64_t size; /// amount of time of data packets pushed to demuxer->audio (in bytes) - float time; /// amount of time elapsed based upon samples_per_frame/sample_rate (in milliseconds) - float last_pts; /// last pts seen - int bitrate; /// bitrate computed as size/time -} aac_priv_t; - -static int demux_aac_init(demuxer_t *demuxer) -{ - aac_priv_t *priv; - - priv = calloc(1, sizeof(aac_priv_t)); - if(!priv) - return 0; - - priv->buf = malloc(8); - if(!priv->buf) - { - free(priv); - return 0; - } - - demuxer->priv = priv; - return 1; -} - -static void demux_close_aac(demuxer_t *demuxer) -{ - aac_priv_t *priv = (aac_priv_t *) demuxer->priv; - - if(!priv) - return; - - free(priv->buf); - - free(demuxer->priv); - - return; -} - -/// returns DEMUXER_TYPE_AAC if it finds 8 ADTS frames in 32768 bytes, 0 otherwise -static int demux_aac_probe(demuxer_t *demuxer) -{ - int cnt = 0, c, len, srate, num; - off_t init, probed; - aac_priv_t *priv; - - if(! demux_aac_init(demuxer)) - { - mp_msg(MSGT_DEMUX, MSGL_ERR, "COULDN'T INIT aac_demux, exit\n"); - return 0; - } - - priv = (aac_priv_t *) demuxer->priv; - - init = probed = stream_tell(demuxer->stream); - while(probed-init <= 32768 && cnt < 8) - { - c = 0; - while(c != 0xFF) - { - c = stream_read_char(demuxer->stream); - if(c < 0) - goto fail; - } - priv->buf[0] = 0xFF; - if(stream_read(demuxer->stream, &(priv->buf[1]), 7) < 7) - goto fail; - - len = aac_parse_frame(priv->buf, &srate, &num); - if(len > 0) - { - cnt++; - stream_skip(demuxer->stream, len - 8); - } - probed = stream_tell(demuxer->stream); - } - - stream_seek(demuxer->stream, init); - if(cnt < 8) - goto fail; - - mp_msg(MSGT_DEMUX, MSGL_V, "demux_aac_probe, INIT: %"PRIu64", PROBED: %"PRIu64", cnt: %d\n", init, probed, cnt); - return DEMUXER_TYPE_AAC; - -fail: - mp_msg(MSGT_DEMUX, MSGL_V, "demux_aac_probe, failed to detect an AAC stream\n"); - return 0; -} - -static demuxer_t* demux_aac_open(demuxer_t *demuxer) -{ - sh_audio_t *sh; - - sh = new_sh_audio(demuxer, 0); - sh->ds = demuxer->audio; - sh->format = mmioFOURCC('M', 'P', '4', 'A'); - demuxer->audio->id = 0; - demuxer->audio->sh = sh; - - demuxer->filepos = stream_tell(demuxer->stream); - - return demuxer; -} - -static int demux_aac_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) -{ - aac_priv_t *priv = (aac_priv_t *) demuxer->priv; - demux_packet_t *dp; - int c1, c2, len, srate, num; - float tm = 0; - - if(demuxer->stream->eof || (demuxer->movi_end && stream_tell(demuxer->stream) >= demuxer->movi_end)) - return 0; - - while(! demuxer->stream->eof) - { - c1 = c2 = 0; - while(c1 != 0xFF) - { - c1 = stream_read_char(demuxer->stream); - if(c1 < 0) - return 0; - } - c2 = stream_read_char(demuxer->stream); - if(c2 < 0) - return 0; - if((c2 & 0xF6) != 0xF0) - continue; - - priv->buf[0] = (unsigned char) c1; - priv->buf[1] = (unsigned char) c2; - if(stream_read(demuxer->stream, &(priv->buf[2]), 6) < 6) - return 0; - - len = aac_parse_frame(priv->buf, &srate, &num); - if(len > 0) - { - dp = new_demux_packet(len); - if(! dp) - { - mp_msg(MSGT_DEMUX, MSGL_ERR, "fill_buffer, NEW_ADD_PACKET(%d)FAILED\n", len); - return 0; - } - - - memcpy(dp->buffer, priv->buf, 8); - stream_read(demuxer->stream, &(dp->buffer[8]), len-8); - if(srate) - tm = (float) (num * 1024.0/srate); - priv->last_pts += tm; - dp->pts = priv->last_pts; - //fprintf(stderr, "\nPTS: %.3f\n", dp->pts); - ds_add_packet(demuxer->audio, dp); - priv->size += len; - priv->time += tm; - - priv->bitrate = (int) (priv->size / priv->time); - demuxer->filepos = stream_tell(demuxer->stream); - - return len; - } - else - stream_skip(demuxer->stream, -6); - } - - return 0; -} - - -//This is an almost verbatim copy of high_res_mp3_seek(), from demux_audio.c -static void demux_aac_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags) -{ - aac_priv_t *priv = (aac_priv_t *) demuxer->priv; - demux_stream_t *d_audio=demuxer->audio; - sh_audio_t *sh_audio=d_audio->sh; - float time; - - ds_free_packs(d_audio); - - time = (flags & SEEK_ABSOLUTE) ? rel_seek_secs - priv->last_pts : rel_seek_secs; - if(time < 0) - { - stream_seek(demuxer->stream, demuxer->movi_start); - time = priv->last_pts + time; - priv->last_pts = 0; - } - - if(time > 0) - { - int len, nf, srate, num; - - nf = time * sh_audio->samplerate/1024; - - while(nf > 0) - { - if(stream_read(demuxer->stream,priv->buf, 8) < 8) - break; - len = aac_parse_frame(priv->buf, &srate, &num); - if(len <= 0) - { - stream_skip(demuxer->stream, -7); - continue; - } - stream_skip(demuxer->stream, len - 8); - priv->last_pts += (float) (num*1024.0/srate); - nf -= num; - } - } -} - - -const demuxer_desc_t demuxer_desc_aac = { - "AAC demuxer", - "aac", - "AAC", - "Nico Sabbi", - "Raw AAC files ", - DEMUXER_TYPE_AAC, - 0, // unsafe autodetect - demux_aac_probe, - demux_aac_fill_buffer, - demux_aac_open, - demux_close_aac, - demux_aac_seek, - NULL -}; diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index f73648166c..3841cf2736 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -29,7 +29,6 @@ #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" -#include "demux_ogg.h" #include "aviheader.h" extern const demuxer_desc_t demuxer_desc_avi_ni; @@ -862,38 +861,6 @@ static int avi_check_file(demuxer_t *demuxer) } -static demuxer_t* demux_open_hack_avi(demuxer_t *demuxer) -{ - struct MPOpts *opts = demuxer->opts; - sh_audio_t* sh_a; - - demuxer = demux_open_avi(demuxer); - if(!demuxer) return NULL; // failed to open - sh_a = demuxer->audio->sh; - if(demuxer->audio->id != -2 && sh_a) { -#ifdef CONFIG_OGGVORBIS - // support for Ogg-in-AVI: - if(sh_a->format == 0xFFFE) - demuxer = init_avi_with_ogg(demuxer); - else if(sh_a->format == 0x674F) { - stream_t* s; - demuxer_t *od; - s = new_ds_stream(demuxer->audio); - od = new_demuxer(opts, s,DEMUXER_TYPE_OGG,-1,-2,-2,NULL); - if(!demux_ogg_open(od)) { - mp_tmsg( MSGT_DEMUXER,MSGL_ERR,"Unable to open the Ogg demuxer.\n"); - free_stream(s); - demuxer->audio->id = -2; - } else - demuxer = new_demuxers_demuxer(demuxer,od,demuxer); - } -#endif - } - - return demuxer; -} - - const demuxer_desc_t demuxer_desc_avi = { "AVI demuxer", "avi", @@ -904,7 +871,7 @@ const demuxer_desc_t demuxer_desc_avi = { 1, // safe autodetect avi_check_file, demux_avi_fill_buffer, - demux_open_hack_avi, + demux_open_avi, demux_close_avi, demux_seek_avi, demux_avi_control @@ -920,7 +887,7 @@ const demuxer_desc_t demuxer_desc_avi_ni = { 1, // safe autodetect avi_check_file, demux_avi_fill_buffer_ni, - demux_open_hack_avi, + demux_open_avi, demux_close_avi, demux_seek_avi, demux_avi_control @@ -936,7 +903,7 @@ const demuxer_desc_t demuxer_desc_avi_nini = { 1, // safe autodetect avi_check_file, demux_avi_fill_buffer_nini, - demux_open_hack_avi, + demux_open_avi, demux_close_avi, demux_seek_avi, demux_avi_control diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c deleted file mode 100644 index 713c9ea26e..0000000000 --- a/libmpdemux/demux_film.c +++ /dev/null @@ -1,490 +0,0 @@ -/* - * FILM file parser - * Copyright (C) 2002 Mike Melanson - * - * This demuxer handles FILM (a.k.a. CPK) files commonly found on Sega - * Saturn CD-ROM games. FILM files have also been found on 3DO games. - * - * details of the FILM file format can be found at: - * http://www.pcisys.net/~melanson/codecs/ - * - * 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 "mp_msg.h" - -#include "stream/stream.h" -#include "demuxer.h" -#include "stheader.h" - -// chunk types found in a FILM file -#define CHUNK_FILM mmioFOURCC('F', 'I', 'L', 'M') -#define CHUNK_FDSC mmioFOURCC('F', 'D', 'S', 'C') -#define CHUNK_STAB mmioFOURCC('S', 'T', 'A', 'B') - -typedef struct film_chunk_t -{ - off_t chunk_offset; - int chunk_size; - unsigned int syncinfo1; - unsigned int syncinfo2; - - float pts; -} film_chunk_t; - -typedef struct film_data_t -{ - unsigned int total_chunks; - unsigned int current_chunk; - film_chunk_t *chunks; - unsigned int chunks_per_second; - unsigned int film_version; -} film_data_t; - -static void demux_seek_film(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags) -{ - film_data_t *film_data = (film_data_t *)demuxer->priv; - int new_current_chunk=(flags&SEEK_ABSOLUTE)?0:film_data->current_chunk; - - if(flags&SEEK_FACTOR) - new_current_chunk += rel_seek_secs * film_data->total_chunks; // 0..1 - else - new_current_chunk += rel_seek_secs * film_data->chunks_per_second; // secs - - -mp_msg(MSGT_DECVIDEO, MSGL_INFO,"current, total chunks = %d, %d; seek %5.3f sec, new chunk guess = %d\n", - film_data->current_chunk, film_data->total_chunks, - rel_seek_secs, new_current_chunk); - - // check if the new chunk number is valid - if (new_current_chunk < 0) - new_current_chunk = 0; - if ((unsigned int)new_current_chunk > film_data->total_chunks) - new_current_chunk = film_data->total_chunks - 1; - - while (((film_data->chunks[new_current_chunk].syncinfo1 == 0xFFFFFFFF) || - (film_data->chunks[new_current_chunk].syncinfo1 & 0x80000000)) && - (new_current_chunk > 0)) - new_current_chunk--; - - film_data->current_chunk = new_current_chunk; - -mp_msg(MSGT_DECVIDEO, MSGL_INFO," (flags = %X) actual new chunk = %d (syncinfo1 = %08X)\n", - flags, film_data->current_chunk, film_data->chunks[film_data->current_chunk].syncinfo1); - demuxer->video->pts=film_data->chunks[film_data->current_chunk].pts; - -} - -// return value: -// 0 = EOF or no stream found -// 1 = successfully read a packet -static int demux_film_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) -{ - int i; - unsigned char byte_swap; - int cvid_size; - sh_video_t *sh_video = demuxer->video->sh; - sh_audio_t *sh_audio = demuxer->audio->sh; - film_data_t *film_data = (film_data_t *)demuxer->priv; - film_chunk_t film_chunk; - int length_fix_bytes; - demux_packet_t* dp; - - // see if the end has been reached - if (film_data->current_chunk >= film_data->total_chunks) - return 0; - - film_chunk = film_data->chunks[film_data->current_chunk]; - - // position stream and fetch chunk - stream_seek(demuxer->stream, film_chunk.chunk_offset); - - // load the chunks manually (instead of using ds_read_packet()), since - // they require some adjustment - // (all ones in syncinfo1 indicates an audio chunk) - if (film_chunk.syncinfo1 == 0xFFFFFFFF) - { - if(demuxer->audio->id>=-1){ // audio not disabled - dp = new_demux_packet(film_chunk.chunk_size); - if (stream_read(demuxer->stream, dp->buffer, film_chunk.chunk_size) != - film_chunk.chunk_size) - return 0; - dp->pts = film_chunk.pts; - dp->pos = film_chunk.chunk_offset; - - // adjust the data before queuing it: - // 8-bit: signed -> unsigned - // 16-bit: big-endian -> little-endian - if (sh_audio->wf->wBitsPerSample == 8) - for (i = 0; i < film_chunk.chunk_size; i++) - dp->buffer[i] += 128; - else - for (i = 0; i < film_chunk.chunk_size; i += 2) - { - byte_swap = dp->buffer[i]; - dp->buffer[i] = dp->buffer[i + 1]; - dp->buffer[i + 1] = byte_swap; - } - - /* for SegaSaturn .cpk file, translate audio data if stereo */ - if (sh_audio->wf->nChannels == 2) { - if (sh_audio->wf->wBitsPerSample == 8) { - unsigned char* tmp = dp->buffer; - unsigned char buf[film_chunk.chunk_size]; - for(i = 0; i < film_chunk.chunk_size/2; i++) { - buf[i*2] = tmp[i]; - buf[i*2+1] = tmp[film_chunk.chunk_size/2+i]; - } - memcpy( tmp, buf, film_chunk.chunk_size ); - } - else {/* for 16bit */ - unsigned short *tmp = (unsigned short *)dp->buffer; - unsigned short buf[film_chunk.chunk_size/2]; - for(i = 0; i < film_chunk.chunk_size/4; i++) { - buf[i*2] = tmp[i]; - buf[i*2+1] = tmp[film_chunk.chunk_size/4+i]; - } - memcpy( tmp, buf, film_chunk.chunk_size ); - } - } - - // append packet to DS stream - ds_add_packet(demuxer->audio, dp); - } - } - else - { - // if the demuxer is dealing with CVID data, deal with it a special way - if (sh_video->format == mmioFOURCC('c', 'v', 'i', 'd')) - { - if (film_data->film_version) - length_fix_bytes = 2; - else - length_fix_bytes = 6; - - // account for the fix bytes when allocating the buffer - dp = new_demux_packet(film_chunk.chunk_size - length_fix_bytes); - - // these CVID data chunks have a few extra bytes; skip them - if (stream_read(demuxer->stream, dp->buffer, 10) != 10) - return 0; - stream_skip(demuxer->stream, length_fix_bytes); - - if (stream_read(demuxer->stream, dp->buffer + 10, - film_chunk.chunk_size - (10 + length_fix_bytes)) != - (film_chunk.chunk_size - (10 + length_fix_bytes))) - return 0; - - dp->pts = film_chunk.pts; - dp->pos = film_chunk.chunk_offset; - dp->keyframe = film_chunk.syncinfo1 & 0x80000000; - - // fix the CVID chunk size - cvid_size = film_chunk.chunk_size - length_fix_bytes; - dp->buffer[1] = (cvid_size >> 16) & 0xFF; - dp->buffer[2] = (cvid_size >> 8) & 0xFF; - dp->buffer[3] = (cvid_size >> 0) & 0xFF; - - // append packet to DS stream - ds_add_packet(demuxer->video, dp); - } - else - { - ds_read_packet(demuxer->video, demuxer->stream, film_chunk.chunk_size, - film_chunk.pts, - film_chunk.chunk_offset, (film_chunk.syncinfo1 & 0x80000000) ? 1 : 0); - } - } - film_data->current_chunk++; - - return 1; -} - -static demuxer_t* demux_open_film(demuxer_t* demuxer) -{ - sh_video_t *sh_video = NULL; - sh_audio_t *sh_audio = NULL; - film_data_t *film_data; - film_chunk_t film_chunk; - int header_size; - unsigned int chunk_type; - unsigned int chunk_size; - unsigned int i; - unsigned int video_format; - int audio_channels; - int counting_chunks; - unsigned int total_audio_bytes = 0; - - film_data = malloc(sizeof(film_data_t)); - film_data->total_chunks = 0; - film_data->current_chunk = 0; - film_data->chunks = NULL; - film_data->chunks_per_second = 0; - - // go back to the beginning - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); - - // read the master chunk type - chunk_type = stream_read_fourcc(demuxer->stream); - // validate the chunk type - if (chunk_type != CHUNK_FILM) - { - mp_msg(MSGT_DEMUX, MSGL_ERR, "Not a FILM file\n"); - free(film_data); - return NULL; - } - - // get the header size, which implicitly points past the header and - // to the start of the data - header_size = stream_read_dword(demuxer->stream); - film_data->film_version = stream_read_fourcc(demuxer->stream); - demuxer->movi_start = header_size; - demuxer->movi_end = demuxer->stream->end_pos; - header_size -= 16; - - mp_msg(MSGT_DEMUX, MSGL_HINT, "FILM version %.4s\n", - (char *)&film_data->film_version); - - // skip to where the next chunk should be - stream_skip(demuxer->stream, 4); - - // traverse through the header - while (header_size > 0) - { - // fetch the chunk type and size - chunk_type = stream_read_fourcc(demuxer->stream); - chunk_size = stream_read_dword(demuxer->stream); - header_size -= chunk_size; - - switch (chunk_type) - { - case CHUNK_FDSC: - mp_msg(MSGT_DECVIDEO, MSGL_V, "parsing FDSC chunk\n"); - - // fetch the video codec fourcc to see if there's any video - video_format = stream_read_fourcc(demuxer->stream); - if (video_format) - { - // create and initialize the video stream header - sh_video = new_sh_video(demuxer, 0); - demuxer->video->sh = sh_video; - sh_video->ds = demuxer->video; - - sh_video->format = video_format; - sh_video->disp_h = stream_read_dword(demuxer->stream); - sh_video->disp_w = stream_read_dword(demuxer->stream); - mp_msg(MSGT_DECVIDEO, MSGL_V, - " FILM video: %d x %d\n", sh_video->disp_w, - sh_video->disp_h); - } - else - // skip height and width if no video - stream_skip(demuxer->stream, 8); - - if(demuxer->audio->id<-1){ - mp_msg(MSGT_DECVIDEO, MSGL_INFO,"chunk size = 0x%X \n",chunk_size); - stream_skip(demuxer->stream, chunk_size-12-8); - break; // audio disabled (or no soundcard) - } - - // skip over unknown byte, but only if file had non-NULL version - if (film_data->film_version) - stream_skip(demuxer->stream, 1); - - // fetch the audio channels to see if there's any audio - // don't do this if the file is a quirky file with NULL version - if (film_data->film_version) - { - audio_channels = stream_read_char(demuxer->stream); - if (audio_channels > 0) - { - // create and initialize the audio stream header - sh_audio = new_sh_audio(demuxer, 0); - demuxer->audio->id = 0; - demuxer->audio->sh = sh_audio; - sh_audio->ds = demuxer->audio; - - sh_audio->wf = malloc(sizeof(*sh_audio->wf)); - - // uncompressed PCM format - sh_audio->wf->wFormatTag = 1; - sh_audio->format = 1; - sh_audio->wf->nChannels = audio_channels; - sh_audio->wf->wBitsPerSample = stream_read_char(demuxer->stream); - stream_skip(demuxer->stream, 1); // skip unknown byte - sh_audio->wf->nSamplesPerSec = stream_read_word(demuxer->stream); - sh_audio->wf->nAvgBytesPerSec = - sh_audio->wf->nSamplesPerSec * sh_audio->wf->wBitsPerSample - * sh_audio->wf->nChannels / 8; - stream_skip(demuxer->stream, 6); // skip the rest of the unknown - - mp_msg(MSGT_DECVIDEO, MSGL_V, - " FILM audio: %d channels, %d bits, %d Hz\n", - sh_audio->wf->nChannels, 8 * sh_audio->wf->wBitsPerSample, - sh_audio->wf->nSamplesPerSec); - } - else - stream_skip(demuxer->stream, 10); - } - else - { - // otherwise, make some assumptions about the audio - - // create and initialize the audio stream header - sh_audio = new_sh_audio(demuxer, 0); - demuxer->audio->sh = sh_audio; - sh_audio->ds = demuxer->audio; - - sh_audio->wf = malloc(sizeof(*sh_audio->wf)); - - // uncompressed PCM format - sh_audio->wf->wFormatTag = 1; - sh_audio->format = 1; - sh_audio->wf->nChannels = 1; - sh_audio->wf->wBitsPerSample = 8; - sh_audio->wf->nSamplesPerSec = 22050; - sh_audio->wf->nAvgBytesPerSec = - sh_audio->wf->nSamplesPerSec * sh_audio->wf->wBitsPerSample - * sh_audio->wf->nChannels / 8; - - mp_msg(MSGT_DECVIDEO, MSGL_V, - " FILM audio: %d channels, %d bits, %d Hz\n", - sh_audio->wf->nChannels, sh_audio->wf->wBitsPerSample, - sh_audio->wf->nSamplesPerSec); - } - break; - - case CHUNK_STAB: - mp_msg(MSGT_DECVIDEO, MSGL_V, "parsing STAB chunk\n"); - - if (sh_video) - { - sh_video->fps = stream_read_dword(demuxer->stream); - sh_video->frametime = 1.0 / sh_video->fps; - } - - // fetch the number of chunks - film_data->total_chunks = stream_read_dword(demuxer->stream); - film_data->current_chunk = 0; - mp_msg(MSGT_DECVIDEO, MSGL_V, - " STAB chunk contains %d chunks\n", film_data->total_chunks); - - // allocate enough entries for the chunk - film_data->chunks = - calloc(film_data->total_chunks, sizeof(film_chunk_t)); - - // build the chunk index - counting_chunks = 1; - for (i = 0; i < film_data->total_chunks; i++) - { - film_chunk = film_data->chunks[i]; - film_chunk.chunk_offset = - demuxer->movi_start + stream_read_dword(demuxer->stream); - film_chunk.chunk_size = stream_read_dword(demuxer->stream); - film_chunk.syncinfo1 = stream_read_dword(demuxer->stream); - film_chunk.syncinfo2 = stream_read_dword(demuxer->stream); - - // count chunks for the purposes of seeking - if (counting_chunks) - { - // if we're counting chunks, always count an audio chunk - if (film_chunk.syncinfo1 == 0xFFFFFFFF) - film_data->chunks_per_second++; - // if it's a video chunk, check if it's time to stop counting - else if ((film_chunk.syncinfo1 & 0x7FFFFFFF) >= sh_video->fps) - counting_chunks = 0; - else - film_data->chunks_per_second++; - } - - // precalculate PTS - if (film_chunk.syncinfo1 == 0xFFFFFFFF) - { - if(demuxer->audio->id>=-1) - film_chunk.pts = - (float)total_audio_bytes / (float)sh_audio->wf->nAvgBytesPerSec; - total_audio_bytes += film_chunk.chunk_size; - } - else - film_chunk.pts = - (film_chunk.syncinfo1 & 0x7FFFFFFF) / sh_video->fps; - - film_data->chunks[i] = film_chunk; - } - - // in some FILM files (notably '1.09'), the length of the FDSC chunk - // follows different rules - if (chunk_size == (film_data->total_chunks * 16)) - header_size -= 16; - break; - - default: - mp_msg(MSGT_DEMUX, MSGL_ERR, "Unrecognized FILM header chunk: %08X\n", - chunk_type); - return NULL; - break; - } - } - - demuxer->priv = film_data; - - return demuxer; -} - -static void demux_close_film(demuxer_t* demuxer) { - film_data_t *film_data = demuxer->priv; - - if(!film_data) - return; - free(film_data->chunks); - free(film_data); - -} - -static int film_check_file(demuxer_t* demuxer) -{ - int signature=stream_read_fourcc(demuxer->stream); - - // check for the FILM file magic number - if(signature==mmioFOURCC('F', 'I', 'L', 'M')) - return DEMUXER_TYPE_FILM; - - return 0; -} - - -const demuxer_desc_t demuxer_desc_film = { - "FILM/CPK demuxer for Sega Saturn CD-ROM games", - "film", - "FILM", - "Mike Melanson", - "", - DEMUXER_TYPE_FILM, - 0, // unsafe autodetect (short signature) - film_check_file, - demux_film_fill_buffer, - demux_open_film, - demux_close_film, - demux_seek_film, - NULL -}; diff --git a/libmpdemux/demux_fli.c b/libmpdemux/demux_fli.c deleted file mode 100644 index e89fa75d97..0000000000 --- a/libmpdemux/demux_fli.c +++ /dev/null @@ -1,228 +0,0 @@ -/* - * FLI file parser - * copyright (c) 2001 Mike Melanson - * - * 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 "mp_msg.h" - -#include "stream/stream.h" -#include "demuxer.h" -#include "stheader.h" - -typedef struct { - int num_frames; - int current_frame; - off_t *filepos; - unsigned int *frame_size; -} fli_frames_t; - -static void demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ - fli_frames_t *frames = (fli_frames_t *)demuxer->priv; - sh_video_t *sh_video = demuxer->video->sh; - int newpos=(flags&SEEK_ABSOLUTE)?0:frames->current_frame; - if(flags&SEEK_FACTOR){ - // float 0..1 - newpos+=rel_seek_secs*frames->num_frames; - } else { - // secs - newpos+=rel_seek_secs*sh_video->fps; - } - if(newpos<0) newpos=0; else - if(newpos>frames->num_frames) newpos=frames->num_frames; - frames->current_frame=newpos; -} - -// return value: -// 0 = EOF or no stream found -// 1 = successfully read a packet -static int demux_fli_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds){ - fli_frames_t *frames = (fli_frames_t *)demuxer->priv; - sh_video_t *sh_video = demuxer->video->sh; - - // see if the end has been reached - if (frames->current_frame >= frames->num_frames) - return 0; - - // fetch the frame from the file - // first, position the file properly since ds_read_packet() doesn't - // seem to do it, even though it takes a file offset as a parameter - stream_seek(demuxer->stream, frames->filepos[frames->current_frame]); - ds_read_packet(demuxer->video, - demuxer->stream, - frames->frame_size[frames->current_frame], - frames->current_frame/sh_video->fps, - frames->filepos[frames->current_frame], - 0 /* what flags? -> demuxer.h (alex) */ - ); - - // get the next frame ready - frames->current_frame++; - - return 1; -} - -static demuxer_t* demux_open_fli(demuxer_t* demuxer){ - sh_video_t *sh_video = NULL; - fli_frames_t *frames = malloc(sizeof(fli_frames_t)); - int frame_number; - int speed; - unsigned int frame_size; - int magic_number; - unsigned char * header; - - // go back to the beginning - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); - - header = calloc(1, sizeof(BITMAPINFOHEADER) + 128); - stream_read(demuxer->stream, header + sizeof(BITMAPINFOHEADER), 128); - stream_seek(demuxer->stream, 0); - - demuxer->movi_start = 128; - demuxer->movi_end = stream_read_dword_le(demuxer->stream); - - magic_number = stream_read_word_le(demuxer->stream); - - if ((magic_number != 0xAF11) && (magic_number != 0xAF12)) - { - mp_msg(MSGT_DEMUX, MSGL_ERR, "Bad/unknown magic number (%04x)\n", - magic_number); - free(header); - free(frames); - return NULL; - } - - // fetch the number of frames - frames->num_frames = stream_read_word_le(demuxer->stream); - frames->current_frame = 0; - - // allocate enough entries for the indices - // audit: num_frames is 16bit so it is safe against overflow - frames->filepos = malloc(frames->num_frames * sizeof(off_t)); - frames->frame_size = malloc(frames->num_frames * sizeof(int)); - - // create a new video stream header - sh_video = new_sh_video(demuxer, 0); - - // make sure the demuxer knows about the new video stream header - // (even though new_sh_video() ought to take care of it) - demuxer->video->sh = sh_video; - - // make sure that the video demuxer stream header knows about its - // parent video demuxer stream (this is getting wacky), or else - // video_read_properties() will choke - sh_video->ds = demuxer->video; - - // custom fourcc for internal MPlayer use - sh_video->format = mmioFOURCC('F', 'L', 'I', 'C'); - - sh_video->disp_w = stream_read_word_le(demuxer->stream); - sh_video->disp_h = stream_read_word_le(demuxer->stream); - - // pass extradata to codec - sh_video->bih = (BITMAPINFOHEADER*)header; - sh_video->bih->biSize = sizeof(BITMAPINFOHEADER) + 128; - sh_video->bih->biWidth = sh_video->disp_w; - sh_video->bih->biHeight = sh_video->disp_h; - - // skip the video depth and flags - stream_skip(demuxer->stream, 4); - - // get the speed - speed = stream_read_word_le(demuxer->stream); - if (speed == 0) - speed = 1; - if (magic_number == 0xAF11) - speed *= 1000/70; - sh_video->fps = 1000 / speed; - sh_video->frametime = 1/sh_video->fps; - - // build the frame index - stream_seek(demuxer->stream, demuxer->movi_start); - frame_number = 0; - while ((!stream_eof(demuxer->stream)) && (frame_number < frames->num_frames)) - { - frames->filepos[frame_number] = stream_tell(demuxer->stream); - frame_size = stream_read_dword_le(demuxer->stream); - magic_number = stream_read_word_le(demuxer->stream); - stream_skip(demuxer->stream, frame_size - 6); - - // if this chunk has the right magic number, index it - if ((magic_number == 0xF1FA) || (magic_number == 0xF5FA)) - { - frames->frame_size[frame_number] = frame_size; - frame_number++; - } - } - - // save the actual number of frames indexed - frames->num_frames = frame_number; - - demuxer->priv = frames; - - return demuxer; -} - -static void demux_close_fli(demuxer_t* demuxer) { - fli_frames_t *frames = demuxer->priv; - - if(!frames) - return; - - free(frames->filepos); - free(frames->frame_size); - free(frames); - -} - - -static int fli_check_file(demuxer_t* demuxer) -{ - int id; - - stream_seek(demuxer->stream, 4); - id=stream_read_word_le(demuxer->stream); - // check for the FLI file magic number - if((id==0xAF11) || (id==0xAF12)) - return DEMUXER_TYPE_FLI; - - return 0; -} - - -const demuxer_desc_t demuxer_desc_fli = { - "Autodesk FLIC demuxer", - "fli", - "FLI", - "Mike Melanson", - "Supports also some extensions", - DEMUXER_TYPE_FLI, - 0, // unsafe autodetect (short signature) - fli_check_file, - demux_fli_fill_buffer, - demux_open_fli, - demux_close_fli, - demux_seek_fli, - NULL -}; diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c deleted file mode 100644 index 739343cdb4..0000000000 --- a/libmpdemux/demux_lmlm4.c +++ /dev/null @@ -1,385 +0,0 @@ -/* - * LMLM4 MPEG4 Compression Card stream & file parser - * Copyright (C) 2003 Maxim Yevtyushkin - * based on SMJPEG file parser by Alex Beregszaszi - * - * 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 /* strtok */ - -#include "config.h" -#include "mp_msg.h" - -#include "stream/stream.h" -#include "demuxer.h" -#include "stheader.h" - -typedef struct FrameInfo -{ - ssize_t frameSize; - ssize_t paddingSize; - int frameType; - int channelNo; -} FrameInfo; - -#define FRAMETYPE_I 0 -#define FRAMETYPE_P 1 -#define FRAMETYPE_B 2 -#define FRAMETYPE_AUDIO_MPEG1L2 4 -#define FRAMETYPE_AUDIO_ULAW 5 -#define FRAMETYPE_AUDIO_ADPCM 6 - -#define PACKET_BLOCK_SIZE 0x00000200 -#define PACKET_BLOCK_LAST 0x000001FF -#define PACKET_BLOCK_MASK 0xFFFFFE00 - -#define MAX_PACKET_SIZE 1048576 // 1 Mb - -#define STREAM_START_CODE_SIZE 4 - -/* -// codes in MSB first -static unsigned int start_code [] = -{ - 0xB0010000, // VISUAL_OBJECT_SEQUENCE_START_CODE - 0xB6010000, // VOP_START_CODE - 0x04C4FDFF, // MPEG1LAYERII_START_CODE - 0x00000000 // end of start codes list -}; -*/ - -static int imeHeaderValid(FrameInfo *frame) -{ - if ( frame->channelNo > 7 || - frame->frameSize > MAX_PACKET_SIZE || frame->frameSize <= 0) - { - mp_msg(MSGT_DEMUX, MSGL_V, - "Invalid packet in LMLM4 stream: ch=%d size=%zd\n", - frame->channelNo, frame->frameSize); - return 0; - } - switch (frame->frameType) { - case FRAMETYPE_I: - case FRAMETYPE_P: - case FRAMETYPE_B: - case FRAMETYPE_AUDIO_MPEG1L2: - case FRAMETYPE_AUDIO_ULAW: - case FRAMETYPE_AUDIO_ADPCM: - break; - default: - mp_msg(MSGT_DEMUX, MSGL_V, "Invalid packet in LMLM4 stream (wrong packet type %d)\n", frame->frameType); - return 0; - } - return 1; -} - -/* -int searchMPEG4Stream(demuxer_t* demuxer, IME6400Header *imeHeader) -{ - void *data; - ssize_t imeHeaderSize = sizeof(IME6400Header); - ssize_t dataSize = sizeof(IME6400Header) * 3; - ssize_t ptr = imeHeaderSize * 2; - int errNo, startCodeNo; - off_t pos; - - data = malloc(dataSize); - - imeHeaderSwap(imeHeader); - memcpy(data + imeHeaderSize, imeHeader, imeHeaderSize); - -// printHex(data + imeHeaderSize, imeHeaderSize); - - while ((errNo = stream_read(demuxer->stream, data + imeHeaderSize * 2 , imeHeaderSize)) == imeHeaderSize) - { -// printHex(data + imeHeaderSize * 2, imeHeaderSize); - - pos = stream_tell(demuxer->stream); - while (dataSize - ptr >= STREAM_START_CODE_SIZE) { - startCodeNo = 0; - while (start_code[startCodeNo]) - { - if (memcmp(&start_code[startCodeNo], data + ptr, STREAM_START_CODE_SIZE) == 0) // start code match - { - memcpy(imeHeader, data + ptr - imeHeaderSize, imeHeaderSize); - imeHeaderSwap(imeHeader); - if (imeHeaderValid(imeHeader)) - { - stream_seek(demuxer->stream, pos - (dataSize - ptr)); - free(data); - return 0; - } - } - startCodeNo++; - } - ptr++; - } - memcpy(data,data + imeHeaderSize, imeHeaderSize * 2); - ptr -= imeHeaderSize; - } - - free(data); - return errNo; -} -*/ - -static int getFrame(demuxer_t *demuxer, FrameInfo *frameInfo) -{ - unsigned int packetSize; - - frameInfo->channelNo = stream_read_word(demuxer->stream); - frameInfo->frameType = stream_read_word(demuxer->stream); - packetSize=stream_read_dword(demuxer->stream); - - if(stream_eof(demuxer->stream)){ - frameInfo->frameSize = 0; - return 0; - } - - frameInfo->frameSize = packetSize - 8; //sizeof(IME6400Header); - frameInfo->paddingSize = (packetSize & PACKET_BLOCK_LAST) ? PACKET_BLOCK_SIZE - (packetSize & PACKET_BLOCK_LAST) : 0; - - mp_msg(MSGT_DEMUX, MSGL_DBG2, "typ: %d chan: %d size: %zd pad: %zd\n", - frameInfo->frameType, - frameInfo->channelNo, - frameInfo->frameSize, - frameInfo->paddingSize); - - if(!imeHeaderValid(frameInfo)){ - // skip this packet - stream_skip(demuxer->stream,PACKET_BLOCK_SIZE-8); - frameInfo->frameSize = 0; - return -1; - } - - return 1; -} - -static int lmlm4_check_file(demuxer_t* demuxer) -{ - FrameInfo frameInfo; - unsigned int first; - - mp_msg(MSGT_DEMUX, MSGL_V, "Checking for LMLM4 Stream Format\n"); - - if(getFrame(demuxer, &frameInfo)!=1){ - mp_msg(MSGT_DEMUX, MSGL_V, "LMLM4 Stream Format not found\n"); - return 0; - } - first=stream_read_dword(demuxer->stream); - stream_skip(demuxer->stream,-12); - - mp_msg(MSGT_DEMUXER,MSGL_V,"LMLM4: first=0x%08X\n",first); - - switch(frameInfo.frameType){ - case FRAMETYPE_AUDIO_MPEG1L2: - if( (first & 0xffe00000) != 0xffe00000 ){ - mp_msg(MSGT_DEMUXER,MSGL_V,"LMLM4: not mpeg audio\n"); - return 0; - } - if((4-((first>>17)&3))!=2){ - mp_msg(MSGT_DEMUXER,MSGL_V,"LMLM4: not layer-2\n"); - return 0; - } - if(((first>>10)&0x3)==3){ - mp_msg(MSGT_DEMUXER,MSGL_V,"LMLM4: invalid audio sampelrate\n"); - return 0; - } - mp_msg(MSGT_DEMUXER,MSGL_V,"LMLM4: first packet is audio, header checks OK!\n"); - break; - // TODO: add checks for video header too, for case of disabled audio - } - - -// stream_reset(demuxer->stream); - mp_msg(MSGT_DEMUX, MSGL_V, "LMLM4 Stream Format found\n"); - - return DEMUXER_TYPE_LMLM4; -} - -static int video = 0; -static int frames= 0; - -// return value: -// 0 = EOF or no stream found -// 1 = successfully read a packet -static int demux_lmlm4_fill_buffer(demuxer_t *demux, demux_stream_t *ds) -{ - FrameInfo frameInfo; - double pts; - int id=1; - int ret; - -//hdr: - demux->filepos = stream_tell(demux->stream); - mp_msg(MSGT_DEMUX, MSGL_DBG2, "fpos = %"PRId64"\n", (int64_t)demux->filepos); - - ret=getFrame(demux, &frameInfo); - if(ret<=0) return ret; // EOF/error - - pts=demux->video->sh ? frames*((sh_video_t*)(demux->video->sh))->frametime : 0; - - switch(frameInfo.frameType){ - case FRAMETYPE_AUDIO_MPEG1L2: - mp_dbg(MSGT_DEMUX, MSGL_DBG2, "Audio Packet\n"); - if (!video) - { - stream_skip(demux->stream, frameInfo.frameSize + frameInfo.paddingSize); - mp_msg(MSGT_DEMUX, MSGL_V, "Skip Audio Packet\n"); - return -1; //goto hdr; - } - if(demux->audio->id==-1){ - if(!demux->a_streams[id]) new_sh_audio(demux,id); - demux->audio->id=id; - demux->audio->sh=demux->a_streams[id]; - ((sh_audio_t*)(demux->audio->sh))->format=0x50; // mpeg audio layer 1/2 - } - if(demux->audio->id==id) - ds_read_packet(demux->audio, demux->stream, frameInfo.frameSize, - pts, demux->filepos, 0); - else - stream_skip(demux->stream,frameInfo.frameSize); - break; - case FRAMETYPE_I: - if (!video) { - video = 1; - mp_dbg(MSGT_DEMUX, MSGL_DBG2, "First Video Packet\n"); - } - case FRAMETYPE_P: - frames=(frames+1)&(1024*1024-1); // wrap around at 4 hrs to avoid inaccurate float calculations - if (!video) - { - stream_skip(demux->stream, frameInfo.frameSize + frameInfo.paddingSize); - mp_msg(MSGT_DEMUX, MSGL_V, "Skip Video P Packet\n"); - return -1; //goto hdr; - } - mp_dbg(MSGT_DEMUX, MSGL_DBG2, "Video Packet\n"); - if(demux->video->id==-1){ - if(!demux->v_streams[id]) new_sh_video(demux,id); - demux->video->id=id; - demux->video->sh=demux->v_streams[id]; - ((sh_video_t*)(demux->video->sh))->format=0x10000004; // mpeg4-ES - } - if(demux->video->id==id) - ds_read_packet(demux->video, demux->stream, frameInfo.frameSize, - pts, demux->filepos, 0); - break; - default: - stream_skip(demux->stream,frameInfo.frameSize); - } - - stream_skip(demux->stream, frameInfo.paddingSize); - - return 1; -} - -static demuxer_t* demux_open_lmlm4(demuxer_t* demuxer){ - sh_audio_t *sh_audio=NULL; - sh_video_t *sh_video=NULL; - -#if 0 - sh_video_t* sh_video; - sh_audio_t* sh_audio; - unsigned int htype = 0, hleng; - int i = 0; - - sh_video = new_sh_video(demuxer, 0); - demuxer->video->sh = sh_video; - sh_video->ds = demuxer->video; - sh_video->disp_w = 640; - sh_video->disp_h = 480; - sh_video->format = mmioFOURCC('D','I','V','X'); - - sh_video->bih = calloc(1, sizeof(*sh_video->bih)); - - /* 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 = 16; - sh_video->bih->biCompression = sh_video->format; - sh_video->bih->biSizeImage = sh_video->disp_w*sh_video->disp_h; - - sh_audio = new_sh_audio(demuxer, 0); - demuxer->audio->sh = sh_audio; - sh_audio->ds = demuxer->audio; - - sh_audio->wf = calloc(1, sizeof(*sh_audio->wf)); - - sh_audio->samplerate = 48000; - sh_audio->wf->wBitsPerSample = 16; - sh_audio->channels = 2; - sh_audio->format = 0x50; - 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; - -#endif - - demuxer->seekable = 0; - - if(!ds_fill_buffer(demuxer->video)){ - mp_msg(MSGT_DEMUXER, MSGL_INFO, "LMLM4: %s", - mp_gtext("No video stream found.\n")); - demuxer->video->sh=NULL; - } else { - sh_video=demuxer->video->sh;sh_video->ds=demuxer->video; - } - if(demuxer->audio->id!=-2) { - if(!ds_fill_buffer(demuxer->audio)){ - mp_msg(MSGT_DEMUXER, MSGL_INFO, "LMLM4: %s", - mp_gtext("No audio stream found -> no sound.\n")); - demuxer->audio->sh=NULL; - } else { - sh_audio=demuxer->audio->sh;sh_audio->ds=demuxer->audio; - } - } - - return demuxer; -} - -static void demux_close_lmlm4(demuxer_t *demuxer) -{ -// printf("Close LMLM4 Stream\n"); - return; -} - - -const demuxer_desc_t demuxer_desc_lmlm4 = { - "LMLM4 MPEG4 Compression Card stream demuxer", - "lmlm4", - "RAW LMLM4", - "Maxim Yevtyushkin", - "", - DEMUXER_TYPE_LMLM4, - 0, // unsafe autodetect - lmlm4_check_file, - demux_lmlm4_fill_buffer, - demux_open_lmlm4, - demux_close_lmlm4, - NULL, - NULL -}; diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c deleted file mode 100644 index 96fb1a2d86..0000000000 --- a/libmpdemux/demux_mov.c +++ /dev/null @@ -1,2350 +0,0 @@ -/* - * QuickTime MOV file parser - * copyright(c) 2001 A'rpi - * additional work by Atmos - * based on TOOLS/movinfo.c by A'rpi & Al3x - * compressed header support from moov.c of the openquicktime lib. - * - * references: http://openquicktime.sf.net/, http://www.heroinewarrior.com/ - * http://www.geocities.com/SiliconValley/Lakes/2160/fformats/files/mov.pdf - * (above URL no longer works, file mirrored somewhere? ::atmos) - * The QuickTime File Format PDF from Apple: - * http://developer.apple.com/techpubs/quicktime/qtdevdocs/PDF/QTFileFormat.pdf - * (Complete list of documentation at http://developer.apple.com/quicktime/) - * MP4-Lib sources from http://mpeg4ip.sf.net/ might be useful for .mp4 - * as well as .mov specific stuff. - * - * All sort of Stuff about MPEG4: - * http://www.cmlab.csie.ntu.edu.tw/~pkhsiao/thesis.html - * I really recommend N4270-1.doc and N4270-2.doc which are exact specs - * of the MP4-File Format and the MPEG4 Specific extensions. ::atmos - * TSGS#15(02)0088 - * http://www.3gpp.org/ftp/tsg_sa/TSG_SA/TSGS_15/Docs/pdf/SP-020088.pdf - * http://www.3gpp2.org/Public_html/specs/C.S0050-0_v1.0_121503.pdf - * - * 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 - -#include -#include - -#include "config.h" - -#ifdef CONFIG_QUICKTIME -#include -#include -#include -#else -#include "loader/qtx/qtxsdk/components.h" -#endif - -#if CONFIG_ZLIB -#include -#endif - -#ifndef _FCNTL_H -#include -#endif - -#include "mp_msg.h" - -#include "stream/stream.h" -#include "demuxer.h" -#include "stheader.h" - -#include "libmpcodecs/img_format.h" - -#include "sub/sub.h" - -#include "demux_mov.h" -#include "qtpalette.h" -#include "parse_mp4.h" // .MP4 specific stuff - -#define char2short(x,y) AV_RB16(&(x)[(y)]) -#define char2int(x,y) AV_RB32(&(x)[(y)]) - -typedef struct { - unsigned int pts; // duration - unsigned int size; - off_t pos; -} mov_sample_t; - -typedef struct { - unsigned int sample; // number of the first sample in the chunk - unsigned int size; // number of samples in the chunk - int desc; // for multiple codecs mode - not used - off_t pos; -} mov_chunk_t; - -typedef struct { - unsigned int first; - unsigned int spc; - unsigned int sdid; -} mov_chunkmap_t; - -typedef struct { - unsigned int num; - unsigned int dur; -} mov_durmap_t; - -typedef struct { - unsigned int dur; - unsigned int pos; - int speed; - // - int frames; - int start_sample; - int start_frame; - int pts_offset; -} mov_editlist_t; - -#define MOV_TRAK_UNKNOWN 0 -#define MOV_TRAK_VIDEO 1 -#define MOV_TRAK_AUDIO 2 -#define MOV_TRAK_FLASH 3 -#define MOV_TRAK_GENERIC 4 -#define MOV_TRAK_CODE 5 - -typedef struct { - int id; - int type; - off_t pos; - // - unsigned int media_handler; - unsigned int data_handler; - // - int timescale; - unsigned int length; - int samplesize; // 0 = variable - int duration; // 0 = variable - int width,height; // for video - unsigned int fourcc; - unsigned int nchannels; - unsigned int samplebytes; - // - int tkdata_len; // track data - unsigned char* tkdata; - int stdata_len; // stream data - unsigned char* stdata; - // - unsigned char* stream_header; - int stream_header_len; // if >0, this header should be sent before the 1st frame - // - int samples_size; - mov_sample_t* samples; - int chunks_size; - mov_chunk_t* chunks; - int chunkmap_size; - mov_chunkmap_t* chunkmap; - int durmap_size; - mov_durmap_t* durmap; - int keyframes_size; - unsigned int* keyframes; - int editlist_size; - mov_editlist_t* editlist; - int editlist_pos; - // - void* desc; // image/sound/etc description (pointer to ImageDescription etc) -} mov_track_t; - -static void mov_build_index(mov_track_t* trak,int timescale){ - int i,j,s; - int last=trak->chunks_size; - unsigned int pts=0; - -#if 0 - if (trak->chunks_size <= 0) - { - mp_msg(MSGT_DEMUX, MSGL_WARN, "No chunk offset table, trying to build one!\n"); - - trak->chunks_size = trak->samples_size; /* XXX: FIXME ! */ - // audit: this code will be vulnerable if it is reenabled (currently #if 0) - trak->chunks = realloc(trak->chunks, sizeof(mov_chunk_t)*trak->chunks_size); - - for (i=0; i < trak->chunks_size; i++) - trak->chunks[i].pos = -1; - } -#endif - - mp_msg(MSGT_DEMUX, MSGL_V, "MOV track #%d: %d chunks, %d samples\n",trak->id,trak->chunks_size,trak->samples_size); - mp_msg(MSGT_DEMUX, MSGL_V, "pts=%d scale=%d time=%5.3f\n",trak->length,trak->timescale,(float)trak->length/(float)trak->timescale); - - // process chunkmap: - i=trak->chunkmap_size; - while(i>0){ - --i; - j=trak->chunkmap[i].first; - for(;j>=0 && jchunks[j].desc=trak->chunkmap[i].sdid; - trak->chunks[j].size=trak->chunkmap[i].spc; - } - last=FFMIN(trak->chunkmap[i].first, trak->chunks_size); - } - -#if 0 - for (i=0; i < trak->chunks_size; i++) - { - /* fixup position */ - if (trak->chunks[i].pos == -1) - if (i > 0) - trak->chunks[i].pos = trak->chunks[i-1].pos + trak->chunks[i-1].size; - else - trak->chunks[i].pos = 0; /* FIXME: set initial pos */ -#endif - - // calc pts of chunks: - s=0; - for(j=0;jchunks_size;j++){ - trak->chunks[j].sample=s; - s+=trak->chunks[j].size; - } - i = 0; - for (j = 0; j < trak->durmap_size; j++) - i += trak->durmap[j].num; - if (i != s) { - mp_msg(MSGT_DEMUX, MSGL_WARN, - "MOV: durmap and chunkmap sample count differ (%i vs %i)\n", i, s); - if (i > s) s = i; - } - - // workaround for fixed-size video frames (dv and uncompressed) - if(!trak->samples_size && trak->type!=MOV_TRAK_AUDIO){ - trak->samples=calloc(s, sizeof(mov_sample_t)); - trak->samples_size=trak->samples ? s : 0; - for(i=0;isamples_size;i++) - trak->samples[i].size=trak->samplesize; - trak->samplesize=0; - } - - if(!trak->samples_size){ - // constant sampesize - if(trak->durmap_size==1 || (trak->durmap_size==2 && trak->durmap[1].num==1)){ - trak->duration=trak->durmap[0].dur; - } else mp_msg(MSGT_DEMUX, MSGL_ERR, "*** constant samplesize & variable duration not yet supported! ***\nContact the author if you have such sample file!\n"); - return; - } - - if (trak->samples_size < s) { - mp_msg(MSGT_DEMUX, MSGL_WARN, - "MOV: durmap or chunkmap bigger than sample count (%i vs %i)\n", - s, trak->samples_size); - free(trak->samples); - trak->samples = calloc(s, sizeof(mov_sample_t)); - trak->samples_size = trak->samples ? s : 0; - } - - // calc pts: - s=0; - for(j=0;jdurmap_size;j++){ - for(i=0;idurmap[j].num;i++){ - if (s >= trak->samples_size) - break; - trak->samples[s].pts=pts; - ++s; - pts+=trak->durmap[j].dur; - } - } - - // calc sample offsets - s=0; - for(j=0;jchunks_size;j++){ - off_t pos=trak->chunks[j].pos; - for(i=0;ichunks[j].size;i++){ - if (s >= trak->samples_size) - break; - trak->samples[s].pos=pos; - mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d off=0x%08X size=%d\n",s, - trak->samples[s].pts, - (int)trak->samples[s].pos, - trak->samples[s].size); - pos+=trak->samples[s].size; - ++s; - } - } - - // precalc editlist entries - if(trak->editlist_size>0){ - int frame=0; - int e_pts=0; - for(i=0;ieditlist_size;i++){ - mov_editlist_t* el=&trak->editlist[i]; - int sample=0; - int pts=el->pos; - el->start_frame=frame; - if(pts<0){ - // skip! - el->frames=0; continue; - } - // find start sample - for(;samplesamples_size;sample++){ - if(pts<=trak->samples[sample].pts) break; - } - el->start_sample=sample; - el->pts_offset=((long long)e_pts*(long long)trak->timescale)/(long long)timescale-trak->samples[sample].pts; - pts+=((long long)el->dur*(long long)trak->timescale)/(long long)timescale; - e_pts+=el->dur; - // find end sample - for(;samplesamples_size;sample++){ - if(ptssamples[sample].pts) break; - } - el->frames=sample-el->start_sample; - frame+=el->frames; - mp_msg(MSGT_DEMUX,MSGL_V,"EL#%d: pts=%d 1st_sample=%d frames=%d (%5.3fs) pts_offs=%d\n",i, - el->pos,el->start_sample, el->frames, - (float)(el->dur)/(float)timescale, el->pts_offset); - } - } - -} - -#define MOV_MAX_TRACKS 256 -#define MOV_MAX_SUBLEN 1024 - -typedef struct { - off_t moov_start; - off_t moov_end; - off_t mdat_start; - off_t mdat_end; - int track_db; - mov_track_t* tracks[MOV_MAX_TRACKS]; - int timescale; // movie timescale - int duration; // movie duration (in movie timescale units) - subtitle subs; - char subtext[MOV_MAX_SUBLEN + 1]; - int current_sub; -} mov_priv_t; - -#define MOV_FOURCC(a,b,c,d) ((a<<24)|(b<<16)|(c<<8)|(d)) - -static int mov_check_file(demuxer_t* demuxer){ - int flags=0; - int no=0; - mov_priv_t* priv=calloc(1, sizeof(mov_priv_t)); - - mp_msg(MSGT_DEMUX,MSGL_V,"Checking for MOV\n"); - - priv->current_sub = -1; - - while(1){ - int i; - int skipped=8; - off_t len=stream_read_dword(demuxer->stream); - unsigned int id=stream_read_dword(demuxer->stream); - if(stream_eof(demuxer->stream)) break; // EOF - if (len == 1) /* real size is 64bits - cjb */ - { -#ifndef _LARGEFILE_SOURCE - if (stream_read_dword(demuxer->stream) != 0) - mp_msg(MSGT_DEMUX, MSGL_WARN, "64bit file, but you've compiled MPlayer without LARGEFILE support!\n"); - len = stream_read_dword(demuxer->stream); -#else - len = stream_read_qword(demuxer->stream); -#endif - skipped += 8; - } -#if 0 - else if (len == 0) /* deleted chunk */ - { - /* XXX: CJB! is this right? - alex */ - goto skip_chunk; - } -#endif - if(len<8) break; // invalid chunk - - switch(id){ - case MOV_FOURCC('f','t','y','p'): { - unsigned int tmp; - // File Type Box (ftyp): - // char[4] major_brand (eg. 'isom') - // int minor_version (eg. 0x00000000) - // char[4] compatible_brands[] (eg. 'mp41') - // compatible_brands list spans to the end of box -#if 1 - tmp = stream_read_dword(demuxer->stream); - switch(tmp) { - case MOV_FOURCC('i','s','o','m'): - mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Major Brand: ISO Base Media\n"); - break; - case MOV_FOURCC('m','p','4','1'): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: ISO/IEC 14496-1 (MPEG-4 system) v1\n"); - break; - case MOV_FOURCC('m','p','4','2'): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: ISO/IEC 14496-1 (MPEG-4 system) v2\n"); - break; - case MOV_FOURCC('M','4','A',' '): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: Apple iTunes AAC-LC Audio\n"); - break; - case MOV_FOURCC('M','4','P',' '): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: Apple iTunes AAC-LC Protected Audio\n"); - break; - case MOV_FOURCC('q','t',' ',' '): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: Original QuickTime\n"); - break; - case MOV_FOURCC('3','g','p','1'): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: 3GPP Profile 1\n"); - break; - case MOV_FOURCC('3','g','p','2'): - case MOV_FOURCC('3','g','2','a'): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: 3GPP Profile 2\n"); - break; - case MOV_FOURCC('3','g','p','3'): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: 3GPP Profile 3\n"); - break; - case MOV_FOURCC('3','g','p','4'): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: 3GPP Profile 4\n"); - break; - case MOV_FOURCC('3','g','p','5'): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: 3GPP Profile 5\n"); - break; - case MOV_FOURCC('m','m','p','4'): - mp_msg(MSGT_DEMUX,MSGL_INFO,"ISO: File Type Major Brand: Mobile ISO/IEC 14496-1 (MPEG-4 system)\n"); - break; - default: - tmp = be2me_32(tmp); - mp_msg(MSGT_DEMUX,MSGL_WARN,"ISO: Unknown File Type Major Brand: %.4s\n",(char *)&tmp); - } - mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Minor Version: %d\n", - stream_read_dword(demuxer->stream)); - skipped += 8; - // List all compatible brands - for(i = 0; i < ((len-16)/4); i++) { - tmp = be2me_32(stream_read_dword(demuxer->stream)); - mp_msg(MSGT_DEMUX,MSGL_V,"ISO: File Type Compatible Brand #%d: %.4s\n",i,(char *)&tmp); - skipped += 4; - } -#endif - } break; - case MOV_FOURCC('m','o','o','v'): -// case MOV_FOURCC('c','m','o','v'): - mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Movie header found!\n"); - priv->moov_start=(off_t)stream_tell(demuxer->stream); - priv->moov_end=(off_t)priv->moov_start+len-skipped; - mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie header: start: %"PRIx64" end: %"PRIx64"\n", - (int64_t)priv->moov_start, (int64_t)priv->moov_end); - skipped+=8; - i = stream_read_dword(demuxer->stream)-8; - if(stream_read_dword(demuxer->stream)==MOV_FOURCC('r','m','r','a')){ - skipped+=i; - mp_msg(MSGT_DEMUX,MSGL_INFO,"MOV: Reference Media file!!!\n"); - //set demuxer type to playlist ... - demuxer->type=DEMUXER_TYPE_PLAYLIST; - while(i>0){ - int len=stream_read_dword(demuxer->stream)-8; - int fcc=stream_read_dword(demuxer->stream); - if(len<0) break; // EOF!? - i-=8; -// printf("i=%d len=%d\n",i,len); - switch(fcc){ - case MOV_FOURCC('r','m','d','a'): - continue; - case MOV_FOURCC('r','d','r','f'): { - av_unused int tmp=stream_read_dword(demuxer->stream); - av_unused int type=stream_read_dword_le(demuxer->stream); - int