From 8ca3ec1562986c0681261cad407e05578eda45fd Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 18 Aug 2012 11:13:58 +0200 Subject: libmpdemux: remove demux_real, demux_viv, demux_audio libavformat replaces demux_audio completely. I don't know/care what vivo (demux_viv) is. libavformat has a Real demuxer; it seems it works slightly better, with a different set of bugs. --- Makefile | 4 - cfg-mplayer.h | 24 - libmpdemux/demux_audio.c | 830 ------------------- libmpdemux/demux_mkv.c | 50 +- libmpdemux/demux_real.c | 1916 -------------------------------------------- libmpdemux/demux_real.h | 28 - libmpdemux/demux_realaud.c | 375 --------- libmpdemux/demux_viv.c | 769 ------------------ libmpdemux/demuxer.c | 10 - libmpdemux/demuxer.h | 4 - libmpdemux/extension.c | 16 +- libmpdemux/genres.h | 293 ------- libmpdemux/video.c | 10 - stream/http.c | 2 +- stream/network.c | 2 +- 15 files changed, 58 insertions(+), 4275 deletions(-) delete mode 100644 libmpdemux/demux_audio.c delete mode 100644 libmpdemux/demux_real.c delete mode 100644 libmpdemux/demux_real.h delete mode 100644 libmpdemux/demux_realaud.c delete mode 100644 libmpdemux/demux_viv.c delete mode 100644 libmpdemux/genres.h diff --git a/Makefile b/Makefile index d5a5b11b61..2a8b4a536f 100644 --- a/Makefile +++ b/Makefile @@ -253,7 +253,6 @@ SRCS_COMMON = asxparser.c \ libmpdemux/aviprint.c \ libmpdemux/demuxer.c \ libmpdemux/demux_asf.c \ - libmpdemux/demux_audio.c \ libmpdemux/demux_avi.c \ libmpdemux/demux_demuxers.c \ libmpdemux/demux_edl.c \ @@ -263,9 +262,6 @@ SRCS_COMMON = asxparser.c \ libmpdemux/demux_mkv.c \ libmpdemux/demux_rawaudio.c \ libmpdemux/demux_rawvideo.c \ - libmpdemux/demux_realaud.c \ - libmpdemux/demux_real.c \ - libmpdemux/demux_viv.c \ libmpdemux/ebml.c \ libmpdemux/extension.c \ libmpdemux/mf.c \ diff --git a/cfg-mplayer.h b/cfg-mplayer.h index da39b06c65..7d26316ac5 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -204,31 +204,8 @@ const m_option_t scaler_filter_conf[]={ {NULL, NULL, 0, 0, 0, 0, NULL} }; -/* VIVO demuxer options: */ -extern int vivo_param_version; -extern char *vivo_param_acodec; -extern int vivo_param_abitrate; -extern int vivo_param_samplerate; -extern int vivo_param_bytesperblock; -extern int vivo_param_width; -extern int vivo_param_height; -extern int vivo_param_vformat; extern char *dvd_device, *cdrom_device; -const m_option_t vivoopts_conf[]={ - {"version", &vivo_param_version, CONF_TYPE_INT, 0, 0, 0, NULL}, - /* audio options */ - {"acodec", &vivo_param_acodec, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"abitrate", &vivo_param_abitrate, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"samplerate", &vivo_param_samplerate, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"bytesperblock", &vivo_param_bytesperblock, CONF_TYPE_INT, 0, 0, 0, NULL}, - /* video options */ - {"width", &vivo_param_width, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"height", &vivo_param_height, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"vformat", &vivo_param_vformat, CONF_TYPE_INT, 0, 0, 0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - extern int mf_w; extern int mf_h; extern double mf_fps; @@ -485,7 +462,6 @@ const m_option_t common_opts[] = { #ifdef CONFIG_PVR {"pvr", (void *) pvropts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif /* CONFIG_PVR */ - {"vivo", (void *) vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #ifdef CONFIG_DVBIN {"dvbin", (void *) dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c deleted file mode 100644 index 4daaef0a09..0000000000 --- a/libmpdemux/demux_audio.c +++ /dev/null @@ -1,830 +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 - -#include "config.h" -#include "options.h" -#include "mp_msg.h" - -#include "stream/stream.h" -#include "aviprint.h" -#include "demuxer.h" -#include "stheader.h" -#include "genres.h" -#include "mp3_hdr.h" - -#define MP3 1 -#define WAV 2 -#define fLaC 3 - - -#define HDR_SIZE 4 - -typedef struct da_priv { - int frmt; - double next_pts; -} da_priv_t; - -//! rather arbitrary value for maximum length of wav-format headers -#define MAX_WAVHDR_LEN (1 * 1024 * 1024) - -//! how many valid frames in a row we need before accepting as valid MP3 -#define MIN_MP3_HDRS 12 - -//! Used to describe a potential (chain of) MP3 headers we found -typedef struct mp3_hdr { - off_t frame_pos; // start of first frame in this "chain" of headers - off_t next_frame_pos; // here we expect the next header with same parameters - int mp3_chans; - int mp3_freq; - int mpa_spf; - int mpa_layer; - int mpa_br; - int cons_hdrs; // if this reaches MIN_MP3_HDRS we accept as MP3 file - struct mp3_hdr *next; -} mp3_hdr_t; - -/** - * \brief free a list of MP3 header descriptions - * \param list pointer to the head-of-list pointer - */ -static void free_mp3_hdrs(mp3_hdr_t **list) { - mp3_hdr_t *tmp; - while (*list) { - tmp = (*list)->next; - free(*list); - *list = tmp; - } -} - -/** - * \brief add another potential MP3 header to our list - * If it fits into an existing chain this one is expanded otherwise - * a new one is created. - * All entries that expected a MP3 header before the current position - * are discarded. - * The list is expected to be and will be kept sorted by next_frame_pos - * and when those are equal by frame_pos. - * \param list pointer to the head-of-list pointer - * \param st_pos stream position where the described header starts - * \param mp3_chans number of channels as specified by the header (*) - * \param mp3_freq sampling frequency as specified by the header (*) - * \param mpa_spf frame size as specified by the header - * \param mpa_layer layer type ("version") as specified by the header (*) - * \param mpa_br bitrate as specified by the header - * \param mp3_flen length of the frame as specified by the header - * \return If non-null the current file is accepted as MP3 and the - * mp3_hdr struct describing the valid chain is returned. Must be - * freed independent of the list. - * - * parameters marked by (*) must be the same for all headers in the same chain - */ -static mp3_hdr_t *add_mp3_hdr(mp3_hdr_t **list, off_t st_pos, - int mp3_chans, int mp3_freq, int mpa_spf, - int mpa_layer, int mpa_br, int mp3_flen) { - mp3_hdr_t *tmp; - int in_list = 0; - while (*list && (*list)->next_frame_pos <= st_pos) { - if (((*list)->next_frame_pos < st_pos) || ((*list)->mp3_chans != mp3_chans) - || ((*list)->mp3_freq != mp3_freq) || ((*list)->mpa_layer != mpa_layer) ) { - // wasn't valid! - tmp = (*list)->next; - free(*list); - *list = tmp; - } else { - (*list)->cons_hdrs++; - (*list)->next_frame_pos = st_pos + mp3_flen; - (*list)->mpa_spf = mpa_spf; - (*list)->mpa_br = mpa_br; - if ((*list)->cons_hdrs >= MIN_MP3_HDRS) { - // copy the valid entry, so that the list can be easily freed - tmp = malloc(sizeof(mp3_hdr_t)); - memcpy(tmp, *list, sizeof(mp3_hdr_t)); - tmp->next = NULL; - return tmp; - } - in_list = 1; - list = &((*list)->next); - } - } - if (!in_list) { // does not belong into an existing chain, insert - // find right position to insert to keep sorting - while (*list && (*list)->next_frame_pos <= st_pos + mp3_flen) - list = &((*list)->next); - tmp = malloc(sizeof(mp3_hdr_t)); - tmp->frame_pos = st_pos; - tmp->next_frame_pos = st_pos + mp3_flen; - tmp->mp3_chans = mp3_chans; - tmp->mp3_freq = mp3_freq; - tmp->mpa_spf = mpa_spf; - tmp->mpa_layer = mpa_layer; - tmp->mpa_br = mpa_br; - tmp->cons_hdrs = 1; - tmp->next = *list; - *list = tmp; - } - return NULL; -} - -#if 0 /* this code is a mess, clean it up before reenabling */ -#define FLAC_SIGNATURE_SIZE 4 -#define FLAC_STREAMINFO_SIZE 34 -#define FLAC_SEEKPOINT_SIZE 18 - -enum { - FLAC_STREAMINFO = 0, - FLAC_PADDING, - FLAC_APPLICATION, - FLAC_SEEKTABLE, - FLAC_VORBIS_COMMENT, - FLAC_CUESHEET -} flac_preamble_t; - -static void -get_flac_metadata (demuxer_t* demuxer) -{ - uint8_t preamble[4]; - unsigned int blk_len; - stream_t *s = demuxer->stream; - - /* file is qualified; skip over the signature bytes in the stream */ - stream_seek (s, 4); - - /* loop through the metadata blocks; use a do-while construct since there - * will always be 1 metadata block */ - do { - int r; - - r = stream_read (s, (char *) preamble, FLAC_SIGNATURE_SIZE); - if (r != FLAC_SIGNATURE_SIZE) - return; - - blk_len = AV_RB24(preamble + 1); - - switch (preamble[0] & 0x7F) - { - case FLAC_VORBIS_COMMENT: - { - /* For a description of the format please have a look at */ - /* http://www.xiph.org/vorbis/doc/v-comment.html */ - - uint32_t length, comment_list_len; - char comments[blk_len]; - uint8_t *ptr = comments; - char *comment; - int cn; - char c; - - if (stream_read (s, comments, blk_len) == blk_len) - { - length = AV_RL32(ptr); - ptr += 4 + length; - - comment_list_len = AV_RL32(ptr); - ptr += 4; - - cn = 0; - for (; cn < comment_list_len; cn++) - { - length = AV_RL32(ptr); - ptr += 4; - - comment = ptr; - if (&comment[length] < comments || &comment[length] >= &comments[blk_len]) - return; - c = comment[length]; - comment[length] = 0; - - if (!strncasecmp ("TITLE=", comment, 6) && (length - 6 > 0)) - demux_info_add (demuxer, "Title", comment + 6); - else if (!strncasecmp ("ARTIST=", comment, 7) && (length - 7 > 0)) - demux_info_add (demuxer, "Artist", comment + 7); - else if (!strncasecmp ("ALBUM=", comment, 6) && (length - 6 > 0)) - demux_info_add (demuxer, "Album", comment + 6); - else if (!strncasecmp ("DATE=", comment, 5) && (length - 5 > 0)) - demux_info_add (demuxer, "Year", comment + 5); - else if (!strncasecmp ("GENRE=", comment, 6) && (length - 6 > 0)) - demux_info_add (demuxer, "Genre", comment + 6); - else if (!strncasecmp ("Comment=", comment, 8) && (length - 8 > 0)) - demux_info_add (demuxer, "Comment", comment + 8); - else if (!strncasecmp ("TRACKNUMBER=", comment, 12) - && (length - 12 > 0)) - { - char buf[31]; - buf[30] = '\0'; - sprintf (buf, "%d", atoi (comment + 12)); - demux_info_add(demuxer, "Track", buf); - } - comment[length] = c; - - ptr += length; - } - } - break; - } - - case FLAC_STREAMINFO: - case FLAC_PADDING: - case FLAC_APPLICATION: - case FLAC_SEEKTABLE: - case FLAC_CUESHEET: - default: - /* 6-127 are presently reserved */ - stream_skip (s, blk_len); - break; - } - } while ((preamble[0] & 0x80) == 0); -} -#endif - -/** - * @brief Determine the number of frames of a file encoded with - * variable bitrate mode (VBR). - * - * @param s stream to be read - * @param off offset in stream to start reading from - * - * @return 0 (error or no variable bitrate mode) or number of frames - */ -static unsigned int mp3_vbr_frames(stream_t *s, off_t off) { - static const int xing_offset[2][2] = {{32, 17}, {17, 9}}; - unsigned int data; - unsigned char hdr[4]; - int framesize, chans, spf, layer; - - if ((s->flags & MP_STREAM_SEEK) == MP_STREAM_SEEK) { - - if (!stream_seek(s, off)) return 0; - - data = stream_read_dword(s); - hdr[0] = data >> 24; - hdr[1] = data >> 16; - hdr[2] = data >> 8; - hdr[3] = data; - - if (!mp_check_mp3_header(data)) return 0; - - framesize = mp_get_mp3_header(hdr, &chans, NULL, &spf, &layer, NULL); - - if (framesize == -1 || layer != 3) return 0; - - /* Xing / Info (at variable position: 32, 17 or 9 bytes after header) */ - - if (!stream_skip(s, xing_offset[spf < 1152][chans == 1])) return 0; - - data = stream_read_dword(s); - - if (data == MKBETAG('X','i','n','g') || data == MKBETAG('I','n','f','o')) { - data = stream_read_dword(s); - - if (data & 0x1) // frames field is present - return stream_read_dword(s); // frames - } - - /* VBRI (at fixed position: 32 bytes after header) */ - - if (!stream_seek(s, off + 4 + 32)) return 0; - - data = stream_read_dword(s); - - if (data == MKBETAG('V','B','R','I')) { - data = stream_read_word(s); - - if (data == 1) { // check version - if (!stream_skip(s, 8)) return 0; // skip delay, quality and bytes - return stream_read_dword(s); // frames - } - } - } - - return 0; -} - -/** - * @brief Determine the total size of an ID3v2 tag. - * - * @param maj_ver major version of the ID3v2 tag - * @param s stream to be read, assumed to be positioned at revision byte - * - * @return 0 (error or malformed tag) or tag size - */ -static unsigned int id3v2_tag_size(uint8_t maj_ver, stream_t *s) { - unsigned int header_footer_size; - unsigned int size; - int i; - - if(stream_read_char(s) == 0xff) - return 0; - header_footer_size = ((stream_read_char(s) & 0x10) && maj_ver >= 4) ? 20 : 10; - - size = 0; - for(i = 0; i < 4; i++) { - uint8_t data = stream_read_char(s); - if (data & 0x80) - return 0; - size = size << 7 | data; - } - - return header_footer_size + size; -} - -static int demux_audio_open(demuxer_t* demuxer) { - stream_t *s; - sh_audio_t* sh_audio; - uint8_t hdr[HDR_SIZE]; - int frmt = 0, n = 0, step; - off_t st_pos = 0, next_frame_pos = 0; - // mp3_hdrs list is sorted first by next_frame_pos and then by frame_pos - mp3_hdr_t *mp3_hdrs = NULL, *mp3_found = NULL; - da_priv_t* priv; - double duration; - int found_WAVE = 0; - - s = demuxer->stream; - - stream_read(s, hdr, HDR_SIZE); - while(n < 30000 && !s->eof) { - int mp3_freq, mp3_chans, mp3_flen, mpa_layer, mpa_spf, mpa_br; - st_pos = stream_tell(s) - HDR_SIZE; - step = 1; - - if( hdr[0] == 'R' && hdr[1] == 'I' && hdr[2] == 'F' && hdr[3] == 'F' ) { - stream_skip(s,4); - if(s->eof) - break; - stream_read(s,hdr,4); - if(s->eof) - break; - if(hdr[0] != 'W' || hdr[1] != 'A' || hdr[2] != 'V' || hdr[3] != 'E' ) - stream_skip(s,-8); - else - // We found wav header. Now we can have 'fmt ' or a mp3 header - // empty the buffer - step = 4; - } else if( hdr[0] == 'I' && hdr[1] == 'D' && hdr[2] == '3' && hdr[3] >= 2 && hdr[3] != 0xff) { - unsigned int len = id3v2_tag_size(hdr[3], s); - if(len > 0) - stream_skip(s,len-10); - step = 4; - } else if( found_WAVE && hdr[0] == 'f' && hdr[1] == 'm' && hdr[2] == 't' && hdr[3] == ' ' ) { - frmt = WAV; - break; - } else if((mp3_flen = mp_get_mp3_header(hdr, &mp3_chans, &mp3_freq, - &mpa_spf, &mpa_layer, &mpa_br)) > 0) { - mp3_found = add_mp3_hdr(&mp3_hdrs, st_pos, mp3_chans, mp3_freq, - mpa_spf, mpa_layer, mpa_br, mp3_flen); - if (mp3_found) { - frmt = MP3; - break; - } - } else if( hdr[0] == 'f' && hdr[1] == 'L' && hdr[2] == 'a' && hdr[3] == 'C' ) { - frmt = fLaC; - if (!mp3_hdrs || mp3_hdrs->cons_hdrs < 3) - break; - } - found_WAVE = hdr[0] == 'W' && hdr[1] == 'A' && hdr[2] == 'V' && hdr[3] == 'E'; - // Add here some other audio format detection - if(step < HDR_SIZE) - memmove(hdr,&hdr[step],HDR_SIZE-step); - stream_read(s, &hdr[HDR_SIZE - step], step); - n++; - } - - free_mp3_hdrs(&mp3_hdrs); - - if(!frmt) - return 0; - - sh_audio = new_sh_audio(demuxer,0); - - switch(frmt) { - case MP3: - sh_audio->format = (mp3_found->mpa_layer < 3 ? 0x50 : 0x55); - demuxer->movi_start = mp3_found->frame_pos; - demuxer->movi_end = s->end_pos; - next_frame_pos = mp3_found->next_frame_pos; - sh_audio->audio.dwSampleSize= 0; - sh_audio->audio.dwScale = mp3_found->mpa_spf; - sh_audio->audio.dwRate = mp3_found->mp3_freq; - sh_audio->wf = malloc(sizeof(*sh_audio->wf)); - sh_audio->wf->wFormatTag = sh_audio->format; - sh_audio->wf->nChannels = mp3_found->mp3_chans; - sh_audio->wf->nSamplesPerSec = mp3_found->mp3_freq; - sh_audio->wf->nAvgBytesPerSec = mp3_found->mpa_br * (1000 / 8); - sh_audio->wf->nBlockAlign = mp3_found->mpa_spf; - sh_audio->wf->wBitsPerSample = 16; - sh_audio->wf->cbSize = 0; - duration = (double) mp3_vbr_frames(s, demuxer->movi_start) * mp3_found->mpa_spf / mp3_found->mp3_freq; - free(mp3_found); - mp3_found = NULL; - if(demuxer->movi_end && (s->flags & MP_STREAM_SEEK) == MP_STREAM_SEEK) { - if(demuxer->movi_end >= 128) { - stream_seek(s,demuxer->movi_end-128); - stream_read(s,hdr,3); - if(!memcmp(hdr,"TAG",3)) { - char buf[31]; - uint8_t g; - demuxer->movi_end -= 128; - stream_read(s,buf,30); - buf[30] = '\0'; - demux_info_add(demuxer,"Title",buf); - stream_read(s,buf,30); - buf[30] = '\0'; - demux_info_add(demuxer,"Artist",buf); - stream_read(s,buf,30); - buf[30] = '\0'; - demux_info_add(demuxer,"Album",buf); - stream_read(s,buf,4); - buf[4] = '\0'; - demux_info_add(demuxer,"Year",buf); - stream_read(s,buf,30); - buf[30] = '\0'; - demux_info_add(demuxer,"Comment",buf); - if(buf[28] == 0 && buf[29] != 0) { - uint8_t trk = (uint8_t)buf[29]; - sprintf(buf,"%d",trk); - demux_info_add(demuxer,"Track",buf); - } - g = stream_read_char(s); - demux_info_add(demuxer,"Genre",genres[g]); - } - } - if(demuxer->movi_end >= 10) { - stream_seek(s,demuxer->movi_end-10); - stream_read(s,hdr,4); - if(!memcmp(hdr,"3DI",3) && hdr[3] >= 4 && hdr[3] != 0xff) { - unsigned int len = id3v2_tag_size(hdr[3], s); - if(len > 0) { - if(len > demuxer->movi_end - demuxer->movi_start) { - mp_msg(MSGT_DEMUX,MSGL_WARN,"Audio demuxer: bad ID3v2 tag size: larger than stream (%u).\n",len); - len = FFMIN(10,demuxer->movi_end-demuxer->movi_start); - } else { - stream_seek(s,demuxer->movi_end-len); - stream_read(s,hdr,4); - if(memcmp(hdr,"ID3",3) || hdr[3] < 4 || hdr[3] == 0xff || id3v2_tag_size(hdr[3], s) != len) { - mp_msg(MSGT_DEMUX,MSGL_WARN,"Audio demuxer: damaged appended ID3v2 tag detected.\n"); - len = FFMIN(10,demuxer->movi_end-demuxer->movi_start); - } - } - demuxer->movi_end -= len; - } - } - } - } - if (duration && demuxer->movi_end && demuxer->movi_end > demuxer->movi_start) sh_audio->wf->nAvgBytesPerSec = (demuxer->movi_end - demuxer->movi_start) / duration; - sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec; - break; - case WAV: { - unsigned int chunk_type; - unsigned int chunk_size; - WAVEFORMATEX* w; - int l; - l = stream_read_dword_le(s); - if(l < 16) { - mp_msg(MSGT_DEMUX,MSGL_ERR,"[demux_audio] Bad wav header length: too short (%d)!!!\n",l); - l = 16; - } - if(l > MAX_WAVHDR_LEN) { - mp_msg(MSGT_DEMUX,MSGL_ERR,"[demux_audio] Bad wav header length: too long (%d)!!!\n",l); - l = 16; - } - sh_audio->wf = w = malloc(l > sizeof(*w) ? l : sizeof(*w)); - w->wFormatTag = sh_audio->format = stream_read_word_le(s); - w->nChannels = sh_audio->channels = stream_read_word_le(s); - w->nSamplesPerSec = sh_audio->samplerate = stream_read_dword_le(s); - w->nAvgBytesPerSec = stream_read_dword_le(s); - w->nBlockAlign = stream_read_word_le(s); - w->wBitsPerSample = stream_read_word_le(s); - sh_audio->samplesize = (w->wBitsPerSample + 7) / 8; - w->cbSize = 0; - sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec; - l -= 16; - if (l >= 2) { - w->cbSize = stream_read_word_le(s); - l -= 2; - if (l < w->cbSize) { - mp_msg(MSGT_DEMUX,MSGL_ERR,"[demux_audio] truncated extradata (%d < %d)\n", - l,w->cbSize); - w->cbSize = l; - } - stream_read(s,(char*)(w + 1),w->cbSize); - l -= w->cbSize; - if (w->wFormatTag == 0xfffe && w->cbSize >= 22) - sh_audio->format = le2me_16(((WAVEFORMATEXTENSIBLE *)w)->SubFormat); - } - - if( mp_msg_test(MSGT_DEMUX,MSGL_V) ) print_wave_header(w, MSGL_V); - if(l) - stream_skip(s,l); - do - { - chunk_type = stream_read_fourcc(demuxer->stream); - chunk_size = stream_read_dword_le(demuxer->stream); - if (chunk_type != mmioFOURCC('d', 'a', 't', 'a')) - stream_skip(demuxer->stream, chunk_size); - } while (!s->eof && chunk_type != mmioFOURCC('d', 'a', 't', 'a')); - demuxer->movi_start = stream_tell(s); - demuxer->movi_end = chunk_size ? demuxer->movi_start + chunk_size : s->end_pos; -// printf("wav: %X .. %X\n",(int)demuxer->movi_start,(int)demuxer->movi_end); - // Check if it contains dts audio - if((w->wFormatTag == 0x01) && (w->nChannels == 2) && (w->nSamplesPerSec == 44100)) { - unsigned char buf[16384]; // vlc uses 16384*4 (4 dts frames) - unsigned int i; - memset(buf, 0, sizeof(buf)); - stream_read(s, buf, sizeof(buf)); - for (i = 0; i < sizeof(buf) - 5; i += 2) { - // DTS, 14 bit, LE - if((buf[i] == 0xff) && (buf[i+1] == 0x1f) && (buf[i+2] == 0x00) && - (buf[i+3] == 0xe8) && ((buf[i+4] & 0xfe) == 0xf0) && (buf[i+5] == 0x07)) { - sh_audio->format = 0x2001; - mp_msg(MSGT_DEMUX,MSGL_V,"[demux_audio] DTS audio in wav, 14 bit, LE\n"); - break; - } - // DTS, 14 bit, BE - if((buf[i] == 0x1f) && (buf[i+1] == 0xff) && (buf[i+2] == 0xe8) && - (buf[i+3] == 0x00) && (buf[i+4] == 0x07) && ((buf[i+5] & 0xfe) == 0xf0)) { - sh_audio->format = 0x2001; - mp_msg(MSGT_DEMUX,MSGL_V,"[demux_audio] DTS audio in wav, 14 bit, BE\n"); - break; - } - // DTS, 16 bit, BE - if((buf[i] == 0x7f) && (buf[i+1] == 0xfe) && (buf[i+2] == 0x80) && - (buf[i+3] == 0x01)) { - sh_audio->format = 0x2001; - mp_msg(MSGT_DEMUX,MSGL_V,"[demux_audio] DTS audio in wav, 16 bit, BE\n"); - break; - } - // DTS, 16 bit, LE - if((buf[i] == 0xfe) && (buf[i+1] == 0x7f) && (buf[i+2] == 0x01) && - (buf[i+3] == 0x80)) { - sh_audio->format = 0x2001; - mp_msg(MSGT_DEMUX,MSGL_V,"[demux_audio] DTS audio in wav, 16 bit, LE\n"); - break; - } - } - if (sh_audio->format == 0x2001) { - mp_msg(MSGT_DEMUX,MSGL_DBG2,"[demux_audio] DTS sync offset = %u\n", i); - } - - } - // All formats that have a parser will need it when stored in WAV - sh_audio->needs_parsing = 1; - stream_seek(s,demuxer->movi_start); - } break; - case fLaC: - sh_audio->format = mmioFOURCC('f', 'L', 'a', 'C'); - demuxer->movi_start = stream_tell(s) - 4; - demuxer->movi_end = s->end_pos; - if (demuxer->movi_end > demuxer->movi_start) { - // try to find out approx. bitrate - int64_t size = demuxer->movi_end - demuxer->movi_start; - int64_t num_samples; - int32_t srate; - stream_skip(s, 14); - srate = stream_read_int24(s) >> 4; - num_samples = stream_read_int24(s) << 16; - num_samples |= stream_read_word(s); - if (num_samples && srate) - sh_audio->i_bps = size * srate / num_samples; - } - if (sh_audio->i_bps < 1) // guess value to prevent crash - sh_audio->i_bps = 64 * 1024; - sh_audio->needs_parsing = 1; -// get_flac_metadata (demuxer); - break; - } - - priv = malloc(sizeof(da_priv_t)); - priv->frmt = frmt; - priv->next_pts = 0; - demuxer->priv = priv; - demuxer->audio->id = 0; - demuxer->audio->sh = sh_audio; - sh_audio->ds = demuxer->audio; - sh_audio->samplerate = sh_audio->audio.dwRate; - - if(stream_tell(s) != demuxer->movi_start) - { - mp_msg(MSGT_DEMUX, MSGL_V, "demux_audio: seeking from 0x%X to start pos 0x%X\n", - (int)stream_tell(s), (int)demuxer->movi_start); - stream_seek(s,demuxer->movi_start); - if (stream_tell(s) != demuxer->movi_start) { - mp_msg(MSGT_DEMUX, MSGL_V, "demux_audio: seeking failed, now at 0x%X!\n", - (int)stream_tell(s)); - if (next_frame_pos) { - mp_msg(MSGT_DEMUX, MSGL_V, "demux_audio: seeking to 0x%X instead\n", - (int)next_frame_pos); - stream_seek(s, next_frame_pos); - } - } - } - - mp_msg(MSGT_DEMUX,MSGL_V,"demux_audio: audio data 0x%X - 0x%X \n",(int)demuxer->movi_start,(int)demuxer->movi_end); - - return DEMUXER_TYPE_AUDIO; -} - - -static int demux_audio_fill_buffer(demuxer_t *demux, demux_stream_t *ds) { - int l; - demux_packet_t* dp; - sh_audio_t* sh_audio = ds->sh; - da_priv_t* priv = demux->priv; - double this_pts = priv->next_pts; - stream_t* s = demux->stream; - - if(s->eof) - return 0; - - switch(priv->frmt) { - case MP3 : - while(1) { - uint8_t hdr[4]; - stream_read(s,hdr,4); - if (s->eof) - return 0; - l = mp_decode_mp3_header(hdr); - if(l < 0) { - if (demux->movi_end && stream_tell(s) >= demux->movi_end) - return 0; // might be ID3 tag, i.e. EOF - stream_skip(s,-3); - } else { - dp = new_demux_packet(l); - memcpy(dp->buffer,hdr,4); - if (stream_read(s,dp->buffer + 4,l-4) != l-4) - { - free_demux_packet(dp); - return 0; - } - priv->next_pts += sh_audio->audio.dwScale/(double)sh_audio->samplerate; - break; - } - } break; - case WAV : { - unsigned align = sh_audio->wf->nBlockAlign; - l = sh_audio->wf->nAvgBytesPerSec; - if (l <= 0) l = 65536; - if (demux->movi_end && l > demux->movi_end - stream_tell(s)) { - // do not read beyond end, there might be junk after data chunk - l = demux->movi_end - stream_tell(s); - if (l <= 0) return 0; - } - if (align) - l = (l + align - 1) / align * align; - dp = new_demux_packet(l); - l = stream_read(s,dp->buffer,l); - priv->next_pts += l/(double)sh_audio->i_bps; - break; - } - case fLaC: { - l = 65535; - dp = new_demux_packet(l); - l = stream_read(s,dp->buffer,l); - priv->next_pts = MP_NOPTS_VALUE; - break; - } - default: - mp_tmsg(MSGT_DEMUXER,MSGL_WARN,"Audio demuxer: unknown format %d.\n",priv->frmt); - return 0; - } - - resize_demux_packet(dp, l); - dp->pts = this_pts; - ds_add_packet(ds, dp); - return 1; -} - -static void high_res_mp3_seek(demuxer_t *demuxer,float time) { - uint8_t hdr[4]; - int len,nf; - da_priv_t* priv = demuxer->priv; - sh_audio_t* sh = (sh_audio_t*)demuxer->audio->sh; - - nf = time*sh->samplerate/sh->audio.dwScale; - while(nf > 0) { - stream_read(demuxer->stream,hdr,4); - len = mp_decode_mp3_header(hdr); - if(len < 0) { - stream_skip(demuxer->stream,-3); - continue; - } - stream_skip(demuxer->stream,len-4); - priv->next_pts += sh->audio.dwScale/(double)sh->samplerate; - nf--; - } -} - -static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ - struct MPOpts *opts = demuxer->opts; - sh_audio_t* sh_audio; - stream_t* s; - int64_t base,pos; - float len; - da_priv_t* priv; - - if(!(sh_audio = demuxer->audio->sh)) - return; - s = demuxer->stream; - priv = demuxer->priv; - - if(priv->frmt == MP3 && opts->hr_mp3_seek && !(flags & SEEK_FACTOR)) { - len = (flags & SEEK_ABSOLUTE) ? rel_seek_secs - priv->next_pts : rel_seek_secs; - if(len < 0) { - stream_seek(s,demuxer->movi_start); - len = priv->next_pts + len; - priv->next_pts = 0; - } - if(len > 0) - high_res_mp3_seek(demuxer,len); - return; - } - - base = flags&SEEK_ABSOLUTE ? demuxer->movi_start : stream_tell(s); - if(flags&SEEK_FACTOR) - pos = base + ((demuxer->movi_end - demuxer->movi_start)*rel_seek_secs); - else - pos = base + (rel_seek_secs*sh_audio->i_bps); - - if(demuxer->movi_end && pos >= demuxer->movi_end) { - pos = demuxer->movi_end; - } else if(pos < demuxer->movi_start) - pos = demuxer->movi_start; - - priv->next_pts = (pos-demuxer->movi_start)/(double)sh_audio->i_bps; - - switch(priv->frmt) { - case WAV: - pos -= (pos - demuxer->movi_start) % - (sh_audio->wf->nBlockAlign ? sh_audio->wf->nBlockAlign : - (sh_audio->channels * sh_audio->samplesize)); - break; - } - - stream_seek(s,pos); -} - -static void demux_close_audio(demuxer_t* demuxer) { - da_priv_t* priv = demuxer->priv; - - free(priv); -} - -static int demux_audio_control(demuxer_t *demuxer,int cmd, void *arg){ - sh_audio_t *sh_audio=demuxer->audio->sh; - int audio_length = sh_audio->i_bps && demuxer->movi_end > demuxer->movi_start ? - (demuxer->movi_end - demuxer->movi_start) / sh_audio->i_bps : 0; - da_priv_t* priv = demuxer->priv; - - switch(cmd) { - case DEMUXER_CTRL_GET_TIME_LENGTH: - if (audio_length<=0) return DEMUXER_CTRL_DONTKNOW; - *((double *)arg)=(double)audio_length; - return DEMUXER_CTRL_GUESS; - - case DEMUXER_CTRL_GET_PERCENT_POS: - if (audio_length<=0) - return DEMUXER_CTRL_DONTKNOW; - *((int *)arg)=(int)( (priv->next_pts*100) / audio_length); - return DEMUXER_CTRL_OK; - - default: - return DEMUXER_CTRL_NOTIMPL; - } -} - - -const demuxer_desc_t demuxer_desc_audio = { - "Audio demuxer", - "audio", - "Audio only", - "?", - "Audio only files", - DEMUXER_TYPE_AUDIO, - 0, // unsafe autodetect - demux_audio_open, - demux_audio_fill_buffer, - NULL, - demux_close_audio, - demux_audio_seek, - demux_audio_control -}; diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 5bc890a970..b5ab880916 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -46,7 +46,7 @@ #include "stheader.h" #include "ebml.h" #include "matroska.h" -#include "demux_real.h" +//#include "demux_real.h" #include "mp_msg.h" @@ -1814,6 +1814,54 @@ static int demux_mkv_read_block_lacing(uint8_t *buffer, uint64_t *size, return 1; } +#define SKIP_BITS(n) buffer<<=n +#define SHOW_BITS(n) ((buffer)>>(32-(n))) + +static double real_fix_timestamp(unsigned char *buf, unsigned int timestamp, unsigned int format, int64_t *kf_base, int *kf_pts, double *pts){ + double v_pts; + unsigned char *s = buf + 1 + (*buf+1)*8; + uint32_t buffer= (s[0]<<24) + (s[1]<<16) + (s[2]<<8) + s[3]; + unsigned int kf=timestamp; + int pict_type; + + if(format==mmioFOURCC('R','V','3','0') || format==mmioFOURCC('R','V','4','0')){ + if(format==mmioFOURCC('R','V','3','0')){ + SKIP_BITS(3); + pict_type= SHOW_BITS(2); + SKIP_BITS(2 + 7); + }else{ + SKIP_BITS(1); + pict_type= SHOW_BITS(2); + SKIP_BITS(2 + 7 + 3); + } + kf= SHOW_BITS(13); // kf= 2*SHOW_BITS(12); +// if(pict_type==0) + if(pict_type<=1){ + // I frame, sync timestamps: + *kf_base=(int64_t)timestamp-kf; + mp_msg(MSGT_DEMUX, MSGL_DBG2,"\nTS: base=%08"PRIX64"\n",*kf_base); + kf=timestamp; + } else { + // P/B frame, merge timestamps: + int64_t tmp=(int64_t)timestamp-*kf_base; + kf|=tmp&(~0x1fff); // combine with packet timestamp + if(kftmp+4096) kf-=8192; + kf+=*kf_base; + } + if(pict_type != 3){ // P || I frame -> swap timestamps + unsigned int tmp=kf; + kf=*kf_pts; + *kf_pts=tmp; +// if(kf<=tmp) kf=0; + } + } + v_pts=kf*0.001f; +// if(pts && (v_pts<*pts || !kf)) v_pts=*pts+frametime; + if(pts) *pts=v_pts; + return v_pts; +} + static void handle_realvideo(demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer, uint32_t size, bool keyframe) { diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c deleted file mode 100644 index 8f598aa3d5..0000000000 --- a/libmpdemux/demux_real.c +++ /dev/null @@ -1,1916 +0,0 @@ -/* - * Real parser & demuxer - * copyright (C) 2001 Alex Beregszaszi - * copyright (C) 2005, 2006 Roberto Togni - * based on FFmpeg's libav/rm.c - * - * audio codecs: (supported by RealPlayer8 for Linux) - * DNET - RealAudio 3.0, really it's AC3 in swapped-byteorder - * SIPR - SiproLab's audio codec, ACELP decoder working with MPlayer, - * needs fine-tuning too :) - * ATRC - RealAudio 8 (ATRAC3) - www.minidisc.org/atrac3_article.pdf, - * ACM decoder uploaded, needs some fine-tuning to work - * -> RealAudio 8 - * COOK/COKR - Real Cooker -> RealAudio G2 - * - * video codecs: (supported by RealPlayer8 for Linux) - * RV10 - H.263 based, working with libavcodec's decoder - * RV20-RV40 - using RealPlayer's codec plugins - * - * 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" -#include "mp_msg.h" -#include "mpbswap.h" -#include "stream/stream.h" -#include "aviprint.h" -#include "demuxer.h" -#include "stheader.h" -#include "demux_real.h" - -//#define mp_dbg(mod,lev, args... ) mp_msg_c((mod<<8)|lev, ## args ) - -#define MAX_STREAMS 32 - -static unsigned char sipr_swaps[38][2]={ - {0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68}, - {13,39},{14,73},{15,53},{16,69},{17,57},{19,88},{20,34},{21,71},{24,46}, - {25,94},{26,54},{28,75},{29,50},{32,70},{33,92},{35,74},{38,85},{40,56}, - {42,87},{43,65},{45,59},{48,79},{49,93},{51,89},{55,95},{61,76},{67,83}, - {77,80} }; - -typedef struct { - unsigned int timestamp; - int offset; -// int packetno; -// int len; /* only filled by our index generator */ -// int flags; /* only filled by our index generator */ -} real_index_table_t; - -typedef struct { - /* for seeking */ - int index_chunk_offset; - real_index_table_t *index_table[MAX_STREAMS]; - -// int *index_table[MAX_STREAMS]; - int index_table_size[MAX_STREAMS]; - int index_malloc_size[MAX_STREAMS]; - int data_chunk_offset; - int num_of_packets; - int current_packet; - -// need for seek - int audio_need_keyframe; - int video_after_seek; - - int current_apacket; - int current_vpacket; - - // timestamp correction: - int64_t kf_base;// timestamp of the prev. video keyframe - unsigned int kf_pts; // timestamp of next video keyframe - unsigned int a_pts; // previous audio timestamp - double v_pts; // previous video timestamp - unsigned long duration; - - /* stream id table */ -// int last_a_stream; -// int a_streams[MAX_STREAMS]; -// int last_v_stream; -// int v_streams[MAX_STREAMS]; - - /** - * Used to demux multirate files - */ - int is_multirate; ///< != 0 for multirate files - int str_data_offset[MAX_STREAMS]; ///< Data chunk offset for every audio/video stream - int audio_curpos; ///< Current file position for audio demuxing - int video_curpos; ///< Current file position for video demuxing - int a_num_of_packets; ///< Number of audio packets - int v_num_of_packets; ///< Number of video packets - int a_bitrate; ///< Audio bitrate - int v_bitrate; ///< Video bitrate - int stream_switch; ///< Flag used to switch audio/video demuxing - - /** - * Used to reorder audio data - */ - unsigned int intl_id[MAX_STREAMS]; ///< interleaver id, per stream - int sub_packet_size[MAX_STREAMS]; ///< sub packet size, per stream - int sub_packet_h[MAX_STREAMS]; ///< number of coded frames per block - int coded_framesize[MAX_STREAMS]; ///< coded frame size, per stream - int audiopk_size[MAX_STREAMS]; ///< audio packet size - unsigned char *audio_buf; ///< place to store reordered audio data - double *audio_timestamp; ///< timestamp for each audio packet - int sub_packet_cnt; ///< number of subpacket already received - int audio_filepos; ///< file position of first audio packet in block -} real_priv_t; - -//! use at most 200 MB of memory for index, corresponds to around 25 million entries -#define MAX_INDEX_ENTRIES (200*1024*1024 / sizeof(real_index_table_t)) - -/* originally from FFmpeg */ -static void get_str(int isbyte, demuxer_t *demuxer, char *buf, int buf_size) -{ - int len; - - if (isbyte) - len = stream_read_char(demuxer->stream); - else - len = stream_read_word(demuxer->stream); - - stream_read(demuxer->stream, buf, (len > buf_size) ? buf_size : len); - if (len > buf_size) - stream_skip(demuxer->stream, len-buf_size); - - mp_msg(MSGT_DEMUX, MSGL_V, "read_str: %d bytes read\n", len); -} - -static void dump_index(demuxer_t *demuxer, int stream_id) -{ - real_priv_t *priv = demuxer->priv; - real_index_table_t *index; - int i, entries; - - if (!mp_msg_test(MSGT_DEMUX,MSGL_V)) - return; - - if ((unsigned)stream_id >= MAX_STREAMS) - return; - - index = priv->index_table[stream_id]; - entries = priv->index_table_size[stream_id]; - - mp_msg(MSGT_DEMUX, MSGL_V, "Index table for stream %d\n", stream_id); - for (i = 0; i < entries; i++) - { -#if 1 - mp_msg(MSGT_DEMUX, MSGL_V,"i: %d, pos: %d, timestamp: %u\n", i, index[i].offset, index[i].timestamp); -#else - mp_msg(MSGT_DEMUX, MSGL_V,"packetno: %x pos: %x len: %x timestamp: %x flags: %x\n", - index[i].packetno, index[i].offset, index[i].len, index[i].timestamp, - index[i].flags); -#endif - } -} - -static int parse_index_chunk(demuxer_t *demuxer) -{ - real_priv_t *priv = demuxer->priv; - int origpos = stream_tell(demuxer->stream); - int next_header_pos = priv->index_chunk_offset; - int i, entries, stream_id; - -read_index: - stream_seek(demuxer->stream, next_header_pos); - - i = stream_read_dword_le(demuxer->stream); - if ((i == -256) || (i != MKTAG('I', 'N', 'D', 'X'))) - { - mp_msg(MSGT_DEMUX, MSGL_WARN,"Something went wrong, no index chunk found on given address (%d)\n", - next_header_pos); - index_mode = -1; - if (i == -256) - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, origpos); - return 0; - //goto end; - } - - mp_msg(MSGT_DEMUX, MSGL_V,"Reading index table from index chunk (%d)\n", - next_header_pos); - - i = stream_read_dword(demuxer->stream); - mp_msg(MSGT_DEMUX, MSGL_V,"size: %d bytes\n", i); - - i = stream_read_word(demuxer->stream); - if (i != 0) - mp_msg(MSGT_DEMUX, MSGL_WARN,"Hmm, index table with unknown version (%d), please report it to MPlayer developers!\n", i); - - entries = stream_read_dword(demuxer->stream); - mp_msg(MSGT_DEMUX, MSGL_V,"entries: %d\n", entries); - - stream_id = stream_read_word(demuxer->stream); - mp_msg(MSGT_DEMUX, MSGL_V,"stream_id: %d\n", stream_id); - - next_header_pos = stream_read_dword(demuxer->stream); - mp_msg(MSGT_DEMUX, MSGL_V,"next_header_pos: %d\n", next_header_pos); - if (entries <= 0 || entries > MAX_INDEX_ENTRIES) - { - if (next_header_pos) - goto read_index; - i = entries; - goto end; - } - - priv->index_table_size[stream_id] = entries; - priv->index_table[stream_id] = calloc(priv->index_table_size[stream_id], sizeof(real_index_table_t)); - - for (i = 0; i < entries; i++) - { - stream_skip(demuxer->stream, 2); /* version */ - priv->index_table[stream_id][i].timestamp = stream_read_dword(demuxer->stream); - priv->index_table[stream_id][i].offset = stream_read_dword(demuxer->stream); - stream_skip(demuxer->stream, 4); /* packetno */ -// priv->index_table[stream_id][i].packetno = stream_read_dword(demuxer->stream); -// printf("Index table: Stream#%d: entry: %d: pos: %d\n", -// stream_id, i, priv->index_table[stream_id][i].offset); - } - - dump_index(demuxer, stream_id); - - if (next_header_pos > 0) - goto read_index; - -end: - if (i == -256) - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, origpos); - if (i == -256) - return 0; - else - return 1; -} - -#if 1 - -static void add_index_item(demuxer_t *demuxer, int stream_id, unsigned int timestamp, int offset) -{ - if ((unsigned)stream_id < MAX_STREAMS) - { - real_priv_t *priv = demuxer->priv; - real_index_table_t *index; - if (priv->index_table_size[stream_id] >= MAX_INDEX_ENTRIES) { - mp_msg(MSGT_DEMUXER, MSGL_WARN, "Index too large during building\n"); - return; - } - if (priv->index_table_size[stream_id] >= priv->index_malloc_size[stream_id]) - { - if (priv->index_malloc_size[stream_id] == 0) - priv->index_malloc_size[stream_id] = 2048; - else - priv->index_malloc_size[stream_id] += priv->index_malloc_size[stream_id] / 2; - // in case we have a really large chunk... - if (priv->index_table_size[stream_id] >= - priv->index_malloc_size[stream_id]) - priv->index_malloc_size[stream_id] = - priv->index_table_size[stream_id] + 1; - priv->index_table[stream_id] = realloc(priv->index_table[stream_id], priv->index_malloc_size[stream_id]*sizeof(priv->index_table[0][0])); - } - if (priv->index_table_size[stream_id] > 0) - { - index = &priv->index_table[stream_id][priv->index_table_size[stream_id] - 1]; - if (index->timestamp >= timestamp || index->offset >= offset) - return; - } - index = &priv->index_table[stream_id][priv->index_table_size[stream_id]++]; - index->timestamp = timestamp; - index->offset = offset; - } -} - -static void add_index_segment(demuxer_t *demuxer, int seek_stream_id, int64_t seek_timestamp) -{ - int tag, len, stream_id, flags; - unsigned int timestamp; - if (seek_timestamp != -1 && (unsigned)seek_stream_id >= MAX_STREAMS) - return; - while (1) - { - demuxer->filepos = stream_tell(demuxer->stream); - - tag = stream_read_dword(demuxer->stream); - if (tag == MKTAG('A', 'T', 'A', 'D')) - { - stream_skip(demuxer->stream, 14); - continue; /* skip to next loop */ - } - len = tag & 0xffff; - if (tag == -256 || len < 12) - break; - - stream_id = stream_read_word(demuxer->stream); - timestamp = stream_read_dword(demuxer->stream); - - stream_skip(demuxer->stream, 1); /* reserved */ - flags = stream_read_char(demuxer->stream); - - if (flags == -256) - break; - - if (flags & 2) - { - add_index_item(demuxer, stream_id, timestamp, demuxer->filepos); - if (stream_id == seek_stream_id && timestamp >= seek_timestamp) - { - stream_seek(demuxer->stream, demuxer->filepos); - return; - } - } - // printf("Index: stream=%d packet=%d timestamp=%u len=%d flags=0x%x datapos=0x%x\n", stream_id, entries, timestamp, len, flags, index->offset); - /* skip data */ - stream_skip(demuxer->stream, len-12); - } -} - -static int generate_index(demuxer_t *demuxer) -{ - real_priv_t *priv = demuxer->priv; - int origpos = stream_tell(demuxer->stream); - int data_pos = priv->data_chunk_offset-10; - int i; - int tag; - - stream_seek(demuxer->stream, data_pos); - tag = stream_read_dword(demuxer->stream); - if (tag != MKTAG('A', 'T', 'A', 'D')) - { - mp_msg(MSGT_DEMUX, MSGL_WARN,"Something went wrong, no data chunk found on given address (%d)\n", data_pos); - } - else - { - stream_skip(demuxer->stream, 14); - add_index_segment(demuxer, -1, -1); - } - for (i = 0; i < MAX_STREAMS; i++) - { - if (priv->index_table_size[i] > 0) - { - dump_index(demuxer, i); - } - } - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, origpos); - return 0; -} - -#else - -static int generate_index(demuxer_t *demuxer) -{ - real_priv_t *priv = demuxer->priv; - int origpos = stream_tell(demuxer->stream); - int data_pos = priv->data_chunk_offset-10; - int num_of_packets = 0; - int i, entries = 0; - int len, stream_id = 0, flags; - unsigned int timestamp; - int tab_pos = 0; - -read_index: - stream_seek(demuxer->stream, data_pos); - - i = stream_read_dword_le(demuxer->stream); - if ((i == -256) || (i != MKTAG('D', 'A', 'T', 'A'))) - { - mp_msg(MSGT_DEMUX, MSGL_WARN,"Something went wrong, no data chunk found on given address (%d)\n", - data_pos); - goto end; - } - stream_skip(demuxer->stream, 4); /* chunk size */ - stream_skip(demuxer->stream, 2); /* version */ - - num_of_packets = stream_read_dword(demuxer->stream); - mp_msg(MSGT_DEMUX, MSGL_V,"Generating index table from raw data (pos: 0x%x) for %d packets\n", - data_pos, num_of_packets); - - data_pos = stream_read_dword_le(demuxer->stream)-10; /* next data chunk */ - - for (i = 0; i < MAX_STREAMS; i++) - { - priv->index_table_size[i] = num_of_packets; - priv->index_table[i] = calloc(priv->index_table_size[i], sizeof(real_index_table_t)); -// priv->index_table[stream_id] = realloc(priv->index_table[stream_id], -// priv->index_table_size[stream_id] * sizeof(real_index_table_t)); - } - - tab_pos = 0; - -// memset(priv->index_table_size, 0, sizeof(int)*MAX_STREAMS); -// memset(priv->index_table, 0, sizeof(real_index_table_t)*MAX_STREAMS); - - while (tab_pos < num_of_packets) - { - i = stream_read_char(demuxer->stream); - if (i == -256) - goto end; - stream_skip(demuxer->stream, 1); -// stream_skip(demuxer->stream, 2); /* version */ - - len = stream_read_word(demuxer->stream); - stream_id = stream_read_word(demuxer->stream); - timestamp = stream_read_dword(demuxer->stream); - - stream_skip(demuxer->stream, 1); /* reserved */ - flags = stream_read_char(demuxer->stream); - - i = tab_pos; - -// priv->index_table_size[stream_id] = i; -// if (priv->index_table[stream_id] == NULL) -// priv->index_table[stream_id] = malloc(priv->index_table_size[stream_id] * sizeof(real_index_table_t)); -// else -// priv->index_table[stream_id] = realloc(priv->index_table[stream_id], -// priv->index_table_size[stream_id] * sizeof(real_index_table_t)); - - priv->index_table[stream_id][i].timestamp = timestamp; - priv->index_table[stream_id][i].offset = stream_tell(demuxer->stream)-12; - priv->index_table[stream_id][i].len = len; - priv->index_table[stream_id][i].packetno = entries; - priv->index_table[stream_id][i].flags = flags; - - tab_pos++; - - /* skip data */ - stream_skip(demuxer->stream, len-12); - } - dump_index(demuxer, stream_id); - if (data_pos) - goto read_index; - -end: - if (i == -256) - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, origpos); - if (i == -256) - return 0; - else - return 1; -} -#endif - - -static int real_check_file(demuxer_t* demuxer) -{ - real_priv_t *priv; - int c; - - mp_msg(MSGT_DEMUX,MSGL_V,"Checking for REAL\n"); - - c = stream_read_dword_le(demuxer->stream); - if (c == -256) - return 0; /* EOF */ - if (c != MKTAG('.', 'R', 'M', 'F')) - return 0; /* bad magic */ - - priv = calloc(1, sizeof(real_priv_t)); - demuxer->priv = priv; - - return DEMUXER_TYPE_REAL; -} - -#define SKIP_BITS(n) buffer<<=n -#define SHOW_BITS(n) ((buffer)>>(32-(n))) - -double real_fix_timestamp(unsigned char *buf, unsigned int timestamp, unsigned int format, int64_t *kf_base, int *kf_pts, double *pts){ - double v_pts; - unsigned char *s = buf + 1 + (*buf+1)*8; - uint32_t buffer= (s[0]<<24) + (s[1]<<16) + (s[2]<<8) + s[3]; - unsigned int kf=timestamp; - int pict_type; - unsigned int orig_kf; - - if(format==mmioFOURCC('R','V','3','0') || format==mmioFOURCC('R','V','4','0')){ - if(format==mmioFOURCC('R','V','3','0')){ - SKIP_BITS(3); - pict_type= SHOW_BITS(2); - SKIP_BITS(2 + 7); - }else{ - SKIP_BITS(1); - pict_type= SHOW_BITS(2); - SKIP_BITS(2 + 7 + 3); - } - orig_kf= - kf= SHOW_BITS(13); // kf= 2*SHOW_BITS(12); -// if(pict_type==0) - if(pict_type<=1){ - // I frame, sync timestamps: - *kf_base=(int64_t)timestamp-kf; - mp_msg(MSGT_DEMUX, MSGL_DBG2,"\nTS: base=%08"PRIX64"\n",*kf_base); - kf=timestamp; - } else { - // P/B frame, merge timestamps: - int64_t tmp=(int64_t)timestamp-*kf_base; - kf|=tmp&(~0x1fff); // combine with packet timestamp - if(kftmp+4096) kf-=8192; - kf+=*kf_base; - } - if(pict_type != 3){ // P || I frame -> swap timestamps - unsigned int tmp=kf; - kf=*kf_pts; - *kf_pts=tmp; -// if(kf<=tmp) kf=0; - } - mp_msg(MSGT_DEMUX, MSGL_DBG2,"\nTS: %08X -> %08X (%04X) %d %02X %02X %02X %02X %5u\n",timestamp,kf,orig_kf,pict_type,s[0],s[1],s[2],s[3],pts?kf-(unsigned int)(*pts*1000.0):0); - } - v_pts=kf*0.001f; -// if(pts && (v_pts<*pts || !kf)) v_pts=*pts+frametime; - if(pts) *pts=v_pts; - return v_pts; -} - -typedef struct dp_hdr_s { - uint32_t chunks; // number of chunks - uint32_t timestamp; // timestamp from packet header - uint32_t len; // length of actual data - uint32_t chunktab; // offset to chunk offset array -} dp_hdr_t; - -static void queue_video_packet(real_priv_t *priv, demux_stream_t *ds, demux_packet_t *dp) -{ - dp_hdr_t hdr = *(dp_hdr_t*)dp->buffer; - unsigned char *tmp = malloc(8*(1+hdr.chunks)); - memcpy(tmp, dp->buffer+hdr.chunktab, 8*(1+hdr.chunks)); - memmove(dp->buffer+1+8*(1+hdr.chunks), dp->buffer+sizeof(dp_hdr_t), hdr.len); - memcpy(dp->buffer+1, tmp, 8*(1+hdr.chunks)); - *dp->buffer = (uint8_t)hdr.chunks; - free(tmp); - - if(priv->video_after_seek){ - priv->kf_base = 0; - priv->kf_pts = hdr.timestamp; - priv->video_after_seek = 0; - } - if(hdr.len >= 3) /* this check may be useless */ - dp->pts = real_fix_timestamp(dp->buffer, hdr.timestamp, - ((sh_video_t *)ds->sh)->format, - &priv->kf_base, &priv->kf_pts, - &priv->v_pts); - ds_add_packet(ds, dp); -} - -// return value: -// 0 = EOF or no stream found -// 1 = successfully read a packet -static int demux_real_fill_buffer(demuxer_t *demuxer, demux_stream_t *dsds) -{ - real_priv_t *priv = demuxer->priv; - demux_stream_t *ds = NULL; - int len; - unsigned int timestamp; - int stream_id; -#ifdef CRACK_MATRIX - int i; -#endif - int flags; - int version; - int reserved av_unused; - demux_packet_t *dp; - int x, sps, cfs, sph, spc, w; - int audioreorder_getnextpk = 0; - - // Don't demux video if video codec init failed - if (demuxer->video->id >= 0 && !demuxer->video->sh) - demuxer->video->id = -2; - - while(!stream_eof(demuxer->stream)){ - - /* Handle audio/video demxing switch for multirate files (non-interleaved) */ - if (priv->is_multirate && priv->stream_switch) { - if (priv->current_apacket >= priv->index_table_size[demuxer->audio->id]) - demuxer->audio->eof = 1; - if (priv->current_vpacket >= priv->index_table_size[demuxer->video->id]) - demuxer->video->eof = 1; - if (demuxer->audio->eof && demuxer->video->eof) - return 0; - else if (!demuxer->audio->eof && demuxer->video->eof) - stream_seek(demuxer->stream, priv->audio_curpos); // Get audio - else if (demuxer->audio->eof && !demuxer->video->eof) - stream_seek(demuxer->stream, priv->video_curpos); // Get video - else if (priv->index_table[demuxer->audio->id][priv->current_apacket].timestamp < - priv->index_table[demuxer->video->id][priv->current_vpacket].timestamp) - stream_seek(demuxer->stream, priv->audio_curpos); // Get audio - else - stream_seek(demuxer->stream, priv->video_curpos); // Get video - priv->stream_switch = 0; - } - - demuxer->filepos = stream_tell(demuxer->stream); - version = stream_read_word(demuxer->stream); /* version */ - len = stream_read_word(demuxer->stream); - if ((version==0x4441) && (len==0x5441)) { // new data chunk - mp_msg(MSGT_DEMUX,MSGL_INFO,"demux_real: New data chunk is coming!!!\n"); - if (priv->is_multirate) - return 0; // EOF - stream_skip(demuxer->stream,14); - demuxer->filepos = stream_tell(demuxer->stream); - version = stream_read_word(demuxer->stream); /* version */ - len = stream_read_word(demuxer->stream); - } else if ((version == 0x494e) && (len == 0x4458)) { - mp_msg(MSGT_DEMUX,MSGL_V,"demux_real: Found INDX chunk. EOF.\n"); - demuxer->stream->eof=1; - return 0; - } - - - if (len == -256){ /* EOF */ -// printf("len==-256!\n"); - return 0; - } - if (len < 12){ - mp_msg(MSGT_DEMUX, MSGL_V,"%08X: packet v%d len=%d \n",(int)demuxer->filepos,(int)version,(int)len); - mp_msg(MSGT_DEMUX, MSGL_WARN,"bad packet len (%d)\n", len); - if ((unsigned)demuxer->video->id < MAX_STREAMS) { - if (priv->current_vpacket + 1 < priv->index_table_size[demuxer->video->id]) { - stream_seek(demuxer->stream, priv->index_table[demuxer->video->id][++priv->current_vpacket].offset); - } - } else if ((unsigned)demuxer->audio->id < MAX_STREAMS) { - if (priv->current_apacket + 1 < priv->index_table_size[demuxer->audio->id]) { - stream_seek(demuxer->stream, priv->index_table[demuxer->audio->id][++priv->current_apacket].offset); - } - } - continue; //goto loop; - } - - stream_id = stream_read_word(demuxer->stream); - timestamp = stream_read_dword(demuxer->stream); - reserved = stream_read_char(demuxer->stream); - flags = stream_read_char(demuxer->stream); - /* flags: */ - /* 0x1 - reliable */ - /* 0x2 - keyframe */ - - if (version == 1) { - int tmp; - tmp = stream_read_char(demuxer->stream); - mp_msg(MSGT_DEMUX, MSGL_DBG2,"Version: %d, skipped byte is %d\n", version, tmp); - len--; - } - - if (flags & 2) - add_index_item(demuxer, stream_id, timestamp, demuxer->filepos); - -// printf("%08X: packet v%d len=%4d id=%d pts=%6d rvd=%d flags=%d \n", -// (int)demuxer->filepos,(int)version,(int)len, stream_id, -// (int) timestamp, reserved, flags); - - mp_dbg(MSGT_DEMUX,MSGL_DBG2, "\npacket#%d: pos: 0x%0x, len: %d, id: %d, pts: %u, flags: %x rvd:%d\n", - priv->current_packet, (int)demuxer->filepos, len, stream_id, timestamp, flags, reserved); - - priv->current_packet++; - len -= 12; - -// printf("s_id=%d aid=%d vid=%d \n",stream_id,demuxer->audio->id,demuxer->video->id); - - /* check stream_id: */ - - if(demuxer->audio->id==stream_id){ - if (priv->audio_need_keyframe == 1&& flags != 0x2) - goto discard; -got_audio: - ds=demuxer->audio; - mp_dbg(MSGT_DEMUX,MSGL_DBG2, "packet is audio (id: %d)\n", stream_id); - - if (flags & 2) { - priv->sub_packet_cnt = 0; - audioreorder_getnextpk = 0; - } - - // parse audio chunk: - { -#ifdef CRACK_MATRIX - int spos=stream_tell(demuxer->stream); - static int cnt=0; - static int cnt2=CRACK_MATRIX; -#endif - if (((sh_audio_t *)ds->sh)->format == mmioFOURCC('M', 'P', '4', 'A')) { - uint16_t sub_packet_lengths[16], sub_packets, i; - int totlen = 0; - /* AAC in Real: several AAC frames in one Real packet. */ - /* Second byte, upper four bits: number of AAC frames */ - /* next n * 2 bytes: length of the AAC frames in bytes, BE */ - if (len < 2) - goto discard; - sub_packets = (stream_read_word(demuxer->stream) & 0xf0) >> 4; - if (len < 2 * sub_packets) - goto discard; - for (i = 0; i < sub_packets; i++) - totlen += sub_packet_lengths[i] = stream_read_word(demuxer->stream); - if (len < totlen ) - goto discard; - for (i = 0; i < sub_packets; i++) { - demux_packet_t *dp = new_demux_packet(sub_packet_lengths[i]); - stream_read(demuxer->stream, dp->buffer, sub_packet_lengths[i]); - if (priv->a_pts != timestamp) - dp->pts = timestamp / 1000.0; - priv->a_pts = timestamp; - dp->pos = demuxer->filepos; - ds_add_packet(ds, dp); - } - return 1; - } - if ((priv->intl_id[stream_id] == mmioFOURCC('I', 'n', 't', '4')) || - (priv->intl_id[stream_id] == mmioFOURCC('g', 'e', 'n', 'r')) || - (priv->intl_id[stream_id] == mmioFOURCC('s', 'i', 'p', 'r'))) { - sps = priv->sub_packet_size[stream_id]; - sph = priv->sub_packet_h[stream_id]; - cfs = priv->coded_framesize[stream_id]; - w = priv->audiopk_size[stream_id]; - spc = priv->sub_packet_cnt; - switch (priv->intl_id[stream_id]) { - case mmioFOURCC('I', 'n', 't', '4'): - if (len < cfs * sph/2) - goto discard; - for (x = 0; x < sph / 2; x++) - stream_read(demuxer->stream, priv->audio_buf + x * 2 * w + spc * cfs, cfs); - break; - case mmioFOURCC('g', 'e', 'n', 'r'): - if (len < w) - goto discard; - for (x = 0; x < w / sps; x++) - stream_read(demuxer->stream, priv->audio_buf + sps * (sph * x + ((sph + 1) / 2) * (spc & 1) + - (spc >> 1)), sps); - break; - case mmioFOURCC('s', 'i', 'p', 'r'): - if (len < w) - goto discard; - stream_read(demuxer->stream, priv->audio_buf + spc * w, w); - if (spc == sph - 1) { - int n; - int bs = sph * w * 2 / 96; // nibbles per subpacket - // Perform reordering - for(n=0; n < 38; n++) { - int j; - int i = bs * sipr_swaps[n][0]; - int o = bs * sipr_swaps[n][1]; - // swap nibbles of block 'i' with 'o' TODO: optimize - for(j = 0;j < bs; j++) { - int x = (i & 1) ? (priv->audio_buf[i >> 1] >> 4) : (priv->audio_buf[i >> 1] & 0x0F); - int y = (o & 1) ? (priv->audio_buf[o >> 1] >> 4) : (priv->audio_buf[o >> 1] & 0x0F); - if(o & 1) - priv->audio_buf[o >> 1] = (priv->audio_buf[o >> 1] & 0x0F) | (x << 4); - else - priv->audio_buf[o >> 1] = (priv->audio_buf[o >> 1] & 0xF0) | x; - if(i & 1) - priv->audio_buf[i >> 1] = (priv->audio_buf[i >> 1] & 0x0F) | (y << 4); - else - priv->audio_buf[i >> 1] = (priv->audio_buf[i >> 1] & 0xF0) | y; - ++i; ++o; - } - } - } - break; - } - priv->audio_need_keyframe = 0; - priv->audio_timestamp[priv->sub_packet_cnt] = (priv->a_pts==timestamp) ? MP_NOPTS_VALUE : (timestamp/1000.0); - priv->a_pts = timestamp; - if (priv->sub_packet_cnt == 0) - priv->audio_filepos = demuxer->filepos; - if (++(priv->sub_packet_cnt) < sph) - audioreorder_getnextpk = 1; - else { - int apk_usize = ((sh_audio_t*)ds->sh)->wf->nBlockAlign; - audioreorder_getnextpk = 0; - priv->sub_packet_cnt = 0; - // Release all the audio packets - for (x = 0; x < sph*w/apk_usize; x++) { - dp = new_demux_packet(apk_usize); - memcpy(dp->buffer, priv->audio_buf + x * apk_usize, apk_usize); - /* Put timestamp only on packets that correspond to original audio packets in file */ - if (x * apk_usize % w == 0) - dp->pts = priv->audio_timestamp[x * apk_usize / w]; - dp->pos = priv->audio_filepos; // all equal - dp->keyframe = !x; // Mark first packet as keyframe - ds_add_packet(ds, dp); - } - } - } else { // No interleaving - dp = new_demux_packet(len); - stream_read(demuxer->stream, dp->buffer, len); - -#ifdef CRACK_MATRIX - mp_msg(MSGT_DEMUX, MSGL_V,"*** audio block len=%d\n",len); - { // HACK - used for reverse engineering the descrambling matrix - FILE* f=fopen("test.rm","r+"); - fseek(f,spos,SEEK_SET); - ++cnt; -// for(i=0;ibuffer[i]=i/0x12; -// for(i=0;ibuffer[i]=i; -// for(i=0;ibuffer[i]=cnt; -// for(i=0;ibuffer[i]=cnt<<4; - for(i=0;ibuffer[i]=(i==cnt2) ? (cnt+16*(8+cnt)) : 0; - if(cnt==6){ cnt=0; ++cnt2; } - fwrite(dp->buffer, len, 1, f); - fclose(f); - if(cnt2>0x150) *((int*)NULL)=1; // sig11 :) - } -#endif -#if 0 - if( ((sh_audio_t *)ds->sh)->format == 0x2000) { - // if DNET, swap bytes, as DNET is byte-swapped AC3: - char *ptr = dp->buffer; - int i; - for (i = 0; i < len; i += 2) - { - const char tmp = ptr[0]; - ptr[0] = ptr[1]; - ptr[1] = tmp; - ptr += 2; - } - } -#endif - if (priv->audio_need_keyframe == 1) { - priv->audio_need_keyframe = 0; - } else if(priv->a_pts != timestamp) - dp->pts = timestamp/1000.0; - priv->a_pts=timestamp; - dp->pos = demuxer->filepos; - dp->keyframe = flags & 0x2; - ds_add_packet(ds, dp); - - } // codec_id check, codec default case - } -// we will not use audio index if we use -idx and have a video - if(((!demuxer->video->sh && index_mode == 2) || priv->is_multirate) && (unsigned)demuxer->audio->id < MAX_STREAMS) { - while (priv->current_apacket + 1 < priv->index_table_size[demuxer->audio->id] && - timestamp > priv->index_table[demuxer->audio->id][priv->current_apacket].timestamp) { - priv->current_apacket += 1; - priv->stream_switch = 1; - } - if (priv->stream_switch) - priv->audio_curpos = stream_tell(demuxer->stream); - } - - // If we're reordering audio packets and we need more data get it - if (audioreorder_getnextpk) - continue; - - return 1; - } - - if(demuxer->video->id==stream_id){ -got_video: - ds=demuxer->video; - mp_dbg(MSGT_DEMUX,MSGL_DBG2, "packet is video (id: %d)\n", stream_id); - - // parse video chunk: - { - // we need a more complicated, 2nd level demuxing, as the video - // frames are stored fragmented in the video chunks :( - sh_video_t *sh_video = ds->sh; - demux_packet_t *dp; - unsigned vpkg_header, vpkg_length, vpkg_offset; - int vpkg_seqnum=-1; - int vpkg_subseq=0; - - while(len>2){ - dp_hdr_t* dp_hdr; - unsigned char* dp_data; - uint8_t* extra; - -// printf("xxx len=%d \n",len); - - // read packet header - // bit 7: 1=last block in block chain - // bit 6: 1=short header (only one block?) - vpkg_header=stream_read_char(demuxer->stream); --len; - mp_dbg(MSGT_DEMUX,MSGL_DBG2, "hdr: %02X (len=%d) ",vpkg_header,len); - - if (0x40==(vpkg_header&0xc0)) { - // seems to be a very short header - // 2 bytes, purpose of the second byte yet unknown - int bummer av_unused; - bummer=stream_read_char(demuxer->stream); --len; - mp_dbg(MSGT_DEMUX,MSGL_DBG2, "%02X",bummer); - vpkg_offset=0; - vpkg_length=len; - } else { - - if