diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_mkv.c | 100 | ||||
-rw-r--r-- | libmpdemux/demux_mov.c | 27 | ||||
-rw-r--r-- | libmpdemux/demux_real.c | 91 |
3 files changed, 66 insertions, 152 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index aff05bd92d..76a3874723 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -36,7 +36,7 @@ #include "loader/qtx/qtxsdk/components.h" #endif -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif @@ -98,7 +98,8 @@ typedef struct mkv_track /* stuff for realmedia */ int realmedia; - int rv_kf_base, rv_kf_pts; + int64_t rv_kf_base; + int rv_kf_pts; float rv_pts; /* previous video timestamp */ float ra_pts; /* previous audio timestamp */ @@ -296,7 +297,7 @@ demux_mkv_decode (mkv_track_t *track, uint8_t *src, uint8_t **dest, if (!(track->encodings[i].scope & type)) continue; -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB if (track->encodings[i].comp_algo == 0) { /* zlib encoded track */ @@ -544,7 +545,7 @@ demux_mkv_read_trackencodings (demuxer_t *demuxer, mkv_track_t *track) MSGTR_MPDEMUX_MKV_UnknownCompression, track->tnum, e.comp_algo); } -#ifndef CONFIG_ZLIB +#if !CONFIG_ZLIB else if (e.comp_algo == 0) { mp_msg (MSGT_DEMUX, MSGL_WARN, @@ -2376,61 +2377,7 @@ handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block, ds_add_packet(demuxer->sub, dp); } -// Taken from demux_real.c. Thanks to the original developpers :) -#define SKIP_BITS(n) buffer <<= n -#define SHOW_BITS(n) ((buffer) >> (32 - (n))) - -static float real_fix_timestamp(mkv_track_t *track, unsigned char *s, - int timestamp) { - float v_pts; - uint32_t buffer = (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3]; - int kf = timestamp; - int pict_type; - int orig_kf; - - if (!strcmp(track->codec_id, MKV_V_REALV30) || - !strcmp(track->codec_id, MKV_V_REALV40)) { - - if (!strcmp(track->codec_id, MKV_V_REALV30)) { - 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); - orig_kf = kf; - if (pict_type <= 1) { - // I frame, sync timestamps: - track->rv_kf_base = timestamp - kf; - mp_msg(MSGT_DEMUX, MSGL_DBG2, "\nTS: base=%08X\n", track->rv_kf_base); - kf = timestamp; - } else { - // P/B frame, merge timestamps: - int tmp = timestamp - track->rv_kf_base; - kf |= tmp & (~0x1fff); // combine with packet timestamp - if (kf < (tmp - 4096)) // workaround wrap-around problems - kf += 8192; - else if (kf > (tmp + 4096)) - kf -= 8192; - kf += track->rv_kf_base; - } - if (pict_type != 3) { // P || I frame -> swap timestamps - int tmp = kf; - kf = track->rv_kf_pts; - track->rv_kf_pts = tmp; - } - mp_msg(MSGT_DEMUX, MSGL_DBG2, "\nTS: %08X -> %08X (%04X) %d %02X %02X %02X " - "%02X %5d\n", timestamp, kf, orig_kf, pict_type, s[0], s[1], s[2], - s[3], kf - (int)(1000.0 * track->rv_pts)); - } - v_pts = kf * 0.001f; - track->rv_pts = v_pts; - - return v_pts; -} +double real_fix_timestamp(unsigned char *buf, unsigned int timestamp, unsigned int format, int64_t *kf_base, int *kf_pts, double *pts); static void handle_realvideo (demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer, @@ -2439,35 +2386,9 @@ handle_realvideo (demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer, mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; demux_packet_t *dp; uint32_t timestamp = mkv_d->last_pts * 1000; - uint32_t *hdr; - uint8_t chunks; - int isize; -#ifdef WORDS_BIGENDIAN - uint8_t *p; - int i; -#endif - - chunks = *buffer++; - isize = --size - (chunks+1)*8; - dp = new_demux_packet (REALHEADER_SIZE + size); - memcpy (dp->buffer + REALHEADER_SIZE, buffer + (chunks+1)*8, isize); -#ifdef WORDS_BIGENDIAN - p = (uint8_t *)(dp->buffer + REALHEADER_SIZE + isize); - for (i = 0; i<(chunks+1)*8; i+=4) { - p[i] = *((uint8_t *)buffer+i+3); - p[i+1] = *((uint8_t *)buffer+i+2); - p[i+2] = *((uint8_t *)buffer+i+1); - p[i+3] = *((uint8_t *)buffer+i); - } -#else - memcpy (dp->buffer + REALHEADER_SIZE + isize, buffer, (chunks+1)*8); -#endif - hdr = (uint32_t *) dp->buffer; - *hdr++ = chunks; // number of chunks - *hdr++ = timestamp; // timestamp from packet header - *hdr++ = isize; // length of actual data - *hdr++ = REALHEADER_SIZE + isize; // offset to chunk offset array + dp = new_demux_packet (size); + memcpy (dp->buffer, buffer, size); if (mkv_d->v_skip_to_keyframe) { @@ -2476,8 +2397,9 @@ handle_realvideo (demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer, track->rv_kf_pts = timestamp; } else - dp->pts = real_fix_timestamp (track, dp->buffer + REALHEADER_SIZE, - timestamp); + dp->pts = real_fix_timestamp (dp->buffer, timestamp, + ((sh_video_t*)demuxer->video->sh)->bih->biCompression, + &track->rv_kf_base, &track->rv_kf_pts, NULL); dp->pos = demuxer->filepos; dp->flags = block_bref ? 0 : 0x10; diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index a17d0966bd..fb271e1e49 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -41,6 +41,7 @@ #include "stheader.h" #include "libmpcodecs/img_format.h" +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libvo/sub.h" @@ -48,7 +49,7 @@ #include "qtpalette.h" #include "parse_mp4.h" // .MP4 specific stuff -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif @@ -434,8 +435,8 @@ static int mov_check_file(demuxer_t* demuxer){ case MOV_FOURCC('r','m','d','a'): continue; case MOV_FOURCC('r','d','r','f'): { - int tmp=stream_read_dword(demuxer->stream); - int type=stream_read_dword_le(demuxer->stream); + av_unused int tmp=stream_read_dword(demuxer->stream); + av_unused int type=stream_read_dword_le(demuxer->stream); int slen=stream_read_dword(demuxer->stream); //char* s=malloc(slen+1); //stream_read(demuxer->stream,s,slen); @@ -455,7 +456,7 @@ static int mov_check_file(demuxer_t* demuxer){ len-=12+slen;i-=12+slen; break; } case MOV_FOURCC('r','m','d','r'): { - int flags=stream_read_dword(demuxer->stream); + av_unused int flags=stream_read_dword(demuxer->stream); int rate=stream_read_dword(demuxer->stream); mp_msg(MSGT_DEMUX,MSGL_V," min. data rate: %d bits/sec\n",rate); len-=8; i-=8; break; @@ -1395,7 +1396,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak trak=NULL; break; } -#ifndef CONFIG_ZLIB +#if !CONFIG_ZLIB case MOV_FOURCC('c','m','o','v'): { mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVcomprhdr); return; @@ -1658,12 +1659,12 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, break; } case MOV_FOURCC('h','d','l','r'): { - unsigned int tmp = stream_read_dword(demuxer->stream); + av_unused unsigned int tmp = stream_read_dword(demuxer->stream); unsigned int type = stream_read_dword_le(demuxer->stream); unsigned int subtype = stream_read_dword_le(demuxer->stream); unsigned int manufact = stream_read_dword_le(demuxer->stream); - unsigned int comp_flags = stream_read_dword(demuxer->stream); - unsigned int comp_mask = stream_read_dword(demuxer->stream); + av_unused unsigned int comp_flags = stream_read_dword(demuxer->stream); + av_unused unsigned int comp_mask = stream_read_dword(demuxer->stream); int len = stream_read_char(demuxer->stream); char* str = malloc(len + 1); stream_read(demuxer->stream, str, len); @@ -1743,7 +1744,7 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, break; } case MOV_FOURCC('s','t','t','s'): { - int temp = stream_read_dword(demuxer->stream); + av_unused int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; unsigned int pts = 0; @@ -1802,7 +1803,7 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, break; } case MOV_FOURCC('s','t','c','o'): { - int temp = stream_read_dword(demuxer->stream); + av_unused int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX, MSGL_V, @@ -1819,7 +1820,7 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, break; } case MOV_FOURCC('c','o','6','4'): { - int temp = stream_read_dword(demuxer->stream); + av_unused int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX, MSGL_V, @@ -2027,7 +2028,7 @@ static demuxer_t* mov_read_header(demuxer_t* demuxer){ char2int(trak->stdata,12)==MOV_FOURCC('z','l','i','b') ){ int newlen=stream_read_dword(demuxer->stream); -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB // unzip: z_stream zstrm; int zret; @@ -2192,7 +2193,7 @@ if(trak->pos==0 && trak->stream_header_len>0){ if (samplenr < 0) vo_sub = NULL; else if (samplenr != priv->current_sub) { - sh_sub_t *sh = demuxer->sub->sh; + av_unused sh_sub_t *sh = demuxer->sub->sh; off_t pos = trak->samples[samplenr].pos; int len = trak->samples[samplenr].size; double subpts = (double)trak->samples[samplenr].pts / (double)trak->timescale; diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index b6b54f7c03..32b7acc11d 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -28,6 +28,7 @@ Video codecs: (supported by RealPlayer8 for Linux) #include "config.h" #include "mp_msg.h" #include "help_mp.h" +#include "mpbswap.h" #include "stream/stream.h" #include "demuxer.h" @@ -474,8 +475,9 @@ void hexdump(char *, unsigned long); #define SKIP_BITS(n) buffer<<=n #define SHOW_BITS(n) ((buffer)>>(32-(n))) -static double real_fix_timestamp(real_priv_t* priv, unsigned char* s, unsigned int timestamp, double frametime, unsigned int format){ +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; @@ -497,29 +499,29 @@ static double real_fix_timestamp(real_priv_t* priv, unsigned char* s, unsigned i // if(pict_type==0) if(pict_type<=1){ // I frame, sync timestamps: - priv->kf_base=(int64_t)timestamp-kf; - mp_msg(MSGT_DEMUX, MSGL_DBG2,"\nTS: base=%08"PRIX64"\n",priv->kf_base); + *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-priv->kf_base; + int64_t tmp=(int64_t)timestamp-*kf_base; kf|=tmp&(~0x1fff); // combine with packet timestamp if(kf<tmp-4096) kf+=8192; else // workaround wrap-around problems if(kf>tmp+4096) kf-=8192; - kf+=priv->kf_base; + kf+=*kf_base; } if(pict_type != 3){ // P || I frame -> swap timestamps unsigned int tmp=kf; - kf=priv->kf_pts; - priv->kf_pts=tmp; + 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],kf-(unsigned int)(1000.0*priv->v_pts)); + 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); } #endif v_pts=kf*0.001f; -// if(v_pts<priv->v_pts || !kf) v_pts=priv->v_pts+frametime; - priv->v_pts=v_pts; +// if(pts && (v_pts<*pts || !kf)) v_pts=*pts+frametime; + if(pts) *pts=v_pts; return v_pts; } @@ -530,6 +532,29 @@ typedef struct dp_hdr_s { 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 @@ -915,16 +940,7 @@ got_video: if(ds->asf_seq!=vpkg_seqnum){ // this fragment is for new packet, close the old one mp_msg(MSGT_DEMUX,MSGL_DBG2, "closing probably incomplete packet, len: %d \n",dp->len); - if(priv->video_after_seek){ - priv->kf_base = 0; - priv->kf_pts = dp_hdr->timestamp; - dp->pts= - real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format); - priv->video_after_seek = 0; - } else if (dp_hdr->len >= 3) - dp->pts = - real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format); - ds_add_packet(ds,dp); + queue_video_packet(priv, ds, dp); ds->asf_packet=NULL; } else { // append data to it! @@ -941,8 +957,8 @@ got_video: dp_data=dp->buffer+sizeof(dp_hdr_t); extra=(uint32_t*)(dp->buffer+dp_hdr->chunktab); } - extra[2*dp_hdr->chunks+0]=1; - extra[2*dp_hdr->chunks+1]=dp_hdr->len; + extra[2*dp_hdr->chunks+0]=le2me_32(1); + extra[2*dp_hdr->chunks+1]=le2me_32(dp_hdr->len); if(0x80==(vpkg_header&0xc0)){ // last fragment! if(dp_hdr->len!=vpkg_length-vpkg_offset) @@ -954,16 +970,7 @@ got_video: len-=vpkg_offset; mp_dbg(MSGT_DEMUX,MSGL_DBG2, "fragment (%d bytes) appended, %d bytes left\n",vpkg_offset,len); // we know that this is the last fragment -> we can close the packet! - if(priv->video_after_seek){ - priv->kf_base = 0; - priv->kf_pts = dp_hdr->timestamp; - dp->pts= - real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format); - priv->video_after_seek = 0; - } else if (dp_hdr->len >= 3) - dp->pts = - real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format); - ds_add_packet(ds,dp); + queue_video_packet(priv, ds, dp); ds->asf_packet=NULL; // continue parsing continue; @@ -991,7 +998,7 @@ got_video: dp_hdr->chunktab=sizeof(dp_hdr_t)+vpkg_length; dp_data=dp->buffer+sizeof(dp_hdr_t); extra=(uint32_t*)(dp->buffer+dp_hdr->chunktab); - extra[0]=1; extra[1]=0; // offset of the first chunk + extra[0]=le2me_32(1); extra[1]=0; // offset of the first chunk if(0x00==(vpkg_header&0xc0)){ // first fragment: if (len > dp->len - sizeof(dp_hdr_t)) len = dp->len - sizeof(dp_hdr_t); @@ -999,13 +1006,6 @@ got_video: stream_read(demuxer->stream, dp_data, len); ds->asf_packet=dp; len=0; - if(priv->video_after_seek){ - priv->kf_base = 0; - priv->kf_pts = dp_hdr->timestamp; - dp->pts= - real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format); - priv->video_after_seek = 0; - } break; } // whole packet (not fragmented): @@ -1020,16 +1020,7 @@ got_video: } dp_hdr->len=vpkg_length; len-=vpkg_length; stream_read(demuxer->stream, dp_data, vpkg_length); - if(priv->video_after_seek){ - priv->kf_base = 0; - priv->kf_pts = dp_hdr->timestamp; - dp->pts= - real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format); - priv->video_after_seek = 0; - } else if (dp_hdr->len >= 3) - dp->pts = - real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format); - ds_add_packet(ds,dp); + queue_video_packet(priv, ds, dp); } // while(len>0) |