From fa0d14555dd5ba7c39d97888bcb798a0b3ca47c2 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Tue, 1 Mar 2011 10:53:19 +0000 Subject: codecs.conf, mp_taglists.c: add LXF PCM and dvvideo Support audio in Leitch/Harris' VR native stream format (LXF). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32990 b3059339-0415-0410-9bf9-f77b7e298cf2 Support dvvideo in Leitch/Harris' VR native stream format (LXF). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32991 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/mp_taglists.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libmpdemux') diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index e994075d56..146edc42ea 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -46,6 +46,9 @@ static const struct mp_AVCodecTag mp_wav_tags[] = { { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, { CODEC_ID_MUSEPACK8, MKTAG('M', 'P', 'C', '8')}, { CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')}, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 92, 0) + { CODEC_ID_PCM_LXF, MKTAG('P', 'L', 'X', 'F')}, +#endif { CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'p')}, { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2')}, { CODEC_ID_RA_144, MKTAG('1', '4', '_', '4')}, @@ -71,6 +74,7 @@ static const struct mp_AVCodecTag mp_codecid_override_tags[] = { { CODEC_ID_AC3, 0x2000}, { CODEC_ID_ADPCM_IMA_AMV, MKTAG('A', 'M', 'V', 'A')}, { CODEC_ID_DTS, 0x2001}, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd')}, { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, { CODEC_ID_H264, MKTAG('H', '2', '6', '4')}, { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'V')}, -- cgit v1.2.3 From 7a3fd839efe870575c94ffc856d625f78145a7f4 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 5 Mar 2011 12:03:03 +0000 Subject: audio: do not run the AC-3 parser on byte-swapped AC-3 Libavcodec has no parser that would work on byte-swapped AC3, but at least don't run the normal AC-3 one which would only break things. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33026 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33027 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 9b38af9452..7bcaae360c 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -514,10 +514,13 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse case 0x332D6361: case 0x332D4341: case 0x20736D: - case MKTAG('d', 'n', 'e', 't'): case MKTAG('s', 'a', 'c', '3'): codec_id = CODEC_ID_AC3; break; + case MKTAG('d', 'n', 'e', 't'): + // DNET/byte-swapped AC-3 - there is no parser for that yet + //codec_id = CODEC_ID_DNET; + break; case MKTAG('E', 'A', 'C', '3'): codec_id = CODEC_ID_EAC3; break; -- cgit v1.2.3 From 42f97b2b820f274f7a37a4c0639527a7a10e7b84 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Wed, 23 Mar 2011 08:35:45 +0000 Subject: codecs.conf, stheader.h: support CrystalHD decoding (libavcodec) Add the various decoders to codecs.conf and increase the maximum number of buffered pts in stheader.h (apparently CrystalHD can have very high decoder lag). Patch by Philip Langdale, philipl overt org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33095 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/stheader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index dc84518abc..f67a3217ac 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -102,7 +102,7 @@ typedef struct sh_video { double i_pts; // PTS for the _next_ I/P frame float next_frame_time; double last_pts; - double buffered_pts[20]; + double buffered_pts[32]; int num_buffered_pts; double codec_reordered_pts; double prev_codec_reordered_pts; -- cgit v1.2.3 From 673a2c759788a7d3df1e0a6f9df929057724c449 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sun, 27 Mar 2011 07:16:38 +0000 Subject: codecs.conf, mp_taglists: add FFmpeg Bitmap Brothers JV decoder git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33125 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/mp_taglists.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libmpdemux') diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 146edc42ea..632b0fd703 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -107,6 +107,9 @@ static const struct mp_AVCodecTag mp_bmp_tags[] = { { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')}, { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')}, { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')}, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 114, 0) + { CODEC_ID_JV, MKTAG('F', 'F', 'J', 'V')}, +#endif { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')}, -- cgit v1.2.3 From f8471184e86fee4267ceec2fd5b1115be82e3287 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 19 Apr 2011 08:23:15 +0000 Subject: demux_ts: Hint at -tsprobe option when no audio stream is found patch by Godmar Back, godmar gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33271 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 237a524bd4..c0c8a01a18 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -901,7 +901,7 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param) audio_found = 0; param->atype = UNKNOWN; //WE DIDN'T MATCH ANY AUDIO STREAM, SO WE FORCE THE DEMUXER TO IGNORE AUDIO - mp_msg(MSGT_DEMUXER, MSGL_INFO, "NO AUDIO! "); + mp_msg(MSGT_DEMUXER, MSGL_INFO, "NO AUDIO! (try increasing -tsprobe)"); } if(IS_SUB(param->stype)) -- cgit v1.2.3 From a3bf88ddefa5ba4bc1ab46332062c341e0280d34 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 22 Apr 2011 09:06:03 +0000 Subject: mp_taglists.c: add CODEC_ID_ANM and CODEC_ID_AVS Add mapping between codec ID and tag for ANM and AVS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33288 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/mp_taglists.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libmpdemux') diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 632b0fd703..7fb493b3b6 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -97,6 +97,8 @@ const struct mp_AVCodecTag * const mp_codecid_override_taglists[] = {mp_codecid_ static const struct mp_AVCodecTag mp_bmp_tags[] = { { CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'V')}, + { CODEC_ID_ANM, MKTAG('A', 'N', 'M', ' ')}, + { CODEC_ID_AVS, MKTAG('A', 'V', 'S', ' ')}, { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')}, { CODEC_ID_BFI, MKTAG('B', 'F', 'I', 'V')}, { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, -- cgit v1.2.3