# HG changeset patch # User ben # Date 1153347230 0 # Node ID 6e6ca469073b230367c91cb7c6266c256f0d9080 # Parent c6c3ad8a5475c81996cd4b95cec02ebdf457eaa8 moved mpeg_packetizer helpers to libmpdemux diff -r c6c3ad8a5475 -r 6e6ca469073b libmpcodecs/Makefile --- a/libmpcodecs/Makefile Wed Jul 19 22:06:32 2006 +0000 +++ b/libmpcodecs/Makefile Wed Jul 19 22:13:50 2006 +0000 @@ -310,7 +310,6 @@ $(VIDEO_SRCS) \ $(VFILTER_SRCS) \ $(NATIVE_SRCS) \ - mpeg_packetizer.c \ img_format.c \ OBJS=$(SRCS:.c=.o) diff -r c6c3ad8a5475 -r 6e6ca469073b libmpcodecs/mpeg_packetizer.c --- a/libmpcodecs/mpeg_packetizer.c Wed Jul 19 22:06:32 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,278 +0,0 @@ -/* - * Copyright (C) 2006 Benjamin Zores - * Set of helper routines for building MPEG 1/2 PS/PES packets. - * - * Based on various code bororwed from vo_mpegpes/vo_dxr2 : - * (C) 2000 Ralph Metzler - * Marcus Metzler - * Gerard Lantau - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include - -#include "mp_msg.h" -#include "mpeg_packetizer.h" - -#define PES_MAX_SIZE 2048 - -static unsigned char pes_header[PES_MAX_SIZE]; - -static unsigned char ps_header[] = { - 0x00, 0x00, 0x01, 0xba, 0x44, 0x00, 0x04, 0x00, - 0x04, 0x01, 0x01, 0x86, 0xa3, 0xf8 -}; - -/* Send MPEG 1 PES packet */ -int -send_mpeg1_pes_packet (unsigned char *data, int len, int id, uint64_t pts, - int my_write (unsigned char *data, int len)) -{ - int ptslen = pts ? 5 : 1; - int n = 0; - - mp_msg (MSGT_HEADER, MSGL_DBG2, - "MPEG1 PES packet: 0x%x => %lu \n", id, pts); - memset (pes_header, '\0', PES_MAX_SIZE); - - /* startcode */ - pes_header[0] = 0; - pes_header[1] = 0; - pes_header[2] = id >> 8; - pes_header[3] = id & 255; - - while (len > 0) - { - int payload_size = len; /* data + PTS */ - if (6 + ptslen + payload_size > PES_MAX_SIZE) - payload_size = PES_MAX_SIZE - (6 + ptslen); - - /* construct PES header: packetsize */ - pes_header[4] = (ptslen + payload_size) >> 8; - pes_header[5] = (ptslen + payload_size) & 255; - - if (ptslen == 5) - { - int x; - /* presentation time stamp */ - x = (0x02 << 4) | (((pts >> 30) & 0x07) << 1) | 1; - pes_header[6] = x; - - x = ((((pts >> 15) & 0x7fff) << 1) | 1); - pes_header[7] = x >> 8; - pes_header[8] = x & 255; - - x = (((pts & 0x7fff) << 1) | 1); - pes_header[9] = x >> 8; - pes_header[10] = x & 255; - } - else - { - /* stuffing and header bits */ - pes_header[6] = 0x0f; - } - - memcpy (&pes_header[6 + ptslen], data, payload_size); - n += my_write (pes_header, 6 + ptslen + payload_size); - - len -= payload_size; - data += payload_size; - ptslen = 1; /* store PTS only once, at first packet! */ - } - - return n; -} - -/* Send MPEG 1 PS packet */ -int -send_mpeg1_ps_packet (unsigned char *data, int len, int id, uint64_t pts, - int my_write (unsigned char *data, int len)) -{ - my_write (ps_header, sizeof (ps_header)); - return send_mpeg1_pes_packet (data, len, id, pts, my_write); -} - -/* Send MPEG 2 PES packet */ -int -send_mpeg2_pes_packet (unsigned char *data, int len, int id, uint64_t pts, - int my_write (unsigned char *data, int len)) -{ - int ptslen = 5; - int n = 0; - - mp_msg (MSGT_HEADER, MSGL_DBG2, - "MPEG2 PES packet: 0x%x => %lu \n", id, pts); - memset (pes_header, '\0', PES_MAX_SIZE); - - /* startcode */ - pes_header[0] = 0; - pes_header[1] = 0; - pes_header[2] = 0x01; - pes_header[3] = id; /* stream id */ - - while (len > 0) - { - int payload_size = len; /* data + PTS */ - if (9 + ptslen + payload_size > PES_MAX_SIZE) - payload_size = PES_MAX_SIZE - (6 + ptslen); - - /* construct PES header: packetize */ - pes_header[4] = (3 + ptslen + payload_size) >> 8; - pes_header[5] = (3 + ptslen + payload_size) & 255; - pes_header[6] = 0x81; - - if (ptslen) - { - int x; - pes_header[7] = 0x80; - pes_header[8] = ptslen; - - /* presentation time stamp */ - x = (0x02 << 4) | (((pts >> 30) & 0x07) << 1) | 1; - pes_header[9] = x; - - x = ((((pts >> 15) & 0x7fff) << 1) | 1); - pes_header[10] = x >>8; - pes_header[11] = x & 255; - - x = (((pts & 0x7fff) << 1) | 1); - pes_header[12] = x >> 8; - pes_header[13] = x & 255; - } - else - { - pes_header[7] = 0x00; - pes_header[8] = 0x00; - } - - my_write (pes_header, 9 + ptslen); - n += my_write (data, payload_size); - - len -= payload_size; - data += payload_size; - ptslen = 0; /* store PTS only once, at first packet! */ - } - - return n; -} - -/* Send MPEG 2 PS packet */ -int -send_mpeg2_ps_packet (unsigned char *data, int len, int id, uint64_t pts, - int my_write (unsigned char *data, int len)) -{ - my_write (ps_header, sizeof (ps_header)); - return send_mpeg2_pes_packet (data, len, id, pts, my_write); -} - -/* Send MPEG LPCM packet */ -int -send_mpeg_lpcm_packet (unsigned char* data, int len, - int id, uint64_t pts, int freq_id, - int my_write (unsigned char *data, int len)) -{ - int ptslen = pts ? 5 : 0; - int n = 0; - - mp_msg (MSGT_HEADER, MSGL_DBG2, - "MPEG LPCM packet: 0x%x => %lu \n", id, pts); - memset (pes_header, '\0', PES_MAX_SIZE); - - /* startcode */ - pes_header[0] = 0; - pes_header[1] = 0; - pes_header[2] = 1; - pes_header[3] = 0xBD; /* stream id */ - - while (len >= 4) - { - int payload_size = PES_MAX_SIZE - 6 - 20; /* max possible data len */ - if( payload_size > len) - payload_size = len; - - payload_size &= ~3; /* align! */ - - /* packetsize */ - pes_header[4] = (payload_size + 3 + ptslen + 7) >> 8; - pes_header[5] = (payload_size + 3 + ptslen + 7) & 255; - - /* stuffing */ - /* TTCCxxxx CC=css TT=type: 1=STD 0=mpeg1 2=vob */ - pes_header[6] = 0x81; - - /* FFxxxxxx FF=pts flags=2 vs 0 */ - pes_header[7] = ptslen ? 0x80 : 0; - - /* header length */ - pes_header[8] = ptslen; - - if (ptslen) - { - int x; - - /* presentation time stamp */ - x = (0x02 << 4) | (((pts >> 30) & 0x07) << 1) | 1; - pes_header[9] = x; - - x = ((((pts >> 15) & 0x7fff) << 1) | 1); - pes_header[10] = x >> 8; - pes_header[11] = x &255; - - x = (((pts & 0x7fff) << 1) | 1); - pes_header[12] = x >> 8; - pes_header[13] = x & 255; - } - - /* ============ LPCM header: (7 bytes) ================= */ - /* Info by mocm@convergence.de */ - - /* ID */ - pes_header[ptslen + 9] = id; - - /* number of frames */ - pes_header[ptslen + 10] = 0x07; - - /* first acces unit pointer, i.e. start of audio frame */ - pes_header[ptslen + 11] = 0x00; - pes_header[ptslen + 12] = 0x04; - - /* audio emphasis on-off 1 bit */ - /* audio mute on-off 1 bit */ - /* reserved 1 bit */ - /* audio frame number 5 bit */ - pes_header[ptslen + 13] = 0x0C; - - /* quantization word length 2 bit */ - /* audio sampling frequency (48khz = 0, 96khz = 1) 2 bit */ - /* reserved 1 bit */ - /* number of audio channels - 1 (e.g. stereo = 1) 3 bit */ - pes_header[ptslen + 14] = 1 | (freq_id << 4); - - /* dynamic range control (0x80 if off) */ - pes_header [ptslen + 15] = 0x80; - - memcpy (&pes_header[6 + 3 + ptslen + 7], data, payload_size); - n += my_write (pes_header, 6 + 3 + ptslen + 7 + payload_size); - - len -= payload_size; - data += payload_size; - ptslen = 0; /* store PTS only once, at first packet! */ - } - - return n; -} diff -r c6c3ad8a5475 -r 6e6ca469073b libmpcodecs/mpeg_packetizer.h --- a/libmpcodecs/mpeg_packetizer.h Wed Jul 19 22:06:32 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2006 Benjamin Zores - * Set of helper routines for building MPEG 1/2 PS/PES packets. - * - * Based on various code bororwed from vo_mpegpes/vo_dxr2 : - * (C) 2000 Ralph Metzler - * Marcus Metzler - * Gerard Lantau - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _MPEG_PACKETIZER_H_ -#define _MPEG_PACKETIZER_H_ - -/* Send MPEG 1 PES packet */ -int send_mpeg1_pes_packet (unsigned char *data, int len, int id, uint64_t pts, - int my_write (unsigned char *data, int len)); - -/* Send MPEG 1 PS packet */ -int send_mpeg1_ps_packet (unsigned char *data, int len, int id, uint64_t pts, - int my_write (unsigned char *data, int len)); -/* Send MPEG 2 PES packet */ -int send_mpeg2_pes_packet (unsigned char *data, int len, int id, uint64_t pts, - int my_write (unsigned char *data, int len)); - -/* Send MPEG 2 PS packet */ -int send_mpeg2_ps_packet (unsigned char *data, int len, int id, uint64_t pts, - int my_write (unsigned char *data, int len)); - -/* Send MPEG LPCM packet */ -int send_mpeg_lpcm_packet (unsigned char *data, int len, - int id, uint64_t pts, int freq_id, - int my_write (unsigned char *data, int len)); - -#endif /* _MPEG_PACKETIZER_H_ */ diff -r c6c3ad8a5475 -r 6e6ca469073b libmpdemux/Makefile --- a/libmpdemux/Makefile Wed Jul 19 22:06:32 2006 +0000 +++ b/libmpdemux/Makefile Wed Jul 19 22:13:50 2006 +0000 @@ -26,6 +26,7 @@ cue_read.c \ parse_es.c \ parse_mp4.c \ + mpeg_packetizer.c \ yuv4mpeg.c \ yuv4mpeg_ratio.c \ diff -r c6c3ad8a5475 -r 6e6ca469073b libmpdemux/mpeg_packetizer.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpdemux/mpeg_packetizer.c Wed Jul 19 22:13:50 2006 +0000 @@ -0,0 +1,278 @@ +/* + * Copyright (C) 2006 Benjamin Zores + * Set of helper routines for building MPEG 1/2 PS/PES packets. + * + * Based on various code bororwed from vo_mpegpes/vo_dxr2 : + * (C) 2000 Ralph Metzler + * Marcus Metzler + * Gerard Lantau + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include + +#include "mp_msg.h" +#include "mpeg_packetizer.h" + +#define PES_MAX_SIZE 2048 + +static unsigned char pes_header[PES_MAX_SIZE]; + +static unsigned char ps_header[] = { + 0x00, 0x00, 0x01, 0xba, 0x44, 0x00, 0x04, 0x00, + 0x04, 0x01, 0x01, 0x86, 0xa3, 0xf8 +}; + +/* Send MPEG 1 PES packet */ +int +send_mpeg1_pes_packet (unsigned char *data, int len, int id, uint64_t pts, + int my_write (unsigned char *data, int len)) +{ + int ptslen = pts ? 5 : 1; + int n = 0; + + mp_msg (MSGT_HEADER, MSGL_DBG2, + "MPEG1 PES packet: 0x%x => %lu \n", id, pts); + memset (pes_header, '\0', PES_MAX_SIZE); + + /* startcode */ + pes_header[0] = 0; + pes_header[1] = 0; + pes_header[2] = id >> 8; + pes_header[3] = id & 255; + + while (len > 0) + { + int payload_size = len; /* data + PTS */ + if (6 + ptslen + payload_size > PES_MAX_SIZE) + payload_size = PES_MAX_SIZE - (6 + ptslen); + + /* construct PES header: packetsize */ + pes_header[4] = (ptslen + payload_size) >> 8; + pes_header[5] = (ptslen + payload_size) & 255; + + if (ptslen == 5) + { + int x; + /* presentation time stamp */ + x = (0x02 << 4) | (((pts >> 30) & 0x07) << 1) | 1; + pes_header[6] = x; + + x = ((((pts >> 15) & 0x7fff) << 1) | 1); + pes_header[7] = x >> 8; + pes_header[8] = x & 255; + + x = (((pts & 0x7fff) << 1) | 1); + pes_header[9] = x >> 8; + pes_header[10] = x & 255; + } + else + { + /* stuffing and header bits */ + pes_header[6] = 0x0f; + } + + memcpy (&pes_header[6 + ptslen], data, payload_size); + n += my_write (pes_header, 6 + ptslen + payload_size); + + len -= payload_size; + data += payload_size; + ptslen = 1; /* store PTS only once, at first packet! */ + } + + return n; +} + +/* Send MPEG 1 PS packet */ +int +send_mpeg1_ps_packet (unsigned char *data, int len, int id, uint64_t pts, + int my_write (unsigned char *data, int len)) +{ + my_write (ps_header, sizeof (ps_header)); + return send_mpeg1_pes_packet (data, len, id, pts, my_write); +} + +/* Send MPEG 2 PES packet */ +int +send_mpeg2_pes_packet (unsigned char *data, int len, int id, uint64_t pts, + int my_write (unsigned char *data, int len)) +{ + int ptslen = 5; + int n = 0; + + mp_msg (MSGT_HEADER, MSGL_DBG2, + "MPEG2 PES packet: 0x%x => %lu \n", id, pts); + memset (pes_header, '\0', PES_MAX_SIZE); + + /* startcode */ + pes_header[0] = 0; + pes_header[1] = 0; + pes_header[2] = 0x01; + pes_header[3] = id; /* stream id */ + + while (len > 0) + { + int payload_size = len; /* data + PTS */ + if (9 + ptslen + payload_size > PES_MAX_SIZE) + payload_size = PES_MAX_SIZE - (6 + ptslen); + + /* construct PES header: packetize */ + pes_header[4] = (3 + ptslen + payload_size) >> 8; + pes_header[5] = (3 + ptslen + payload_size) & 255; + pes_header[6] = 0x81; + + if (ptslen) + { + int x; + pes_header[7] = 0x80; + pes_header[8] = ptslen; + + /* presentation time stamp */ + x = (0x02 << 4) | (((pts >> 30) & 0x07) << 1) | 1; + pes_header[9] = x; + + x = ((((pts >> 15) & 0x7fff) << 1) | 1); + pes_header[10] = x >>8; + pes_header[11] = x & 255; + + x = (((pts & 0x7fff) << 1) | 1); + pes_header[12] = x >> 8; + pes_header[13] = x & 255; + } + else + { + pes_header[7] = 0x00; + pes_header[8] = 0x00; + } + + my_write (pes_header, 9 + ptslen); + n += my_write (data, payload_size); + + len -= payload_size; + data += payload_size; + ptslen = 0; /* store PTS only once, at first packet! */ + } + + return n; +} + +/* Send MPEG 2 PS packet */ +int +send_mpeg2_ps_packet (unsigned char *data, int len, int id, uint64_t pts, + int my_write (unsigned char *data, int len)) +{ + my_write (ps_header, sizeof (ps_header)); + return send_mpeg2_pes_packet (data, len, id, pts, my_write); +} + +/* Send MPEG LPCM packet */ +int +send_mpeg_lpcm_packet (unsigned char* data, int len, + int id, uint64_t pts, int freq_id, + int my_write (unsigned char *data, int len)) +{ + int ptslen = pts ? 5 : 0; + int n = 0; + + mp_msg (MSGT_HEADER, MSGL_DBG2, + "MPEG LPCM packet: 0x%x => %lu \n", id, pts); + memset (pes_header, '\0', PES_MAX_SIZE); + + /* startcode */ + pes_header[0] = 0; + pes_header[1] = 0; + pes_header[2] = 1; + pes_header[3] = 0xBD; /* stream id */ + + while (len >= 4) + { + int payload_size = PES_MAX_SIZE - 6 - 20; /* max possible data len */ + if( payload_size > len) + payload_size = len; + + payload_size &= ~3; /* align! */ + + /* packetsize */ + pes_header[4] = (payload_size + 3 + ptslen + 7) >> 8; + pes_header[5] = (payload_size + 3 + ptslen + 7) & 255; + + /* stuffing */ + /* TTCCxxxx CC=css TT=type: 1=STD 0=mpeg1 2=vob */ + pes_header[6] = 0x81; + + /* FFxxxxxx FF=pts flags=2 vs 0 */ + pes_header[7] = ptslen ? 0x80 : 0; + + /* header length */ + pes_header[8] = ptslen; + + if (ptslen) + { + int x; + + /* presentation time stamp */ + x = (0x02 << 4) | (((pts >> 30) & 0x07) << 1) | 1; + pes_header[9] = x; + + x = ((((pts >> 15) & 0x7fff) << 1) | 1); + pes_header[10] = x >> 8; + pes_header[11] = x &255; + + x = (((pts & 0x7fff) << 1) | 1); + pes_header[12] = x >> 8; + pes_header[13] = x & 255; + } + + /* ============ LPCM header: (7 bytes) ================= */ + /* Info by mocm@convergence.de */ + + /* ID */ + pes_header[ptslen + 9] = id; + + /* number of frames */ + pes_header[ptslen + 10] = 0x07; + + /* first acces unit pointer, i.e. start of audio frame */ + pes_header[ptslen + 11] = 0x00; + pes_header[ptslen + 12] = 0x04; + + /* audio emphasis on-off 1 bit */ + /* audio mute on-off 1 bit */ + /* reserved 1 bit */ + /* audio frame number 5 bit */ + pes_header[ptslen + 13] = 0x0C; + + /* quantization word length 2 bit */ + /* audio sampling frequency (48khz = 0, 96khz = 1) 2 bit */ + /* reserved 1 bit */ + /* number of audio channels - 1 (e.g. stereo = 1) 3 bit */ + pes_header[ptslen + 14] = 1 | (freq_id << 4); + + /* dynamic range control (0x80 if off) */ + pes_header [ptslen + 15] = 0x80; + + memcpy (&pes_header[6 + 3 + ptslen + 7], data, payload_size); + n += my_write (pes_header, 6 + 3 + ptslen + 7 + payload_size); + + len -= payload_size; + data += payload_size; + ptslen = 0; /* store PTS only once, at first packet! */ + } + + return n; +} diff -r c6c3ad8a5475 -r 6e6ca469073b libmpdemux/mpeg_packetizer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpdemux/mpeg_packetizer.h Wed Jul 19 22:13:50 2006 +0000 @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2006 Benjamin Zores + * Set of helper routines for building MPEG 1/2 PS/PES packets. + * + * Based on various code bororwed from vo_mpegpes/vo_dxr2 : + * (C) 2000 Ralph Metzler + * Marcus Metzler + * Gerard Lantau + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _MPEG_PACKETIZER_H_ +#define _MPEG_PACKETIZER_H_ + +/* Send MPEG 1 PES packet */ +int send_mpeg1_pes_packet (unsigned char *data, int len, int id, uint64_t pts, + int my_write (unsigned char *data, int len)); + +/* Send MPEG 1 PS packet */ +int send_mpeg1_ps_packet (unsigned char *data, int len, int id, uint64_t pts, + int my_write (unsigned char *data, int len)); +/* Send MPEG 2 PES packet */ +int send_mpeg2_pes_packet (unsigned char *data, int len, int id, uint64_t pts, + int my_write (unsigned char *data, int len)); + +/* Send MPEG 2 PS packet */ +int send_mpeg2_ps_packet (unsigned char *data, int len, int id, uint64_t pts, + int my_write (unsigned char *data, int len)); + +/* Send MPEG LPCM packet */ +int send_mpeg_lpcm_packet (unsigned char *data, int len, + int id, uint64_t pts, int freq_id, + int my_write (unsigned char *data, int len)); + +#endif /* _MPEG_PACKETIZER_H_ */