#include "libavcodec/aacadtsdec.h"
static int spdif_get_offset_and_codec(AVFormatContext *s,
- enum IEC958DataType data_type,
+ enum IEC61937DataType data_type,
const char *buf, int *offset,
enum CodecID *codec)
{
GetBitContext gbc;
switch (data_type & 0xff) {
- case IEC958_AC3:
+ case IEC61937_AC3:
*offset = AC3_FRAME_SIZE << 2;
*codec = CODEC_ID_AC3;
break;
- case IEC958_MPEG1_LAYER1:
+ case IEC61937_MPEG1_LAYER1:
*offset = spdif_mpeg_pkt_offset[1][0];
*codec = CODEC_ID_MP1;
break;
- case IEC958_MPEG1_LAYER23:
+ case IEC61937_MPEG1_LAYER23:
*offset = spdif_mpeg_pkt_offset[1][0];
*codec = CODEC_ID_MP3;
break;
- case IEC958_MPEG2_EXT:
+ case IEC61937_MPEG2_EXT:
*offset = 4608;
*codec = CODEC_ID_MP3;
break;
- case IEC958_MPEG2_AAC:
+ case IEC61937_MPEG2_AAC:
init_get_bits(&gbc, buf, AAC_ADTS_HEADER_SIZE * 8);
if (ff_aac_parse_header(&gbc, &aac_hdr)) {
if (s) /* be silent during a probe */
*offset = aac_hdr.samples << 2;
*codec = CODEC_ID_AAC;
break;
- case IEC958_MPEG2_LAYER1_LSF:
+ case IEC61937_MPEG2_LAYER1_LSF:
*offset = spdif_mpeg_pkt_offset[0][0];
*codec = CODEC_ID_MP1;
break;
- case IEC958_MPEG2_LAYER2_LSF:
+ case IEC61937_MPEG2_LAYER2_LSF:
*offset = spdif_mpeg_pkt_offset[0][1];
*codec = CODEC_ID_MP2;
break;
- case IEC958_MPEG2_LAYER3_LSF:
+ case IEC61937_MPEG2_LAYER3_LSF:
*offset = spdif_mpeg_pkt_offset[0][2];
*codec = CODEC_ID_MP3;
break;
- case IEC958_DTS1:
+ case IEC61937_DTS1:
*offset = 2048;
*codec = CODEC_ID_DTS;
break;
- case IEC958_DTS2:
+ case IEC61937_DTS2:
*offset = 4096;
*codec = CODEC_ID_DTS;
break;
- case IEC958_DTS3:
+ case IEC61937_DTS3:
*offset = 8192;
*codec = CODEC_ID_DTS;
break;
static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt)
{
ByteIOContext *pb = s->pb;
- enum IEC958DataType data_type;
+ enum IEC61937DataType data_type;
enum CodecID codec_id;
uint32_t state = 0;
int pkt_size_bits, offset, ret;