libmpdemux: add back demux_mpg

Apparently this was needed for good DVD playback.

This demuxer has been removed in 1fde09db6f4ce. All code added comes
from the revision before that. Some other bits have been removed in
later commits, and are added back as well.

Usage of memalign() is replaced by av_malloc(). As far as I can tell,
this memory is never free'd or reallocated, so no calls to av_free()
have been added.

The code re-added to video.c is plain horrible, full of code
duplication, full of demuxer/codecs specifics, but apparently needed.

Unrelated to re-adding the demuxer, re-add one codepath for
DEMUXER_TYPE_TV, which was accidentally removed in the same commit
demux_mpg was removed.

The closed captions decoder is not re-added.

1 files changed, 36 insertions, 0 deletions

diff --git a/libmpdemux/mp3_hdr.h b/libmpdemux/mp3_hdr.h
new file mode 100644
index 0000000000..a9b34ac12c
--- /dev/null
+++ b/libmpdemux/mp3_hdr.h
@@ -0,0 +1,36 @@
+/*
+ * 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_MP3_HDR_H
+#define MPLAYER_MP3_HDR_H
+
+#include <stddef.h>
+
+int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* freq, int* spf, int* mpa_layer, int* br);
+
+#define mp_decode_mp3_header(hbuf)  mp_get_mp3_header(hbuf,NULL,NULL,NULL,NULL,NULL)
+
+static inline int mp_check_mp3_header(unsigned int head){
+    unsigned char tmp[4] = {head >> 24, head >> 16, head >> 8, head};
+    if( (head & 0xffe00000) != 0xffe00000 ||
+        (head & 0x00000c00) == 0x00000c00) return 0;
+    if(mp_decode_mp3_header(tmp)<=0) return 0;
+    return 1;
+}
+
+#endif /* MPLAYER_MP3_HDR_H */