summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-12 04:17:55 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-12 04:17:55 +0200
commit1e869638280f962fb80f372d152234f21246c2af (patch)
tree64657f88e7902aa000f44f40be4f8e575f58c8de /libmpdemux/demux_mkv.c
parent9790f4e6e72cdc8093be966d3d6e007c8f44a035 (diff)
parent379b176f25905f273a368336c3f5f287eeea51a2 (diff)
downloadmpv-1e869638280f962fb80f372d152234f21246c2af.tar.bz2
mpv-1e869638280f962fb80f372d152234f21246c2af.tar.xz
Merge svn changes up to r28537
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c100
1 files changed, 11 insertions, 89 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;