From e311efda5c6ae33090e263c5d02265df8599052b Mon Sep 17 00:00:00 2001 From: arpi Date: Wed, 27 Mar 2002 21:10:46 +0000 Subject: we don't need ac3-iec958 any more git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5372 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- ac3-iec958.c | 138 ----------------------------------------------------------- ac3-iec958.h | 13 ------ 3 files changed, 1 insertion(+), 152 deletions(-) delete mode 100644 ac3-iec958.c delete mode 100644 ac3-iec958.h diff --git a/Makefile b/Makefile index 20000a5179..05ccb7179a 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ MANDIR = ${prefix}/man # a BSD compatible 'install' program INSTALL = install -SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c roqav.c qtrpza.c +SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c roqav.c qtrpza.c SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c me-opt-reg.c SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c vobsub.c mp-opt-reg.c diff --git a/ac3-iec958.c b/ac3-iec958.c deleted file mode 100644 index 45500ab4c1..0000000000 --- a/ac3-iec958.c +++ /dev/null @@ -1,138 +0,0 @@ -/* ---------------------------------------------------------------------- - - Copyright (C) 2001 Juha Yrjölä (jyrjola@cc.hut.fi) - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. - - ---------------------------------------------------------------------- */ - -#include -#include -#include -#include "ac3-iec958.h" - -struct frmsize_s -{ - unsigned short bit_rate; - unsigned short frm_size[3]; -}; - -static const struct frmsize_s frmsizecod_tbl[64] = -{ - { 32 ,{64 ,69 ,96 } }, - { 32 ,{64 ,70 ,96 } }, - { 40 ,{80 ,87 ,120 } }, - { 40 ,{80 ,88 ,120 } }, - { 48 ,{96 ,104 ,144 } }, - { 48 ,{96 ,105 ,144 } }, - { 56 ,{112 ,121 ,168 } }, - { 56 ,{112 ,122 ,168 } }, - { 64 ,{128 ,139 ,192 } }, - { 64 ,{128 ,140 ,192 } }, - { 80 ,{160 ,174 ,240 } }, - { 80 ,{160 ,175 ,240 } }, - { 96 ,{192 ,208 ,288 } }, - { 96 ,{192 ,209 ,288 } }, - { 112 ,{224 ,243 ,336 } }, - { 112 ,{224 ,244 ,336 } }, - { 128 ,{256 ,278 ,384 } }, - { 128 ,{256 ,279 ,384 } }, - { 160 ,{320 ,348 ,480 } }, - { 160 ,{320 ,349 ,480 } }, - { 192 ,{384 ,417 ,576 } }, - { 192 ,{384 ,418 ,576 } }, - { 224 ,{448 ,487 ,672 } }, - { 224 ,{448 ,488 ,672 } }, - { 256 ,{512 ,557 ,768 } }, - { 256 ,{512 ,558 ,768 } }, - { 320 ,{640 ,696 ,960 } }, - { 320 ,{640 ,697 ,960 } }, - { 384 ,{768 ,835 ,1152 } }, - { 384 ,{768 ,836 ,1152 } }, - { 448 ,{896 ,975 ,1344 } }, - { 448 ,{896 ,976 ,1344 } }, - { 512 ,{1024 ,1114 ,1536 } }, - { 512 ,{1024 ,1115 ,1536 } }, - { 576 ,{1152 ,1253 ,1728 } }, - { 576 ,{1152 ,1254 ,1728 } }, - { 640 ,{1280 ,1393 ,1920 } }, - { 640 ,{1280 ,1394 ,1920 } } -}; - -struct syncframe { - struct syncinfo { - unsigned char syncword[2]; - unsigned char crc1[2]; - unsigned char code; - } syncinfo; - struct bsi { - unsigned char bsidmod; - unsigned char acmod; - } bsi; -}; - -int ac3_iec958_build_burst(int length, int data_type, int big_endian, unsigned char * data, unsigned char * out) -{ - out[0] = 0x72; - out[1] = 0xF8; - out[2] = 0x1F; - out[3] = 0x4E; - out[4] = (length) ? data_type : 0; /* & 0x1F; */ - out[5] = 0x00; - out[6] = (length << 3) & 0xFF; - out[7] = (length >> 5) & 0xFF; - if (big_endian) - swab(data, out + 8, length); - else - memcpy(out + 8, data, length); - memset(out + 8 + length, 0, 6144 - 8 - length); - return 6144; -} - -int ac3_iec958_parse_syncinfo(unsigned char *buf, int size, struct hwac3info *ai, int *skipped) -{ - int samplerates[4] = { 48000, 44100, 32000, -1 }; - unsigned short sync = 0; - unsigned char *ptr = buf; - int fscod, frmsizecod; - struct syncframe *sf; - - sync = buf[0] << 8; - sync |= buf[1]; - ptr = buf + 2; - *skipped = 0; - while (sync != 0xb77 && *skipped < size - 8) { - sync <<= 8; - sync |= *ptr; - ptr++; - *skipped += 1; - } - if (sync != 0xb77) - return -1; - ptr -= 2; - sf = (struct syncframe *) ptr; - fscod = (sf->syncinfo.code >> 6) & 0x03; - ai->samplerate = samplerates[fscod]; - if (ai->samplerate == -1) - return -1; - frmsizecod = sf->syncinfo.code & 0x3f; - ai->framesize = 2 * frmsizecod_tbl[frmsizecod].frm_size[fscod]; - ai->bitrate = frmsizecod_tbl[frmsizecod].bit_rate; - if (((sf->bsi.bsidmod >> 3) & 0x1f) != 0x08) - return -1; - ai->bsmod = sf->bsi.bsidmod & 0x7; - - return 0; -} diff --git a/ac3-iec958.h b/ac3-iec958.h deleted file mode 100644 index 3ef1dea8dc..0000000000 --- a/ac3-iec958.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _AC3_IEC958_H -#define _AC3_IEC958_H - -#define IEC61937_DATA_TYPE_AC3 1 - -struct hwac3info { - int bitrate, framesize, samplerate, bsmod; -}; - -int ac3_iec958_build_burst(int length, int data_type, int big_endian, unsigned char * data, unsigned char * out); -int ac3_iec958_parse_syncinfo(unsigned char *buf, int size, struct hwac3info *ai, int *skipped); - -#endif -- cgit v1.2.3