static int spdif_get_offset_and_codec(AVFormatContext *s,
enum IEC61937DataType data_type,
const char *buf, int *offset,
- enum CodecID *codec)
+ enum AVCodecID *codec)
{
AACADTSHeaderInfo aac_hdr;
GetBitContext gbc;
switch (data_type & 0xff) {
case IEC61937_AC3:
*offset = AC3_FRAME_SIZE << 2;
- *codec = CODEC_ID_AC3;
+ *codec = AV_CODEC_ID_AC3;
break;
case IEC61937_MPEG1_LAYER1:
*offset = spdif_mpeg_pkt_offset[1][0];
- *codec = CODEC_ID_MP1;
+ *codec = AV_CODEC_ID_MP1;
break;
case IEC61937_MPEG1_LAYER23:
*offset = spdif_mpeg_pkt_offset[1][0];
- *codec = CODEC_ID_MP3;
+ *codec = AV_CODEC_ID_MP3;
break;
case IEC61937_MPEG2_EXT:
*offset = 4608;
- *codec = CODEC_ID_MP3;
+ *codec = AV_CODEC_ID_MP3;
break;
case IEC61937_MPEG2_AAC:
init_get_bits(&gbc, buf, AAC_ADTS_HEADER_SIZE * 8);
return AVERROR_INVALIDDATA;
}
*offset = aac_hdr.samples << 2;
- *codec = CODEC_ID_AAC;
+ *codec = AV_CODEC_ID_AAC;
break;
case IEC61937_MPEG2_LAYER1_LSF:
*offset = spdif_mpeg_pkt_offset[0][0];
- *codec = CODEC_ID_MP1;
+ *codec = AV_CODEC_ID_MP1;
break;
case IEC61937_MPEG2_LAYER2_LSF:
*offset = spdif_mpeg_pkt_offset[0][1];
- *codec = CODEC_ID_MP2;
+ *codec = AV_CODEC_ID_MP2;
break;
case IEC61937_MPEG2_LAYER3_LSF:
*offset = spdif_mpeg_pkt_offset[0][2];
- *codec = CODEC_ID_MP3;
+ *codec = AV_CODEC_ID_MP3;
break;
case IEC61937_DTS1:
*offset = 2048;
- *codec = CODEC_ID_DTS;
+ *codec = AV_CODEC_ID_DTS;
break;
case IEC61937_DTS2:
*offset = 4096;
- *codec = CODEC_ID_DTS;
+ *codec = AV_CODEC_ID_DTS;
break;
case IEC61937_DTS3:
*offset = 8192;
- *codec = CODEC_ID_DTS;
+ *codec = AV_CODEC_ID_DTS;
break;
default:
if (s) { /* be silent during a probe */
- av_log(s, AV_LOG_WARNING, "Data type 0x%04x", data_type);
- av_log_missing_feature(s, " in IEC 61937 is", 1);
+ avpriv_request_sample(s, "Data type 0x%04x in IEC 61937",
+ data_type);
}
return AVERROR_PATCHWELCOME;
}
int sync_codes = 0;
int consecutive_codes = 0;
int offset;
- enum CodecID codec;
+ enum AVCodecID codec;
for (; buf < probe_end; buf++) {
state = (state << 8) | *buf;
if (sync_codes >= 6)
/* good amount of sync codes but with unexpected offsets */
- return AVPROBE_SCORE_MAX / 2;
+ return AVPROBE_SCORE_EXTENSION;
/* some sync codes were found */
- return AVPROBE_SCORE_MAX / 8;
+ return AVPROBE_SCORE_EXTENSION / 4;
}
-static int spdif_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int spdif_read_header(AVFormatContext *s)
{
s->ctx_flags |= AVFMTCTX_NOHEADER;
return 0;
{
AVIOContext *pb = s->pb;
enum IEC61937DataType data_type;
- enum CodecID codec_id;
+ enum AVCodecID codec_id;
uint32_t state = 0;
int pkt_size_bits, offset, ret;
pkt_size_bits = avio_rl16(pb);
if (pkt_size_bits % 16)
- av_log_ask_for_sample(s, "Packet does not end to a 16-bit boundary.");
+ avpriv_request_sample(s, "Packet not ending at a 16-bit boundary");
ret = av_new_packet(pkt, FFALIGN(pkt_size_bits, 16) >> 3);
if (ret)
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = codec_id;
} else if (codec_id != s->streams[0]->codec->codec_id) {
- av_log_missing_feature(s, "codec change in IEC 61937", 0);
+ avpriv_report_missing_feature(s, "Codec change in IEC 61937");
return AVERROR_PATCHWELCOME;
}
.read_probe = spdif_probe,
.read_header = spdif_read_header,
.read_packet = spdif_read_packet,
- .flags = AVFMT_GENERIC_INDEX,
+ .flags = AVFMT_GENERIC_INDEX,
};