From 7e57bfd853285f39330d0122e5d8cde3a7cef7fa Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 5 Aug 2010 09:01:30 +0000 Subject: demux: Move mp_a52_framesize from demux_ts.c to parse_es.c The function is used in the MPEG muxer as well and not specific to MPEG-TS. Jointly developed by Nico Sabbi and myself. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31929 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ts.c | 41 ----------------------------------------- libmpdemux/demux_ts.h | 4 ---- libmpdemux/parse_es.c | 42 ++++++++++++++++++++++++++++++++++++++++++ libmpdemux/parse_es.h | 4 ++++ 4 files changed, 46 insertions(+), 45 deletions(-) diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index ee52c666ff..2bb5c3c558 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -624,47 +624,6 @@ typedef struct { off_t probe; } tsdemux_init_t; -//stripped down version of a52_syncinfo() from liba52 -//copyright belongs to Michel Lespinasse and Aaron Holtzman -int mp_a52_framesize(uint8_t * buf, int *srate) -{ - int rate[] = { 32, 40, 48, 56, 64, 80, 96, 112, - 128, 160, 192, 224, 256, 320, 384, 448, - 512, 576, 640 - }; - uint8_t halfrate[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3}; - int frmsizecod, bitrate, half; - - if((buf[0] != 0x0b) || (buf[1] != 0x77)) /* syncword */ - return 0; - - if(buf[5] >= 0x60) /* bsid >= 12 */ - return 0; - - half = halfrate[buf[5] >> 3]; - - frmsizecod = buf[4] & 63; - if(frmsizecod >= 38) - return 0; - - bitrate = rate[frmsizecod >> 1]; - - switch(buf[4] & 0xc0) - { - case 0: /* 48 KHz */ - *srate = 48000 >> half; - return 4 * bitrate; - case 0x40: /* 44.1 KHz */ - *srate = 44100 >> half; - return 2 * (320 * bitrate / 147 + (frmsizecod & 1)); - case 0x80: /* 32 KHz */ - *srate = 32000 >> half; - return 6 * bitrate; - } - - return 0; -} - //second stage: returns the count of A52 syncwords found static int a52_check(char *buf, int len) { diff --git a/libmpdemux/demux_ts.h b/libmpdemux/demux_ts.h index 7a06d80f2e..37bddb86da 100644 --- a/libmpdemux/demux_ts.h +++ b/libmpdemux/demux_ts.h @@ -19,10 +19,6 @@ #ifndef MPLAYER_DEMUX_TS_H #define MPLAYER_DEMUX_TS_H -#include - #define TS_MAX_PROBE_SIZE 2000000 -int mp_a52_framesize(uint8_t *buf, int *srate); - #endif /* MPLAYER_DEMUX_TS_H */ diff --git a/libmpdemux/parse_es.c b/libmpdemux/parse_es.c index 4dc20b86fd..05507a495a 100644 --- a/libmpdemux/parse_es.c +++ b/libmpdemux/parse_es.c @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include #include #include @@ -114,3 +115,44 @@ int skip_video_packet(demux_stream_t *ds){ // SYNC AGAIN: return sync_video_packet(ds); } + +/* stripped down version of a52_syncinfo() from liba52 + * copyright belongs to Michel Lespinasse + * and Aaron Holtzman */ +int mp_a52_framesize(uint8_t * buf, int *srate) +{ + int rate[] = { 32, 40, 48, 56, 64, 80, 96, 112, + 128, 160, 192, 224, 256, 320, 384, 448, + 512, 576, 640 + }; + uint8_t halfrate[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3 }; + int frmsizecod, bitrate, half; + + if ((buf[0] != 0x0b) || (buf[1] != 0x77)) /* syncword */ + return 0; + + if (buf[5] >= 0x60) /* bsid >= 12 */ + return 0; + + half = halfrate[buf[5] >> 3]; + + frmsizecod = buf[4] & 63; + if (frmsizecod >= 38) + return 0; + + bitrate = rate[frmsizecod >> 1]; + + switch (buf[4] & 0xc0) { + case 0: /* 48 KHz */ + *srate = 48000 >> half; + return 4 * bitrate; + case 0x40: /* 44.1 KHz */ + *srate = 44100 >> half; + return 2 * (320 * bitrate / 147 + (frmsizecod & 1)); + case 0x80: /* 32 KHz */ + *srate = 32000 >> half; + return 6 * bitrate; + } + + return 0; +} diff --git a/libmpdemux/parse_es.h b/libmpdemux/parse_es.h index ea2405a803..ed76593e50 100644 --- a/libmpdemux/parse_es.h +++ b/libmpdemux/parse_es.h @@ -19,6 +19,8 @@ #ifndef MPLAYER_PARSE_ES_H #define MPLAYER_PARSE_ES_H +#include + #include "demuxer.h" #define MAX_VIDEO_PACKET_SIZE (224*1024+4) @@ -38,4 +40,6 @@ int read_video_packet(demux_stream_t *ds); // return: next packet code int skip_video_packet(demux_stream_t *ds); +int mp_a52_framesize(uint8_t *buf, int *srate); + #endif /* MPLAYER_PARSE_ES_H */ -- cgit v1.2.3