diff options
Diffstat (limited to 'libavformat')
244 files changed, 2545 insertions, 2545 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 61fa886e70..0a003d4b8e 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -155,7 +155,7 @@ static int fourxm_read_header(AVFormatContext *s) fourxm->video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_4XM; + st->codec->codec_id = AV_CODEC_ID_4XM; st->codec->extradata_size = 4; st->codec->extradata = av_malloc(4); AV_WL32(st->codec->extradata, AV_RL32(&header[i + 16])); @@ -228,11 +228,11 @@ static int fourxm_read_header(AVFormatContext *s) st->codec->bits_per_coded_sample; st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; if (fourxm->tracks[current_track].adpcm){ - st->codec->codec_id = CODEC_ID_ADPCM_4XM; + st->codec->codec_id = AV_CODEC_ID_ADPCM_4XM; }else if (st->codec->bits_per_coded_sample == 8){ - st->codec->codec_id = CODEC_ID_PCM_U8; + st->codec->codec_id = AV_CODEC_ID_PCM_U8; }else - st->codec->codec_id = CODEC_ID_PCM_S16LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; } } diff --git a/libavformat/a64.c b/libavformat/a64.c index 2cd24083a8..c1f6b67904 100644 --- a/libavformat/a64.c +++ b/libavformat/a64.c @@ -43,12 +43,12 @@ static int a64_write_header(struct AVFormatContext *s) }; c->interleaved = 0; switch (avctx->codec->id) { - case CODEC_ID_A64_MULTI: + case AV_CODEC_ID_A64_MULTI: header[2] = 0x00; header[3] = AV_RB32(avctx->extradata+0); header[4] = 2; break; - case CODEC_ID_A64_MULTI5: + case AV_CODEC_ID_A64_MULTI5: header[2] = 0x01; header[3] = AV_RB32(avctx->extradata+0); header[4] = 3; @@ -76,8 +76,8 @@ static int a64_write_packet(struct AVFormatContext *s, AVPacket *pkt) /* fetch values from extradata */ switch (avctx->codec->id) { - case CODEC_ID_A64_MULTI: - case CODEC_ID_A64_MULTI5: + case AV_CODEC_ID_A64_MULTI: + case AV_CODEC_ID_A64_MULTI5: if(c->interleaved) { /* Write interleaved, means we insert chunks of the future charset before each current frame. * Reason: if we load 1 charset + corresponding frames in one block on c64, we need to store @@ -168,7 +168,7 @@ AVOutputFormat ff_a64_muxer = { .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"), .extensions = "a64, A64", .priv_data_size = sizeof (A64Context), - .video_codec = CODEC_ID_A64_MULTI, + .video_codec = AV_CODEC_ID_A64_MULTI, .write_header = a64_write_header, .write_packet = a64_write_packet, .write_trailer = a64_write_trailer, diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 3289b0d3a6..e165959dab 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -90,5 +90,5 @@ AVInputFormat ff_aac_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "aac", - .raw_codec_id = CODEC_ID_AAC, + .raw_codec_id = AV_CODEC_ID_AAC, }; diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index 3741ee44fc..74df0d2f44 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -24,13 +24,13 @@ #include "avformat.h" #include "rawdec.h" -static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id) +static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id) { int max_frames, first_frames = 0, frames; uint8_t *buf, *buf2, *end; AC3HeaderInfo hdr; GetBitContext gbc; - enum CodecID codec_id = CODEC_ID_AC3; + enum AVCodecID codec_id = AV_CODEC_ID_AC3; max_frames = 0; buf = p->buf; @@ -51,7 +51,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id) av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, buf2 + 2, hdr.frame_size - 2)) break; if (hdr.bitstream_id > 10) - codec_id = CODEC_ID_EAC3; + codec_id = AV_CODEC_ID_EAC3; buf2 += hdr.frame_size; } max_frames = FFMAX(max_frames, frames); @@ -71,7 +71,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id) #if CONFIG_AC3_DEMUXER static int ac3_probe(AVProbeData *p) { - return ac3_eac3_probe(p, CODEC_ID_AC3); + return ac3_eac3_probe(p, AV_CODEC_ID_AC3); } AVInputFormat ff_ac3_demuxer = { @@ -82,14 +82,14 @@ AVInputFormat ff_ac3_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "ac3", - .raw_codec_id = CODEC_ID_AC3, + .raw_codec_id = AV_CODEC_ID_AC3, }; #endif #if CONFIG_EAC3_DEMUXER static int eac3_probe(AVProbeData *p) { - return ac3_eac3_probe(p, CODEC_ID_EAC3); + return ac3_eac3_probe(p, AV_CODEC_ID_EAC3); } AVInputFormat ff_eac3_demuxer = { @@ -100,6 +100,6 @@ AVInputFormat ff_eac3_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "eac3", - .raw_codec_id = CODEC_ID_EAC3, + .raw_codec_id = AV_CODEC_ID_EAC3, }; #endif diff --git a/libavformat/act.c b/libavformat/act.c index e47afc1d27..78f1d3bb9a 100644 --- a/libavformat/act.c +++ b/libavformat/act.c @@ -90,7 +90,7 @@ static int read_header(AVFormatContext *s) st->codec->channels=1; avpriv_set_pts_info(st, 64, 1, 100); - st->codec->codec_id=CODEC_ID_G729; + st->codec->codec_id=AV_CODEC_ID_G729; avio_seek(pb, 257, SEEK_SET); msec=avio_rl16(pb); diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index 396cf8b856..14c72a8c63 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -169,8 +169,8 @@ AVOutputFormat ff_adts_muxer = { .mime_type = "audio/aac", .extensions = "aac,adts", .priv_data_size = sizeof(ADTSContext), - .audio_codec = CODEC_ID_AAC, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_AAC, + .video_codec = AV_CODEC_ID_NONE, .write_header = adts_write_header, .write_packet = adts_write_packet, }; diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c index 305c67431b..49e19307d5 100644 --- a/libavformat/adxdec.c +++ b/libavformat/adxdec.c @@ -108,6 +108,6 @@ AVInputFormat ff_adx_demuxer = { .read_header = adx_read_header, .read_packet = adx_read_packet, .extensions = "adx", - .raw_codec_id = CODEC_ID_ADPCM_ADX, + .raw_codec_id = AV_CODEC_ID_ADPCM_ADX, .flags = AVFMT_GENERIC_INDEX, }; diff --git a/libavformat/aea.c b/libavformat/aea.c index c02942b598..6aa7ae321c 100644 --- a/libavformat/aea.c +++ b/libavformat/aea.c @@ -67,7 +67,7 @@ static int aea_read_header(AVFormatContext *s) st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ATRAC1; + st->codec->codec_id = AV_CODEC_ID_ATRAC1; st->codec->sample_rate = 44100; st->codec->bit_rate = 292000; diff --git a/libavformat/aiff.h b/libavformat/aiff.h index d909bdd83e..6ece0e0ce3 100644 --- a/libavformat/aiff.h +++ b/libavformat/aiff.h @@ -31,24 +31,24 @@ #include "riff.h" static const AVCodecTag ff_codec_aiff_tags[] = { - { CODEC_ID_PCM_S16BE, MKTAG('N','O','N','E') }, - { CODEC_ID_PCM_S8, MKTAG('N','O','N','E') }, - { CODEC_ID_PCM_S24BE, MKTAG('N','O','N','E') }, - { CODEC_ID_PCM_S32BE, MKTAG('N','O','N','E') }, - { CODEC_ID_PCM_F32BE, MKTAG('f','l','3','2') }, - { CODEC_ID_PCM_F64BE, MKTAG('f','l','6','4') }, - { CODEC_ID_PCM_ALAW, MKTAG('a','l','a','w') }, - { CODEC_ID_PCM_MULAW, MKTAG('u','l','a','w') }, - { CODEC_ID_MACE3, MKTAG('M','A','C','3') }, - { CODEC_ID_MACE6, MKTAG('M','A','C','6') }, - { CODEC_ID_GSM, MKTAG('G','S','M',' ') }, - { CODEC_ID_ADPCM_G726, MKTAG('G','7','2','6') }, - { CODEC_ID_PCM_S16BE, MKTAG('t','w','o','s') }, - { CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') }, - { CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') }, - { CODEC_ID_QDM2, MKTAG('Q','D','M','2') }, - { CODEC_ID_QCELP, MKTAG('Q','c','l','p') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_PCM_S16BE, MKTAG('N','O','N','E') }, + { AV_CODEC_ID_PCM_S8, MKTAG('N','O','N','E') }, + { AV_CODEC_ID_PCM_S24BE, MKTAG('N','O','N','E') }, + { AV_CODEC_ID_PCM_S32BE, MKTAG('N','O','N','E') }, + { AV_CODEC_ID_PCM_F32BE, MKTAG('f','l','3','2') }, + { AV_CODEC_ID_PCM_F64BE, MKTAG('f','l','6','4') }, + { AV_CODEC_ID_PCM_ALAW, MKTAG('a','l','a','w') }, + { AV_CODEC_ID_PCM_MULAW, MKTAG('u','l','a','w') }, + { AV_CODEC_ID_MACE3, MKTAG('M','A','C','3') }, + { AV_CODEC_ID_MACE6, MKTAG('M','A','C','6') }, + { AV_CODEC_ID_GSM, MKTAG('G','S','M',' ') }, + { AV_CODEC_ID_ADPCM_G726, MKTAG('G','7','2','6') }, + { AV_CODEC_ID_PCM_S16BE, MKTAG('t','w','o','s') }, + { AV_CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') }, + { AV_CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') }, + { AV_CODEC_ID_QDM2, MKTAG('Q','D','M','2') }, + { AV_CODEC_ID_QCELP, MKTAG('Q','c','l','p') }, + { AV_CODEC_ID_NONE, 0 }, }; #endif /* AVFORMAT_AIFF_H */ diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index f89ed93dd5..83fa9c3548 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -36,19 +36,19 @@ typedef struct { int block_duration; } AIFFInputContext; -static enum CodecID aiff_codec_get_id(int bps) +static enum AVCodecID aiff_codec_get_id(int bps) { if (bps <= 8) - return CODEC_ID_PCM_S8; + return AV_CODEC_ID_PCM_S8; if (bps <= 16) - return CODEC_ID_PCM_S16BE; + return AV_CODEC_ID_PCM_S16BE; if (bps <= 24) - return CODEC_ID_PCM_S24BE; + return AV_CODEC_ID_PCM_S24BE; if (bps <= 32) - return CODEC_ID_PCM_S32BE; + return AV_CODEC_ID_PCM_S32BE; /* bigger than 32 isn't allowed */ - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } /* returns the size of the found tag */ @@ -120,32 +120,32 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size, size -= 4; } - if (version != AIFF_C_VERSION1 || codec->codec_id == CODEC_ID_PCM_S16BE) { + if (version != AIFF_C_VERSION1 || codec->codec_id == AV_CODEC_ID_PCM_S16BE) { codec->codec_id = aiff_codec_get_id(codec->bits_per_coded_sample); codec->bits_per_coded_sample = av_get_bits_per_sample(codec->codec_id); aiff->block_duration = 1; } else { switch (codec->codec_id) { - case CODEC_ID_PCM_F32BE: - case CODEC_ID_PCM_F64BE: - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_ALAW: - case CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_F32BE: + case AV_CODEC_ID_PCM_F64BE: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_MULAW: aiff->block_duration = 1; break; - case CODEC_ID_ADPCM_IMA_QT: + case AV_CODEC_ID_ADPCM_IMA_QT: codec->block_align = 34*codec->channels; break; - case CODEC_ID_MACE3: + case AV_CODEC_ID_MACE3: codec->block_align = 2*codec->channels; break; - case CODEC_ID_MACE6: + case AV_CODEC_ID_MACE6: codec->block_align = 1*codec->channels; break; - case CODEC_ID_GSM: + case AV_CODEC_ID_GSM: codec->block_align = 33; break; - case CODEC_ID_QCELP: + case AV_CODEC_ID_QCELP: codec->block_align = 35; break; default: diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 3cc0fcccf1..8cdb2616c2 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -168,8 +168,8 @@ AVOutputFormat ff_aiff_muxer = { .mime_type = "audio/aiff", .extensions = "aif,aiff,afc,aifc", .priv_data_size = sizeof(AIFFOutputContext), - .audio_codec = CODEC_ID_PCM_S16BE, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_PCM_S16BE, + .video_codec = AV_CODEC_ID_NONE, .write_header = aiff_write_header, .write_packet = aiff_write_packet, .write_trailer = aiff_write_trailer, diff --git a/libavformat/amr.c b/libavformat/amr.c index 299dbc91fc..36ff9b036a 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -40,9 +40,9 @@ static int amr_write_header(AVFormatContext *s) s->priv_data = NULL; - if (enc->codec_id == CODEC_ID_AMR_NB) { + if (enc->codec_id == AV_CODEC_ID_AMR_NB) { avio_write(pb, AMR_header, sizeof(AMR_header) - 1); /* magic number */ - } else if (enc->codec_id == CODEC_ID_AMR_WB) { + } else if (enc->codec_id == AV_CODEC_ID_AMR_WB) { avio_write(pb, AMRWB_header, sizeof(AMRWB_header) - 1); /* magic number */ } else { return -1; @@ -90,11 +90,11 @@ static int amr_read_header(AVFormatContext *s) } st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b'); - st->codec->codec_id = CODEC_ID_AMR_WB; + st->codec->codec_id = AV_CODEC_ID_AMR_WB; st->codec->sample_rate = 16000; } else { st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r'); - st->codec->codec_id = CODEC_ID_AMR_NB; + st->codec->codec_id = AV_CODEC_ID_AMR_NB; st->codec->sample_rate = 8000; } st->codec->channels = 1; @@ -118,13 +118,13 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) toc = avio_r8(s->pb); mode = (toc >> 3) & 0x0F; - if (enc->codec_id == CODEC_ID_AMR_NB) { + if (enc->codec_id == AV_CODEC_ID_AMR_NB) { static const uint8_t packed_size[16] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 }; size = packed_size[mode] + 1; - } else if (enc->codec_id == CODEC_ID_AMR_WB) { + } else if (enc->codec_id == AV_CODEC_ID_AMR_WB) { static const uint8_t packed_size[16] = { 18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1 }; @@ -143,7 +143,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = 0; pkt->pos = pos; pkt->data[0] = toc; - pkt->duration = enc->codec_id == CODEC_ID_AMR_NB ? 160 : 320; + pkt->duration = enc->codec_id == AV_CODEC_ID_AMR_NB ? 160 : 320; read = avio_read(s->pb, pkt->data + 1, size - 1); if (read != size - 1) { @@ -171,8 +171,8 @@ AVOutputFormat ff_amr_muxer = { .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"), .mime_type = "audio/amr", .extensions = "amr", - .audio_codec = CODEC_ID_AMR_NB, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_AMR_NB, + .video_codec = AV_CODEC_ID_NONE, .write_header = amr_write_header, .write_packet = amr_write_packet, }; diff --git a/libavformat/anm.c b/libavformat/anm.c index 3c8d570c8e..69a5ddab0f 100644 --- a/libavformat/anm.c +++ b/libavformat/anm.c @@ -101,7 +101,7 @@ static int read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_ANM; + st->codec->codec_id = AV_CODEC_ID_ANM; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = avio_rl16(pb); st->codec->height = avio_rl16(pb); diff --git a/libavformat/apc.c b/libavformat/apc.c index c4774f1375..2ccf7946aa 100644 --- a/libavformat/apc.c +++ b/libavformat/apc.c @@ -44,7 +44,7 @@ static int apc_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ADPCM_IMA_APC; + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_APC; avio_rl32(pb); /* number of samples */ st->codec->sample_rate = avio_rl32(pb); diff --git a/libavformat/ape.c b/libavformat/ape.c index 62c94780ec..547a9c01e6 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -327,7 +327,7 @@ static int ape_read_header(AVFormatContext * s) total_blocks = (ape->totalframes == 0) ? 0 : ((ape->totalframes - 1) * ape->blocksperframe) + ape->finalframeblocks; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_APE; + st->codec->codec_id = AV_CODEC_ID_APE; st->codec->codec_tag = MKTAG('A', 'P', 'E', ' '); st->codec->channels = ape->channels; st->codec->sample_rate = ape->samplerate; diff --git a/libavformat/apetag.c b/libavformat/apetag.c index 7c87086a29..bf9918a0b3 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -55,7 +55,7 @@ static int ape_tag_read_field(AVFormatContext *s) return -1; if (flags & APE_TAG_FLAG_IS_BINARY) { uint8_t filename[1024]; - enum CodecID id; + enum AVCodecID id; AVStream *st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); @@ -68,7 +68,7 @@ static int ape_tag_read_field(AVFormatContext *s) av_dict_set(&st->metadata, key, filename, 0); - if ((id = ff_guess_image2_codec(filename)) != CODEC_ID_NONE) { + if ((id = ff_guess_image2_codec(filename)) != AV_CODEC_ID_NONE) { AVPacket pkt; int ret; diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 25c7ae5d64..f274520cdc 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -170,7 +170,7 @@ static int asf_read_picture(AVFormatContext *s, int len) { AVPacket pkt = { 0 }; const CodecMime *mime = ff_id3v2_mime_tags; - enum CodecID id = CODEC_ID_NONE; + enum AVCodecID id = AV_CODEC_ID_NONE; char mimetype[64]; uint8_t *desc = NULL; ASFStream *ast = NULL; @@ -197,14 +197,14 @@ static int asf_read_picture(AVFormatContext *s, int len) /* picture MIME type */ len -= avio_get_str16le(s->pb, len, mimetype, sizeof(mimetype)); - while (mime->id != CODEC_ID_NONE) { + while (mime->id != AV_CODEC_ID_NONE) { if (!strncmp(mime->str, mimetype, sizeof(mimetype))) { id = mime->id; break; } mime++; } - if (id == CODEC_ID_NONE) { + if (id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", mimetype); return 0; @@ -362,7 +362,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) type = AVMEDIA_TYPE_VIDEO; } else if (!ff_guidcmp(&g, &ff_asf_jfif_media)) { type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MJPEG; + st->codec->codec_id = AV_CODEC_ID_MJPEG; } else if (!ff_guidcmp(&g, &ff_asf_command_stream)) { type = AVMEDIA_TYPE_DATA; } else if (!ff_guidcmp(&g, &ff_asf_ext_stream_embed_stream_header)) { @@ -406,7 +406,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) st->request_probe= 1; st->codec->codec_tag = 0; } - if (st->codec->codec_id == CODEC_ID_AAC) { + if (st->codec->codec_id == AV_CODEC_ID_AAC) { st->need_parsing = AVSTREAM_PARSE_NONE; } else { st->need_parsing = AVSTREAM_PARSE_FULL; @@ -475,7 +475,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) av_freep(&st->codec->extradata); st->codec->extradata_size=0; } - if(st->codec->codec_id == CODEC_ID_H264) + if(st->codec->codec_id == AV_CODEC_ID_H264) st->need_parsing = AVSTREAM_PARSE_FULL_ONCE; } pos2 = avio_tell(pb); @@ -1147,7 +1147,7 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk /* test if whole packet is read */ if (asf_st->frag_offset == asf_st->pkt.size) { //workaround for macroshit radio DVR-MS files - if( s->streams[asf->stream_index]->codec->codec_id == CODEC_ID_MPEG2VIDEO + if( s->streams[asf->stream_index]->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO && asf_st->pkt.size > 100){ int i; for(i=0; i<asf_st->pkt.size && !asf_st->pkt.data[i]; i++); diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 5b5b0b0d2f..79f21a37f7 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -218,10 +218,10 @@ typedef struct { } ASFContext; static const AVCodecTag codec_asf_bmp_tags[] = { - { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, - { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, - { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, + { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, + { AV_CODEC_ID_NONE, 0 }, }; #define PREROLL_TIME 3100 @@ -448,7 +448,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data } /* ERROR Correction */ avio_w8(pb, 0x01); - if(enc->codec_id == CODEC_ID_ADPCM_G726 || !enc->block_align){ + if(enc->codec_id == AV_CODEC_ID_ADPCM_G726 || !enc->block_align){ avio_wl16(pb, 0x0190); avio_wl16(pb, 0x0190); }else{ @@ -491,7 +491,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data else avio_wl16(pb, -1); - if(enc->codec_id == CODEC_ID_WMAV2) + if(enc->codec_id == AV_CODEC_ID_WMAV2) desc = "Windows Media Audio V8"; else desc = p ? p->name : enc->codec_name; @@ -905,8 +905,8 @@ AVOutputFormat ff_asf_muxer = { .mime_type = "video/x-ms-asf", .extensions = "asf,wmv,wma", .priv_data_size = sizeof(ASFContext), - .audio_codec = CODEC_ID_WMAV2, - .video_codec = CODEC_ID_MSMPEG4V3, + .audio_codec = AV_CODEC_ID_WMAV2, + .video_codec = AV_CODEC_ID_MSMPEG4V3, .write_header = asf_write_header, .write_packet = asf_write_packet, .write_trailer = asf_write_trailer, @@ -924,8 +924,8 @@ AVOutputFormat ff_asf_stream_muxer = { .mime_type = "video/x-ms-asf", .extensions = "asf,wmv,wma", .priv_data_size = sizeof(ASFContext), - .audio_codec = CODEC_ID_WMAV2, - .video_codec = CODEC_ID_MSMPEG4V3, + .audio_codec = AV_CODEC_ID_WMAV2, + .video_codec = AV_CODEC_ID_MSMPEG4V3, .write_header = asf_write_stream_header, .write_packet = asf_write_packet, .write_trailer = asf_write_trailer, diff --git a/libavformat/assdec.c b/libavformat/assdec.c index 6229857395..687869107c 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -88,7 +88,7 @@ static int read_header(AVFormatContext *s) return -1; avpriv_set_pts_info(st, 64, 1, 100); st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id= CODEC_ID_SSA; + st->codec->codec_id= AV_CODEC_ID_SSA; header_remaining= INT_MAX; dst[0] = &st->codec->extradata; diff --git a/libavformat/assenc.c b/libavformat/assenc.c index 73f6613209..2b683fbe7e 100644 --- a/libavformat/assenc.c +++ b/libavformat/assenc.c @@ -31,7 +31,7 @@ static int write_header(AVFormatContext *s) AVCodecContext *avctx= s->streams[0]->codec; uint8_t *last= NULL; - if(s->nb_streams != 1 || avctx->codec_id != CODEC_ID_SSA){ + if(s->nb_streams != 1 || avctx->codec_id != AV_CODEC_ID_SSA){ av_log(s, AV_LOG_ERROR, "Exactly one ASS/SSA stream is needed.\n"); return -1; } @@ -83,7 +83,7 @@ AVOutputFormat ff_ass_muxer = { .mime_type = "text/x-ssa", .extensions = "ass,ssa", .priv_data_size = sizeof(ASSContext), - .subtitle_codec = CODEC_ID_SSA, + .subtitle_codec = AV_CODEC_ID_SSA, .write_header = write_header, .write_packet = write_packet, .write_trailer = write_trailer, diff --git a/libavformat/au.c b/libavformat/au.c index 69d93c6d90..b7654a417a 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -38,15 +38,15 @@ /* The libavcodec codecs we support, and the IDs they have in the file */ static const AVCodecTag codec_au_tags[] = { - { CODEC_ID_PCM_MULAW, 1 }, - { CODEC_ID_PCM_S8, 2 }, - { CODEC_ID_PCM_S16BE, 3 }, - { CODEC_ID_PCM_S24BE, 4 }, - { CODEC_ID_PCM_S32BE, 5 }, - { CODEC_ID_PCM_F32BE, 6 }, - { CODEC_ID_PCM_F64BE, 7 }, - { CODEC_ID_PCM_ALAW, 27 }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_PCM_MULAW, 1 }, + { AV_CODEC_ID_PCM_S8, 2 }, + { AV_CODEC_ID_PCM_S16BE, 3 }, + { AV_CODEC_ID_PCM_S24BE, 4 }, + { AV_CODEC_ID_PCM_S32BE, 5 }, + { AV_CODEC_ID_PCM_F32BE, 6 }, + { AV_CODEC_ID_PCM_F64BE, 7 }, + { AV_CODEC_ID_PCM_ALAW, 27 }, + { AV_CODEC_ID_NONE, 0 }, }; #if CONFIG_AU_MUXER @@ -124,7 +124,7 @@ static int au_read_header(AVFormatContext *s) unsigned int tag; AVIOContext *pb = s->pb; unsigned int id, channels, rate; - enum CodecID codec; + enum AVCodecID codec; AVStream *st; /* check ".snd" header */ @@ -210,8 +210,8 @@ AVOutputFormat ff_au_muxer = { .long_name = NULL_IF_CONFIG_SMALL("Sun AU"), .mime_type = "audio/basic", .extensions = "au", - .audio_codec = CODEC_ID_PCM_S16BE, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_PCM_S16BE, + .video_codec = AV_CODEC_ID_NONE, .write_header = au_write_header, .write_packet = au_write_packet, .write_trailer = au_write_trailer, diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 58b02a6a80..150af3f988 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -381,9 +381,9 @@ typedef struct AVOutputFormat { const char *mime_type; const char *extensions; /**< comma-separated filename extensions */ /* output support */ - enum CodecID audio_codec; /**< default audio codec */ - enum CodecID video_codec; /**< default video codec */ - enum CodecID subtitle_codec; /**< default subtitle codec */ + enum AVCodecID audio_codec; /**< default audio codec */ + enum AVCodecID video_codec; /**< default video codec */ + enum AVCodecID subtitle_codec; /**< default subtitle codec */ /** * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE, * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS, @@ -394,7 +394,7 @@ typedef struct AVOutputFormat { /** * List of supported codec_id-codec_tag pairs, ordered by "better - * choice first". The arrays are all terminated by CODEC_ID_NONE. + * choice first". The arrays are all terminated by AV_CODEC_ID_NONE. */ const struct AVCodecTag * const *codec_tag; @@ -435,7 +435,7 @@ typedef struct AVOutputFormat { * @return 1 if the codec is supported, 0 if it is not. * A negative number if unknown. */ - int (*query_codec)(enum CodecID id, int std_compliance); + int (*query_codec)(enum AVCodecID id, int std_compliance); void (*get_output_timestamp)(struct AVFormatContext *s, int stream, int64_t *dts, int64_t *wall); @@ -993,19 +993,19 @@ typedef struct AVFormatContext { * Forced video codec_id. * Demuxing: Set by user. */ - enum CodecID video_codec_id; + enum AVCodecID video_codec_id; /** * Forced audio codec_id. * Demuxing: Set by user. */ - enum CodecID audio_codec_id; + enum AVCodecID audio_codec_id; /** * Forced subtitle codec_id. * Demuxing: Set by user. */ - enum CodecID subtitle_codec_id; + enum AVCodecID subtitle_codec_id; /** * Maximum amount of memory in bytes to use for the index of each stream. @@ -1730,7 +1730,7 @@ AVOutputFormat *av_guess_format(const char *short_name, /** * Guess the codec ID based upon muxer and filename. */ -enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, +enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, const char *filename, const char *mime_type, enum AVMediaType type); @@ -1818,13 +1818,13 @@ void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload, AVStream *st); /** - * Get the CodecID for the given codec tag tag. - * If no codec id is found returns CODEC_ID_NONE. + * Get the AVCodecID for the given codec tag tag. + * If no codec id is found returns AV_CODEC_ID_NONE. * * @param tags list of supported codec_id-codec_tag pairs, as stored * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag */ -enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag); +enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag); /** * Get the codec tag for the given codec id id. @@ -1833,7 +1833,7 @@ enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int * @param tags list of supported codec_id-codec_tag pairs, as stored * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag */ -unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum CodecID id); +unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id); int av_find_default_stream_index(AVFormatContext *s); @@ -1944,26 +1944,26 @@ int av_match_ext(const char *filename, const char *extensions); * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot. * A negative number if this information is not available. */ -int avformat_query_codec(AVOutputFormat *ofmt, enum CodecID codec_id, int std_compliance); +int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance); /** * @defgroup riff_fourcc RIFF FourCCs * @{ - * Get the tables mapping RIFF FourCCs to libavcodec CodecIDs. The tables are + * Get the tables mapping RIFF FourCCs to libavcodec AVCodecIDs. The tables are * meant to be passed to av_codec_get_id()/av_codec_get_tag() as in the * following code: * @code * uint32_t tag = MKTAG('H', '2', '6', '4'); * const struct AVCodecTag *table[] = { avformat_get_riff_video_tags(), 0 }; - * enum CodecID id = av_codec_get_id(table, tag); + * enum AVCodecID id = av_codec_get_id(table, tag); * @endcode */ /** - * @return the table mapping RIFF FourCCs for video to libavcodec CodecID. + * @return the table mapping RIFF FourCCs for video to libavcodec AVCodecID. */ const struct AVCodecTag *avformat_get_riff_video_tags(void); /** - * @return the table mapping RIFF FourCCs for audio to CodecID. + * @return the table mapping RIFF FourCCs for audio to AVCodecID. */ const struct AVCodecTag *avformat_get_riff_audio_tags(void); diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 0144b65f6f..d3bb8d85f9 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -588,7 +588,7 @@ static int avi_read_header(AVFormatContext *s) st->codec->width=avih_width; st->codec->height=avih_height; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_AMV; + st->codec->codec_id = AV_CODEC_ID_AMV; avio_skip(pb, size); break; } @@ -597,7 +597,7 @@ static int avi_read_header(AVFormatContext *s) if (tag1 == MKTAG('D', 'X', 'S', 'B') || tag1 == MKTAG('D','X','S','A')) { st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codec->codec_tag = tag1; - st->codec->codec_id = CODEC_ID_XSUB; + st->codec->codec_id = AV_CODEC_ID_XSUB; break; } @@ -639,7 +639,7 @@ static int avi_read_header(AVFormatContext *s) if(tag1 == MKTAG('A', 'V', 'R', 'n') && st->codec->extradata_size >= 31 && !memcmp(&st->codec->extradata[28], "1:1", 3)) - st->codec->codec_id = CODEC_ID_RAWVIDEO; + st->codec->codec_id = AV_CODEC_ID_RAWVIDEO; if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){ st->codec->extradata_size+= 9; @@ -668,17 +668,17 @@ static int avi_read_header(AVFormatContext *s) /* ADTS header is in extradata, AAC without header must be * stored as exact frames. Parser not needed and it will * fail. */ - if (st->codec->codec_id == CODEC_ID_AAC && st->codec->extradata_size) + if (st->codec->codec_id == AV_CODEC_ID_AAC && st->codec->extradata_size) st->need_parsing = AVSTREAM_PARSE_NONE; /* AVI files with Xan DPCM audio (wrongly) declare PCM * audio in the header but have Axan as stream_code_tag. */ if (st->codec->stream_codec_tag == AV_RL32("Axan")){ - st->codec->codec_id = CODEC_ID_XAN_DPCM; + st->codec->codec_id = AV_CODEC_ID_XAN_DPCM; st->codec->codec_tag = 0; ast->dshow_block_align = 0; } if (amv_file_format){ - st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV; + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_AMV; ast->dshow_block_align = 0; } break; @@ -688,7 +688,7 @@ static int avi_read_header(AVFormatContext *s) break; default: st->codec->codec_type = AVMEDIA_TYPE_DATA; - st->codec->codec_id= CODEC_ID_NONE; + st->codec->codec_id= AV_CODEC_ID_NONE; st->codec->codec_tag= 0; avio_skip(pb, size); break; @@ -1186,7 +1186,7 @@ resync: int i; uint32_t state=-1; for(i=0; i<FFMIN(size,256); i++){ - if(st->codec->codec_id == CODEC_ID_MPEG4){ + if(st->codec->codec_id == AV_CODEC_ID_MPEG4){ if(state == 0x1B6){ key= !(pkt->data[i]&0xC0); break; diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 0a68aa7a50..ff25d792a8 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -235,7 +235,7 @@ static int avi_write_header(AVFormatContext *s) case AVMEDIA_TYPE_SUBTITLE: // XSUB subtitles behave like video tracks, other subtitles // are not (yet) supported. - if (stream->codec_id != CODEC_ID_XSUB) { + if (stream->codec_id != AV_CODEC_ID_XSUB) { av_log(s, AV_LOG_ERROR, "Subtitle streams other than DivX XSUB are not supported by the AVI muxer.\n"); return AVERROR_PATCHWELCOME; } @@ -245,7 +245,7 @@ static int avi_write_header(AVFormatContext *s) case AVMEDIA_TYPE_DATA : ffio_wfourcc(pb, "dats"); break; } if(stream->codec_type == AVMEDIA_TYPE_VIDEO || - stream->codec_id == CODEC_ID_XSUB) + stream->codec_id == AV_CODEC_ID_XSUB) avio_wl32(pb, stream->codec_tag); else avio_wl32(pb, 1); @@ -257,7 +257,7 @@ static int avi_write_header(AVFormatContext *s) ff_parse_specific_params(stream, &au_byterate, &au_ssize, &au_scale); avpriv_set_pts_info(s->streams[i], 64, au_scale, au_byterate); - if(stream->codec_id == CODEC_ID_XSUB) + if(stream->codec_id == AV_CODEC_ID_XSUB) au_scale = au_byterate = 0; avio_wl32(pb, au_scale); /* scale */ @@ -290,7 +290,7 @@ static int avi_write_header(AVFormatContext *s) case AVMEDIA_TYPE_SUBTITLE: // XSUB subtitles behave like video tracks, other subtitles // are not (yet) supported. - if (stream->codec_id != CODEC_ID_XSUB) break; + if (stream->codec_id != AV_CODEC_ID_XSUB) break; case AVMEDIA_TYPE_VIDEO: ff_put_bmp_header(pb, stream, ff_codec_bmp_tags, 0); break; @@ -525,7 +525,7 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) int size= pkt->size; // av_log(s, AV_LOG_DEBUG, "%"PRId64" %d %d\n", pkt->dts, avist->packet_count, stream_index); - while(enc->block_align==0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avist->packet_count && enc->codec_id != CODEC_ID_XSUB){ + while(enc->block_align==0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avist->packet_count && enc->codec_id != AV_CODEC_ID_XSUB){ AVPacket empty_packet; if(pkt->dts - avist->packet_count > 60000){ @@ -624,7 +624,7 @@ static int avi_write_trailer(AVFormatContext *s) if (nb_frames < avist->packet_count) nb_frames = avist->packet_count; } else { - if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) { + if (stream->codec_id == AV_CODEC_ID_MP2 || stream->codec_id == AV_CODEC_ID_MP3) { nb_frames += avist->packet_count; } } @@ -654,8 +654,8 @@ AVOutputFormat ff_avi_muxer = { .mime_type = "video/x-msvideo", .extensions = "avi", .priv_data_size = sizeof(AVIContext), - .audio_codec = CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_AC3, - .video_codec = CODEC_ID_MPEG4, + .audio_codec = CONFIG_LIBMP3LAME ? AV_CODEC_ID_MP3 : AV_CODEC_ID_AC3, + .video_codec = AV_CODEC_ID_MPEG4, .write_header = avi_write_header, .write_packet = avi_write_packet, .write_trailer = avi_write_trailer, diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index dcfaa27033..e5d9b7626f 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -133,7 +133,7 @@ static int avisynth_read_header(AVFormatContext *s) st->codec->bit_rate = (uint64_t)stream->info.dwSampleSize * (uint64_t)stream->info.dwRate * 8 / (uint64_t)stream->info.dwScale; st->codec->codec_tag = imgfmt.bmiHeader.biCompression; st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, imgfmt.bmiHeader.biCompression); - if (st->codec->codec_id == CODEC_ID_RAWVIDEO && imgfmt.bmiHeader.biCompression== BI_RGB) { + if (st->codec->codec_id == AV_CODEC_ID_RAWVIDEO && imgfmt.bmiHeader.biCompression== BI_RGB) { st->codec->extradata = av_malloc(9 + FF_INPUT_BUFFER_PADDING_SIZE); if (st->codec->extradata) { st->codec->extradata_size = 9; diff --git a/libavformat/avs.c b/libavformat/avs.c index 124d43f33f..5a1eb2e675 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -183,7 +183,7 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt) if (avs->st_video == NULL) return AVERROR(ENOMEM); avs->st_video->codec->codec_type = AVMEDIA_TYPE_VIDEO; - avs->st_video->codec->codec_id = CODEC_ID_AVS; + avs->st_video->codec->codec_id = AV_CODEC_ID_AVS; avs->st_video->codec->width = avs->width; avs->st_video->codec->height = avs->height; avs->st_video->codec->bits_per_coded_sample=avs->bits_per_sample; diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index 77c45eefa1..1a83c797f7 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -112,7 +112,7 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt, } avpriv_set_pts_info(st, 64, 185, vid->sample_rate); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_BETHSOFTVID; + st->codec->codec_id = AV_CODEC_ID_BETHSOFTVID; st->codec->width = vid->width; st->codec->height = vid->height; } @@ -237,7 +237,7 @@ static int vid_read_packet(AVFormatContext *s, return AVERROR(ENOMEM); vid->audio_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_PCM_U8; + st->codec->codec_id = AV_CODEC_ID_PCM_U8; st->codec->channels = 1; st->codec->bits_per_coded_sample = 8; st->codec->sample_rate = vid->sample_rate; diff --git a/libavformat/bfi.c b/libavformat/bfi.c index 97fa8025e7..c03a1deb29 100644 --- a/libavformat/bfi.c +++ b/libavformat/bfi.c @@ -89,12 +89,12 @@ static int bfi_read_header(AVFormatContext * s) /* Set up the video codec... */ avpriv_set_pts_info(vstream, 32, 1, fps); vstream->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vstream->codec->codec_id = CODEC_ID_BFI; + vstream->codec->codec_id = AV_CODEC_ID_BFI; vstream->codec->pix_fmt = PIX_FMT_PAL8; /* Set up the audio codec now... */ astream->codec->codec_type = AVMEDIA_TYPE_AUDIO; - astream->codec->codec_id = CODEC_ID_PCM_U8; + astream->codec->codec_id = AV_CODEC_ID_PCM_U8; astream->codec->channels = 1; astream->codec->bits_per_coded_sample = 8; astream->codec->bit_rate = diff --git a/libavformat/bink.c b/libavformat/bink.c index 5eb22111f0..9c90480c8d 100644 --- a/libavformat/bink.c +++ b/libavformat/bink.c @@ -113,7 +113,7 @@ static int read_header(AVFormatContext *s) avpriv_set_pts_info(vst, 64, fps_den, fps_num); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_BINKVIDEO; + vst->codec->codec_id = AV_CODEC_ID_BINKVIDEO; vst->codec->extradata = av_mallocz(4 + FF_INPUT_BUFFER_PADDING_SIZE); if (!vst->codec->extradata) return AVERROR(ENOMEM); @@ -142,7 +142,7 @@ static int read_header(AVFormatContext *s) avpriv_set_pts_info(ast, 64, 1, ast->codec->sample_rate); flags = avio_rl16(pb); ast->codec->codec_id = flags & BINK_AUD_USEDCT ? - CODEC_ID_BINKAUDIO_DCT : CODEC_ID_BINKAUDIO_RDFT; + AV_CODEC_ID_BINKAUDIO_DCT : AV_CODEC_ID_BINKAUDIO_RDFT; ast->codec->channels = flags & BINK_AUD_STEREO ? 2 : 1; ast->codec->extradata = av_mallocz(4 + FF_INPUT_BUFFER_PADDING_SIZE); if (!ast->codec->extradata) diff --git a/libavformat/bintext.c b/libavformat/bintext.c index 58db3cf71a..5ad30b3519 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -148,7 +148,7 @@ static int bintext_read_header(AVFormatContext *s) AVStream *st = init_stream(s); if (!st) return AVERROR(ENOMEM); - st->codec->codec_id = CODEC_ID_BINTEXT; + st->codec->codec_id = AV_CODEC_ID_BINTEXT; st->codec->extradata_size = 2; st->codec->extradata = av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); @@ -206,7 +206,7 @@ static int xbin_read_header(AVFormatContext *s) st->codec->extradata_size += 48; if ((flags & BINTEXT_FONT)) st->codec->extradata_size += fontheight * (flags & 0x10 ? 512 : 256); - st->codec->codec_id = flags & 4 ? CODEC_ID_XBIN : CODEC_ID_BINTEXT; + st->codec->codec_id = flags & 4 ? AV_CODEC_ID_XBIN : AV_CODEC_ID_BINTEXT; st->codec->extradata = av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); if (!st->codec->extradata) @@ -239,7 +239,7 @@ static int adf_read_header(AVFormatContext *s) st = init_stream(s); if (!st) return AVERROR(ENOMEM); - st->codec->codec_id = CODEC_ID_BINTEXT; + st->codec->codec_id = AV_CODEC_ID_BINTEXT; st->codec->extradata_size = 2 + 48 + 4096; st->codec->extradata = av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); @@ -296,7 +296,7 @@ static int idf_read_header(AVFormatContext *s) st = init_stream(s); if (!st) return AVERROR(ENOMEM); - st->codec->codec_id = CODEC_ID_IDF; + st->codec->codec_id = AV_CODEC_ID_IDF; st->codec->extradata_size = 2 + 48 + 4096; st->codec->extradata = av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); diff --git a/libavformat/bit.c b/libavformat/bit.c index b0931f429b..03c6152c5d 100644 --- a/libavformat/bit.c +++ b/libavformat/bit.c @@ -56,7 +56,7 @@ static int read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id=CODEC_ID_G729; + st->codec->codec_id=AV_CODEC_ID_G729; st->codec->sample_rate=8000; st->codec->block_align = 16; st->codec->channels=1; @@ -118,7 +118,7 @@ static int write_header(AVFormatContext *s) { AVCodecContext *enc = s->streams[0]->codec; - enc->codec_id = CODEC_ID_G729; + enc->codec_id = AV_CODEC_ID_G729; enc->channels = 1; enc->bits_per_coded_sample = 16; enc->block_align = (enc->bits_per_coded_sample * enc->channels) >> 3; @@ -148,8 +148,8 @@ AVOutputFormat ff_bit_muxer = { .long_name = NULL_IF_CONFIG_SMALL("G.729 BIT file format"), .mime_type = "audio/bit", .extensions = "bit", - .audio_codec = CODEC_ID_G729, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_G729, + .video_codec = AV_CODEC_ID_NONE, .write_header = write_header, .write_packet = write_packet, }; diff --git a/libavformat/bmv.c b/libavformat/bmv.c index 8c1eb787ce..474f4e3bc3 100644 --- a/libavformat/bmv.c +++ b/libavformat/bmv.c @@ -47,7 +47,7 @@ static int bmv_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_BMV_VIDEO; + st->codec->codec_id = AV_CODEC_ID_BMV_VIDEO; st->codec->width = 640; st->codec->height = 429; st->codec->pix_fmt = PIX_FMT_PAL8; @@ -56,7 +56,7 @@ static int bmv_read_header(AVFormatContext *s) if (!ast) return AVERROR(ENOMEM); ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_id = CODEC_ID_BMV_AUDIO; + ast->codec->codec_id = AV_CODEC_ID_BMV_AUDIO; ast->codec->channels = 2; ast->codec->sample_rate = 22050; avpriv_set_pts_info(ast, 16, 1, 22050); diff --git a/libavformat/c93.c b/libavformat/c93.c index 5a044d9d3d..66516e9c39 100644 --- a/libavformat/c93.c +++ b/libavformat/c93.c @@ -84,7 +84,7 @@ static int read_header(AVFormatContext *s) return AVERROR(ENOMEM); video->codec->codec_type = AVMEDIA_TYPE_VIDEO; - video->codec->codec_id = CODEC_ID_C93; + video->codec->codec_id = AV_CODEC_ID_C93; video->codec->width = 320; video->codec->height = 192; /* 4:3 320x200 with 8 empty lines */ diff --git a/libavformat/caf.c b/libavformat/caf.c index 054533038f..5f490d82d6 100644 --- a/libavformat/caf.c +++ b/libavformat/caf.c @@ -32,34 +32,34 @@ * Known codec tags for CAF */ const AVCodecTag ff_codec_caf_tags[] = { - { CODEC_ID_AAC, MKTAG('a','a','c',' ') }, - { CODEC_ID_AC3, MKTAG('a','c','-','3') }, - { CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') }, - { CODEC_ID_ADPCM_IMA_WAV, MKTAG('m','s', 0, 17 ) }, - { CODEC_ID_ADPCM_MS, MKTAG('m','s', 0, 2 ) }, - { CODEC_ID_ALAC, MKTAG('a','l','a','c') }, - { CODEC_ID_AMR_NB, MKTAG('s','a','m','r') }, + { AV_CODEC_ID_AAC, MKTAG('a','a','c',' ') }, + { AV_CODEC_ID_AC3, MKTAG('a','c','-','3') }, + { AV_CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') }, + { AV_CODEC_ID_ADPCM_IMA_WAV, MKTAG('m','s', 0, 17 ) }, + { AV_CODEC_ID_ADPCM_MS, MKTAG('m','s', 0, 2 ) }, + { AV_CODEC_ID_ALAC, MKTAG('a','l','a','c') }, + { AV_CODEC_ID_AMR_NB, MKTAG('s','a','m','r') }, /* FIXME: use DV demuxer, as done in MOV */ - /*{ CODEC_ID_DVAUDIO, MKTAG('v','d','v','a') },*/ - /*{ CODEC_ID_DVAUDIO, MKTAG('d','v','c','a') },*/ - { CODEC_ID_GSM, MKTAG('a','g','s','m') }, - { CODEC_ID_GSM_MS, MKTAG('m','s', 0, '1') }, - { CODEC_ID_MACE3, MKTAG('M','A','C','3') }, - { CODEC_ID_MACE6, MKTAG('M','A','C','6') }, - { CODEC_ID_MP1, MKTAG('.','m','p','1') }, - { CODEC_ID_MP2, MKTAG('.','m','p','2') }, - { CODEC_ID_MP3, MKTAG('.','m','p','3') }, - { CODEC_ID_MP3, MKTAG('m','s', 0 ,'U') }, - { CODEC_ID_PCM_ALAW, MKTAG('a','l','a','w') }, - { CODEC_ID_PCM_MULAW, MKTAG('u','l','a','w') }, - { CODEC_ID_QCELP, MKTAG('Q','c','l','p') }, - { CODEC_ID_QDM2, MKTAG('Q','D','M','2') }, - { CODEC_ID_QDM2, MKTAG('Q','D','M','C') }, + /*{ AV_CODEC_ID_DVAUDIO, MKTAG('v','d','v','a') },*/ + /*{ AV_CODEC_ID_DVAUDIO, MKTAG('d','v','c','a') },*/ + { AV_CODEC_ID_GSM, MKTAG('a','g','s','m') }, + { AV_CODEC_ID_GSM_MS, MKTAG('m','s', 0, '1') }, + { AV_CODEC_ID_MACE3, MKTAG('M','A','C','3') }, + { AV_CODEC_ID_MACE6, MKTAG('M','A','C','6') }, + { AV_CODEC_ID_MP1, MKTAG('.','m','p','1') }, + { AV_CODEC_ID_MP2, MKTAG('.','m','p','2') }, + { AV_CODEC_ID_MP3, MKTAG('.','m','p','3') }, + { AV_CODEC_ID_MP3, MKTAG('m','s', 0 ,'U') }, + { AV_CODEC_ID_PCM_ALAW, MKTAG('a','l','a','w') }, + { AV_CODEC_ID_PCM_MULAW, MKTAG('u','l','a','w') }, + { AV_CODEC_ID_QCELP, MKTAG('Q','c','l','p') }, + { AV_CODEC_ID_QDM2, MKTAG('Q','D','M','2') }, + { AV_CODEC_ID_QDM2, MKTAG('Q','D','M','C') }, /* currently unsupported codecs */ /*{ AC-3 over S/PDIF MKTAG('c','a','c','3') },*/ /*{ MPEG4CELP MKTAG('c','e','l','p') },*/ /*{ MPEG4HVXC MKTAG('h','v','x','c') },*/ /*{ MPEG4TwinVQ MKTAG('t','w','v','q') },*/ - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_NONE, 0 }, }; diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index 2c967f0a69..f1682b0d34 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -103,7 +103,7 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) if (size < 0 || size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE) return -1; - if (st->codec->codec_id == CODEC_ID_AAC) { + if (st->codec->codec_id == AV_CODEC_ID_AAC) { /* The magic cookie format for AAC is an mp4 esds atom. The lavc AAC decoder requires the data from the codec specific description as extradata input. */ @@ -114,12 +114,12 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) ff_mov_read_esds(s, pb, atom); skip = size - (avio_tell(pb) - strt); if (skip < 0 || !st->codec->extradata || - st->codec->codec_id != CODEC_ID_AAC) { + st->codec->codec_id != AV_CODEC_ID_AAC) { av_log(s, AV_LOG_ERROR, "invalid AAC magic cookie\n"); return AVERROR_INVALIDDATA; } avio_skip(pb, skip); - } else if (st->codec->codec_id == CODEC_ID_ALAC) { + } else if (st->codec->codec_id == AV_CODEC_ID_ALAC) { #define ALAC_PREAMBLE 12 #define ALAC_HEADER 36 #define ALAC_NEW_KUKI 24 diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index c34705636d..4e51407fea 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -36,15 +36,15 @@ typedef struct { static uint32_t codec_flags(enum CodecID codec_id) { switch (codec_id) { - case CODEC_ID_PCM_F32BE: - case CODEC_ID_PCM_F64BE: + case AV_CODEC_ID_PCM_F32BE: + case AV_CODEC_ID_PCM_F64BE: return 1; //< kCAFLinearPCMFormatFlagIsFloat - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S24LE: - case CODEC_ID_PCM_S32LE: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S24LE: + case AV_CODEC_ID_PCM_S32LE: return 2; //< kCAFLinearPCMFormatFlagIsLittleEndian - case CODEC_ID_PCM_F32LE: - case CODEC_ID_PCM_F64LE: + case AV_CODEC_ID_PCM_F32LE: + case AV_CODEC_ID_PCM_F64LE: return 3; //< kCAFLinearPCMFormatFlagIsFloat | kCAFLinearPCMFormatFlagIsLittleEndian default: return 0; @@ -53,44 +53,44 @@ static uint32_t codec_flags(enum CodecID codec_id) { static uint32_t samples_per_packet(enum CodecID codec_id, int channels) { switch (codec_id) { - case CODEC_ID_PCM_S8: - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_S24LE: - case CODEC_ID_PCM_S24BE: - case CODEC_ID_PCM_S32LE: - case CODEC_ID_PCM_S32BE: - case CODEC_ID_PCM_F32LE: - case CODEC_ID_PCM_F32BE: - case CODEC_ID_PCM_F64LE: - case CODEC_ID_PCM_F64BE: - case CODEC_ID_PCM_ALAW: - case CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S24LE: + case AV_CODEC_ID_PCM_S24BE: + case AV_CODEC_ID_PCM_S32LE: + case AV_CODEC_ID_PCM_S32BE: + case AV_CODEC_ID_PCM_F32LE: + case AV_CODEC_ID_PCM_F32BE: + case AV_CODEC_ID_PCM_F64LE: + case AV_CODEC_ID_PCM_F64BE: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_MULAW: return 1; - case CODEC_ID_MACE3: - case CODEC_ID_MACE6: + case AV_CODEC_ID_MACE3: + case AV_CODEC_ID_MACE6: return 6; - case CODEC_ID_ADPCM_IMA_QT: + case AV_CODEC_ID_ADPCM_IMA_QT: return 64; - case CODEC_ID_AMR_NB: - case CODEC_ID_GSM: - case CODEC_ID_QCELP: + case AV_CODEC_ID_AMR_NB: + case AV_CODEC_ID_GSM: + case AV_CODEC_ID_QCELP: return 160; - case CODEC_ID_GSM_MS: + case AV_CODEC_ID_GSM_MS: return 320; - case CODEC_ID_MP1: + case AV_CODEC_ID_MP1: return 384; - case CODEC_ID_MP2: - case CODEC_ID_MP3: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: return 1152; - case CODEC_ID_AC3: + case AV_CODEC_ID_AC3: return 1536; - case CODEC_ID_ALAC: - case CODEC_ID_QDM2: + case AV_CODEC_ID_ALAC: + case AV_CODEC_ID_QDM2: return 4096; - case CODEC_ID_ADPCM_IMA_WAV: + case AV_CODEC_ID_ADPCM_IMA_WAV: return (1024 - 4 * channels) * 8 / (4 * channels) + 1; - case CODEC_ID_ADPCM_MS: + case AV_CODEC_ID_ADPCM_MS: return (1024 - 7 * channels) * 2 / channels + 2; default: return 0; @@ -105,26 +105,26 @@ static int caf_write_header(AVFormatContext *s) unsigned int codec_tag = ff_codec_get_tag(ff_codec_caf_tags, enc->codec_id); switch (enc->codec_id) { - case CODEC_ID_AAC: - case CODEC_ID_AC3: + case AV_CODEC_ID_AAC: + case AV_CODEC_ID_AC3: av_log(s, AV_LOG_ERROR, "muxing codec currently unsupported\n"); return AVERROR_PATCHWELCOME; } switch (enc->codec_id) { - case CODEC_ID_PCM_S8: - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_S24LE: - case CODEC_ID_PCM_S24BE: - case CODEC_ID_PCM_S32LE: - case CODEC_ID_PCM_S32BE: - case CODEC_ID_PCM_F32LE: - case CODEC_ID_PCM_F32BE: - case CODEC_ID_PCM_F64LE: - case CODEC_ID_PCM_F64BE: - case CODEC_ID_PCM_ALAW: - case CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S24LE: + case AV_CODEC_ID_PCM_S24BE: + case AV_CODEC_ID_PCM_S32LE: + case AV_CODEC_ID_PCM_S32BE: + case AV_CODEC_ID_PCM_F32LE: + case AV_CODEC_ID_PCM_F32BE: + case AV_CODEC_ID_PCM_F64LE: + case AV_CODEC_ID_PCM_F64BE: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_MULAW: codec_tag = MKTAG('l','p','c','m'); } @@ -158,12 +158,12 @@ static int caf_write_header(AVFormatContext *s) ff_mov_write_chan(pb, enc->channel_layout); } - if (enc->codec_id == CODEC_ID_ALAC) { + if (enc->codec_id == AV_CODEC_ID_ALAC) { ffio_wfourcc(pb, "kuki"); avio_wb64(pb, 12 + enc->extradata_size); avio_write(pb, "\0\0\0\14frmaalac", 12); avio_write(pb, enc->extradata, enc->extradata_size); - } else if (enc->codec_id == CODEC_ID_AMR_NB) { + } else if (enc->codec_id == AV_CODEC_ID_AMR_NB) { ffio_wfourcc(pb, "kuki"); avio_wb64(pb, 29); avio_write(pb, "\0\0\0\14frmasamr", 12); @@ -174,7 +174,7 @@ static int caf_write_header(AVFormatContext *s) avio_wb16(pb, 0x81FF); /* Mode set (all modes for AMR_NB) */ avio_w8(pb, 0x00); /* Mode change period (no restriction) */ avio_w8(pb, 0x01); /* Frames per sample */ - } else if (enc->codec_id == CODEC_ID_QDM2) { + } else if (enc->codec_id == AV_CODEC_ID_QDM2) { ffio_wfourcc(pb, "kuki"); avio_wb64(pb, enc->extradata_size); avio_write(pb, enc->extradata, enc->extradata_size); @@ -253,8 +253,8 @@ AVOutputFormat ff_caf_muxer = { .mime_type = "audio/x-caf", .extensions = "caf", .priv_data_size = sizeof(CAFContext), - .audio_codec = CODEC_ID_PCM_S16BE, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_PCM_S16BE, + .video_codec = AV_CODEC_ID_NONE, .write_header = caf_write_header, .write_packet = caf_write_packet, .write_trailer = caf_write_trailer, diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c index a55438075f..c035128bcf 100644 --- a/libavformat/cavsvideodec.c +++ b/libavformat/cavsvideodec.c @@ -65,4 +65,4 @@ static int cavsvideo_probe(AVProbeData *p) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, NULL, CODEC_ID_CAVS) +FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, NULL, AV_CODEC_ID_CAVS) diff --git a/libavformat/cdg.c b/libavformat/cdg.c index 256fc21873..2d40d3dc55 100644 --- a/libavformat/cdg.c +++ b/libavformat/cdg.c @@ -36,7 +36,7 @@ static int read_header(AVFormatContext *s) return AVERROR(ENOMEM); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_CDGRAPHICS; + vst->codec->codec_id = AV_CODEC_ID_CDGRAPHICS; /// 75 sectors/sec * 4 packets/sector = 300 packets/sec avpriv_set_pts_info(vst, 32, 1, 300); diff --git a/libavformat/cdxl.c b/libavformat/cdxl.c index 736ce3d634..21f63a5a8f 100644 --- a/libavformat/cdxl.c +++ b/libavformat/cdxl.c @@ -100,7 +100,7 @@ static int cdxl_read_packet(AVFormatContext *s, AVPacket *pkt) st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_tag = 0; - st->codec->codec_id = CODEC_ID_PCM_S8; + st->codec->codec_id = AV_CODEC_ID_PCM_S8; st->codec->channels = cdxl->header[1] & 0x10 ? 2 : 1; st->codec->sample_rate = cdxl->sample_rate; st->start_time = 0; @@ -123,7 +123,7 @@ static int cdxl_read_packet(AVFormatContext *s, AVPacket *pkt) st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_tag = 0; - st->codec->codec_id = CODEC_ID_CDXL; + st->codec->codec_id = AV_CODEC_ID_CDXL; st->codec->width = width; st->codec->height = height; st->start_time = 0; diff --git a/libavformat/crcenc.c b/libavformat/crcenc.c index 210ef2c4dd..107e149eaa 100644 --- a/libavformat/crcenc.c +++ b/libavformat/crcenc.c @@ -58,8 +58,8 @@ AVOutputFormat ff_crc_muxer = { .name = "crc", .long_name = NULL_IF_CONFIG_SMALL("CRC testing"), .priv_data_size = sizeof(CRCState), - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_RAWVIDEO, .write_header = crc_write_header, .write_packet = crc_write_packet, .write_trailer = crc_write_trailer, diff --git a/libavformat/daud.c b/libavformat/daud.c index a25c0bff4c..bfbcf0a6b0 100644 --- a/libavformat/daud.c +++ b/libavformat/daud.c @@ -25,7 +25,7 @@ static int daud_header(AVFormatContext *s) { if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_PCM_S24DAUD; + st->codec->codec_id = AV_CODEC_ID_PCM_S24DAUD; st->codec->codec_tag = MKTAG('d', 'a', 'u', 'd'); st->codec->channels = 6; st->codec->sample_rate = 96000; @@ -84,8 +84,8 @@ AVOutputFormat ff_daud_muxer = { .name = "daud", .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio"), .extensions = "302", - .audio_codec = CODEC_ID_PCM_S24DAUD, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_PCM_S24DAUD, + .video_codec = AV_CODEC_ID_NONE, .write_header = daud_write_header, .write_packet = daud_write_packet, .flags = AVFMT_NOTIMESTAMPS, diff --git a/libavformat/dfa.c b/libavformat/dfa.c index fa342fa11f..8cf2f24fc8 100644 --- a/libavformat/dfa.c +++ b/libavformat/dfa.c @@ -50,7 +50,7 @@ static int dfa_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_DFA; + st->codec->codec_id = AV_CODEC_ID_DFA; st->codec->width = avio_rl16(pb); st->codec->height = avio_rl16(pb); mspf = avio_rl32(pb); diff --git a/libavformat/diracdec.c b/libavformat/diracdec.c index 6afda533dc..6636ead30d 100644 --- a/libavformat/diracdec.c +++ b/libavformat/diracdec.c @@ -31,4 +31,4 @@ static int dirac_probe(AVProbeData *p) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(dirac, "raw Dirac", dirac_probe, NULL, CODEC_ID_DIRAC) +FF_DEF_RAWVIDEO_DEMUXER(dirac, "raw Dirac", dirac_probe, NULL, AV_CODEC_ID_DIRAC) diff --git a/libavformat/dnxhddec.c b/libavformat/dnxhddec.c index f89782a880..e5c438197f 100644 --- a/libavformat/dnxhddec.c +++ b/libavformat/dnxhddec.c @@ -42,4 +42,4 @@ static int dnxhd_probe(AVProbeData *p) return AVPROBE_SCORE_MAX; } -FF_DEF_RAWVIDEO_DEMUXER(dnxhd, "raw DNxHD (SMPTE VC-3)", dnxhd_probe, NULL, CODEC_ID_DNXHD) +FF_DEF_RAWVIDEO_DEMUXER(dnxhd, "raw DNxHD (SMPTE VC-3)", dnxhd_probe, NULL, AV_CODEC_ID_DNXHD) diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c index 5a97e75971..afc010a16f 100644 --- a/libavformat/dsicin.c +++ b/libavformat/dsicin.c @@ -116,7 +116,7 @@ static int cin_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 32, 1, 12); cin->video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_DSICINVIDEO; + st->codec->codec_id = AV_CODEC_ID_DSICINVIDEO; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = hdr->video_frame_width; st->codec->height = hdr->video_frame_height; @@ -129,7 +129,7 @@ static int cin_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 32, 1, 22050); cin->audio_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_DSICINAUDIO; + st->codec->codec_id = AV_CODEC_ID_DSICINAUDIO; st->codec->codec_tag = 0; /* no tag */ st->codec->channels = 1; st->codec->sample_rate = 22050; diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c index 7f4173e0f3..5c05758327 100644 --- a/libavformat/dtsdec.c +++ b/libavformat/dtsdec.c @@ -73,5 +73,5 @@ AVInputFormat ff_dts_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "dts", - .raw_codec_id = CODEC_ID_DTS, + .raw_codec_id = AV_CODEC_ID_DTS, }; diff --git a/libavformat/dv.c b/libavformat/dv.c index 7ea2d53b92..fff55ab255 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -242,7 +242,7 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame) break; avpriv_set_pts_info(c->ast[i], 64, 1, 30000); c->ast[i]->codec->codec_type = AVMEDIA_TYPE_AUDIO; - c->ast[i]->codec->codec_id = CODEC_ID_PCM_S16LE; + c->ast[i]->codec->codec_id = AV_CODEC_ID_PCM_S16LE; av_init_packet(&c->audio_pkt[i]); c->audio_pkt[i].size = 0; @@ -323,7 +323,7 @@ DVDemuxContext* avpriv_dv_init_demux(AVFormatContext *s) c->fctx = s; c->vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - c->vst->codec->codec_id = CODEC_ID_DVVIDEO; + c->vst->codec->codec_id = AV_CODEC_ID_DVVIDEO; c->vst->codec->bit_rate = 25000000; c->vst->start_time = 0; diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 880caeab72..518ae70ccc 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -304,10 +304,10 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s) } /* Some checks -- DV format is very picky about its incoming streams */ - if (!vst || vst->codec->codec_id != CODEC_ID_DVVIDEO) + if (!vst || vst->codec->codec_id != AV_CODEC_ID_DVVIDEO) goto bail_out; for (i=0; i<c->n_ast; i++) { - if (c->ast[i] && (c->ast[i]->codec->codec_id != CODEC_ID_PCM_S16LE || + if (c->ast[i] && (c->ast[i]->codec->codec_id != AV_CODEC_ID_PCM_S16LE || c->ast[i]->codec->sample_rate != 48000 || c->ast[i]->codec->channels != 2)) goto bail_out; @@ -410,8 +410,8 @@ AVOutputFormat ff_dv_muxer = { .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), .extensions = "dv", .priv_data_size = sizeof(DVMuxContext), - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_DVVIDEO, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_DVVIDEO, .write_header = dv_write_header, .write_packet = dv_write_packet, .write_trailer = dv_write_trailer, diff --git a/libavformat/dxa.c b/libavformat/dxa.c index 3d85193279..30d1e02068 100644 --- a/libavformat/dxa.c +++ b/libavformat/dxa.c @@ -126,7 +126,7 @@ static int dxa_read_header(AVFormatContext *s) /* now we are ready: build format streams */ st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_DXA; + st->codec->codec_id = AV_CODEC_ID_DXA; st->codec->width = w; st->codec->height = h; av_reduce(&den, &num, den, num, (1UL<<31)-1); diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c index 313cbe2aec..be31d007e0 100644 --- a/libavformat/eacdata.c +++ b/libavformat/eacdata.c @@ -72,7 +72,7 @@ static int cdata_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_tag = 0; /* no fourcc */ - st->codec->codec_id = CODEC_ID_ADPCM_EA_XAS; + st->codec->codec_id = AV_CODEC_ID_ADPCM_EA_XAS; st->codec->channels = cdata->channels; st->codec->channel_layout = channel_layout; st->codec->sample_rate = sample_rate; diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 3d51c70a64..c5533f2674 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -63,13 +63,13 @@ typedef struct EaDemuxContext { int big_endian; - enum CodecID video_codec; + enum AVCodecID video_codec; AVRational time_base; int width, height; int nb_frames; int video_stream_index; - enum CodecID audio_codec; + enum AVCodecID audio_codec; int audio_stream_index; int bytes; @@ -175,25 +175,25 @@ static int process_audio_header_elements(AVFormatContext *s) } switch (compression_type) { - case 0: ea->audio_codec = CODEC_ID_PCM_S16LE; break; - case 7: ea->audio_codec = CODEC_ID_ADPCM_EA; break; + case 0: ea->audio_codec = AV_CODEC_ID_PCM_S16LE; break; + case 7: ea->audio_codec = AV_CODEC_ID_ADPCM_EA; break; case -1: switch (revision) { - case 1: ea->audio_codec = CODEC_ID_ADPCM_EA_R1; break; - case 2: ea->audio_codec = CODEC_ID_ADPCM_EA_R2; break; - case 3: ea->audio_codec = CODEC_ID_ADPCM_EA_R3; break; + case 1: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R1; break; + case 2: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2; break; + case 3: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R3; break; case -1: break; default: av_log(s, AV_LOG_ERROR, "unsupported stream type; revision=%i\n", revision); return 0; } switch (revision2) { - case 8: ea->audio_codec = CODEC_ID_PCM_S16LE_PLANAR; break; - case 10: ea->audio_codec = CODEC_ID_ADPCM_EA_R2; break; - case 16: ea->audio_codec = CODEC_ID_MP3; break; + case 8: ea->audio_codec = AV_CODEC_ID_PCM_S16LE_PLANAR; break; + case 10: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2; break; + case 16: ea->audio_codec = AV_CODEC_ID_MP3; break; case -1: break; default: - ea->audio_codec = CODEC_ID_NONE; + ea->audio_codec = AV_CODEC_ID_NONE; av_log(s, AV_LOG_ERROR, "unsupported stream type; revision2=%i\n", revision2); return 0; } @@ -228,12 +228,12 @@ static int process_audio_header_eacs(AVFormatContext *s) switch (compression_type) { case 0: switch (ea->bytes) { - case 1: ea->audio_codec = CODEC_ID_PCM_S8; break; - case 2: ea->audio_codec = CODEC_ID_PCM_S16LE; break; + case 1: ea->audio_codec = AV_CODEC_ID_PCM_S8; break; + case 2: ea->audio_codec = AV_CODEC_ID_PCM_S16LE; break; } break; - case 1: ea->audio_codec = CODEC_ID_PCM_MULAW; ea->bytes = 1; break; - case 2: ea->audio_codec = CODEC_ID_ADPCM_IMA_EA_EACS; break; + case 1: ea->audio_codec = AV_CODEC_ID_PCM_MULAW; ea->bytes = 1; break; + case 2: ea->audio_codec = AV_CODEC_ID_ADPCM_IMA_EA_EACS; break; default: av_log (s, AV_LOG_ERROR, "unsupported stream type; audio compression_type=%i\n", compression_type); } @@ -253,7 +253,7 @@ static int process_audio_header_sead(AVFormatContext *s) ea->sample_rate = avio_rl32(pb); ea->bytes = avio_rl32(pb); /* 1=8-bit, 2=16-bit */ ea->num_channels = avio_rl32(pb); - ea->audio_codec = CODEC_ID_ADPCM_IMA_EA_SEAD; + ea->audio_codec = AV_CODEC_ID_ADPCM_IMA_EA_SEAD; return 1; } @@ -266,7 +266,7 @@ static int process_video_header_mdec(AVFormatContext *s) ea->width = avio_rl16(pb); ea->height = avio_rl16(pb); ea->time_base = (AVRational){1,15}; - ea->video_codec = CODEC_ID_MDEC; + ea->video_codec = AV_CODEC_ID_MDEC; return 1; } @@ -280,7 +280,7 @@ static int process_video_header_vp6(AVFormatContext *s) avio_skip(pb, 4); ea->time_base.den = avio_rl32(pb); ea->time_base.num = avio_rl32(pb); - ea->video_codec = CODEC_ID_VP6; + ea->video_codec = AV_CODEC_ID_VP6; return 1; } @@ -294,7 +294,7 @@ static int process_video_header_cmv(AVFormatContext *s) fps = avio_rl16(s->pb); if (fps) ea->time_base = (AVRational){1, fps}; - ea->video_codec = CODEC_ID_CMV; + ea->video_codec = AV_CODEC_ID_CMV; return 0; } @@ -350,7 +350,7 @@ static int process_ea_header(AVFormatContext *s) { break; case kVGT_TAG: - ea->video_codec = CODEC_ID_TGV; + ea->video_codec = AV_CODEC_ID_TGV; break; case mTCD_TAG : @@ -358,20 +358,20 @@ static int process_ea_header(AVFormatContext *s) { break; case MPCh_TAG: - ea->video_codec = CODEC_ID_MPEG2VIDEO; + ea->video_codec = AV_CODEC_ID_MPEG2VIDEO; break; case pQGT_TAG: case TGQs_TAG: - ea->video_codec = CODEC_ID_TGQ; + ea->video_codec = AV_CODEC_ID_TGQ; break; case pIQT_TAG: - ea->video_codec = CODEC_ID_TQI; + ea->video_codec = AV_CODEC_ID_TQI; break; case MADk_TAG : - ea->video_codec = CODEC_ID_MAD; + ea->video_codec = AV_CODEC_ID_MAD; break; case MVhd_TAG : @@ -431,7 +431,7 @@ static int ea_read_header(AVFormatContext *s) st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = ea->video_codec; // parsing is necessary to make FFmpeg generate correct timestamps - if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO) + if (st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO) st->need_parsing = AVSTREAM_PARSE_HEADERS; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = ea->width; @@ -456,7 +456,7 @@ static int ea_read_header(AVFormatContext *s) } if (ea->bytes <= 0) { av_log(s, AV_LOG_ERROR, "Invalid number of bytes per sample: %d\n", ea->bytes); - ea->audio_codec = CODEC_ID_NONE; + ea->audio_codec = AV_CODEC_ID_NONE; return 1; } @@ -515,8 +515,8 @@ static int ea_read_packet(AVFormatContext *s, if (!ea->audio_codec) { avio_skip(pb, chunk_size); break; - } else if (ea->audio_codec == CODEC_ID_PCM_S16LE_PLANAR || - ea->audio_codec == CODEC_ID_MP3) { + } else if (ea->audio_codec == AV_CODEC_ID_PCM_S16LE_PLANAR || + ea->audio_codec == AV_CODEC_ID_MP3) { num_samples = avio_rl32(pb); avio_skip(pb, 8); chunk_size -= 12; @@ -532,20 +532,20 @@ static int ea_read_packet(AVFormatContext *s, pkt->stream_index = ea->audio_stream_index; switch (ea->audio_codec) { - case CODEC_ID_ADPCM_EA: - case CODEC_ID_ADPCM_EA_R1: - case CODEC_ID_ADPCM_EA_R2: - case CODEC_ID_ADPCM_IMA_EA_EACS: + case AV_CODEC_ID_ADPCM_EA: + case AV_CODEC_ID_ADPCM_EA_R1: + case AV_CODEC_ID_ADPCM_EA_R2: + case AV_CODEC_ID_ADPCM_IMA_EA_EACS: pkt->duration = AV_RL32(pkt->data); break; - case CODEC_ID_ADPCM_EA_R3: + case AV_CODEC_ID_ADPCM_EA_R3: pkt->duration = AV_RB32(pkt->data); break; - case CODEC_ID_ADPCM_IMA_EA_SEAD: + case AV_CODEC_ID_ADPCM_IMA_EA_SEAD: pkt->duration = ret * 2 / ea->num_channels; break; - case CODEC_ID_PCM_S16LE_PLANAR: - case CODEC_ID_MP3: + case AV_CODEC_ID_PCM_S16LE_PLANAR: + case AV_CODEC_ID_MP3: pkt->duration = num_samples; break; default: diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index a8d038ac68..ca252dee08 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -243,8 +243,8 @@ AVOutputFormat ff_ffm_muxer = { .long_name = NULL_IF_CONFIG_SMALL("FFM (FFserver live feed)"), .extensions = "ffm", .priv_data_size = sizeof(FFMContext), - .audio_codec = CODEC_ID_MP2, - .video_codec = CODEC_ID_MPEG1VIDEO, + .audio_codec = AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_MPEG1VIDEO, .write_header = ffm_write_header, .write_packet = ffm_write_packet, .write_trailer = ffm_write_trailer, diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c index 5a4bc82c99..4bdc98a3d4 100644 --- a/libavformat/ffmetadec.c +++ b/libavformat/ffmetadec.c @@ -138,7 +138,7 @@ static int read_header(AVFormatContext *s) return -1; st->codec->codec_type = AVMEDIA_TYPE_DATA; - st->codec->codec_id = CODEC_ID_FFMETADATA; + st->codec->codec_id = AV_CODEC_ID_FFMETADATA; m = &st->metadata; } else if (!memcmp(line, ID_CHAPTER, strlen(ID_CHAPTER))) { diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c index 20ab4a70fb..2f3aa6c6d1 100644 --- a/libavformat/filmstripdec.c +++ b/libavformat/filmstripdec.c @@ -61,7 +61,7 @@ static int read_header(AVFormatContext *s) avio_skip(pb, 2); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_RAWVIDEO; + st->codec->codec_id = AV_CODEC_ID_RAWVIDEO; st->codec->pix_fmt = PIX_FMT_RGBA; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = avio_rb16(pb); diff --git a/libavformat/filmstripenc.c b/libavformat/filmstripenc.c index 3862cb1dba..3e35ef64f5 100644 --- a/libavformat/filmstripenc.c +++ b/libavformat/filmstripenc.c @@ -76,8 +76,8 @@ AVOutputFormat ff_filmstrip_muxer = { .long_name = NULL_IF_CONFIG_SMALL("Adobe Filmstrip"), .extensions = "flm", .priv_data_size = sizeof(FilmstripMuxContext), - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_RAWVIDEO, .write_header = write_header, .write_packet = write_packet, .write_trailer = write_trailer, diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 475acd934a..bbb28f435a 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -33,7 +33,7 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) { const CodecMime *mime = ff_id3v2_mime_tags; - enum CodecID id = CODEC_ID_NONE; + enum AVCodecID id = AV_CODEC_ID_NONE; uint8_t mimetype[64], *desc = NULL, *data = NULL; AVIOContext *pb = NULL; AVStream *st; @@ -66,14 +66,14 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) } mimetype[len] = 0; - while (mime->id != CODEC_ID_NONE) { + while (mime->id != AV_CODEC_ID_NONE) { if (!strncmp(mime->str, mimetype, sizeof(mimetype))) { id = mime->id; break; } mime++; } - if (id == CODEC_ID_NONE) { + if (id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", mimetype); if (s->error_recognition & AV_EF_EXPLODE) @@ -162,7 +162,7 @@ static int flac_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_FLAC; + st->codec->codec_id = AV_CODEC_ID_FLAC; st->need_parsing = AVSTREAM_PARSE_FULL_RAW; /* the parameters will be extracted from the compressed bitstream */ @@ -292,5 +292,5 @@ AVInputFormat ff_flac_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "flac", - .raw_codec_id = CODEC_ID_FLAC, + .raw_codec_id = AV_CODEC_ID_FLAC, }; diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index ee66e98f3a..8c270eeb14 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -122,8 +122,8 @@ AVOutputFormat ff_flac_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw FLAC"), .mime_type = "audio/x-flac", .extensions = "flac", - .audio_codec = CODEC_ID_FLAC, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_FLAC, + .video_codec = AV_CODEC_ID_NONE, .write_header = flac_write_header, .write_packet = flac_write_packet, .write_trailer = flac_write_trailer, diff --git a/libavformat/flic.c b/libavformat/flic.c index 85c5564f5e..f6aa3b0e2e 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -110,7 +110,7 @@ static int flic_read_header(AVFormatContext *s) return AVERROR(ENOMEM); flic->video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_FLIC; + st->codec->codec_id = AV_CODEC_ID_FLIC; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = AV_RL16(&header[0x08]); st->codec->height = AV_RL16(&header[0x0A]); @@ -154,7 +154,7 @@ static int flic_read_header(AVFormatContext *s) /* all audio frames are the same size, so use the size of the first chunk for block_align */ ast->codec->block_align = AV_RL32(&preamble[0]); ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_id = CODEC_ID_PCM_U8; + ast->codec->codec_id = AV_CODEC_ID_PCM_U8; ast->codec->codec_tag = 0; ast->codec->sample_rate = FLIC_TFTD_SAMPLE_RATE; ast->codec->channels = 1; diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 2c342bbddb..bf1ff98fde 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -95,34 +95,34 @@ static int flv_same_audio_codec(AVCodecContext *acodec, int flags) switch(flv_codecid) { //no distinction between S16 and S8 PCM codec flags case FLV_CODECID_PCM: - codec_id = bits_per_coded_sample == 8 ? CODEC_ID_PCM_U8 : + codec_id = bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 : #if HAVE_BIGENDIAN - CODEC_ID_PCM_S16BE; + AV_CODEC_ID_PCM_S16BE; #else - CODEC_ID_PCM_S16LE; + AV_CODEC_ID_PCM_S16LE; #endif return codec_id == acodec->codec_id; case FLV_CODECID_PCM_LE: - codec_id = bits_per_coded_sample == 8 ? CODEC_ID_PCM_U8 : CODEC_ID_PCM_S16LE; + codec_id = bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 : AV_CODEC_ID_PCM_S16LE; return codec_id == acodec->codec_id; case FLV_CODECID_AAC: - return acodec->codec_id == CODEC_ID_AAC; + return acodec->codec_id == AV_CODEC_ID_AAC; case FLV_CODECID_ADPCM: - return acodec->codec_id == CODEC_ID_ADPCM_SWF; + return acodec->codec_id == AV_CODEC_ID_ADPCM_SWF; case FLV_CODECID_SPEEX: - return acodec->codec_id == CODEC_ID_SPEEX; + return acodec->codec_id == AV_CODEC_ID_SPEEX; case FLV_CODECID_MP3: - return acodec->codec_id == CODEC_ID_MP3; + return acodec->codec_id == AV_CODEC_ID_MP3; case FLV_CODECID_NELLYMOSER_8KHZ_MONO: case FLV_CODECID_NELLYMOSER_16KHZ_MONO: case FLV_CODECID_NELLYMOSER: - return acodec->codec_id == CODEC_ID_NELLYMOSER; + return acodec->codec_id == AV_CODEC_ID_NELLYMOSER; case FLV_CODECID_PCM_MULAW: return acodec->sample_rate == 8000 && - acodec->codec_id == CODEC_ID_PCM_MULAW; + acodec->codec_id == AV_CODEC_ID_PCM_MULAW; case FLV_CODECID_PCM_ALAW: return acodec->sample_rate = 8000 && - acodec->codec_id == CODEC_ID_PCM_ALAW; + acodec->codec_id == AV_CODEC_ID_PCM_ALAW; default: return acodec->codec_tag == (flv_codecid >> FLV_AUDIO_CODECID_OFFSET); } @@ -134,40 +134,40 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, AVCodecCo switch(flv_codecid) { //no distinction between S16 and S8 PCM codec flags case FLV_CODECID_PCM: - acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_U8 : + acodec->codec_id = acodec->bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 : #if HAVE_BIGENDIAN - CODEC_ID_PCM_S16BE; + AV_CODEC_ID_PCM_S16BE; #else - CODEC_ID_PCM_S16LE; + AV_CODEC_ID_PCM_S16LE; #endif break; case FLV_CODECID_PCM_LE: - acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_U8 : CODEC_ID_PCM_S16LE; break; - case FLV_CODECID_AAC : acodec->codec_id = CODEC_ID_AAC; break; - case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF; break; + acodec->codec_id = acodec->bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 : AV_CODEC_ID_PCM_S16LE; break; + case FLV_CODECID_AAC : acodec->codec_id = AV_CODEC_ID_AAC; break; + case FLV_CODECID_ADPCM: acodec->codec_id = AV_CODEC_ID_ADPCM_SWF; break; case FLV_CODECID_SPEEX: - acodec->codec_id = CODEC_ID_SPEEX; + acodec->codec_id = AV_CODEC_ID_SPEEX; acodec->sample_rate = 16000; break; - case FLV_CODECID_MP3 : acodec->codec_id = CODEC_ID_MP3 ; astream->need_parsing = AVSTREAM_PARSE_FULL; break; + case FLV_CODECID_MP3 : acodec->codec_id = AV_CODEC_ID_MP3 ; astream->need_parsing = AVSTREAM_PARSE_FULL; break; case FLV_CODECID_NELLYMOSER_8KHZ_MONO: acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate - acodec->codec_id = CODEC_ID_NELLYMOSER; + acodec->codec_id = AV_CODEC_ID_NELLYMOSER; break; case FLV_CODECID_NELLYMOSER_16KHZ_MONO: acodec->sample_rate = 16000; - acodec->codec_id = CODEC_ID_NELLYMOSER; + acodec->codec_id = AV_CODEC_ID_NELLYMOSER; break; case FLV_CODECID_NELLYMOSER: - acodec->codec_id = CODEC_ID_NELLYMOSER; + acodec->codec_id = AV_CODEC_ID_NELLYMOSER; break; case FLV_CODECID_PCM_MULAW: acodec->sample_rate = 8000; - acodec->codec_id = CODEC_ID_PCM_MULAW; + acodec->codec_id = AV_CODEC_ID_PCM_MULAW; break; case FLV_CODECID_PCM_ALAW: acodec->sample_rate = 8000; - acodec->codec_id = CODEC_ID_PCM_ALAW; + acodec->codec_id = AV_CODEC_ID_PCM_ALAW; break; default: av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET); @@ -184,17 +184,17 @@ static int flv_same_video_codec(AVCodecContext *vcodec, int flags) switch (flv_codecid) { case FLV_CODECID_H263: - return vcodec->codec_id == CODEC_ID_FLV1; + return vcodec->codec_id == AV_CODEC_ID_FLV1; case FLV_CODECID_SCREEN: - return vcodec->codec_id == CODEC_ID_FLASHSV; + return vcodec->codec_id == AV_CODEC_ID_FLASHSV; case FLV_CODECID_SCREEN2: - return vcodec->codec_id == CODEC_ID_FLASHSV2; + return vcodec->codec_id == AV_CODEC_ID_FLASHSV2; case FLV_CODECID_VP6: - return vcodec->codec_id == CODEC_ID_VP6F; + return vcodec->codec_id == AV_CODEC_ID_VP6F; case FLV_CODECID_VP6A: - return vcodec->codec_id == CODEC_ID_VP6A; + return vcodec->codec_id == AV_CODEC_ID_VP6A; case FLV_CODECID_H264: - return vcodec->codec_id == CODEC_ID_H264; + return vcodec->codec_id == AV_CODEC_ID_H264; default: return vcodec->codec_tag == flv_codecid; } @@ -205,14 +205,14 @@ static int flv_same_video_codec(AVCodecContext *vcodec, int flags) static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) { AVCodecContext *vcodec = vstream->codec; switch(flv_codecid) { - case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break; - case FLV_CODECID_REALH263: vcodec->codec_id = CODEC_ID_H263 ; break; // Really mean it this time - case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break; - case FLV_CODECID_SCREEN2: vcodec->codec_id = CODEC_ID_FLASHSV2; break; - case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ; + case FLV_CODECID_H263 : vcodec->codec_id = AV_CODEC_ID_FLV1 ; break; + case FLV_CODECID_REALH263: vcodec->codec_id = AV_CODEC_ID_H263 ; break; // Really mean it this time + case FLV_CODECID_SCREEN: vcodec->codec_id = AV_CODEC_ID_FLASHSV; break; + case FLV_CODECID_SCREEN2: vcodec->codec_id = AV_CODEC_ID_FLASHSV2; break; + case FLV_CODECID_VP6 : vcodec->codec_id = AV_CODEC_ID_VP6F ; case FLV_CODECID_VP6A : if(flv_codecid == FLV_CODECID_VP6A) - vcodec->codec_id = CODEC_ID_VP6A; + vcodec->codec_id = AV_CODEC_ID_VP6A; if(vcodec->extradata_size != 1) { vcodec->extradata_size = 1; vcodec->extradata = av_malloc(1 + FF_INPUT_BUFFER_PADDING_SIZE); @@ -220,10 +220,10 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_co vcodec->extradata[0] = avio_r8(s->pb); return 1; // 1 byte body size adjustment for flv_read_packet() case FLV_CODECID_H264: - vcodec->codec_id = CODEC_ID_H264; + vcodec->codec_id = AV_CODEC_ID_H264; return 3; // not 4, reading packet type will consume one byte case FLV_CODECID_MPEG4: - vcodec->codec_id = CODEC_ID_MPEG4; + vcodec->codec_id = AV_CODEC_ID_MPEG4; return 3; default: av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid); @@ -406,7 +406,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst AVStream *st = create_stream(s, AVMEDIA_TYPE_DATA); if (!st) return AVERROR(ENOMEM); - st->codec->codec_id = CODEC_ID_TEXT; + st->codec->codec_id = AV_CODEC_ID_TEXT; } else if (flv->trust_metadata) { if (!strcmp(key, "videocodecid") && vcodec) { flv_set_video_codec(s, vstream, num_val); @@ -621,7 +621,7 @@ static int flv_data_packet(AVFormatContext *s, AVPacket *pkt, st = create_stream(s, AVMEDIA_TYPE_DATA); if (!st) goto out; - st->codec->codec_id = CODEC_ID_TEXT; + st->codec->codec_id = AV_CODEC_ID_TEXT; } pkt->dts = dts; @@ -792,12 +792,12 @@ retry_duration: size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK); } - if (st->codec->codec_id == CODEC_ID_AAC || - st->codec->codec_id == CODEC_ID_H264 || - st->codec->codec_id == CODEC_ID_MPEG4) { + if (st->codec->codec_id == AV_CODEC_ID_AAC || + st->codec->codec_id == AV_CODEC_ID_H264 || + st->codec->codec_id == AV_CODEC_ID_MPEG4) { int type = avio_r8(s->pb); size--; - if (st->codec->codec_id == CODEC_ID_H264 || st->codec->codec_id == CODEC_ID_MPEG4) { + if (st->codec->codec_id == AV_CODEC_ID_H264 || st->codec->codec_id == AV_CODEC_ID_MPEG4) { int32_t cts = (avio_rb24(s->pb)+0xff800000)^0xff800000; // sign extension pts = dts + cts; if (cts < 0) { // dts are wrong @@ -807,7 +807,7 @@ retry_duration: if (flv->wrong_dts) dts = AV_NOPTS_VALUE; } - if (type == 0 && (!st->codec->extradata || st->codec->codec_id == CODEC_ID_AAC)) { + if (type == 0 && (!st->codec->extradata || st->codec->codec_id == AV_CODEC_ID_AAC)) { if (st->codec->extradata) { if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0) return ret; @@ -816,7 +816,7 @@ retry_duration: } if ((ret = flv_get_extradata(s, st, size)) < 0) return ret; - if (st->codec->codec_id == CODEC_ID_AAC) { + if (st->codec->codec_id == AV_CODEC_ID_AAC) { MPEG4AudioConfig cfg; if (avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata, st->codec->extradata_size * 8, 1) >= 0) { diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index a4911b8265..3d331317ad 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -31,30 +31,30 @@ static const AVCodecTag flv_video_codec_ids[] = { - { CODEC_ID_FLV1, FLV_CODECID_H263 }, - { CODEC_ID_H263, FLV_CODECID_REALH263 }, - { CODEC_ID_MPEG4, FLV_CODECID_MPEG4 }, - { CODEC_ID_FLASHSV, FLV_CODECID_SCREEN }, - { CODEC_ID_FLASHSV2, FLV_CODECID_SCREEN2 }, - { CODEC_ID_VP6F, FLV_CODECID_VP6 }, - { CODEC_ID_VP6, FLV_CODECID_VP6 }, - { CODEC_ID_VP6A, FLV_CODECID_VP6A }, - { CODEC_ID_H264, FLV_CODECID_H264 }, - { CODEC_ID_NONE, 0 } + { AV_CODEC_ID_FLV1, FLV_CODECID_H263 }, + { AV_CODEC_ID_H263, FLV_CODECID_REALH263 }, + { AV_CODEC_ID_MPEG4, FLV_CODECID_MPEG4 }, + { AV_CODEC_ID_FLASHSV, FLV_CODECID_SCREEN }, + { AV_CODEC_ID_FLASHSV2, FLV_CODECID_SCREEN2 }, + { AV_CODEC_ID_VP6F, FLV_CODECID_VP6 }, + { AV_CODEC_ID_VP6, FLV_CODECID_VP6 }, + { AV_CODEC_ID_VP6A, FLV_CODECID_VP6A }, + { AV_CODEC_ID_H264, FLV_CODECID_H264 }, + { AV_CODEC_ID_NONE, 0 } }; static const AVCodecTag flv_audio_codec_ids[] = { - { CODEC_ID_MP3, FLV_CODECID_MP3 >> FLV_AUDIO_CODECID_OFFSET }, - { CODEC_ID_PCM_U8, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET }, - { CODEC_ID_PCM_S16BE, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET }, - { CODEC_ID_PCM_S16LE, FLV_CODECID_PCM_LE >> FLV_AUDIO_CODECID_OFFSET }, - { CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET }, - { CODEC_ID_AAC, FLV_CODECID_AAC >> FLV_AUDIO_CODECID_OFFSET }, - { CODEC_ID_NELLYMOSER, FLV_CODECID_NELLYMOSER >> FLV_AUDIO_CODECID_OFFSET }, - { CODEC_ID_PCM_MULAW, FLV_CODECID_PCM_MULAW >> FLV_AUDIO_CODECID_OFFSET }, - { CODEC_ID_PCM_ALAW, FLV_CODECID_PCM_ALAW >> FLV_AUDIO_CODECID_OFFSET }, - { CODEC_ID_SPEEX, FLV_CODECID_SPEEX >> FLV_AUDIO_CODECID_OFFSET }, - { CODEC_ID_NONE, 0 } + { AV_CODEC_ID_MP3, FLV_CODECID_MP3 >> FLV_AUDIO_CODECID_OFFSET }, + { AV_CODEC_ID_PCM_U8, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET }, + { AV_CODEC_ID_PCM_S16BE, FLV_CODECID_PCM >> FLV_AUDIO_CODECID_OFFSET }, + { AV_CODEC_ID_PCM_S16LE, FLV_CODECID_PCM_LE >> FLV_AUDIO_CODECID_OFFSET }, + { AV_CODEC_ID_ADPCM_SWF, FLV_CODECID_ADPCM >> FLV_AUDIO_CODECID_OFFSET }, + { AV_CODEC_ID_AAC, FLV_CODECID_AAC >> FLV_AUDIO_CODECID_OFFSET }, + { AV_CODEC_ID_NELLYMOSER, FLV_CODECID_NELLYMOSER >> FLV_AUDIO_CODECID_OFFSET }, + { AV_CODEC_ID_PCM_MULAW, FLV_CODECID_PCM_MULAW >> FLV_AUDIO_CODECID_OFFSET }, + { AV_CODEC_ID_PCM_ALAW, FLV_CODECID_PCM_ALAW >> FLV_AUDIO_CODECID_OFFSET }, + { AV_CODEC_ID_SPEEX, FLV_CODECID_SPEEX >> FLV_AUDIO_CODECID_OFFSET }, + { AV_CODEC_ID_NONE, 0 } }; typedef struct FLVContext { @@ -74,10 +74,10 @@ static int get_audio_flags(AVFormatContext *s, AVCodecContext *enc) int flags = (enc->bits_per_coded_sample == 16) ? FLV_SAMPLESSIZE_16BIT : FLV_SAMPLESSIZE_8BIT; - if (enc->codec_id == CODEC_ID_AAC) // specs force these parameters + if (enc->codec_id == AV_CODEC_ID_AAC) // specs force these parameters return FLV_CODECID_AAC | FLV_SAMPLERATE_44100HZ | FLV_SAMPLESSIZE_16BIT | FLV_STEREO; - else if (enc->codec_id == CODEC_ID_SPEEX) { + else if (enc->codec_id == AV_CODEC_ID_SPEEX) { if (enc->sample_rate != 16000) { av_log(s, AV_LOG_ERROR, "flv only supports wideband (16kHz) Speex audio\n"); @@ -102,7 +102,7 @@ static int get_audio_flags(AVFormatContext *s, AVCodecContext *enc) case 16000: // nellymoser only case 8000: // nellymoser only case 5512: // not MP3 - if (enc->codec_id != CODEC_ID_MP3) { + if (enc->codec_id != AV_CODEC_ID_MP3) { flags |= FLV_SAMPLERATE_SPECIAL; break; } @@ -118,22 +118,22 @@ static int get_audio_flags(AVFormatContext *s, AVCodecContext *enc) flags |= FLV_STEREO; switch (enc->codec_id) { - case CODEC_ID_MP3: + case AV_CODEC_ID_MP3: flags |= FLV_CODECID_MP3 | FLV_SAMPLESSIZE_16BIT; break; - case CODEC_ID_PCM_U8: + case AV_CODEC_ID_PCM_U8: flags |= FLV_CODECID_PCM | FLV_SAMPLESSIZE_8BIT; break; - case CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S16BE: flags |= FLV_CODECID_PCM | FLV_SAMPLESSIZE_16BIT; break; - case CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16LE: flags |= FLV_CODECID_PCM_LE | FLV_SAMPLESSIZE_16BIT; break; - case CODEC_ID_ADPCM_SWF: + case AV_CODEC_ID_ADPCM_SWF: flags |= FLV_CODECID_ADPCM | FLV_SAMPLESSIZE_16BIT; break; - case CODEC_ID_NELLYMOSER: + case AV_CODEC_ID_NELLYMOSER: if (enc->sample_rate == 8000) flags |= FLV_CODECID_NELLYMOSER_8KHZ_MONO | FLV_SAMPLESSIZE_16BIT; else if (enc->sample_rate == 16000) @@ -141,10 +141,10 @@ static int get_audio_flags(AVFormatContext *s, AVCodecContext *enc) else flags |= FLV_CODECID_NELLYMOSER | FLV_SAMPLESSIZE_16BIT; break; - case CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_MULAW: flags = FLV_CODECID_PCM_MULAW | FLV_SAMPLERATE_SPECIAL | FLV_SAMPLESSIZE_16BIT; break; - case CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_ALAW: flags = FLV_CODECID_PCM_ALAW | FLV_SAMPLERATE_SPECIAL | FLV_SAMPLESSIZE_16BIT; break; case 0: @@ -223,7 +223,7 @@ static int flv_write_header(AVFormatContext *s) return AVERROR_INVALIDDATA; break; case AVMEDIA_TYPE_DATA: - if (enc->codec_id != CODEC_ID_TEXT) { + if (enc->codec_id != AV_CODEC_ID_TEXT) { av_log(s, AV_LOG_ERROR, "codec not compatible with flv\n"); return AVERROR_INVALIDDATA; } @@ -315,7 +315,7 @@ static int flv_write_header(AVFormatContext *s) put_amf_double(pb, audio_enc->sample_rate); put_amf_string(pb, "audiosamplesize"); - put_amf_double(pb, audio_enc->codec_id == CODEC_ID_PCM_U8 ? 8 : 16); + put_amf_double(pb, audio_enc->codec_id == AV_CODEC_ID_PCM_U8 ? 8 : 16); put_amf_string(pb, "stereo"); put_amf_bool(pb, audio_enc->channels == 2); @@ -372,7 +372,7 @@ static int flv_write_header(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVCodecContext *enc = s->streams[i]->codec; - if (enc->codec_id == CODEC_ID_AAC || enc->codec_id == CODEC_ID_H264 || enc->codec_id == CODEC_ID_MPEG4) { + if (enc->codec_id == AV_CODEC_ID_AAC || enc->codec_id == AV_CODEC_ID_H264 || enc->codec_id == AV_CODEC_ID_MPEG4) { int64_t pos; avio_w8(pb, enc->codec_type == AVMEDIA_TYPE_VIDEO ? FLV_TAG_TYPE_VIDEO : FLV_TAG_TYPE_AUDIO); @@ -381,7 +381,7 @@ static int flv_write_header(AVFormatContext *s) avio_w8(pb, 0); // ts ext avio_wb24(pb, 0); // streamid pos = avio_tell(pb); - if (enc->codec_id == CODEC_ID_AAC) { + if (enc->codec_id == AV_CODEC_ID_AAC) { avio_w8(pb, get_audio_flags(s, enc)); avio_w8(pb, 0); // AAC sequence header avio_write(pb, enc->extradata, enc->extradata_size); @@ -415,7 +415,7 @@ static int flv_write_trailer(AVFormatContext *s) AVCodecContext *enc = s->streams[i]->codec; FLVStreamContext *sc = s->streams[i]->priv_data; if (enc->codec_type == AVMEDIA_TYPE_VIDEO && - (enc->codec_id == CODEC_ID_H264 || enc->codec_id == CODEC_ID_MPEG4)) + (enc->codec_id == AV_CODEC_ID_H264 || enc->codec_id == AV_CODEC_ID_MPEG4)) put_avc_eos_tag(pb, sc->last_ts); } @@ -445,10 +445,10 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) // av_log(s, AV_LOG_DEBUG, "type:%d pts: %"PRId64" size:%d\n", // enc->codec_type, timestamp, size); - if (enc->codec_id == CODEC_ID_VP6 || enc->codec_id == CODEC_ID_VP6F || - enc->codec_id == CODEC_ID_VP6A || enc->codec_id == CODEC_ID_AAC) + if (enc->codec_id == AV_CODEC_ID_VP6 || enc->codec_id == AV_CODEC_ID_VP6F || + enc->codec_id == AV_CODEC_ID_VP6A || enc->codec_id == AV_CODEC_ID_AAC) flags_size = 2; - else if (enc->codec_id == CODEC_ID_H264 || enc->codec_id == CODEC_ID_MPEG4) + else if (enc->codec_id == AV_CODEC_ID_H264 || enc->codec_id == AV_CODEC_ID_MPEG4) flags_size = 5; else flags_size = 1; @@ -481,12 +481,12 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EINVAL); } - if (enc->codec_id == CODEC_ID_H264 || enc->codec_id == CODEC_ID_MPEG4) { + if (enc->codec_id == AV_CODEC_ID_H264 || enc->codec_id == AV_CODEC_ID_MPEG4) { /* check if extradata looks like mp4 formated */ if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0) return -1; - } else if (enc->codec_id == CODEC_ID_AAC && pkt->size > 2 && + } else if (enc->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 && (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) { av_log(s, AV_LOG_ERROR, "malformated aac bitstream, use -absf aac_adtstoasc\n"); return -1; @@ -504,7 +504,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) ts = pkt->dts + flv->delay; // add delay to force positive dts /* check Speex packet duration */ - if (enc->codec_id == CODEC_ID_SPEEX && ts - sc->last_ts > 160) + if (enc->codec_id == AV_CODEC_ID_SPEEX && ts - sc->last_ts > 160) av_log(s, AV_LOG_WARNING, "Warning: Speex stream has more than " "8 frames per packet. Adobe Flash " "Player cannot handle this!\n"); @@ -540,13 +540,13 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) avio_wb32(pb, data_size + 11); } else { avio_w8(pb,flags); - if (enc->codec_id == CODEC_ID_VP6) + if (enc->codec_id == AV_CODEC_ID_VP6) avio_w8(pb,0); - if (enc->codec_id == CODEC_ID_VP6F || enc->codec_id == CODEC_ID_VP6A) + if (enc->codec_id == AV_CODEC_ID_VP6F || enc->codec_id == AV_CODEC_ID_VP6A) avio_w8(pb, enc->extradata_size ? enc->extradata[0] : 0); - else if (enc->codec_id == CODEC_ID_AAC) + else if (enc->codec_id == AV_CODEC_ID_AAC) avio_w8(pb,1); // AAC raw - else if (enc->codec_id == CODEC_ID_H264 || enc->codec_id == CODEC_ID_MPEG4) { + else if (enc->codec_id == AV_CODEC_ID_H264 || enc->codec_id == AV_CODEC_ID_MPEG4) { avio_w8(pb,1); // AVC NALU avio_wb24(pb,pkt->pts - pkt->dts); } @@ -570,8 +570,8 @@ AVOutputFormat ff_flv_muxer = { .mime_type = "video/x-flv", .extensions = "flv", .priv_data_size = sizeof(FLVContext), - .audio_codec = CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_ADPCM_SWF, - .video_codec = CODEC_ID_FLV1, + .audio_codec = CONFIG_LIBMP3LAME ? AV_CODEC_ID_MP3 : AV_CODEC_ID_ADPCM_SWF, + .video_codec = AV_CODEC_ID_FLV1, .write_header = flv_write_header, .write_packet = flv_write_packet, .write_trailer = flv_write_trailer, diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index 78f7131a5d..b17c92284a 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -38,8 +38,8 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_framecrc_muxer = { .name = "framecrc", .long_name = NULL_IF_CONFIG_SMALL("framecrc testing"), - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_RAWVIDEO, .write_header = ff_framehash_write_header, .write_packet = framecrc_write_packet, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT, diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index fa8011cd28..7d97a4ba8d 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -39,7 +39,7 @@ static int g723_1_init(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_G723_1; + st->codec->codec_id = AV_CODEC_ID_G723_1; st->codec->channel_layout = AV_CH_LAYOUT_MONO; st->codec->channels = 1; st->codec->sample_rate = 8000; diff --git a/libavformat/g729dec.c b/libavformat/g729dec.c index d56da5cd7b..1a8e07d0ac 100644 --- a/libavformat/g729dec.c +++ b/libavformat/g729dec.c @@ -39,7 +39,7 @@ static int g729_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_G729; + st->codec->codec_id = AV_CODEC_ID_G729; st->codec->sample_rate = 8000; st->codec->channels = 1; diff --git a/libavformat/gif.c b/libavformat/gif.c index 9cc4c9a2f6..e2118fe175 100644 --- a/libavformat/gif.c +++ b/libavformat/gif.c @@ -372,8 +372,8 @@ AVOutputFormat ff_gif_muxer = { .mime_type = "image/gif", .extensions = "gif", .priv_data_size = sizeof(GIFContext), - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_RAWVIDEO, .write_header = gif_write_header, .write_packet = gif_write_packet, .write_trailer = gif_write_trailer, diff --git a/libavformat/gsmdec.c b/libavformat/gsmdec.c index f3be47f61a..3ba6d6920d 100644 --- a/libavformat/gsmdec.c +++ b/libavformat/gsmdec.c @@ -93,6 +93,6 @@ AVInputFormat ff_gsm_demuxer = { .read_packet = gsm_read_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "gsm", - .raw_codec_id = CODEC_ID_GSM, + .raw_codec_id = AV_CODEC_ID_GSM, .priv_class = &class, }; diff --git a/libavformat/gxf.c b/libavformat/gxf.c index ec82a7b209..9f000d0d16 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -111,34 +111,34 @@ static int get_sindex(AVFormatContext *s, int id, int format) { case 3: case 4: st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MJPEG; + st->codec->codec_id = AV_CODEC_ID_MJPEG; break; case 13: case 15: st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_DVVIDEO; + st->codec->codec_id = AV_CODEC_ID_DVVIDEO; break; case 14: case 16: st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_DVVIDEO; + st->codec->codec_id = AV_CODEC_ID_DVVIDEO; break; case 11: case 12: case 20: st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MPEG2VIDEO; + st->codec->codec_id = AV_CODEC_ID_MPEG2VIDEO; st->need_parsing = AVSTREAM_PARSE_HEADERS; //get keyframe flag etc. break; case 22: case 23: st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MPEG1VIDEO; + st->codec->codec_id = AV_CODEC_ID_MPEG1VIDEO; st->need_parsing = AVSTREAM_PARSE_HEADERS; //get keyframe flag etc. break; case 9: st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_PCM_S24LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S24LE; st->codec->channels = 1; st->codec->sample_rate = 48000; st->codec->bit_rate = 3 * 1 * 48000 * 8; @@ -147,7 +147,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) { break; case 10: st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_PCM_S16LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; st->codec->channels = 1; st->codec->sample_rate = 48000; st->codec->bit_rate = 2 * 1 * 48000 * 8; @@ -156,7 +156,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) { break; case 17: st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_AC3; + st->codec->codec_id = AV_CODEC_ID_AC3; st->codec->channels = 2; st->codec->sample_rate = 48000; break; @@ -165,11 +165,11 @@ static int get_sindex(AVFormatContext *s, int id, int format) { case 8: case 24: st->codec->codec_type = AVMEDIA_TYPE_DATA; - st->codec->codec_id = CODEC_ID_NONE; + st->codec->codec_id = AV_CODEC_ID_NONE; break; default: st->codec->codec_type = AVMEDIA_TYPE_UNKNOWN; - st->codec->codec_id = CODEC_ID_NONE; + st->codec->codec_id = AV_CODEC_ID_NONE; break; } return s->nb_streams - 1; @@ -503,8 +503,8 @@ static int gxf_packet(AVFormatContext *s, AVPacket *pkt) { avio_rb32(pb); // "timeline" field number avio_r8(pb); // flags avio_r8(pb); // reserved - if (st->codec->codec_id == CODEC_ID_PCM_S24LE || - st->codec->codec_id == CODEC_ID_PCM_S16LE) { + if (st->codec->codec_id == AV_CODEC_ID_PCM_S24LE || + st->codec->codec_id == AV_CODEC_ID_PCM_S16LE) { int first = field_info >> 16; int last = field_info & 0xffff; // last is exclusive int bps = av_get_bits_per_sample(st->codec->codec_id)>>3; @@ -522,7 +522,7 @@ static int gxf_packet(AVFormatContext *s, AVPacket *pkt) { pkt->dts = field_nr; //set duration manually for DV or else lavf misdetects the frame rate - if (st->codec->codec_id == CODEC_ID_DVVIDEO) + if (st->codec->codec_id == AV_CODEC_ID_DVVIDEO) pkt->duration = si->fields_per_frame; return ret; diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index c1a2bb599c..7c6b4cc6e7 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -97,22 +97,22 @@ static const struct { }; static const AVCodecTag gxf_media_types[] = { - { CODEC_ID_MJPEG , 3 }, /* NTSC */ - { CODEC_ID_MJPEG , 4 }, /* PAL */ - { CODEC_ID_PCM_S24LE , 9 }, - { CODEC_ID_PCM_S16LE , 10 }, - { CODEC_ID_MPEG2VIDEO, 11 }, /* NTSC */ - { CODEC_ID_MPEG2VIDEO, 12 }, /* PAL */ - { CODEC_ID_DVVIDEO , 13 }, /* NTSC */ - { CODEC_ID_DVVIDEO , 14 }, /* PAL */ - { CODEC_ID_DVVIDEO , 15 }, /* 50M NTSC */ - { CODEC_ID_DVVIDEO , 16 }, /* 50M PAL */ - { CODEC_ID_AC3 , 17 }, - //{ CODEC_ID_NONE, , 18 }, /* Non compressed 24 bit audio */ - { CODEC_ID_MPEG2VIDEO, 20 }, /* MPEG HD */ - { CODEC_ID_MPEG1VIDEO, 22 }, /* NTSC */ - { CODEC_ID_MPEG1VIDEO, 23 }, /* PAL */ - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_MJPEG , 3 }, /* NTSC */ + { AV_CODEC_ID_MJPEG , 4 }, /* PAL */ + { AV_CODEC_ID_PCM_S24LE , 9 }, + { AV_CODEC_ID_PCM_S16LE , 10 }, + { AV_CODEC_ID_MPEG2VIDEO, 11 }, /* NTSC */ + { AV_CODEC_ID_MPEG2VIDEO, 12 }, /* PAL */ + { AV_CODEC_ID_DVVIDEO , 13 }, /* NTSC */ + { AV_CODEC_ID_DVVIDEO , 14 }, /* PAL */ + { AV_CODEC_ID_DVVIDEO , 15 }, /* 50M NTSC */ + { AV_CODEC_ID_DVVIDEO , 16 }, /* 50M PAL */ + { AV_CODEC_ID_AC3 , 17 }, + //{ AV_CODEC_ID_NONE, , 18 }, /* Non compressed 24 bit audio */ + { AV_CODEC_ID_MPEG2VIDEO, 20 }, /* MPEG HD */ + { AV_CODEC_ID_MPEG1VIDEO, 22 }, /* NTSC */ + { AV_CODEC_ID_MPEG1VIDEO, 23 }, /* PAL */ + { AV_CODEC_ID_NONE, 0 }, }; #define SERVER_PATH "EXT:/PDR/default/" @@ -510,9 +510,9 @@ static int gxf_write_umf_media_mpeg(AVIOContext *pb, AVStream *st) avio_wl32(pb, 1); /* I picture per GOP */ avio_wl32(pb, sc->p_per_gop); avio_wl32(pb, sc->b_per_i_or_p); - if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO) + if (st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO) avio_wl32(pb, 2); - else if (st->codec->codec_id == CODEC_ID_MPEG1VIDEO) + else if (st->codec->codec_id == AV_CODEC_ID_MPEG1VIDEO) avio_wl32(pb, 1); else avio_wl32(pb, 0); @@ -595,14 +595,14 @@ static int gxf_write_umf_media_description(AVFormatContext *s) else { AVStream *st = s->streams[i]; switch (st->codec->codec_id) { - case CODEC_ID_MPEG1VIDEO: - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG1VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: gxf_write_umf_media_mpeg(pb, st); break; - case CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16LE: gxf_write_umf_media_audio(pb, sc); break; - case CODEC_ID_DVVIDEO: + case AV_CODEC_ID_DVVIDEO: gxf_write_umf_media_dv(pb, sc); break; } @@ -697,7 +697,7 @@ static int gxf_write_header(AVFormatContext *s) sc->media_type = ff_codec_get_tag(gxf_media_types, st->codec->codec_id); if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { - if (st->codec->codec_id != CODEC_ID_PCM_S16LE) { + if (st->codec->codec_id != AV_CODEC_ID_PCM_S16LE) { av_log(s, AV_LOG_ERROR, "only 16 BIT PCM LE allowed for now\n"); return -1; } @@ -752,24 +752,24 @@ static int gxf_write_header(AVFormatContext *s) vsc = sc; switch (st->codec->codec_id) { - case CODEC_ID_MJPEG: + case AV_CODEC_ID_MJPEG: sc->track_type = 1; gxf->flags |= 0x00004000; media_info = 'J'; break; - case CODEC_ID_MPEG1VIDEO: + case AV_CODEC_ID_MPEG1VIDEO: sc->track_type = 9; gxf->mpeg_tracks++; media_info = 'L'; break; - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: sc->first_gop_closed = -1; sc->track_type = 4; gxf->mpeg_tracks++; gxf->flags |= 0x00008000; media_info = 'M'; break; - case CODEC_ID_DVVIDEO: + case AV_CODEC_ID_DVVIDEO: if (st->codec->pix_fmt == PIX_FMT_YUV422P) { sc->media_type += 2; sc->track_type = 6; @@ -885,7 +885,7 @@ static int gxf_write_media_preamble(AVFormatContext *s, AVPacket *pkt, int size) if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { avio_wb16(pb, 0); avio_wb16(pb, size / 2); - } else if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO) { + } else if (st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO) { int frame_type = gxf_parse_mpeg_frame(sc, pkt->data, pkt->size); if (frame_type == AV_PICTURE_TYPE_I) { avio_w8(pb, 0x0d); @@ -898,7 +898,7 @@ static int gxf_write_media_preamble(AVFormatContext *s, AVPacket *pkt, int size) sc->pframes++; } avio_wb24(pb, size); - } else if (st->codec->codec_id == CODEC_ID_DVVIDEO) { + } else if (st->codec->codec_id == AV_CODEC_ID_DVVIDEO) { avio_w8(pb, size / 4096); avio_wb24(pb, 0); } else @@ -919,7 +919,7 @@ static int gxf_write_packet(AVFormatContext *s, AVPacket *pkt) int packet_start_offset = avio_tell(pb) / 1024; gxf_write_packet_header(pb, PKT_MEDIA); - if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO && pkt->size % 4) /* MPEG-2 frames must be padded */ + if (st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO && pkt->size % 4) /* MPEG-2 frames must be padded */ padding = 4 - pkt->size % 4; else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) padding = GXF_AUDIO_PACKET_SIZE - pkt->size; @@ -989,8 +989,8 @@ AVOutputFormat ff_gxf_muxer = { .long_name = NULL_IF_CONFIG_SMALL("GXF (General eXchange Format)"), .extensions = "gxf", .priv_data_size = sizeof(GXFContext), - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_MPEG2VIDEO, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_header = gxf_write_header, .write_packet = gxf_write_packet, .write_trailer = gxf_write_trailer, diff --git a/libavformat/h261dec.c b/libavformat/h261dec.c index 354a7c78c1..1b254d613a 100644 --- a/libavformat/h261dec.c +++ b/libavformat/h261dec.c @@ -62,4 +62,4 @@ static int h261_probe(AVProbeData *p) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(h261, "raw H.261", h261_probe, "h261", CODEC_ID_H261) +FF_DEF_RAWVIDEO_DEMUXER(h261, "raw H.261", h261_probe, "h261", AV_CODEC_ID_H261) diff --git a/libavformat/h263dec.c b/libavformat/h263dec.c index b07e9782b8..8afacad8b7 100644 --- a/libavformat/h263dec.c +++ b/libavformat/h263dec.c @@ -64,4 +64,4 @@ static int h263_probe(AVProbeData *p) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(h263, "raw H.263", h263_probe, NULL, CODEC_ID_H263) +FF_DEF_RAWVIDEO_DEMUXER(h263, "raw H.263", h263_probe, NULL, AV_CODEC_ID_H263) diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c index 96f93e258e..7e525e0bc9 100644 --- a/libavformat/h264dec.c +++ b/libavformat/h264dec.c @@ -67,4 +67,4 @@ static int h264_probe(AVProbeData *p) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(h264 , "raw H.264 video", h264_probe, "h26l,h264,264", CODEC_ID_H264) +FF_DEF_RAWVIDEO_DEMUXER(h264 , "raw H.264 video", h264_probe, "h26l,h264,264", AV_CODEC_ID_H264) diff --git a/libavformat/icodec.c b/libavformat/icodec.c index 81ad0b0824..37909aab72 100644 --- a/libavformat/icodec.c +++ b/libavformat/icodec.c @@ -90,14 +90,14 @@ static int read_header(AVFormatContext *s) switch(avio_rl32(pb)) { case MKTAG(0x89, 'P', 'N', 'G'): - st->codec->codec_id = CODEC_ID_PNG; + st->codec->codec_id = AV_CODEC_ID_PNG; st->codec->width = 0; st->codec->height = 0; break; case 40: if (ico->images[i].size < 40) return AVERROR_INVALIDDATA; - st->codec->codec_id = CODEC_ID_BMP; + st->codec->codec_id = AV_CODEC_ID_BMP; tmp = avio_rl32(pb); if (tmp) st->codec->width = tmp; @@ -130,7 +130,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) if ((ret = avio_seek(pb, image->offset, SEEK_SET)) < 0) return ret; - if (s->streams[ico->current_image]->codec->codec_id == CODEC_ID_PNG) { + if (s->streams[ico->current_image]->codec->codec_id == AV_CODEC_ID_PNG) { if ((ret = av_get_packet(pb, pkt, image->size)) < 0) return ret; } else { diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 9ccd8f2d07..97de41efad 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -125,13 +125,13 @@ const char *ff_id3v2_picture_types[21] = { }; const CodecMime ff_id3v2_mime_tags[] = { - {"image/gif" , CODEC_ID_GIF}, - {"image/jpeg", CODEC_ID_MJPEG}, - {"image/jpg", CODEC_ID_MJPEG}, - {"image/png" , CODEC_ID_PNG}, - {"image/tiff", CODEC_ID_TIFF}, - {"image/bmp", CODEC_ID_BMP}, - {"", CODEC_ID_NONE}, + {"image/gif" , AV_CODEC_ID_GIF}, + {"image/jpeg", AV_CODEC_ID_MJPEG}, + {"image/jpg", AV_CODEC_ID_MJPEG}, + {"image/png" , AV_CODEC_ID_PNG}, + {"image/tiff", AV_CODEC_ID_TIFF}, + {"image/bmp", AV_CODEC_ID_BMP}, + {"", AV_CODEC_ID_NONE}, }; int ff_id3v2_match(const uint8_t *buf, const char * magic) @@ -441,7 +441,7 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag int enc, pic_type; char mimetype[64]; const CodecMime *mime = ff_id3v2_mime_tags; - enum CodecID id = CODEC_ID_NONE; + enum AVCodecID id = AV_CODEC_ID_NONE; ID3v2ExtraMetaAPIC *apic = NULL; ID3v2ExtraMeta *new_extra = NULL; int64_t end = avio_tell(pb) + taglen; @@ -459,14 +459,14 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag /* mimetype */ taglen -= avio_get_str(pb, taglen, mimetype, sizeof(mimetype)); - while (mime->id != CODEC_ID_NONE) { + while (mime->id != AV_CODEC_ID_NONE) { if (!strncmp(mime->str, mimetype, sizeof(mimetype))) { id = mime->id; break; } mime++; } - if (id == CODEC_ID_NONE) { + if (id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_WARNING, "Unknown attached picture mimetype: %s, skipping.\n", mimetype); goto fail; } diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h index 5c12a47b32..f7270106a1 100644 --- a/libavformat/id3v2.h +++ b/libavformat/id3v2.h @@ -71,7 +71,7 @@ typedef struct ID3v2ExtraMetaAPIC { int len; const char *type; uint8_t *description; - enum CodecID id; + enum AVCodecID id; } ID3v2ExtraMetaAPIC; /** diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c index 1caadd6335..a10d679946 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2enc.c @@ -210,7 +210,7 @@ int ff_id3v2_write_apic(AVFormatContext *s, ID3v2EncContext *id3, AVPacket *pkt) int i, len, type = 0; /* get the mimetype*/ - while (mime->id != CODEC_ID_NONE) { + while (mime->id != AV_CODEC_ID_NONE) { if (mime->id == st->codec->codec_id) { mimetype = mime->str; break; diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 81432c187f..f1df00244f 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -159,7 +159,7 @@ static int idcin_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 33, 1, IDCIN_FPS); idcin->video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_IDCIN; + st->codec->codec_id = AV_CODEC_ID_IDCIN; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = width; st->codec->height = height; @@ -187,9 +187,9 @@ static int idcin_read_header(AVFormatContext *s) st->codec->bit_rate = sample_rate * bytes_per_sample * 8 * channels; st->codec->block_align = bytes_per_sample * channels; if (bytes_per_sample == 1) - st->codec->codec_id = CODEC_ID_PCM_U8; + st->codec->codec_id = AV_CODEC_ID_PCM_U8; else - st->codec->codec_id = CODEC_ID_PCM_S16LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; if (sample_rate % 14 != 0) { idcin->audio_chunk_size1 = (sample_rate / 14) * diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c index d832e354a3..3b17ff420c 100644 --- a/libavformat/idroqdec.c +++ b/libavformat/idroqdec.c @@ -130,7 +130,7 @@ static int roq_read_packet(AVFormatContext *s, avpriv_set_pts_info(st, 63, 1, roq->frame_rate); roq->video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_ROQ; + st->codec->codec_id = AV_CODEC_ID_ROQ; st->codec->codec_tag = 0; /* no fourcc */ if (avio_read(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != RoQ_CHUNK_PREAMBLE_SIZE) @@ -176,7 +176,7 @@ static int roq_read_packet(AVFormatContext *s, avpriv_set_pts_info(st, 32, 1, RoQ_AUDIO_SAMPLE_RATE); roq->audio_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ROQ_DPCM; + st->codec->codec_id = AV_CODEC_ID_ROQ_DPCM; st->codec->codec_tag = 0; /* no tag */ st->codec->channels = roq->audio_channels = chunk_type == RoQ_SOUND_STEREO ? 2 : 1; st->codec->sample_rate = RoQ_AUDIO_SAMPLE_RATE; diff --git a/libavformat/idroqenc.c b/libavformat/idroqenc.c index 58bf7e98ad..50c428046b 100644 --- a/libavformat/idroqenc.c +++ b/libavformat/idroqenc.c @@ -39,8 +39,8 @@ AVOutputFormat ff_roq_muxer = { .name = "roq", .long_name = NULL_IF_CONFIG_SMALL("raw id RoQ"), .extensions = "roq", - .audio_codec = CODEC_ID_ROQ_DPCM, - .video_codec = CODEC_ID_ROQ, + .audio_codec = AV_CODEC_ID_ROQ_DPCM, + .video_codec = AV_CODEC_ID_ROQ, .write_header = roq_write_header, .write_packet = ff_raw_write_packet, }; diff --git a/libavformat/iff.c b/libavformat/iff.c index 546836a3fd..49303bf3db 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -287,13 +287,13 @@ static int iff_read_header(AVFormatContext *s) switch (iff->svx8_compression) { case COMP_NONE: - st->codec->codec_id = CODEC_ID_PCM_S8_PLANAR; + st->codec->codec_id = AV_CODEC_ID_PCM_S8_PLANAR; break; case COMP_FIB: - st->codec->codec_id = CODEC_ID_8SVX_FIB; + st->codec->codec_id = AV_CODEC_ID_8SVX_FIB; break; case COMP_EXP: - st->codec->codec_id = CODEC_ID_8SVX_EXP; + st->codec->codec_id = AV_CODEC_ID_8SVX_EXP; break; default: av_log(s, AV_LOG_ERROR, @@ -333,10 +333,10 @@ static int iff_read_header(AVFormatContext *s) switch (iff->bitmap_compression) { case BITMAP_RAW: - st->codec->codec_id = CODEC_ID_IFF_ILBM; + st->codec->codec_id = AV_CODEC_ID_IFF_ILBM; break; case BITMAP_BYTERUN1: - st->codec->codec_id = CODEC_ID_IFF_BYTERUN1; + st->codec->codec_id = AV_CODEC_ID_IFF_BYTERUN1; break; default: av_log(s, AV_LOG_ERROR, diff --git a/libavformat/ilbc.c b/libavformat/ilbc.c index 11959f4028..7a23b2f442 100644 --- a/libavformat/ilbc.c +++ b/libavformat/ilbc.c @@ -36,7 +36,7 @@ static int ilbc_write_header(AVFormatContext *s) } enc = s->streams[0]->codec; - if (enc->codec_id != CODEC_ID_ILBC) { + if (enc->codec_id != AV_CODEC_ID_ILBC) { av_log(s, AV_LOG_ERROR, "Unsupported codec\n"); return AVERROR(EINVAL); } @@ -80,7 +80,7 @@ static int ilbc_read_header(AVFormatContext *s) st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); - st->codec->codec_id = CODEC_ID_ILBC; + st->codec->codec_id = AV_CODEC_ID_ILBC; st->codec->sample_rate = 8000; st->codec->channels = 1; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; @@ -134,7 +134,7 @@ AVOutputFormat ff_ilbc_muxer = { .long_name = NULL_IF_CONFIG_SMALL("iLBC storage"), .mime_type = "audio/iLBC", .extensions = "lbc", - .audio_codec = CODEC_ID_ILBC, + .audio_codec = AV_CODEC_ID_ILBC, .write_header = ilbc_write_header, .write_packet = ilbc_write_packet, .flags = AVFMT_NOTIMESTAMPS, diff --git a/libavformat/img2.c b/libavformat/img2.c index 1fb9c3bcb8..ed4b39afe0 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -24,64 +24,64 @@ #include "internal.h" typedef struct { - enum CodecID id; + enum AVCodecID id; const char *str; } IdStrMap; static const IdStrMap img_tags[] = { - { CODEC_ID_MJPEG , "jpeg"}, - { CODEC_ID_MJPEG , "jpg"}, - { CODEC_ID_MJPEG , "jps"}, - { CODEC_ID_LJPEG , "ljpg"}, - { CODEC_ID_JPEGLS , "jls"}, - { CODEC_ID_PNG , "png"}, - { CODEC_ID_PNG , "pns"}, - { CODEC_ID_PNG , "mng"}, - { CODEC_ID_PPM , "ppm"}, - { CODEC_ID_PPM , "pnm"}, - { CODEC_ID_PGM , "pgm"}, - { CODEC_ID_PGMYUV , "pgmyuv"}, - { CODEC_ID_PBM , "pbm"}, - { CODEC_ID_PAM , "pam"}, - { CODEC_ID_MPEG1VIDEO, "mpg1-img"}, - { CODEC_ID_MPEG2VIDEO, "mpg2-img"}, - { CODEC_ID_MPEG4 , "mpg4-img"}, - { CODEC_ID_FFV1 , "ffv1-img"}, - { CODEC_ID_RAWVIDEO , "y"}, - { CODEC_ID_RAWVIDEO , "raw"}, - { CODEC_ID_BMP , "bmp"}, - { CODEC_ID_GIF , "gif"}, - { CODEC_ID_TARGA , "tga"}, - { CODEC_ID_TIFF , "tiff"}, - { CODEC_ID_TIFF , "tif"}, - { CODEC_ID_SGI , "sgi"}, - { CODEC_ID_PTX , "ptx"}, - { CODEC_ID_PCX , "pcx"}, - { CODEC_ID_SUNRAST , "sun"}, - { CODEC_ID_SUNRAST , "ras"}, - { CODEC_ID_SUNRAST , "rs"}, - { CODEC_ID_SUNRAST , "im1"}, - { CODEC_ID_SUNRAST , "im8"}, - { CODEC_ID_SUNRAST , "im24"}, - { CODEC_ID_SUNRAST , "im32"}, - { CODEC_ID_SUNRAST , "sunras"}, - { CODEC_ID_JPEG2000 , "j2c"}, - { CODEC_ID_JPEG2000 , "j2k"}, - { CODEC_ID_JPEG2000 , "jp2"}, - { CODEC_ID_JPEG2000 , "jpc"}, - { CODEC_ID_DPX , "dpx"}, - { CODEC_ID_EXR , "exr"}, - { CODEC_ID_PICTOR , "pic"}, - { CODEC_ID_V210X , "yuv10"}, - { CODEC_ID_XBM , "xbm"}, - { CODEC_ID_XWD , "xwd"}, - { CODEC_ID_NONE , NULL} + { AV_CODEC_ID_MJPEG , "jpeg"}, + { AV_CODEC_ID_MJPEG , "jpg"}, + { AV_CODEC_ID_MJPEG , "jps"}, + { AV_CODEC_ID_LJPEG , "ljpg"}, + { AV_CODEC_ID_JPEGLS , "jls"}, + { AV_CODEC_ID_PNG , "png"}, + { AV_CODEC_ID_PNG , "pns"}, + { AV_CODEC_ID_PNG , "mng"}, + { AV_CODEC_ID_PPM , "ppm"}, + { AV_CODEC_ID_PPM , "pnm"}, + { AV_CODEC_ID_PGM , "pgm"}, + { AV_CODEC_ID_PGMYUV , "pgmyuv"}, + { AV_CODEC_ID_PBM , "pbm"}, + { AV_CODEC_ID_PAM , "pam"}, + { AV_CODEC_ID_MPEG1VIDEO, "mpg1-img"}, + { AV_CODEC_ID_MPEG2VIDEO, "mpg2-img"}, + { AV_CODEC_ID_MPEG4 , "mpg4-img"}, + { AV_CODEC_ID_FFV1 , "ffv1-img"}, + { AV_CODEC_ID_RAWVIDEO , "y"}, + { AV_CODEC_ID_RAWVIDEO , "raw"}, + { AV_CODEC_ID_BMP , "bmp"}, + { AV_CODEC_ID_GIF , "gif"}, + { AV_CODEC_ID_TARGA , "tga"}, + { AV_CODEC_ID_TIFF , "tiff"}, + { AV_CODEC_ID_TIFF , "tif"}, + { AV_CODEC_ID_SGI , "sgi"}, + { AV_CODEC_ID_PTX , "ptx"}, + { AV_CODEC_ID_PCX , "pcx"}, + { AV_CODEC_ID_SUNRAST , "sun"}, + { AV_CODEC_ID_SUNRAST , "ras"}, + { AV_CODEC_ID_SUNRAST , "rs"}, + { AV_CODEC_ID_SUNRAST , "im1"}, + { AV_CODEC_ID_SUNRAST , "im8"}, + { AV_CODEC_ID_SUNRAST , "im24"}, + { AV_CODEC_ID_SUNRAST , "im32"}, + { AV_CODEC_ID_SUNRAST , "sunras"}, + { AV_CODEC_ID_JPEG2000 , "j2c"}, + { AV_CODEC_ID_JPEG2000 , "j2k"}, + { AV_CODEC_ID_JPEG2000 , "jp2"}, + { AV_CODEC_ID_JPEG2000 , "jpc"}, + { AV_CODEC_ID_DPX , "dpx"}, + { AV_CODEC_ID_EXR , "exr"}, + { AV_CODEC_ID_PICTOR , "pic"}, + { AV_CODEC_ID_V210X , "yuv10"}, + { AV_CODEC_ID_XBM , "xbm"}, + { AV_CODEC_ID_XWD , "xwd"}, + { AV_CODEC_ID_NONE , NULL} }; -static enum CodecID av_str2id(const IdStrMap *tags, const char *str) +static enum AVCodecID av_str2id(const IdStrMap *tags, const char *str) { str= strrchr(str, '.'); - if(!str) return CODEC_ID_NONE; + if(!str) return AV_CODEC_ID_NONE; str++; while (tags->id) { @@ -90,10 +90,10 @@ static enum CodecID av_str2id(const IdStrMap *tags, const char *str) tags++; } - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } -enum CodecID ff_guess_image2_codec(const char *filename) +enum AVCodecID ff_guess_image2_codec(const char *filename) { return av_str2id(img_tags, filename); } diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 0443b1a745..b87b5d5b1a 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -288,8 +288,8 @@ static int read_header(AVFormatContext *s1) s->split_planes = str && !av_strcasecmp(str + 1, "y"); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = ff_guess_image2_codec(s->path); - if (st->codec->codec_id == CODEC_ID_LJPEG) - st->codec->codec_id = CODEC_ID_MJPEG; + if (st->codec->codec_id == AV_CODEC_ID_LJPEG) + st->codec->codec_id = AV_CODEC_ID_MJPEG; } if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO && pix_fmt != PIX_FMT_NONE) st->codec->pix_fmt = pix_fmt; @@ -338,7 +338,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt) filename[ strlen(filename) - 1 ]= 'U' + i; } - if(codec->codec_id == CODEC_ID_RAWVIDEO && !codec->width) + if(codec->codec_id == AV_CODEC_ID_RAWVIDEO && !codec->width) infer_size(&codec->width, &codec->height, size[0]); } else { f[0] = s1->pb; diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 58b4655139..d162cef196 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -97,7 +97,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) avio_close(pb[1]); avio_close(pb[2]); }else{ - if(ff_guess_image2_codec(s->filename) == CODEC_ID_JPEG2000){ + if(ff_guess_image2_codec(s->filename) == AV_CODEC_ID_JPEG2000){ AVStream *st = s->streams[0]; if(st->codec->extradata_size > 8 && AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){ @@ -156,7 +156,7 @@ AVOutputFormat ff_image2_muxer = { "ppm,sgi,tga,tif,tiff,jp2,j2c,xwd,sun,ras,rs,im1,im8,im24," "sunras,xbm", .priv_data_size = sizeof(VideoMuxData), - .video_codec = CODEC_ID_MJPEG, + .video_codec = AV_CODEC_ID_MJPEG, .write_header = write_header, .write_packet = write_packet, .flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS | AVFMT_NOFILE, @@ -168,7 +168,7 @@ AVOutputFormat ff_image2pipe_muxer = { .name = "image2pipe", .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .priv_data_size = sizeof(VideoMuxData), - .video_codec = CODEC_ID_MJPEG, + .video_codec = AV_CODEC_ID_MJPEG, .write_header = write_header, .write_packet = write_packet, .flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS diff --git a/libavformat/ingenientdec.c b/libavformat/ingenientdec.c index f595a7e87f..94c549c711 100644 --- a/libavformat/ingenientdec.c +++ b/libavformat/ingenientdec.c @@ -61,6 +61,6 @@ AVInputFormat ff_ingenient_demuxer = { .read_packet = ingenient_read_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "cgi", // FIXME - .raw_codec_id = CODEC_ID_MJPEG, + .raw_codec_id = AV_CODEC_ID_MJPEG, .priv_class = &ingenient_demuxer_class, }; diff --git a/libavformat/internal.h b/libavformat/internal.h index 6007ecfead..56bf2b00bc 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -33,13 +33,13 @@ #endif typedef struct AVCodecTag { - enum CodecID id; + enum AVCodecID id; unsigned int tag; } AVCodecTag; typedef struct CodecMime{ char str[32]; - enum CodecID id; + enum AVCodecID id; } CodecMime; #ifdef __GNUC__ @@ -250,7 +250,7 @@ void ff_reduce_index(AVFormatContext *s, int stream_index); void ff_make_absolute_url(char *buf, int size, const char *base, const char *rel); -enum CodecID ff_guess_image2_codec(const char *filename); +enum AVCodecID ff_guess_image2_codec(const char *filename); /** * Convert a date string in ISO8601 format to Unix timestamp. diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 4886b8260b..748f4a4467 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -94,7 +94,7 @@ typedef struct IPMVEContext { unsigned int audio_bits; unsigned int audio_channels; unsigned int audio_sample_rate; - enum CodecID audio_type; + enum AVCodecID audio_type; unsigned int audio_frame_count; int video_stream_index; @@ -117,14 +117,14 @@ static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb, int chunk_type; if (s->audio_chunk_offset && s->audio_channels && s->audio_bits) { - if (s->audio_type == CODEC_ID_NONE) { + if (s->audio_type == AV_CODEC_ID_NONE) { av_log(NULL, AV_LOG_ERROR, "Can not read audio packet before" "audio codec is known\n"); return CHUNK_BAD; } /* adjust for PCM audio by skipping chunk header */ - if (s->audio_type != CODEC_ID_INTERPLAY_DPCM) { + if (s->audio_type != AV_CODEC_ID_INTERPLAY_DPCM) { s->audio_chunk_offset += 6; s->audio_chunk_size -= 6; } @@ -139,7 +139,7 @@ static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb, pkt->pts = s->audio_frame_count; /* audio frame maintenance */ - if (s->audio_type != CODEC_ID_INTERPLAY_DPCM) + if (s->audio_type != AV_CODEC_ID_INTERPLAY_DPCM) s->audio_frame_count += (s->audio_chunk_size / s->audio_channels / (s->audio_bits / 8)); else @@ -356,15 +356,15 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, s->audio_bits = (((audio_flags >> 1) & 1) + 1) * 8; /* bit 2 indicates compressed audio in version 1 opcode */ if ((opcode_version == 1) && (audio_flags & 0x4)) - s->audio_type = CODEC_ID_INTERPLAY_DPCM; + s->audio_type = AV_CODEC_ID_INTERPLAY_DPCM; else if (s->audio_bits == 16) - s->audio_type = CODEC_ID_PCM_S16LE; + s->audio_type = AV_CODEC_ID_PCM_S16LE; else - s->audio_type = CODEC_ID_PCM_U8; + s->audio_type = AV_CODEC_ID_PCM_U8; av_dlog(NULL, "audio: %d bits, %d Hz, %s, %s format\n", s->audio_bits, s->audio_sample_rate, (s->audio_channels == 2) ? "stereo" : "mono", - (s->audio_type == CODEC_ID_INTERPLAY_DPCM) ? + (s->audio_type == AV_CODEC_ID_INTERPLAY_DPCM) ? "Interplay audio" : "PCM"); break; @@ -578,7 +578,7 @@ static int ipmovie_read_header(AVFormatContext *s) avio_seek(pb, -CHUNK_PREAMBLE_SIZE, SEEK_CUR); if (chunk_type == CHUNK_VIDEO) - ipmovie->audio_type = CODEC_ID_NONE; /* no audio */ + ipmovie->audio_type = AV_CODEC_ID_NONE; /* no audio */ else if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_AUDIO) return AVERROR_INVALIDDATA; @@ -589,7 +589,7 @@ static int ipmovie_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 63, 1, 1000000); ipmovie->video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_INTERPLAY_VIDEO; + st->codec->codec_id = AV_CODEC_ID_INTERPLAY_VIDEO; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = ipmovie->video_width; st->codec->height = ipmovie->video_height; @@ -609,7 +609,7 @@ static int ipmovie_read_header(AVFormatContext *s) st->codec->bits_per_coded_sample = ipmovie->audio_bits; st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample; - if (st->codec->codec_id == CODEC_ID_INTERPLAY_DPCM) + if (st->codec->codec_id == AV_CODEC_ID_INTERPLAY_DPCM) st->codec->bit_rate /= 2; st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; } diff --git a/libavformat/isom.c b/libavformat/isom.c index c110b7f6fa..caa4d17a58 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -33,273 +33,273 @@ /* http://www.mp4ra.org */ /* ordered by muxing preference */ const AVCodecTag ff_mp4_obj_type[] = { - { CODEC_ID_MOV_TEXT , 0x08 }, - { CODEC_ID_MPEG4 , 0x20 }, - { CODEC_ID_H264 , 0x21 }, - { CODEC_ID_AAC , 0x40 }, - { CODEC_ID_MP4ALS , 0x40 }, /* 14496-3 ALS */ - { CODEC_ID_MPEG2VIDEO, 0x61 }, /* MPEG2 Main */ - { CODEC_ID_MPEG2VIDEO, 0x60 }, /* MPEG2 Simple */ - { CODEC_ID_MPEG2VIDEO, 0x62 }, /* MPEG2 SNR */ - { CODEC_ID_MPEG2VIDEO, 0x63 }, /* MPEG2 Spatial */ - { CODEC_ID_MPEG2VIDEO, 0x64 }, /* MPEG2 High */ - { CODEC_ID_MPEG2VIDEO, 0x65 }, /* MPEG2 422 */ - { CODEC_ID_AAC , 0x66 }, /* MPEG2 AAC Main */ - { CODEC_ID_AAC , 0x67 }, /* MPEG2 AAC Low */ - { CODEC_ID_AAC , 0x68 }, /* MPEG2 AAC SSR */ - { CODEC_ID_MP3 , 0x69 }, /* 13818-3 */ - { CODEC_ID_MP2 , 0x69 }, /* 11172-3 */ - { CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */ - { CODEC_ID_MP3 , 0x6B }, /* 11172-3 */ - { CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */ - { CODEC_ID_PNG , 0x6D }, - { CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */ - { CODEC_ID_VC1 , 0xA3 }, - { CODEC_ID_DIRAC , 0xA4 }, - { CODEC_ID_AC3 , 0xA5 }, - { CODEC_ID_DTS , 0xA9 }, /* mp4ra.org */ - { CODEC_ID_VORBIS , 0xDD }, /* non standard, gpac uses it */ - { CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */ - { CODEC_ID_QCELP , 0xE1 }, - { CODEC_ID_MPEG4SYSTEMS, 0x01 }, - { CODEC_ID_MPEG4SYSTEMS, 0x02 }, - { CODEC_ID_NONE , 0 }, + { AV_CODEC_ID_MOV_TEXT , 0x08 }, + { AV_CODEC_ID_MPEG4 , 0x20 }, + { AV_CODEC_ID_H264 , 0x21 }, + { AV_CODEC_ID_AAC , 0x40 }, + { AV_CODEC_ID_MP4ALS , 0x40 }, /* 14496-3 ALS */ + { AV_CODEC_ID_MPEG2VIDEO , 0x61 }, /* MPEG2 Main */ + { AV_CODEC_ID_MPEG2VIDEO , 0x60 }, /* MPEG2 Simple */ + { AV_CODEC_ID_MPEG2VIDEO , 0x62 }, /* MPEG2 SNR */ + { AV_CODEC_ID_MPEG2VIDEO , 0x63 }, /* MPEG2 Spatial */ + { AV_CODEC_ID_MPEG2VIDEO , 0x64 }, /* MPEG2 High */ + { AV_CODEC_ID_MPEG2VIDEO , 0x65 }, /* MPEG2 422 */ + { AV_CODEC_ID_AAC , 0x66 }, /* MPEG2 AAC Main */ + { AV_CODEC_ID_AAC , 0x67 }, /* MPEG2 AAC Low */ + { AV_CODEC_ID_AAC , 0x68 }, /* MPEG2 AAC SSR */ + { AV_CODEC_ID_MP3 , 0x69 }, /* 13818-3 */ + { AV_CODEC_ID_MP2 , 0x69 }, /* 11172-3 */ + { AV_CODEC_ID_MPEG1VIDEO , 0x6A }, /* 11172-2 */ + { AV_CODEC_ID_MP3 , 0x6B }, /* 11172-3 */ + { AV_CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */ + { AV_CODEC_ID_PNG , 0x6D }, + { AV_CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */ + { AV_CODEC_ID_VC1 , 0xA3 }, + { AV_CODEC_ID_DIRAC , 0xA4 }, + { AV_CODEC_ID_AC3 , 0xA5 }, + { AV_CODEC_ID_DTS , 0xA9 }, /* mp4ra.org */ + { AV_CODEC_ID_VORBIS , 0xDD }, /* non standard, gpac uses it */ + { AV_CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */ + { AV_CODEC_ID_QCELP , 0xE1 }, + { AV_CODEC_ID_MPEG4SYSTEMS, 0x01 }, + { AV_CODEC_ID_MPEG4SYSTEMS, 0x02 }, + { AV_CODEC_ID_NONE , 0 }, }; const AVCodecTag ff_codec_movvideo_tags[] = { -/* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */ - - { CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */ - { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* Uncompressed YUV422 */ - { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */ - { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte swapped */ - - { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') }, - { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', '5', '6', '5') }, - { CODEC_ID_RAWVIDEO, MKTAG('2', '4', 'B', 'G') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') }, - { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG('b', '1', '6', 'g') }, - { CODEC_ID_RAWVIDEO, MKTAG('b', '4', '8', 'r') }, - { CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'b', 'g') }, - { CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'r', 'g') }, - { CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'y', 'v') }, - { CODEC_ID_RAWVIDEO, MKTAG('N', 'O', '1', '6') }, - { CODEC_ID_RAWVIDEO, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */ - { CODEC_ID_RAWVIDEO, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */ - { CODEC_ID_RAWVIDEO, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */ - - { CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, /* UNCOMPRESSED 10BIT RGB */ - { CODEC_ID_R10K, MKTAG('R', '1', '0', 'g') }, /* UNCOMPRESSED 10BIT RGB */ - { CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */ - { CODEC_ID_AVUI, MKTAG('A', 'V', 'U', 'I') }, /* AVID Uncompressed deinterleaved UYVY422 */ - { CODEC_ID_AVRP, MKTAG('A', 'V', 'r', 'p') }, /* Avid 1:1 10-bit RGB Packer */ - { CODEC_ID_AVRP, MKTAG('S', 'U', 'D', 'S') }, /* Avid DS Uncompressed */ - { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */ - { CODEC_ID_V210, MKTAG('b', 'x', 'y', '2') }, /* BOXX 10BIT 4:2:2 */ - { CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4 */ - { CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4:4 */ - { CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* UNCOMPRESSED 10BIT 4:4:4 */ - { CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* UNCOMPRESSED 12BIT 4:1:1 */ - { CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */ - - { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */ - { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */ - { CODEC_ID_MJPEG, MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */ -/* { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channel (AVID ABVB/Truevision NuVista) */ - { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, /* Motion JPEG OpenDML */ - { CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */ - - { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, /* Sorenson Video v1 */ - { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, /* Sorenson Video v1 */ - { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', 'i') }, /* Sorenson Video v1 (from QT specs)*/ - { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */ - - { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, - { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */ - { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, - { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, /* experimental: 3IVX files before ivx D4 4.5.1 */ - - { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */ - { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */ - - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL produced by FCP */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL produced by FCP */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC produced by FCP */ - { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, /* AVID DV */ - { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', '1') }, /* AVID DV100 */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'q') }, /* DVCPRO HD 720p50 */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'p') }, /* DVCPRO HD 720p60 */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '2') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '4') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD 50i produced by FCP */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '6') }, /* DVCPRO HD 60i produced by FCP */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '3') }, /* DVCPRO HD 30p produced by FCP */ - - { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */ - { CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') }, /* Apple Video (RPZA) */ - { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */ - { CODEC_ID_8BPS, MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */ - { CODEC_ID_SMC, MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */ - { CODEC_ID_QTRLE, MKTAG('r', 'l', 'e', ' ') }, /* Apple Animation (RLE) */ - { CODEC_ID_MSRLE, MKTAG('W', 'R', 'L', 'E') }, - { CODEC_ID_QDRAW, MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */ - - { CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') }, - - { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */ - { CODEC_ID_H264, MKTAG('a', 'i', '5', 'p') }, /* AVC-Intra 50M 720p24/30/60 */ - { CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC-Intra 50M 720p25/50 */ - { CODEC_ID_H264, MKTAG('a', 'i', '5', '2') }, /* AVC-Intra 50M 1080p25/50 */ - { CODEC_ID_H264, MKTAG('a', 'i', '5', '3') }, /* AVC-Intra 50M 1080p24/30/60 */ - { CODEC_ID_H264, MKTAG('a', 'i', '5', '5') }, /* AVC-Intra 50M 1080i50 */ - { CODEC_ID_H264, MKTAG('a', 'i', '5', '6') }, /* AVC-Intra 50M 1080i60 */ - { CODEC_ID_H264, MKTAG('a', 'i', '1', 'p') }, /* AVC-Intra 100M 720p24/30/60 */ - { CODEC_ID_H264, MKTAG('a', 'i', '1', 'q') }, /* AVC-Intra 100M 720p25/50 */ - { CODEC_ID_H264, MKTAG('a', 'i', '1', '2') }, /* AVC-Intra 100M 1080p25/50 */ - { CODEC_ID_H264, MKTAG('a', 'i', '1', '3') }, /* AVC-Intra 100M 1080p24/30/60 */ - { CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */ - { CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */ - - { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ - { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ - { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', ' ') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '4') }, /* MPEG2 HDV 720p24 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* MPEG2 HDV 720p25 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '6') }, /* MPEG2 HDV 1080p24 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '7') }, /* MPEG2 HDV 1080p25 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '8') }, /* MPEG2 HDV 1080p30 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '9') }, /* MPEG2 HDV 720p60 JVC */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', 'a') }, /* MPEG2 HDV 720p50 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */ - { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */ - { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'n') }, /* MPEG2 IMX NTSC 525/60 40mb/s produced by FCP */ - { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'p') }, /* MPEG2 IMX PAL 625/50 40mb/s produced by FCP */ - { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX NTSC 525/60 30mb/s produced by FCP */ - { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG2 IMX PAL 625/50 30mb/s produced by FCP */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '4') }, /* XDCAM HD422 720p24 CBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '5') }, /* XDCAM HD422 720p25 CBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '9') }, /* XDCAM HD422 720p60 CBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'a') }, /* XDCAM HD422 720p50 CBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'b') }, /* XDCAM HD422 1080i60 CBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'c') }, /* XDCAM HD422 1080i50 CBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'd') }, /* XDCAM HD422 1080p24 CBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'e') }, /* XDCAM HD422 1080p25 CBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'f') }, /* XDCAM HD422 1080p30 CBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '1') }, /* XDCAM EX 720p30 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '2') }, /* XDCAM HD 1080i60 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '3') }, /* XDCAM HD 1080i50 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '4') }, /* XDCAM EX 720p24 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '5') }, /* XDCAM EX 720p25 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '6') }, /* XDCAM HD 1080p24 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '7') }, /* XDCAM HD 1080p25 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '8') }, /* XDCAM HD 1080p30 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '9') }, /* XDCAM EX 720p60 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'a') }, /* XDCAM EX 720p50 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'b') }, /* XDCAM EX 1080i60 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'c') }, /* XDCAM EX 1080i50 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'd') }, /* XDCAM EX 1080p24 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'e') }, /* XDCAM EX 1080p25 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'f') }, /* XDCAM EX 1080p30 VBR */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'h', 'd') }, /* XDCAM HD 540p */ - { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'h', '2') }, /* XDCAM HD422 540p */ - { CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */ - - { CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */ - - { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, /* Truevision Targa */ - { CODEC_ID_TIFF, MKTAG('t', 'i', 'f', 'f') }, /* TIFF embedded in MOV */ - { CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, /* embedded gif files as frames (usually one "click to play movie" frame) */ - { CODEC_ID_PNG, MKTAG('p', 'n', 'g', ' ') }, - { CODEC_ID_PNG, MKTAG('M', 'N', 'G', ' ') }, - - { CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */ - { CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') }, - - { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, - { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */ -// { CODEC_ID_FLV1, MKTAG('H', '2', '6', '3') }, /* Flash Media Server */ - { CODEC_ID_MSMPEG4V3, MKTAG('3', 'I', 'V', 'D') }, /* 3ivx DivX Doctor */ - { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', '1', 'x') }, /* AVID 1:1x */ - { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') }, - { CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */ - { CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, /* DPX */ - { CODEC_ID_EXR, MKTAG('e', 'x', 'r', ' ') }, /* OpenEXR */ - - { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'h') }, /* Apple ProRes 422 High Quality */ - { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'n') }, /* Apple ProRes 422 Standard Definition */ - { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 's') }, /* Apple ProRes 422 LT */ - { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */ - { CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */ - { CODEC_ID_FLIC, MKTAG('f', 'l', 'i', 'c') }, - - { CODEC_ID_NONE, 0 }, +/* { AV_CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */ + + { AV_CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* Uncompressed YUV422 */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte swapped */ + + { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '5', '6', '5') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('2', '4', 'B', 'G') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('b', '1', '6', 'g') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('b', '4', '8', 'r') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'b', 'g') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'r', 'g') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'y', 'v') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('N', 'O', '1', '6') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */ + + { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, /* UNCOMPRESSED 10BIT RGB */ + { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'g') }, /* UNCOMPRESSED 10BIT RGB */ + { AV_CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */ + { AV_CODEC_ID_AVUI, MKTAG('A', 'V', 'U', 'I') }, /* AVID Uncompressed deinterleaved UYVY422 */ + { AV_CODEC_ID_AVRP, MKTAG('A', 'V', 'r', 'p') }, /* Avid 1:1 10-bit RGB Packer */ + { AV_CODEC_ID_AVRP, MKTAG('S', 'U', 'D', 'S') }, /* Avid DS Uncompressed */ + { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */ + { AV_CODEC_ID_V210, MKTAG('b', 'x', 'y', '2') }, /* BOXX 10BIT 4:2:2 */ + { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4 */ + { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4:4 */ + { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* UNCOMPRESSED 10BIT 4:4:4 */ + { AV_CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* UNCOMPRESSED 12BIT 4:1:1 */ + { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */ + + { AV_CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */ + { AV_CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */ + { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */ +/* { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channel (AVID ABVB/Truevision NuVista) */ + { AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, /* Motion JPEG OpenDML */ + { AV_CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */ + + { AV_CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, /* Sorenson Video v1 */ + { AV_CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, /* Sorenson Video v1 */ + { AV_CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', 'i') }, /* Sorenson Video v1 (from QT specs)*/ + { AV_CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */ + + { AV_CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, + { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */ + { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, + { AV_CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, /* experimental: 3IVX files before ivx D4 4.5.1 */ + + { AV_CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */ + { AV_CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */ + + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */ + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */ + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL produced by FCP */ + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL produced by FCP */ + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC produced by FCP */ + { AV_CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, /* AVID DV */ + { AV_CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', '1') }, /* AVID DV100 */ + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'q') }, /* DVCPRO HD 720p50 */ + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'p') }, /* DVCPRO HD 720p60 */ + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '2') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '4') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD 50i produced by FCP */ + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '6') }, /* DVCPRO HD 60i produced by FCP */ + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '3') }, /* DVCPRO HD 30p produced by FCP */ + + { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */ + { AV_CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') }, /* Apple Video (RPZA) */ + { AV_CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */ + { AV_CODEC_ID_8BPS, MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */ + { AV_CODEC_ID_SMC, MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */ + { AV_CODEC_ID_QTRLE, MKTAG('r', 'l', 'e', ' ') }, /* Apple Animation (RLE) */ + { AV_CODEC_ID_MSRLE, MKTAG('W', 'R', 'L', 'E') }, + { AV_CODEC_ID_QDRAW, MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */ + + { AV_CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') }, + + { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'p') }, /* AVC-Intra 50M 720p24/30/60 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC-Intra 50M 720p25/50 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', '2') }, /* AVC-Intra 50M 1080p25/50 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', '3') }, /* AVC-Intra 50M 1080p24/30/60 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', '5') }, /* AVC-Intra 50M 1080i50 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', '6') }, /* AVC-Intra 50M 1080i60 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', 'p') }, /* AVC-Intra 100M 720p24/30/60 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', 'q') }, /* AVC-Intra 100M 720p25/50 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '2') }, /* AVC-Intra 100M 1080p25/50 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '3') }, /* AVC-Intra 100M 1080p24/30/60 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */ + + { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ + { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ + { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', ' ') }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '4') }, /* MPEG2 HDV 720p24 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* MPEG2 HDV 720p25 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '6') }, /* MPEG2 HDV 1080p24 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '7') }, /* MPEG2 HDV 1080p25 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '8') }, /* MPEG2 HDV 1080p30 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '9') }, /* MPEG2 HDV 720p60 JVC */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', 'a') }, /* MPEG2 HDV 720p50 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'n') }, /* MPEG2 IMX NTSC 525/60 40mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'p') }, /* MPEG2 IMX PAL 625/50 40mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX NTSC 525/60 30mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG2 IMX PAL 625/50 30mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '4') }, /* XDCAM HD422 720p24 CBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '5') }, /* XDCAM HD422 720p25 CBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '9') }, /* XDCAM HD422 720p60 CBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'a') }, /* XDCAM HD422 720p50 CBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'b') }, /* XDCAM HD422 1080i60 CBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'c') }, /* XDCAM HD422 1080i50 CBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'd') }, /* XDCAM HD422 1080p24 CBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'e') }, /* XDCAM HD422 1080p25 CBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'f') }, /* XDCAM HD422 1080p30 CBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '1') }, /* XDCAM EX 720p30 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '2') }, /* XDCAM HD 1080i60 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '3') }, /* XDCAM HD 1080i50 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '4') }, /* XDCAM EX 720p24 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '5') }, /* XDCAM EX 720p25 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '6') }, /* XDCAM HD 1080p24 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '7') }, /* XDCAM HD 1080p25 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '8') }, /* XDCAM HD 1080p30 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '9') }, /* XDCAM EX 720p60 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'a') }, /* XDCAM EX 720p50 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'b') }, /* XDCAM EX 1080i60 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'c') }, /* XDCAM EX 1080i50 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'd') }, /* XDCAM EX 1080p24 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'e') }, /* XDCAM EX 1080p25 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'f') }, /* XDCAM EX 1080p30 VBR */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'h', 'd') }, /* XDCAM HD 540p */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'h', '2') }, /* XDCAM HD422 540p */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */ + + { AV_CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */ + + { AV_CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, /* Truevision Targa */ + { AV_CODEC_ID_TIFF, MKTAG('t', 'i', 'f', 'f') }, /* TIFF embedded in MOV */ + { AV_CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, /* embedded gif files as frames (usually one "click to play movie" frame) */ + { AV_CODEC_ID_PNG, MKTAG('p', 'n', 'g', ' ') }, + { AV_CODEC_ID_PNG, MKTAG('M', 'N', 'G', ' ') }, + + { AV_CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */ + { AV_CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') }, + + { AV_CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, + { AV_CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */ +// { AV_CODEC_ID_FLV1, MKTAG('H', '2', '6', '3') }, /* Flash Media Server */ + { AV_CODEC_ID_MSMPEG4V3, MKTAG('3', 'I', 'V', 'D') }, /* 3ivx DivX Doctor */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'V', '1', 'x') }, /* AVID 1:1x */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') }, + { AV_CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */ + { AV_CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, /* DPX */ + { AV_CODEC_ID_EXR, MKTAG('e', 'x', 'r', ' ') }, /* OpenEXR */ + + { AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'h') }, /* Apple ProRes 422 High Quality */ + { AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'n') }, /* Apple ProRes 422 Standard Definition */ + { AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 's') }, /* Apple ProRes 422 LT */ + { AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */ + { AV_CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */ + { AV_CODEC_ID_FLIC, MKTAG('f', 'l', 'i', 'c') }, + + { AV_CODEC_ID_NONE, 0 }, }; const AVCodecTag ff_codec_movaudio_tags[] = { - { CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') }, - { CODEC_ID_AC3, MKTAG('a', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F */ - { CODEC_ID_AC3, MKTAG('s', 'a', 'c', '3') }, /* Nero Recode */ - { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, - { CODEC_ID_ALAC, MKTAG('a', 'l', 'a', 'c') }, - { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */ - { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */ - { CODEC_ID_DTS, MKTAG('d', 't', 's', 'c') }, /* DTS formats prior to DTS-HD */ - { CODEC_ID_DTS, MKTAG('d', 't', 's', 'h') }, /* DTS-HD audio formats */ - { CODEC_ID_DTS, MKTAG('d', 't', 's', 'l') }, /* DTS-HD Lossless formats */ - { CODEC_ID_DTS, MKTAG('D', 'T', 'S', ' ') }, /* non-standard */ - { CODEC_ID_EAC3, MKTAG('e', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F (only valid in ISOBMFF) */ - { CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') }, - { CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') }, - { CODEC_ID_GSM, MKTAG('a', 'g', 's', 'm') }, - { CODEC_ID_ILBC, MKTAG('i', 'l', 'b', 'c') }, - { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, - { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, - { CODEC_ID_MP1, MKTAG('.', 'm', 'p', '1') }, - { CODEC_ID_MP2, MKTAG('.', 'm', 'p', '2') }, - { CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') }, - { CODEC_ID_MP3, 0x6D730055 }, - { CODEC_ID_NELLYMOSER, MKTAG('n', 'm', 'o', 's') }, /* Flash Media Server */ - { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, - { CODEC_ID_PCM_F32BE, MKTAG('f', 'l', '3', '2') }, - { CODEC_ID_PCM_F32LE, MKTAG('f', 'l', '3', '2') }, - { CODEC_ID_PCM_F64BE, MKTAG('f', 'l', '6', '4') }, - { CODEC_ID_PCM_F64LE, MKTAG('f', 'l', '6', '4') }, - { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, - { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, - { CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, - { CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') }, - { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') }, - { CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') }, - { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') }, - { CODEC_ID_PCM_S32LE, MKTAG('i', 'n', '3', '2') }, - { CODEC_ID_PCM_S8, MKTAG('s', 'o', 'w', 't') }, - { CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') }, - { CODEC_ID_PCM_U8, MKTAG('N', 'O', 'N', 'E') }, - { CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'p') }, - { CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'q') }, - { CODEC_ID_QCELP, MKTAG('s', 'q', 'c', 'p') }, /* ISO Media fourcc */ - { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2') }, - { CODEC_ID_QDMC, MKTAG('Q', 'D', 'M', 'C') }, - { CODEC_ID_SPEEX, MKTAG('s', 'p', 'e', 'x') }, /* Flash Media Server */ - { CODEC_ID_WMAV2, MKTAG('W', 'M', 'A', '2') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') }, + { AV_CODEC_ID_AC3, MKTAG('a', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F */ + { AV_CODEC_ID_AC3, MKTAG('s', 'a', 'c', '3') }, /* Nero Recode */ + { AV_CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, + { AV_CODEC_ID_ALAC, MKTAG('a', 'l', 'a', 'c') }, + { AV_CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */ + { AV_CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */ + { AV_CODEC_ID_DTS, MKTAG('d', 't', 's', 'c') }, /* DTS formats prior to DTS-HD */ + { AV_CODEC_ID_DTS, MKTAG('d', 't', 's', 'h') }, /* DTS-HD audio formats */ + { AV_CODEC_ID_DTS, MKTAG('d', 't', 's', 'l') }, /* DTS-HD Lossless formats */ + { AV_CODEC_ID_DTS, MKTAG('D', 'T', 'S', ' ') }, /* non-standard */ + { AV_CODEC_ID_EAC3, MKTAG('e', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F (only valid in ISOBMFF) */ + { AV_CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') }, + { AV_CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') }, + { AV_CODEC_ID_GSM, MKTAG('a', 'g', 's', 'm') }, + { AV_CODEC_ID_ILBC, MKTAG('i', 'l', 'b', 'c') }, + { AV_CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, + { AV_CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, + { AV_CODEC_ID_MP1, MKTAG('.', 'm', 'p', '1') }, + { AV_CODEC_ID_MP2, MKTAG('.', 'm', 'p', '2') }, + { AV_CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') }, + { AV_CODEC_ID_MP3, 0x6D730055 }, + { AV_CODEC_ID_NELLYMOSER, MKTAG('n', 'm', 'o', 's') }, /* Flash Media Server */ + { AV_CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, + { AV_CODEC_ID_PCM_F32BE, MKTAG('f', 'l', '3', '2') }, + { AV_CODEC_ID_PCM_F32LE, MKTAG('f', 'l', '3', '2') }, + { AV_CODEC_ID_PCM_F64BE, MKTAG('f', 'l', '6', '4') }, + { AV_CODEC_ID_PCM_F64LE, MKTAG('f', 'l', '6', '4') }, + { AV_CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, + { AV_CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, + { AV_CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, + { AV_CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') }, + { AV_CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') }, + { AV_CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') }, + { AV_CODEC_ID_PCM_S32LE, MKTAG('i', 'n', '3', '2') }, + { AV_CODEC_ID_PCM_S8, MKTAG('s', 'o', 'w', 't') }, + { AV_CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') }, + { AV_CODEC_ID_PCM_U8, MKTAG('N', 'O', 'N', 'E') }, + { AV_CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'p') }, + { AV_CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'q') }, + { AV_CODEC_ID_QCELP, MKTAG('s', 'q', 'c', 'p') }, /* ISO Media fourcc */ + { AV_CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2') }, + { AV_CODEC_ID_QDMC, MKTAG('Q', 'D', 'M', 'C') }, + { AV_CODEC_ID_SPEEX, MKTAG('s', 'p', 'e', 'x') }, /* Flash Media Server */ + { AV_CODEC_ID_WMAV2, MKTAG('W', 'M', 'A', '2') }, + { AV_CODEC_ID_NONE, 0 }, }; const AVCodecTag ff_codec_movsubtitle_tags[] = { - { CODEC_ID_MOV_TEXT, MKTAG('t', 'e', 'x', 't') }, - { CODEC_ID_MOV_TEXT, MKTAG('t', 'x', '3', 'g') }, - { CODEC_ID_EIA_608, MKTAG('c', '6', '0', '8') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_MOV_TEXT, MKTAG('t', 'e', 'x', 't') }, + { AV_CODEC_ID_MOV_TEXT, MKTAG('t', 'x', '3', 'g') }, + { AV_CODEC_ID_EIA_608, MKTAG('c', '6', '0', '8') }, + { AV_CODEC_ID_NONE, 0 }, }; /* map numeric codes from mdhd atom to ISO 639 */ @@ -416,12 +416,12 @@ void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id) } static const AVCodecTag mp4_audio_types[] = { - { CODEC_ID_MP3ON4, AOT_PS }, /* old mp3on4 draft */ - { CODEC_ID_MP3ON4, AOT_L1 }, /* layer 1 */ - { CODEC_ID_MP3ON4, AOT_L2 }, /* layer 2 */ - { CODEC_ID_MP3ON4, AOT_L3 }, /* layer 3 */ - { CODEC_ID_MP4ALS, AOT_ALS }, /* MPEG-4 ALS */ - { CODEC_ID_NONE, AOT_NULL }, + { AV_CODEC_ID_MP3ON4, AOT_PS }, /* old mp3on4 draft */ + { AV_CODEC_ID_MP3ON4, AOT_L1 }, /* layer 1 */ + { AV_CODEC_ID_MP3ON4, AOT_L2 }, /* layer 2 */ + { AV_CODEC_ID_MP3ON4, AOT_L3 }, /* layer 3 */ + { AV_CODEC_ID_MP4ALS, AOT_ALS }, /* MPEG-4 ALS */ + { AV_CODEC_ID_NONE, AOT_NULL }, }; int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext *pb) @@ -446,7 +446,7 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext return AVERROR(ENOMEM); avio_read(pb, st->codec->extradata, len); st->codec->extradata_size = len; - if (st->codec->codec_id == CODEC_ID_AAC) { + if (st->codec->codec_id == AV_CODEC_ID_AAC) { MPEG4AudioConfig cfg; avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata, st->codec->extradata_size * 8, 1); @@ -463,7 +463,7 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext cfg.sample_rate, cfg.ext_sample_rate); if (!(st->codec->codec_id = ff_codec_get_id(mp4_audio_types, cfg.object_type))) - st->codec->codec_id = CODEC_ID_AAC; + st->codec->codec_id = AV_CODEC_ID_AAC; } } return 0; diff --git a/libavformat/isom.h b/libavformat/isom.h index f1cbe8c621..f7d25375a1 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -194,7 +194,7 @@ void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id); #define MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES 0x01000000 int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom); -enum CodecID ff_mov_get_lpcm_codec_id(int bps, int flags); +enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags); int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries); int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size); diff --git a/libavformat/iss.c b/libavformat/iss.c index c9b7dc2d3e..4268900840 100644 --- a/libavformat/iss.c +++ b/libavformat/iss.c @@ -98,7 +98,7 @@ static av_cold int iss_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ADPCM_IMA_ISS; + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_ISS; st->codec->channels = stereo ? 2 : 1; st->codec->sample_rate = 44100; if(rate_divisor > 0) diff --git a/libavformat/iv8.c b/libavformat/iv8.c index 6d482b9a05..38b79609f6 100644 --- a/libavformat/iv8.c +++ b/libavformat/iv8.c @@ -46,7 +46,7 @@ static int read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MPEG4; + st->codec->codec_id = AV_CODEC_ID_MPEG4; st->need_parsing = AVSTREAM_PARSE_FULL; avpriv_set_pts_info(st, 64, 1, 90000); diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c index 8b3f3a5421..ddb205b8fa 100644 --- a/libavformat/ivfenc.c +++ b/libavformat/ivfenc.c @@ -30,7 +30,7 @@ static int ivf_write_header(AVFormatContext *s) return AVERROR(EINVAL); } ctx = s->streams[0]->codec; - if (ctx->codec_type != AVMEDIA_TYPE_VIDEO || ctx->codec_id != CODEC_ID_VP8) { + if (ctx->codec_type != AVMEDIA_TYPE_VIDEO || ctx->codec_id != AV_CODEC_ID_VP8) { av_log(s, AV_LOG_ERROR, "Currently only VP8 is supported!\n"); return AVERROR(EINVAL); } @@ -62,8 +62,8 @@ AVOutputFormat ff_ivf_muxer = { .name = "ivf", .long_name = NULL_IF_CONFIG_SMALL("On2 IVF"), .extensions = "ivf", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_VP8, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_VP8, .write_header = ivf_write_header, .write_packet = ivf_write_packet, }; diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index cc4b978dae..f9defd292d 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -166,7 +166,7 @@ static int jacosub_read_header(AVFormatContext *s) return AVERROR(ENOMEM); avpriv_set_pts_info(st, 64, 1, 100); st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = CODEC_ID_JACOSUB; + st->codec->codec_id = AV_CODEC_ID_JACOSUB; jacosub->timeres = 30; diff --git a/libavformat/jacosubenc.c b/libavformat/jacosubenc.c index 57866b3995..a11e45a4aa 100644 --- a/libavformat/jacosubenc.c +++ b/libavformat/jacosubenc.c @@ -38,5 +38,5 @@ AVOutputFormat ff_jacosub_muxer = { .write_header = jacosub_write_header, .write_packet = ff_raw_write_packet, .flags = AVFMT_TS_NONSTRICT, - .subtitle_codec = CODEC_ID_JACOSUB, + .subtitle_codec = AV_CODEC_ID_JACOSUB, }; diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c index e7594b9260..2eac265de7 100644 --- a/libavformat/jvdec.c +++ b/libavformat/jvdec.c @@ -75,7 +75,7 @@ static int read_header(AVFormatContext *s) return AVERROR(ENOMEM); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_JV; + vst->codec->codec_id = AV_CODEC_ID_JV; vst->codec->codec_tag = 0; /* no fourcc */ vst->codec->width = avio_rl16(pb); vst->codec->height = avio_rl16(pb); @@ -87,7 +87,7 @@ static int read_header(AVFormatContext *s) avio_skip(pb, 4); ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_id = CODEC_ID_PCM_U8; + ast->codec->codec_id = AV_CODEC_ID_PCM_U8; ast->codec->codec_tag = 0; /* no fourcc */ ast->codec->sample_rate = avio_rl16(pb); ast->codec->channels = 1; diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index ebd60c0191..2ea801c69e 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -86,7 +86,7 @@ static int latm_write_header(AVFormatContext *s) LATMContext *ctx = s->priv_data; AVCodecContext *avctx = s->streams[0]->codec; - if (avctx->codec_id == CODEC_ID_AAC_LATM) + if (avctx->codec_id == AV_CODEC_ID_AAC_LATM) return 0; if (avctx->extradata_size > 0 && @@ -149,7 +149,7 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt) int i, len; uint8_t loas_header[] = "\x56\xe0\x00"; - if (s->streams[0]->codec->codec_id == CODEC_ID_AAC_LATM) + if (s->streams[0]->codec->codec_id == AV_CODEC_ID_AAC_LATM) return ff_raw_write_packet(s, pkt); if (pkt->size > 2 && pkt->data[0] == 0xff && (pkt->data[1] >> 4) == 0xf) { @@ -213,8 +213,8 @@ AVOutputFormat ff_latm_muxer = { .mime_type = "audio/MP4A-LATM", .extensions = "latm,loas", .priv_data_size = sizeof(LATMContext), - .audio_codec = CODEC_ID_AAC, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_AAC, + .video_codec = AV_CODEC_ID_NONE, .write_header = latm_write_header, .write_packet = latm_write_packet, .priv_class = &latm_muxer_class, diff --git a/libavformat/libmodplug.c b/libavformat/libmodplug.c index a662dbafbc..8065318bc1 100644 --- a/libavformat/libmodplug.c +++ b/libavformat/libmodplug.c @@ -224,7 +224,7 @@ static int modplug_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, 1000); st->duration = ModPlug_GetLength(modplug->f); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_PCM_S16LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; st->codec->channels = settings.mChannels; st->codec->sample_rate = settings.mFrequency; @@ -238,7 +238,7 @@ static int modplug_read_header(AVFormatContext *s) avpriv_set_pts_info(vst, 64, 1, 1000); vst->duration = st->duration; vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_XBIN; + vst->codec->codec_id = AV_CODEC_ID_XBIN; vst->codec->width = modplug->w << 3; vst->codec->height = modplug->h << 3; modplug->linesize = modplug->w * 3; diff --git a/libavformat/libnut.c b/libavformat/libnut.c index 7800d4a69c..838c55a403 100644 --- a/libavformat/libnut.c +++ b/libavformat/libnut.c @@ -39,9 +39,9 @@ typedef struct { } NUTContext; static const AVCodecTag nut_tags[] = { - { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, - { CODEC_ID_MP3, MKTAG('m', 'p', '3', ' ') }, - { CODEC_ID_VORBIS, MKTAG('v', 'r', 'b', 's') }, + { AV_CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, + { AV_CODEC_ID_MP3, MKTAG('m', 'p', '3', ' ') }, + { AV_CODEC_ID_VORBIS, MKTAG('v', 'r', 'b', 's') }, { 0, 0 }, }; @@ -159,8 +159,8 @@ AVOutputFormat ff_libnut_muxer = { .mime_type = "video/x-nut", .extensions = "nut", .priv_data_size = sizeof(NUTContext), - .audio_codec = CODEC_ID_VORBIS, - .video_codec = CODEC_ID_MPEG4, + .audio_codec = AV_CODEC_ID_VORBIS, + .video_codec = AV_CODEC_ID_MPEG4, .write_header = nut_write_header, .write_packet = nut_write_packet, .write_trailer = nut_write_trailer, @@ -247,14 +247,14 @@ static int nut_read_header(AVFormatContext * avf) { switch(s[i].type) { case NUT_AUDIO_CLASS: st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, st->codec->codec_tag); + if (st->codec->codec_id == AV_CODEC_ID_NONE) st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, st->codec->codec_tag); st->codec->channels = s[i].channel_count; st->codec->sample_rate = s[i].samplerate_num / s[i].samplerate_denom; break; case NUT_VIDEO_CLASS: st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, st->codec->codec_tag); + if (st->codec->codec_id == AV_CODEC_ID_NONE) st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, st->codec->codec_tag); st->codec->width = s[i].width; st->codec->height = s[i].height; @@ -262,7 +262,7 @@ static int nut_read_header(AVFormatContext * avf) { st->sample_aspect_ratio.den = s[i].sample_height; break; } - if (st->codec->codec_id == CODEC_ID_NONE) av_log(avf, AV_LOG_ERROR, "Unknown codec?!\n"); + if (st->codec->codec_id == AV_CODEC_ID_NONE) av_log(avf, AV_LOG_ERROR, "Unknown codec?!\n"); } return 0; diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c index 4d68eea2b8..c3eec02e8f 100644 --- a/libavformat/lmlm4.c +++ b/libavformat/lmlm4.c @@ -64,14 +64,14 @@ static int lmlm4_read_header(AVFormatContext *s) { if (!(st = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MPEG4; + st->codec->codec_id = AV_CODEC_ID_MPEG4; st->need_parsing = AVSTREAM_PARSE_HEADERS; avpriv_set_pts_info(st, 64, 1001, 30000); if (!(st = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_MP2; + st->codec->codec_id = AV_CODEC_ID_MP2; st->need_parsing = AVSTREAM_PARSE_HEADERS; /* the parameters will be extracted from the compressed bitstream */ diff --git a/libavformat/loasdec.c b/libavformat/loasdec.c index e8711ceb32..ccb9464c33 100644 --- a/libavformat/loasdec.c +++ b/libavformat/loasdec.c @@ -84,5 +84,5 @@ AVInputFormat ff_loas_demuxer = { .read_header = loas_read_header, .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, - .raw_codec_id = CODEC_ID_AAC_LATM, + .raw_codec_id = AV_CODEC_ID_AAC_LATM, }; diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c index e3b7bea625..2722463ec4 100644 --- a/libavformat/lxfdec.c +++ b/libavformat/lxfdec.c @@ -33,17 +33,17 @@ #define LXF_MAX_AUDIO_PACKET (8008*15*4) ///< 15-channel 32-bit NTSC audio frame static const AVCodecTag lxf_tags[] = { - { CODEC_ID_MJPEG, 0 }, - { CODEC_ID_MPEG1VIDEO, 1 }, - { CODEC_ID_MPEG2VIDEO, 2 }, //MpMl, 4:2:0 - { CODEC_ID_MPEG2VIDEO, 3 }, //MpPl, 4:2:2 - { CODEC_ID_DVVIDEO, 4 }, //DV25 - { CODEC_ID_DVVIDEO, 5 }, //DVCPRO - { CODEC_ID_DVVIDEO, 6 }, //DVCPRO50 - { CODEC_ID_RAWVIDEO, 7 }, //PIX_FMT_ARGB, where alpha is used for chroma keying - { CODEC_ID_RAWVIDEO, 8 }, //16-bit chroma key - { CODEC_ID_MPEG2VIDEO, 9 }, //4:2:2 CBP ("Constrained Bytes per Gop") - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_MJPEG, 0 }, + { AV_CODEC_ID_MPEG1VIDEO, 1 }, + { AV_CODEC_ID_MPEG2VIDEO, 2 }, //MpMl, 4:2:0 + { AV_CODEC_ID_MPEG2VIDEO, 3 }, //MpPl, 4:2:2 + { AV_CODEC_ID_DVVIDEO, 4 }, //DV25 + { AV_CODEC_ID_DVVIDEO, 5 }, //DVCPRO + { AV_CODEC_ID_DVVIDEO, 6 }, //DVCPRO50 + { AV_CODEC_ID_RAWVIDEO, 7 }, //PIX_FMT_ARGB, where alpha is used for chroma keying + { AV_CODEC_ID_RAWVIDEO, 8 }, //16-bit chroma key + { AV_CODEC_ID_MPEG2VIDEO, 9 }, //4:2:2 CBP ("Constrained Bytes per Gop") + { AV_CODEC_ID_NONE, 0 }, }; typedef struct { @@ -185,10 +185,10 @@ static int get_packet_header(AVFormatContext *s) } switch (st->codec->bits_per_coded_sample) { - case 16: st->codec->codec_id = CODEC_ID_PCM_S16LE; break; - case 20: st->codec->codec_id = CODEC_ID_PCM_LXF; break; - case 24: st->codec->codec_id = CODEC_ID_PCM_S24LE; break; - case 32: st->codec->codec_id = CODEC_ID_PCM_S32LE; break; + case 16: st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; break; + case 20: st->codec->codec_id = AV_CODEC_ID_PCM_LXF; break; + case 24: st->codec->codec_id = AV_CODEC_ID_PCM_S24LE; break; + case 32: st->codec->codec_id = AV_CODEC_ID_PCM_S32LE; break; default: av_log(s, AV_LOG_WARNING, "only 16-, 20-, 24- and 32-bit PCM currently supported\n"); @@ -340,7 +340,7 @@ static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt) return ret2; //read non-20-bit audio data into lxf->temp so we can deplanarize it - buf = ast && ast->codec->codec_id != CODEC_ID_PCM_LXF ? lxf->temp : pkt->data; + buf = ast && ast->codec->codec_id != AV_CODEC_ID_PCM_LXF ? lxf->temp : pkt->data; if ((ret2 = avio_read(pb, buf, ret)) != ret) { av_free_packet(pkt); @@ -350,7 +350,7 @@ static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = stream; if (ast) { - if(ast->codec->codec_id != CODEC_ID_PCM_LXF) + if(ast->codec->codec_id != AV_CODEC_ID_PCM_LXF) deplanarize(lxf, ast, pkt->data, ret); } else { //picture type (0 = closed I, 1 = open I, 2 = P, 3 = B) diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c index cc8c11b9b0..e72fb42f1d 100644 --- a/libavformat/m4vdec.c +++ b/libavformat/m4vdec.c @@ -49,4 +49,4 @@ static int mpeg4video_probe(AVProbeData *probe_packet) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(m4v, "raw MPEG-4 video", mpeg4video_probe, "m4v", CODEC_ID_MPEG4) +FF_DEF_RAWVIDEO_DEMUXER(m4v, "raw MPEG-4 video", mpeg4video_probe, "m4v", AV_CODEC_ID_MPEG4) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index ea91ed7494..b386d7421b 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -22,78 +22,78 @@ #include "matroska.h" const CodecTags ff_mkv_codec_tags[]={ - {"A_AAC" , CODEC_ID_AAC}, - {"A_AC3" , CODEC_ID_AC3}, - {"A_ALAC" , CODEC_ID_ALAC}, - {"A_DTS" , CODEC_ID_DTS}, - {"A_EAC3" , CODEC_ID_EAC3}, - {"A_FLAC" , CODEC_ID_FLAC}, - {"A_MLP" , CODEC_ID_MLP}, - {"A_MPEG/L2" , CODEC_ID_MP2}, - {"A_MPEG/L1" , CODEC_ID_MP2}, - {"A_MPEG/L3" , CODEC_ID_MP3}, - {"A_OPUS", CODEC_ID_OPUS}, - {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE}, - {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE}, - {"A_PCM/INT/BIG" , CODEC_ID_PCM_S16BE}, - {"A_PCM/INT/BIG" , CODEC_ID_PCM_S24BE}, - {"A_PCM/INT/BIG" , CODEC_ID_PCM_S32BE}, - {"A_PCM/INT/LIT" , CODEC_ID_PCM_S16LE}, - {"A_PCM/INT/LIT" , CODEC_ID_PCM_S24LE}, - {"A_PCM/INT/LIT" , CODEC_ID_PCM_S32LE}, - {"A_PCM/INT/LIT" , CODEC_ID_PCM_U8}, - {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2}, - {"A_REAL/14_4" , CODEC_ID_RA_144}, - {"A_REAL/28_8" , CODEC_ID_RA_288}, - {"A_REAL/ATRC" , CODEC_ID_ATRAC3}, - {"A_REAL/COOK" , CODEC_ID_COOK}, - {"A_REAL/SIPR" , CODEC_ID_SIPR}, - {"A_TRUEHD" , CODEC_ID_TRUEHD}, - {"A_TTA1" , CODEC_ID_TTA}, - {"A_VORBIS" , CODEC_ID_VORBIS}, - {"A_WAVPACK4" , CODEC_ID_WAVPACK}, + {"A_AAC" , AV_CODEC_ID_AAC}, + {"A_AC3" , AV_CODEC_ID_AC3}, + {"A_ALAC" , AV_CODEC_ID_ALAC}, + {"A_DTS" , AV_CODEC_ID_DTS}, + {"A_EAC3" , AV_CODEC_ID_EAC3}, + {"A_FLAC" , AV_CODEC_ID_FLAC}, + {"A_MLP" , AV_CODEC_ID_MLP}, + {"A_MPEG/L2" , AV_CODEC_ID_MP2}, + {"A_MPEG/L1" , AV_CODEC_ID_MP2}, + {"A_MPEG/L3" , AV_CODEC_ID_MP3}, + {"A_OPUS", AV_CODEC_ID_OPUS}, + {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F32LE}, + {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F64LE}, + {"A_PCM/INT/BIG" , AV_CODEC_ID_PCM_S16BE}, + {"A_PCM/INT/BIG" , AV_CODEC_ID_PCM_S24BE}, + {"A_PCM/INT/BIG" , AV_CODEC_ID_PCM_S32BE}, + {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_S16LE}, + {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_S24LE}, + {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_S32LE}, + {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_U8}, + {"A_QUICKTIME/QDM2" , AV_CODEC_ID_QDM2}, + {"A_REAL/14_4" , AV_CODEC_ID_RA_144}, + {"A_REAL/28_8" , AV_CODEC_ID_RA_288}, + {"A_REAL/ATRC" , AV_CODEC_ID_ATRAC3}, + {"A_REAL/COOK" , AV_CODEC_ID_COOK}, + {"A_REAL/SIPR" , AV_CODEC_ID_SIPR}, + {"A_TRUEHD" , AV_CODEC_ID_TRUEHD}, + {"A_TTA1" , AV_CODEC_ID_TTA}, + {"A_VORBIS" , AV_CODEC_ID_VORBIS}, + {"A_WAVPACK4" , AV_CODEC_ID_WAVPACK}, - {"S_TEXT/UTF8" , CODEC_ID_TEXT}, - {"S_TEXT/UTF8" , CODEC_ID_SRT}, - {"S_TEXT/ASCII" , CODEC_ID_TEXT}, - {"S_TEXT/ASS" , CODEC_ID_SSA}, - {"S_TEXT/SSA" , CODEC_ID_SSA}, - {"S_ASS" , CODEC_ID_SSA}, - {"S_SSA" , CODEC_ID_SSA}, - {"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE}, - {"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE}, + {"S_TEXT/UTF8" , AV_CODEC_ID_TEXT}, + {"S_TEXT/UTF8" , AV_CODEC_ID_SRT}, + {"S_TEXT/ASCII" , AV_CODEC_ID_TEXT}, + {"S_TEXT/ASS" , AV_CODEC_ID_SSA}, + {"S_TEXT/SSA" , AV_CODEC_ID_SSA}, + {"S_ASS" , AV_CODEC_ID_SSA}, + {"S_SSA" , AV_CODEC_ID_SSA}, + {"S_VOBSUB" , AV_CODEC_ID_DVD_SUBTITLE}, + {"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE}, - {"V_DIRAC" , CODEC_ID_DIRAC}, - {"V_MJPEG" , CODEC_ID_MJPEG}, - {"V_MPEG1" , CODEC_ID_MPEG1VIDEO}, - {"V_MPEG2" , CODEC_ID_MPEG2VIDEO}, - {"V_MPEG4/ISO/ASP" , CODEC_ID_MPEG4}, - {"V_MPEG4/ISO/AP" , CODEC_ID_MPEG4}, - {"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4}, - {"V_MPEG4/ISO/AVC" , CODEC_ID_H264}, - {"V_MPEG4/MS/V3" , CODEC_ID_MSMPEG4V3}, - {"V_REAL/RV10" , CODEC_ID_RV10}, - {"V_REAL/RV20" , CODEC_ID_RV20}, - {"V_REAL/RV30" , CODEC_ID_RV30}, - {"V_REAL/RV40" , CODEC_ID_RV40}, - {"V_SNOW" , CODEC_ID_SNOW}, - {"V_THEORA" , CODEC_ID_THEORA}, - {"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO}, - {"V_VP8" , CODEC_ID_VP8}, + {"V_DIRAC" , AV_CODEC_ID_DIRAC}, + {"V_MJPEG" , AV_CODEC_ID_MJPEG}, + {"V_MPEG1" , AV_CODEC_ID_MPEG1VIDEO}, + {"V_MPEG2" , AV_CODEC_ID_MPEG2VIDEO}, + {"V_MPEG4/ISO/ASP" , AV_CODEC_ID_MPEG4}, + {"V_MPEG4/ISO/AP" , AV_CODEC_ID_MPEG4}, + {"V_MPEG4/ISO/SP" , AV_CODEC_ID_MPEG4}, + {"V_MPEG4/ISO/AVC" , AV_CODEC_ID_H264}, + {"V_MPEG4/MS/V3" , AV_CODEC_ID_MSMPEG4V3}, + {"V_REAL/RV10" , AV_CODEC_ID_RV10}, + {"V_REAL/RV20" , AV_CODEC_ID_RV20}, + {"V_REAL/RV30" , AV_CODEC_ID_RV30}, + {"V_REAL/RV40" , AV_CODEC_ID_RV40}, + {"V_SNOW" , AV_CODEC_ID_SNOW}, + {"V_THEORA" , AV_CODEC_ID_THEORA}, + {"V_UNCOMPRESSED" , AV_CODEC_ID_RAWVIDEO}, + {"V_VP8" , AV_CODEC_ID_VP8}, - {"" , CODEC_ID_NONE} + {"" , AV_CODEC_ID_NONE} }; const CodecMime ff_mkv_mime_tags[] = { - {"text/plain" , CODEC_ID_TEXT}, - {"image/gif" , CODEC_ID_GIF}, - {"image/jpeg" , CODEC_ID_MJPEG}, - {"image/png" , CODEC_ID_PNG}, - {"image/tiff" , CODEC_ID_TIFF}, - {"application/x-truetype-font", CODEC_ID_TTF}, - {"application/x-font" , CODEC_ID_TTF}, + {"text/plain" , AV_CODEC_ID_TEXT}, + {"image/gif" , AV_CODEC_ID_GIF}, + {"image/jpeg" , AV_CODEC_ID_MJPEG}, + {"image/png" , AV_CODEC_ID_PNG}, + {"image/tiff" , AV_CODEC_ID_TIFF}, + {"application/x-truetype-font", AV_CODEC_ID_TTF}, + {"application/x-font" , AV_CODEC_ID_TTF}, - {"" , CODEC_ID_NONE} + {"" , AV_CODEC_ID_NONE} }; const AVMetadataConv ff_mkv_metadata_conv[] = { diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 6f6ab1e929..9af709f215 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -248,7 +248,7 @@ typedef enum { typedef struct CodecTags{ char str[20]; - enum CodecID id; + enum AVCodecID id; }CodecTags; /* max. depth in the EBML tree structure */ diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 500048f761..44e9b7df93 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1472,7 +1472,7 @@ static int matroska_read_header(AVFormatContext *s) tracks = matroska->tracks.elem; for (i=0; i < matroska->tracks.nb_elem; i++) { MatroskaTrack *track = &tracks[i]; - enum CodecID codec_id = CODEC_ID_NONE; + enum AVCodecID codec_id = AV_CODEC_ID_NONE; EbmlList *encodings_list = &track->encodings; MatroskaTrackEncoding *encodings = encodings_list->elem; uint8_t *extradata = NULL; @@ -1545,7 +1545,7 @@ static int matroska_read_header(AVFormatContext *s) } } - for(j=0; ff_mkv_codec_tags[j].id != CODEC_ID_NONE; j++){ + for(j=0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++){ if(!strncmp(ff_mkv_codec_tags[j].str, track->codec_id, strlen(ff_mkv_codec_tags[j].str))){ codec_id= ff_mkv_codec_tags[j].id; @@ -1580,7 +1580,7 @@ static int matroska_read_header(AVFormatContext *s) && (track->codec_priv.data != NULL)) { fourcc = AV_RL32(track->codec_priv.data); codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); - } else if (codec_id == CODEC_ID_ALAC && track->codec_priv.size && track->codec_priv.size < INT_MAX-12) { + } else if (codec_id == AV_CODEC_ID_ALAC && track->codec_priv.size && track->codec_priv.size < INT_MAX-12) { /* Only ALAC's magic cookie is stored in Matroska's track headers. Create the "atom size", "tag", and "tag version" fields the decoder expects manually. */ @@ -1592,21 +1592,21 @@ static int matroska_read_header(AVFormatContext *s) memcpy(&extradata[4], "alac", 4); AV_WB32(&extradata[8], 0); memcpy(&extradata[12], track->codec_priv.data, track->codec_priv.size); - } else if (codec_id == CODEC_ID_PCM_S16BE) { + } else if (codec_id == AV_CODEC_ID_PCM_S16BE) { switch (track->audio.bitdepth) { - case 8: codec_id = CODEC_ID_PCM_U8; break; - case 24: codec_id = CODEC_ID_PCM_S24BE; break; - case 32: codec_id = CODEC_ID_PCM_S32BE; break; + case 8: codec_id = AV_CODEC_ID_PCM_U8; break; + case 24: codec_id = AV_CODEC_ID_PCM_S24BE; break; + case 32: codec_id = AV_CODEC_ID_PCM_S32BE; break; } - } else if (codec_id == CODEC_ID_PCM_S16LE) { + } else if (codec_id == AV_CODEC_ID_PCM_S16LE) { switch (track->audio.bitdepth) { - case 8: codec_id = CODEC_ID_PCM_U8; break; - case 24: codec_id = CODEC_ID_PCM_S24LE; break; - case 32: codec_id = CODEC_ID_PCM_S32LE; break; + case 8: codec_id = AV_CODEC_ID_PCM_U8; break; + case 24: codec_id = AV_CODEC_ID_PCM_S24LE; break; + case 32: codec_id = AV_CODEC_ID_PCM_S32LE; break; } - } else if (codec_id==CODEC_ID_PCM_F32LE && track->audio.bitdepth==64) { - codec_id = CODEC_ID_PCM_F64LE; - } else if (codec_id == CODEC_ID_AAC && !track->codec_priv.size) { + } else if (codec_id==AV_CODEC_ID_PCM_F32LE && track->audio.bitdepth==64) { + codec_id = AV_CODEC_ID_PCM_F64LE; + } else if (codec_id == AV_CODEC_ID_AAC && !track->codec_priv.size) { int profile = matroska_aac_profile(track->codec_id); int sri = matroska_aac_sri(track->audio.samplerate); extradata = av_mallocz(5 + FF_INPUT_BUFFER_PADDING_SIZE); @@ -1622,7 +1622,7 @@ static int matroska_read_header(AVFormatContext *s) extradata_size = 5; } else extradata_size = 2; - } else if (codec_id == CODEC_ID_TTA) { + } else if (codec_id == AV_CODEC_ID_TTA) { extradata_size = 30; extradata = av_mallocz(extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); if (extradata == NULL) @@ -1635,14 +1635,14 @@ static int matroska_read_header(AVFormatContext *s) avio_wl16(&b, track->audio.bitdepth); avio_wl32(&b, track->audio.out_samplerate); avio_wl32(&b, matroska->ctx->duration * track->audio.out_samplerate); - } else if (codec_id == CODEC_ID_RV10 || codec_id == CODEC_ID_RV20 || - codec_id == CODEC_ID_RV30 || codec_id == CODEC_ID_RV40) { + } else if (codec_id == AV_CODEC_ID_RV10 || codec_id == AV_CODEC_ID_RV20 || + codec_id == AV_CODEC_ID_RV30 || codec_id == AV_CODEC_ID_RV40) { extradata_offset = 26; - } else if (codec_id == CODEC_ID_RA_144) { + } else if (codec_id == AV_CODEC_ID_RA_144) { track->audio.out_samplerate = 8000; track->audio.channels = 1; - } else if ((codec_id == CODEC_ID_RA_288 || codec_id == CODEC_ID_COOK || - codec_id == CODEC_ID_ATRAC3 || codec_id == CODEC_ID_SIPR) + } else if ((codec_id == AV_CODEC_ID_RA_288 || codec_id == AV_CODEC_ID_COOK || + codec_id == AV_CODEC_ID_ATRAC3 || codec_id == AV_CODEC_ID_SIPR) && track->codec_priv.data) { int flavor; @@ -1656,11 +1656,11 @@ static int matroska_read_header(AVFormatContext *s) track->audio.frame_size = avio_rb16(&b); track->audio.sub_packet_size = avio_rb16(&b); track->audio.buf = av_malloc(track->audio.frame_size * track->audio.sub_packet_h); - if (codec_id == CODEC_ID_RA_288) { + if (codec_id == AV_CODEC_ID_RA_288) { st->codec->block_align = track->audio.coded_framesize; track->codec_priv.size = 0; } else { - if (codec_id == CODEC_ID_SIPR && flavor < 4) { + if (codec_id == AV_CODEC_ID_SIPR && flavor < 4) { const int sipr_bit_rate[4] = { 6504, 8496, 5000, 16000 }; track->audio.sub_packet_size = ff_sipr_subpk_size[flavor]; st->codec->bit_rate = sipr_bit_rate[flavor]; @@ -1671,9 +1671,9 @@ static int matroska_read_header(AVFormatContext *s) } track->codec_priv.size -= extradata_offset; - if (codec_id == CODEC_ID_NONE) + if (codec_id == AV_CODEC_ID_NONE) av_log(matroska->ctx, AV_LOG_INFO, - "Unknown/unsupported CodecID %s.\n", track->codec_id); + "Unknown/unsupported AVCodecID %s.\n", track->codec_id); if (track->time_scale < 0.01) track->time_scale = 1.0; @@ -1749,11 +1749,11 @@ static int matroska_read_header(AVFormatContext *s) st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->sample_rate = track->audio.out_samplerate; st->codec->channels = track->audio.channels; - if (st->codec->codec_id != CODEC_ID_AAC) + if (st->codec->codec_id != AV_CODEC_ID_AAC) st->need_parsing = AVSTREAM_PARSE_HEADERS; } else if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE) { st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - if (st->codec->codec_id == CODEC_ID_SSA) + if (st->codec->codec_id == AV_CODEC_ID_SSA) matroska->contains_ssa = 1; } } @@ -1769,7 +1769,7 @@ static int matroska_read_header(AVFormatContext *s) break; av_dict_set(&st->metadata, "filename",attachements[j].filename, 0); av_dict_set(&st->metadata, "mimetype", attachements[j].mime, 0); - st->codec->codec_id = CODEC_ID_NONE; + st->codec->codec_id = AV_CODEC_ID_NONE; st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT; st->codec->extradata = av_malloc(attachements[j].bin.size + FF_INPUT_BUFFER_PADDING_SIZE); if(st->codec->extradata == NULL) @@ -1777,7 +1777,7 @@ static int matroska_read_header(AVFormatContext *s) st->codec->extradata_size = attachements[j].bin.size; memcpy(st->codec->extradata, attachements[j].bin.data, attachements[j].bin.size); - for (i=0; ff_mkv_mime_tags[i].id != CODEC_ID_NONE; i++) { + for (i=0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) { if (!strncmp(ff_mkv_mime_tags[i].str, attachements[j].mime, strlen(ff_mkv_mime_tags[i].str))) { st->codec->codec_id = ff_mkv_mime_tags[i].id; @@ -2001,10 +2001,10 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, break; } - if ((st->codec->codec_id == CODEC_ID_RA_288 || - st->codec->codec_id == CODEC_ID_COOK || - st->codec->codec_id == CODEC_ID_SIPR || - st->codec->codec_id == CODEC_ID_ATRAC3) && + if ((st->codec->codec_id == AV_CODEC_ID_RA_288 || + st->codec->codec_id == AV_CODEC_ID_COOK || + st->codec->codec_id == AV_CODEC_ID_SIPR || + st->codec->codec_id == AV_CODEC_ID_ATRAC3) && st->codec->block_align && track->audio.sub_packet_size) { int a = st->codec->block_align; int sps = track->audio.sub_packet_size; @@ -2017,7 +2017,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, if (!track->audio.pkt_cnt) { if (track->audio.sub_packet_cnt == 0) track->audio.buf_timecode = timecode; - if (st->codec->codec_id == CODEC_ID_RA_288) { + if (st->codec->codec_id == AV_CODEC_ID_RA_288) { if (size < cfs * h / 2) { av_log(matroska->ctx, AV_LOG_ERROR, "Corrupt int4 RM-style audio packet size\n"); @@ -2027,7 +2027,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, for (x=0; x<h/2; x++) memcpy(track->audio.buf+x*2*w+y*cfs, data+x*cfs, cfs); - } else if (st->codec->codec_id == CODEC_ID_SIPR) { + } else if (st->codec->codec_id == AV_CODEC_ID_SIPR) { if (size < w) { av_log(matroska->ctx, AV_LOG_ERROR, "Corrupt sipr RM-style audio packet size\n"); @@ -2047,7 +2047,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, } if (++track->audio.sub_packet_cnt >= h) { - if (st->codec->codec_id == CODEC_ID_SIPR) + if (st->codec->codec_id == AV_CODEC_ID_SIPR) ff_rm_reorder_sipr_data(track->audio.buf, h, w); track->audio.sub_packet_cnt = 0; track->audio.pkt_cnt = h*w / a; @@ -2100,19 +2100,19 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, else pkt->pts = timecode; pkt->pos = pos; - if (st->codec->codec_id == CODEC_ID_TEXT) + if (st->codec->codec_id == AV_CODEC_ID_TEXT) pkt->convergence_duration = duration; else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE) pkt->duration = duration; - if (st->codec->codec_id == CODEC_ID_SSA) + if (st->codec->codec_id == AV_CODEC_ID_SSA) matroska_fix_ass_packet(matroska, pkt, duration); if (matroska->prev_pkt && timecode != AV_NOPTS_VALUE && matroska->prev_pkt->pts == timecode && matroska->prev_pkt->stream_index == st->index && - st->codec->codec_id == CODEC_ID_SSA) + st->codec->codec_id == AV_CODEC_ID_SSA) matroska_merge_packets(matroska->prev_pkt, pkt); else { dynarray_add(&matroska->packets,&matroska->num_packets,pkt); diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 30885a1cf6..397793119e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -423,7 +423,7 @@ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecContex int first_header_size; int j; - if (codec->codec_id == CODEC_ID_VORBIS) + if (codec->codec_id == AV_CODEC_ID_VORBIS) first_header_size = 30; else first_header_size = 42; @@ -469,13 +469,13 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo return ret; if (native_id) { - if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) + if (codec->codec_id == AV_CODEC_ID_VORBIS || codec->codec_id == AV_CODEC_ID_THEORA) ret = put_xiph_codecpriv(s, dyn_cp, codec); - else if (codec->codec_id == CODEC_ID_FLAC) + else if (codec->codec_id == AV_CODEC_ID_FLAC) ret = ff_flac_write_header(dyn_cp, codec, 1); - else if (codec->codec_id == CODEC_ID_H264) + else if (codec->codec_id == AV_CODEC_ID_H264) ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size); - else if (codec->codec_id == CODEC_ID_ALAC && (12 < codec->extradata_size)) + else if (codec->codec_id == AV_CODEC_ID_ALAC && (12 < codec->extradata_size)) ret = ff_isom_write_avcc(dyn_cp, codec->extradata + 12, codec->extradata_size - 12); else if (codec->extradata_size) avio_write(dyn_cp, codec->extradata, codec->extradata_size); @@ -546,7 +546,7 @@ static int mkv_write_tracks(AVFormatContext *s) if (!bit_depth) bit_depth = av_get_bytes_per_sample(codec->sample_fmt) << 3; - if (codec->codec_id == CODEC_ID_AAC) + if (codec->codec_id == AV_CODEC_ID_AAC) get_aac_sample_rates(s, codec, &sample_rate, &output_sample_rate); track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0); @@ -564,7 +564,7 @@ static int mkv_write_tracks(AVFormatContext *s) // look for a codec ID string specific to mkv to use, // if none are found, use AVI codes - for (j = 0; ff_mkv_codec_tags[j].id != CODEC_ID_NONE; j++) { + for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { if (ff_mkv_codec_tags[j].id == codec->codec_id) { put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str); native_id = 1; @@ -572,8 +572,8 @@ static int mkv_write_tracks(AVFormatContext *s) } } - if (mkv->mode == MODE_WEBM && !(codec->codec_id == CODEC_ID_VP8 || - codec->codec_id == CODEC_ID_VORBIS)) { + if (mkv->mode == MODE_WEBM && !(codec->codec_id == AV_CODEC_ID_VP8 || + codec->codec_id == AV_CODEC_ID_VORBIS)) { av_log(s, AV_LOG_ERROR, "Only VP8 video and Vorbis audio are supported for WebM.\n"); return AVERROR(EINVAL); @@ -590,9 +590,9 @@ static int mkv_write_tracks(AVFormatContext *s) if (!native_id && ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id) && (!ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id) - || codec->codec_id == CODEC_ID_SVQ1 - || codec->codec_id == CODEC_ID_SVQ3 - || codec->codec_id == CODEC_ID_CINEPAK)) + || codec->codec_id == AV_CODEC_ID_SVQ1 + || codec->codec_id == AV_CODEC_ID_SVQ3 + || codec->codec_id == AV_CODEC_ID_CINEPAK)) qt_id = 1; if (qt_id) @@ -635,7 +635,7 @@ static int mkv_write_tracks(AVFormatContext *s) put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, 3); } - if (codec->codec_id == CODEC_ID_RAWVIDEO) { + if (codec->codec_id == AV_CODEC_ID_RAWVIDEO) { uint32_t color_space = av_le2ne32(codec->codec_tag); put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space)); } @@ -860,9 +860,9 @@ static int mkv_write_attachments(AVFormatContext *s) put_ebml_string(pb, MATROSKA_ID_FILENAME, t->value); if (t = av_dict_get(st->metadata, "mimetype", NULL, 0)) mimetype = t->value; - else if (st->codec->codec_id != CODEC_ID_NONE ) { + else if (st->codec->codec_id != AV_CODEC_ID_NONE ) { int i; - for (i = 0; ff_mkv_mime_tags[i].id != CODEC_ID_NONE; i++) + for (i = 0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) if (ff_mkv_mime_tags[i].id == st->codec->codec_id) { mimetype = ff_mkv_mime_tags[i].str; break; @@ -1067,7 +1067,7 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, " "pts %" PRId64 ", dts %" PRId64 ", duration %d, flags %d\n", avio_tell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration, flags); - if (codec->codec_id == CODEC_ID_H264 && codec->extradata_size > 0 && + if (codec->codec_id == AV_CODEC_ID_H264 && codec->extradata_size > 0 && (AV_RB24(codec->extradata) == 1 || AV_RB32(codec->extradata) == 1)) ff_avc_parse_nal_units_buf(pkt->data, &data, &size); else @@ -1162,9 +1162,9 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt) if (codec->codec_type != AVMEDIA_TYPE_SUBTITLE) { mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7); - } else if (codec->codec_id == CODEC_ID_SSA) { + } else if (codec->codec_id == AV_CODEC_ID_SSA) { duration = mkv_write_ass_blocks(s, pb, pkt); - } else if (codec->codec_id == CODEC_ID_SRT) { + } else if (codec->codec_id == AV_CODEC_ID_SRT) { duration = mkv_write_srt_blocks(s, pb, pkt); } else { ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(pkt->size)); @@ -1290,10 +1290,10 @@ static int mkv_write_trailer(AVFormatContext *s) return 0; } -static int mkv_query_codec(enum CodecID codec_id, int std_compliance) +static int mkv_query_codec(enum AVCodecID codec_id, int std_compliance) { int i; - for (i = 0; ff_mkv_codec_tags[i].id != CODEC_ID_NONE; i++) + for (i = 0; ff_mkv_codec_tags[i].id != AV_CODEC_ID_NONE; i++) if (ff_mkv_codec_tags[i].id == codec_id) return 1; @@ -1314,15 +1314,15 @@ AVOutputFormat ff_matroska_muxer = { .extensions = "mkv", .priv_data_size = sizeof(MatroskaMuxContext), .audio_codec = CONFIG_LIBVORBIS_ENCODER ? - CODEC_ID_VORBIS : CODEC_ID_AC3, + AV_CODEC_ID_VORBIS : AV_CODEC_ID_AC3, .video_codec = CONFIG_LIBX264_ENCODER ? - CODEC_ID_H264 : CODEC_ID_MPEG4, + AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4, .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT, - .subtitle_codec = CODEC_ID_SSA, + .subtitle_codec = AV_CODEC_ID_SSA, .query_codec = mkv_query_codec, }; #endif @@ -1334,8 +1334,8 @@ AVOutputFormat ff_webm_muxer = { .mime_type = "video/webm", .extensions = "webm", .priv_data_size = sizeof(MatroskaMuxContext), - .audio_codec = CODEC_ID_VORBIS, - .video_codec = CODEC_ID_VP8, + .audio_codec = AV_CODEC_ID_VORBIS, + .video_codec = AV_CODEC_ID_VP8, .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, @@ -1352,8 +1352,8 @@ AVOutputFormat ff_matroska_audio_muxer = { .extensions = "mka", .priv_data_size = sizeof(MatroskaMuxContext), .audio_codec = CONFIG_LIBVORBIS_ENCODER ? - CODEC_ID_VORBIS : CODEC_ID_AC3, - .video_codec = CODEC_ID_NONE, + AV_CODEC_ID_VORBIS : AV_CODEC_ID_AC3, + .video_codec = AV_CODEC_ID_NONE, .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c index 9c51cf1d43..f3653084e7 100644 --- a/libavformat/md5enc.c +++ b/libavformat/md5enc.c @@ -70,8 +70,8 @@ AVOutputFormat ff_md5_muxer = { .name = "md5", .long_name = NULL_IF_CONFIG_SMALL("MD5 testing"), .priv_data_size = PRIVSIZE, - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_RAWVIDEO, .write_header = write_header, .write_packet = write_packet, .write_trailer = write_trailer, @@ -100,8 +100,8 @@ AVOutputFormat ff_framemd5_muxer = { .name = "framemd5", .long_name = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing"), .priv_data_size = PRIVSIZE, - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_RAWVIDEO, .write_header = ff_framehash_write_header, .write_packet = framemd5_write_packet, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT, diff --git a/libavformat/microdvddec.c b/libavformat/microdvddec.c index b47457454d..ecc2819943 100644 --- a/libavformat/microdvddec.c +++ b/libavformat/microdvddec.c @@ -116,7 +116,7 @@ static int microdvd_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(µdvd->q); avpriv_set_pts_info(st, 64, pts_info.den, pts_info.num); st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = CODEC_ID_MICRODVD; + st->codec->codec_id = AV_CODEC_ID_MICRODVD; return 0; } diff --git a/libavformat/microdvdenc.c b/libavformat/microdvdenc.c index b2abc547e6..ba97444044 100644 --- a/libavformat/microdvdenc.c +++ b/libavformat/microdvdenc.c @@ -26,7 +26,7 @@ static int microdvd_write_header(struct AVFormatContext *s) { AVCodecContext *avctx = s->streams[0]->codec; - if (s->nb_streams != 1 || avctx->codec_id != CODEC_ID_MICRODVD) { + if (s->nb_streams != 1 || avctx->codec_id != AV_CODEC_ID_MICRODVD) { av_log(s, AV_LOG_ERROR, "Exactly one MicroDVD stream is needed.\n"); return -1; } @@ -47,5 +47,5 @@ AVOutputFormat ff_microdvd_muxer = { .write_header = microdvd_write_header, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, - .subtitle_codec = CODEC_ID_MICRODVD, + .subtitle_codec = AV_CODEC_ID_MICRODVD, }; diff --git a/libavformat/mkvtimestamp_v2.c b/libavformat/mkvtimestamp_v2.c index b04c655f7f..3ed195ac5c 100644 --- a/libavformat/mkvtimestamp_v2.c +++ b/libavformat/mkvtimestamp_v2.c @@ -44,8 +44,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_mkvtimestamp_v2_muxer = { .name = "mkvtimestamp_v2", .long_name = NULL_IF_CONFIG_SMALL("extract pts as timecode v2 format, as defined by mkvtoolnix"), - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_RAWVIDEO, .write_header = write_header, .write_packet = write_packet, }; diff --git a/libavformat/mm.c b/libavformat/mm.c index 889aa12e86..125a6773c4 100644 --- a/libavformat/mm.c +++ b/libavformat/mm.c @@ -109,7 +109,7 @@ static int read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MMVIDEO; + st->codec->codec_id = AV_CODEC_ID_MMVIDEO; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = width; st->codec->height = height; @@ -122,7 +122,7 @@ static int read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_tag = 0; /* no fourcc */ - st->codec->codec_id = CODEC_ID_PCM_U8; + st->codec->codec_id = AV_CODEC_ID_PCM_U8; st->codec->channels = 1; st->codec->sample_rate = 8000; avpriv_set_pts_info(st, 64, 1, 8000); /* 8000 hz */ diff --git a/libavformat/mmf.c b/libavformat/mmf.c index 25882ee859..18b69d471f 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -246,7 +246,7 @@ static int mmf_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ADPCM_YAMAHA; + st->codec->codec_id = AV_CODEC_ID_ADPCM_YAMAHA; st->codec->sample_rate = rate; st->codec->channels = 1; st->codec->bits_per_coded_sample = 4; @@ -303,8 +303,8 @@ AVOutputFormat ff_mmf_muxer = { .mime_type = "application/vnd.smaf", .extensions = "mmf", .priv_data_size = sizeof(MMFContext), - .audio_codec = CODEC_ID_ADPCM_YAMAHA, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_ADPCM_YAMAHA, + .video_codec = AV_CODEC_ID_NONE, .write_header = mmf_write_header, .write_packet = mmf_write_packet, .write_trailer = mmf_write_trailer, diff --git a/libavformat/mov.c b/libavformat/mov.c index f0aa85c5e3..786bfcf0fb 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -173,13 +173,13 @@ static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len) AVPacket pkt; AVStream *st; MOVStreamContext *sc; - enum CodecID id; + enum AVCodecID id; int ret; switch (type) { - case 0xd: id = CODEC_ID_MJPEG; break; - case 0xe: id = CODEC_ID_PNG; break; - case 0x1b: id = CODEC_ID_BMP; break; + case 0xd: id = AV_CODEC_ID_MJPEG; break; + case 0xe: id = AV_CODEC_ID_PNG; break; + case 0x1b: id = AV_CODEC_ID_BMP; break; default: av_log(c->fc, AV_LOG_WARNING, "Unknown cover type: 0x%x.\n", type); avio_skip(pb, len); @@ -491,7 +491,7 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom) else if (type == MKTAG('s','o','u','n')) st->codec->codec_type = AVMEDIA_TYPE_AUDIO; else if (type == MKTAG('m','1','a',' ')) - st->codec->codec_id = CODEC_ID_MP2; + st->codec->codec_id = AV_CODEC_ID_MP2; else if ((type == MKTAG('s','u','b','p')) || (type == MKTAG('c','l','c','p'))) st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; @@ -815,17 +815,17 @@ static int mov_read_enda(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_dlog(c->fc, "enda %d\n", little_endian); if (little_endian == 1) { switch (st->codec->codec_id) { - case CODEC_ID_PCM_S24BE: - st->codec->codec_id = CODEC_ID_PCM_S24LE; + case AV_CODEC_ID_PCM_S24BE: + st->codec->codec_id = AV_CODEC_ID_PCM_S24LE; break; - case CODEC_ID_PCM_S32BE: - st->codec->codec_id = CODEC_ID_PCM_S32LE; + case AV_CODEC_ID_PCM_S32BE: + st->codec->codec_id = AV_CODEC_ID_PCM_S32LE; break; - case CODEC_ID_PCM_F32BE: - st->codec->codec_id = CODEC_ID_PCM_F32LE; + case AV_CODEC_ID_PCM_F32BE: + st->codec->codec_id = AV_CODEC_ID_PCM_F32LE; break; - case CODEC_ID_PCM_F64BE: - st->codec->codec_id = CODEC_ID_PCM_F64LE; + case AV_CODEC_ID_PCM_F64BE: + st->codec->codec_id = AV_CODEC_ID_PCM_F64LE; break; default: break; @@ -901,27 +901,27 @@ static int mov_read_extradata(MOVContext *c, AVIOContext *pb, MOVAtom atom, /* wrapper functions for reading ALAC/AVS/MJPEG/MJPEG2000 extradata atoms only for those codecs */ static int mov_read_alac(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - return mov_read_extradata(c, pb, atom, CODEC_ID_ALAC); + return mov_read_extradata(c, pb, atom, AV_CODEC_ID_ALAC); } static int mov_read_avss(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - return mov_read_extradata(c, pb, atom, CODEC_ID_AVS); + return mov_read_extradata(c, pb, atom, AV_CODEC_ID_AVS); } static int mov_read_jp2h(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - return mov_read_extradata(c, pb, atom, CODEC_ID_JPEG2000); + return mov_read_extradata(c, pb, atom, AV_CODEC_ID_JPEG2000); } static int mov_read_avid(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - return mov_read_extradata(c, pb, atom, CODEC_ID_AVUI); + return mov_read_extradata(c, pb, atom, AV_CODEC_ID_AVUI); } static int mov_read_svq3(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - return mov_read_extradata(c, pb, atom, CODEC_ID_SVQ3); + return mov_read_extradata(c, pb, atom, AV_CODEC_ID_SVQ3); } static int mov_read_wave(MOVContext *c, AVIOContext *pb, MOVAtom atom) @@ -935,7 +935,7 @@ static int mov_read_wave(MOVContext *c, AVIOContext *pb, MOVAtom atom) if ((uint64_t)atom.size > (1<<30)) return AVERROR_INVALIDDATA; - if (st->codec->codec_id == CODEC_ID_QDM2 || st->codec->codec_id == CODEC_ID_QDMC) { + if (st->codec->codec_id == AV_CODEC_ID_QDM2 || st->codec->codec_id == AV_CODEC_ID_QDMC) { // pass all frma atom to codec, needed at least for QDMC and QDM2 av_free(st->codec->extradata); st->codec->extradata_size = 0; @@ -1085,35 +1085,35 @@ static int mov_read_stco(MOVContext *c, AVIOContext *pb, MOVAtom atom) * Compute codec id for 'lpcm' tag. * See CoreAudioTypes and AudioStreamBasicDescription at Apple. */ -enum CodecID ff_mov_get_lpcm_codec_id(int bps, int flags) +enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags) { if (flags & 1) { // floating point if (flags & 2) { // big endian - if (bps == 32) return CODEC_ID_PCM_F32BE; - else if (bps == 64) return CODEC_ID_PCM_F64BE; + if (bps == 32) return AV_CODEC_ID_PCM_F32BE; + else if (bps == 64) return AV_CODEC_ID_PCM_F64BE; } else { - if (bps == 32) return CODEC_ID_PCM_F32LE; - else if (bps == 64) return CODEC_ID_PCM_F64LE; + if (bps == 32) return AV_CODEC_ID_PCM_F32LE; + else if (bps == 64) return AV_CODEC_ID_PCM_F64LE; } } else { if (flags & 2) { if (bps == 8) // signed integer - if (flags & 4) return CODEC_ID_PCM_S8; - else return CODEC_ID_PCM_U8; - else if (bps == 16) return CODEC_ID_PCM_S16BE; - else if (bps == 24) return CODEC_ID_PCM_S24BE; - else if (bps == 32) return CODEC_ID_PCM_S32BE; + if (flags & 4) return AV_CODEC_ID_PCM_S8; + else return AV_CODEC_ID_PCM_U8; + else if (bps == 16) return AV_CODEC_ID_PCM_S16BE; + else if (bps == 24) return AV_CODEC_ID_PCM_S24BE; + else if (bps == 32) return AV_CODEC_ID_PCM_S32BE; } else { if (bps == 8) - if (flags & 4) return CODEC_ID_PCM_S8; - else return CODEC_ID_PCM_U8; - else if (bps == 16) return CODEC_ID_PCM_S16LE; - else if (bps == 24) return CODEC_ID_PCM_S24LE; - else if (bps == 32) return CODEC_ID_PCM_S32LE; + if (flags & 4) return AV_CODEC_ID_PCM_S8; + else return AV_CODEC_ID_PCM_U8; + else if (bps == 16) return AV_CODEC_ID_PCM_S16LE; + else if (bps == 24) return AV_CODEC_ID_PCM_S24LE; + else if (bps == 32) return AV_CODEC_ID_PCM_S32LE; } } - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) @@ -1129,7 +1129,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) for (pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) { //Parsing Sample description table - enum CodecID id; + enum AVCodecID id; int dref_id = 1; MOVAtom a = { AV_RL32("stsd") }; int64_t start_pos = avio_tell(pb); @@ -1179,7 +1179,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) st->codec->codec_type = AVMEDIA_TYPE_VIDEO; else if (st->codec->codec_type == AVMEDIA_TYPE_DATA || (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE && - st->codec->codec_id == CODEC_ID_NONE)){ + st->codec->codec_id == AV_CODEC_ID_NONE)){ id = ff_codec_get_id(ff_codec_movsubtitle_tags, format); if (id > 0) st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; @@ -1243,7 +1243,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) color_index = 255; color_dec = 256 / (color_count - 1); for (j = 0; j < color_count; j++) { - if (id == CODEC_ID_CINEPAK){ + if (id == AV_CODEC_ID_CINEPAK){ r = g = b = color_count - 1 - color_index; }else r = g = b = color_index; @@ -1336,34 +1336,34 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) } switch (st->codec->codec_id) { - case CODEC_ID_PCM_S8: - case CODEC_ID_PCM_U8: + case AV_CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_U8: if (st->codec->bits_per_coded_sample == 16) - st->codec->codec_id = CODEC_ID_PCM_S16BE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16BE; break; - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16BE: if (st->codec->bits_per_coded_sample == 8) - st->codec->codec_id = CODEC_ID_PCM_S8; + st->codec->codec_id = AV_CODEC_ID_PCM_S8; else if (st->codec->bits_per_coded_sample == 24) st->codec->codec_id = - st->codec->codec_id == CODEC_ID_PCM_S16BE ? - CODEC_ID_PCM_S24BE : CODEC_ID_PCM_S24LE; + st->codec->codec_id == AV_CODEC_ID_PCM_S16BE ? + AV_CODEC_ID_PCM_S24BE : AV_CODEC_ID_PCM_S24LE; break; /* set values for old format before stsd version 1 appeared */ - case CODEC_ID_MACE3: + case AV_CODEC_ID_MACE3: sc->samples_per_frame = 6; sc->bytes_per_frame = 2*st->codec->channels; break; - case CODEC_ID_MACE6: + case AV_CODEC_ID_MACE6: sc->samples_per_frame = 6; sc->bytes_per_frame = 1*st->codec->channels; break; - case CODEC_ID_ADPCM_IMA_QT: + case AV_CODEC_ID_ADPCM_IMA_QT: sc->samples_per_frame = 64; sc->bytes_per_frame = 34*st->codec->channels; break; - case CODEC_ID_GSM: + case AV_CODEC_ID_GSM: sc->samples_per_frame = 160; sc->bytes_per_frame = 33; break; @@ -1418,7 +1418,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) /* special codec parameters handling */ switch (st->codec->codec_id) { #if CONFIG_DV_DEMUXER - case CODEC_ID_DVAUDIO: + case AV_CODEC_ID_DVAUDIO: c->dv_fctx = avformat_alloc_context(); c->dv_demux = avpriv_dv_init_demux(c->dv_fctx); if (!c->dv_demux) { @@ -1426,49 +1426,49 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) return AVERROR(ENOMEM); } sc->dv_audio_container = 1; - st->codec->codec_id = CODEC_ID_PCM_S16LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; break; #endif /* no ifdef since parameters are always those */ - case CODEC_ID_QCELP: + case AV_CODEC_ID_QCELP: // force sample rate for qcelp when not stored in mov if (st->codec->codec_tag != MKTAG('Q','c','l','p')) st->codec->sample_rate = 8000; st->codec->channels= 1; /* really needed */ break; - case CODEC_ID_AMR_NB: + case AV_CODEC_ID_AMR_NB: st->codec->channels= 1; /* really needed */ /* force sample rate for amr, stsd in 3gp does not store sample rate */ st->codec->sample_rate = 8000; break; - case CODEC_ID_AMR_WB: + case AV_CODEC_ID_AMR_WB: st->codec->channels = 1; st->codec->sample_rate = 16000; break; - case CODEC_ID_MP2: - case CODEC_ID_MP3: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: st->codec->codec_type = AVMEDIA_TYPE_AUDIO; /* force type after stsd for m1a hdlr */ st->need_parsing = AVSTREAM_PARSE_FULL; break; - case CODEC_ID_GSM: - case CODEC_ID_ADPCM_MS: - case CODEC_ID_ADPCM_IMA_WAV: - case CODEC_ID_ILBC: + case AV_CODEC_ID_GSM: + case AV_CODEC_ID_ADPCM_MS: + case AV_CODEC_ID_ADPCM_IMA_WAV: + case AV_CODEC_ID_ILBC: st->codec->block_align = sc->bytes_per_frame; break; - case CODEC_ID_ALAC: + case AV_CODEC_ID_ALAC: if (st->codec->extradata_size == 36) { st->codec->channels = AV_RB8 (st->codec->extradata+21); st->codec->sample_rate = AV_RB32(st->codec->extradata+32); } break; - case CODEC_ID_AC3: + case AV_CODEC_ID_AC3: st->need_parsing = AVSTREAM_PARSE_FULL; break; - case CODEC_ID_MPEG1VIDEO: + case AV_CODEC_ID_MPEG1VIDEO: st->need_parsing = AVSTREAM_PARSE_FULL; break; - case CODEC_ID_VC1: + case AV_CODEC_ID_VC1: st->need_parsing = AVSTREAM_PARSE_FULL; break; default: @@ -2074,13 +2074,13 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) switch (st->codec->codec_id) { #if CONFIG_H261_DECODER - case CODEC_ID_H261: + case AV_CODEC_ID_H261: #endif #if CONFIG_H263_DECODER - case CODEC_ID_H263: + case AV_CODEC_ID_H263: #endif #if CONFIG_MPEG4_DECODER - case CODEC_ID_MPEG4: + case AV_CODEC_ID_MPEG4: #endif st->codec->width = 0; /* let decoder init width/height */ st->codec->height= 0; @@ -2962,7 +2962,7 @@ static int mov_read_header(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; MOVStreamContext *sc = st->priv_data; - if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->codec_id == CODEC_ID_AAC) { + if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->codec_id == AV_CODEC_ID_AAC) { sc->start_pad = 2112; st->skip_samples = sc->start_pad; } diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 3d02aff036..475a66ba82 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -429,25 +429,25 @@ static const enum MovChannelLayoutTag mov_ch_layouts_wav[] = { }; static const struct { - enum CodecID codec_id; + enum AVCodecID codec_id; const enum MovChannelLayoutTag *layouts; } mov_codec_ch_layouts[] = { - { CODEC_ID_AAC, mov_ch_layouts_aac }, - { CODEC_ID_AC3, mov_ch_layouts_ac3 }, - { CODEC_ID_ALAC, mov_ch_layouts_alac }, - { CODEC_ID_PCM_U8, mov_ch_layouts_wav }, - { CODEC_ID_PCM_S8, mov_ch_layouts_wav }, - { CODEC_ID_PCM_S16LE, mov_ch_layouts_wav }, - { CODEC_ID_PCM_S16BE, mov_ch_layouts_wav }, - { CODEC_ID_PCM_S24LE, mov_ch_layouts_wav }, - { CODEC_ID_PCM_S24BE, mov_ch_layouts_wav }, - { CODEC_ID_PCM_S32LE, mov_ch_layouts_wav }, - { CODEC_ID_PCM_S32BE, mov_ch_layouts_wav }, - { CODEC_ID_PCM_F32LE, mov_ch_layouts_wav }, - { CODEC_ID_PCM_F32BE, mov_ch_layouts_wav }, - { CODEC_ID_PCM_F64LE, mov_ch_layouts_wav }, - { CODEC_ID_PCM_F64BE, mov_ch_layouts_wav }, - { CODEC_ID_NONE, NULL }, + { AV_CODEC_ID_AAC, mov_ch_layouts_aac }, + { AV_CODEC_ID_AC3, mov_ch_layouts_ac3 }, + { AV_CODEC_ID_ALAC, mov_ch_layouts_alac }, + { AV_CODEC_ID_PCM_U8, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S8, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S16LE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S16BE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S24LE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S24BE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S32LE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_S32BE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_F32LE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_F32BE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_F64LE, mov_ch_layouts_wav }, + { AV_CODEC_ID_PCM_F64BE, mov_ch_layouts_wav }, + { AV_CODEC_ID_NONE, NULL }, }; uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap) @@ -490,7 +490,7 @@ static uint32_t mov_get_channel_label(uint32_t label) return 0; } -uint32_t ff_mov_get_channel_layout_tag(enum CodecID codec_id, +uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id, uint64_t channel_layout, uint32_t *bitmap) { @@ -499,11 +499,11 @@ uint32_t ff_mov_get_channel_layout_tag(enum CodecID codec_id, const enum MovChannelLayoutTag *layouts = NULL; /* find the layout list for the specified codec */ - for (i = 0; mov_codec_ch_layouts[i].codec_id != CODEC_ID_NONE; i++) { + for (i = 0; mov_codec_ch_layouts[i].codec_id != AV_CODEC_ID_NONE; i++) { if (mov_codec_ch_layouts[i].codec_id == codec_id) break; } - if (mov_codec_ch_layouts[i].codec_id != CODEC_ID_NONE) + if (mov_codec_ch_layouts[i].codec_id != AV_CODEC_ID_NONE) layouts = mov_codec_ch_layouts[i].layouts; if (layouts) { diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h index 0897cd92dd..3972aa6178 100644 --- a/libavformat/mov_chan.h +++ b/libavformat/mov_chan.h @@ -49,7 +49,7 @@ uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap); * @param[out] bitmap channel bitmap * @return channel layout tag */ -uint32_t ff_mov_get_channel_layout_tag(enum CodecID codec_id, +uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id, uint64_t channel_layout, uint32_t *bitmap); diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 659436b5ab..c6a433a230 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -314,8 +314,8 @@ static int mov_write_esds_tag(AVIOContext *pb, MOVTrack *track) // Basic put_descr(pb, 0x04, 13 + decoder_specific_info_len); // Object type indication - if ((track->enc->codec_id == CODEC_ID_MP2 || - track->enc->codec_id == CODEC_ID_MP3) && + if ((track->enc->codec_id == AV_CODEC_ID_MP2 || + track->enc->codec_id == AV_CODEC_ID_MP3) && track->enc->sample_rate > 24000) avio_w8(pb, 0x6B); // 11172-3 else @@ -350,10 +350,10 @@ static int mov_write_esds_tag(AVIOContext *pb, MOVTrack *track) // Basic static int mov_pcm_le_gt16(enum CodecID codec_id) { - return codec_id == CODEC_ID_PCM_S24LE || - codec_id == CODEC_ID_PCM_S32LE || - codec_id == CODEC_ID_PCM_F32LE || - codec_id == CODEC_ID_PCM_F64LE; + return codec_id == AV_CODEC_ID_PCM_S24LE || + codec_id == AV_CODEC_ID_PCM_S32LE || + codec_id == AV_CODEC_ID_PCM_F32LE || + codec_id == AV_CODEC_ID_PCM_F64LE; } static int mov_write_ms_tag(AVIOContext *pb, MOVTrack *track) @@ -407,13 +407,13 @@ static int mov_write_wave_tag(AVIOContext *pb, MOVTrack *track) avio_wb32(pb, 0); /* size */ ffio_wfourcc(pb, "wave"); - if (track->enc->codec_id != CODEC_ID_QDM2) { + if (track->enc->codec_id != AV_CODEC_ID_QDM2) { avio_wb32(pb, 12); /* size */ ffio_wfourcc(pb, "frma"); avio_wl32(pb, track->tag); } - if (track->enc->codec_id == CODEC_ID_AAC) { + if (track->enc->codec_id == AV_CODEC_ID_AAC) { /* useless atom needed by mplayer, ipod, not needed by quicktime */ avio_wb32(pb, 12); /* size */ ffio_wfourcc(pb, "mp4a"); @@ -421,15 +421,15 @@ static int mov_write_wave_tag(AVIOContext *pb, MOVTrack *track) mov_write_esds_tag(pb, track); } else if (mov_pcm_le_gt16(track->enc->codec_id)) { mov_write_enda_tag(pb); - } else if (track->enc->codec_id == CODEC_ID_AMR_NB) { + } else if (track->enc->codec_id == AV_CODEC_ID_AMR_NB) { mov_write_amr_tag(pb, track); - } else if (track->enc->codec_id == CODEC_ID_AC3) { + } else if (track->enc->codec_id == AV_CODEC_ID_AC3) { mov_write_ac3_tag(pb, track); - } else if (track->enc->codec_id == CODEC_ID_ALAC || - track->enc->codec_id == CODEC_ID_QDM2) { + } else if (track->enc->codec_id == AV_CODEC_ID_ALAC || + track->enc->codec_id == AV_CODEC_ID_QDM2) { mov_write_extradata_tag(pb, track); - } else if (track->enc->codec_id == CODEC_ID_ADPCM_MS || - track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) { + } else if (track->enc->codec_id == AV_CODEC_ID_ADPCM_MS || + track->enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) { mov_write_ms_tag(pb, track); } @@ -543,25 +543,25 @@ static int mov_write_glbl_tag(AVIOContext *pb, MOVTrack *track) * Compute flags for 'lpcm' tag. * See CoreAudioTypes and AudioStreamBasicDescription at Apple. */ -static int mov_get_lpcm_flags(enum CodecID codec_id) +static int mov_get_lpcm_flags(enum AVCodecID codec_id) { switch (codec_id) { - case CODEC_ID_PCM_F32BE: - case CODEC_ID_PCM_F64BE: + case AV_CODEC_ID_PCM_F32BE: + case AV_CODEC_ID_PCM_F64BE: return 11; - case CODEC_ID_PCM_F32LE: - case CODEC_ID_PCM_F64LE: + case AV_CODEC_ID_PCM_F32LE: + case AV_CODEC_ID_PCM_F64LE: return 9; - case CODEC_ID_PCM_U8: + case AV_CODEC_ID_PCM_U8: return 10; - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_S24BE: - case CODEC_ID_PCM_S32BE: + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S24BE: + case AV_CODEC_ID_PCM_S32BE: return 14; - case CODEC_ID_PCM_S8: - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S24LE: - case CODEC_ID_PCM_S32LE: + case AV_CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S24LE: + case AV_CODEC_ID_PCM_S32LE: return 12; default: return 0; @@ -616,9 +616,9 @@ static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track) tag = AV_RL32("lpcm"); version = 2; } else if (track->audio_vbr || mov_pcm_le_gt16(track->enc->codec_id) || - track->enc->codec_id == CODEC_ID_ADPCM_MS || - track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || - track->enc->codec_id == CODEC_ID_QDM2) { + track->enc->codec_id == AV_CODEC_ID_ADPCM_MS || + track->enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV || + track->enc->codec_id == AV_CODEC_ID_QDM2) { version = 1; } } @@ -651,8 +651,8 @@ static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track) } else { if (track->mode == MODE_MOV) { avio_wb16(pb, track->enc->channels); - if (track->enc->codec_id == CODEC_ID_PCM_U8 || - track->enc->codec_id == CODEC_ID_PCM_S8) + if (track->enc->codec_id == AV_CODEC_ID_PCM_U8 || + track->enc->codec_id == AV_CODEC_ID_PCM_S8) avio_wb16(pb, 8); /* bits per sample */ else avio_wb16(pb, 16); @@ -677,24 +677,24 @@ static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track) } if(track->mode == MODE_MOV && - (track->enc->codec_id == CODEC_ID_AAC || - track->enc->codec_id == CODEC_ID_AC3 || - track->enc->codec_id == CODEC_ID_AMR_NB || - track->enc->codec_id == CODEC_ID_ALAC || - track->enc->codec_id == CODEC_ID_ADPCM_MS || - track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || - track->enc->codec_id == CODEC_ID_QDM2 || + (track->enc->codec_id == AV_CODEC_ID_AAC || + track->enc->codec_id == AV_CODEC_ID_AC3 || + track->enc->codec_id == AV_CODEC_ID_AMR_NB || + track->enc->codec_id == AV_CODEC_ID_ALAC || + track->enc->codec_id == AV_CODEC_ID_ADPCM_MS || + track->enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV || + track->enc->codec_id == AV_CODEC_ID_QDM2 || (mov_pcm_le_gt16(track->enc->codec_id) && version==1))) mov_write_wave_tag(pb, track); else if(track->tag == MKTAG('m','p','4','a')) mov_write_esds_tag(pb, track); - else if(track->enc->codec_id == CODEC_ID_AMR_NB) + else if(track->enc->codec_id == AV_CODEC_ID_AMR_NB) mov_write_amr_tag(pb, track); - else if(track->enc->codec_id == CODEC_ID_AC3) + else if(track->enc->codec_id == AV_CODEC_ID_AC3) mov_write_ac3_tag(pb, track); - else if(track->enc->codec_id == CODEC_ID_ALAC) + else if(track->enc->codec_id == AV_CODEC_ID_ALAC) mov_write_extradata_tag(pb, track); - else if (track->enc->codec_id == CODEC_ID_WMAPRO) + else if (track->enc->codec_id == AV_CODEC_ID_WMAPRO) mov_write_wfex_tag(pb, track); else if (track->vos_len > 0) mov_write_glbl_tag(pb, track); @@ -782,11 +782,11 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track) if (!ff_codec_get_tag(ff_mp4_obj_type, track->enc->codec_id)) return 0; - if (track->enc->codec_id == CODEC_ID_H264) tag = MKTAG('a','v','c','1'); - else if (track->enc->codec_id == CODEC_ID_AC3) tag = MKTAG('a','c','-','3'); - else if (track->enc->codec_id == CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c'); - else if (track->enc->codec_id == CODEC_ID_MOV_TEXT) tag = MKTAG('t','x','3','g'); - else if (track->enc->codec_id == CODEC_ID_VC1) tag = MKTAG('v','c','-','1'); + if (track->enc->codec_id == AV_CODEC_ID_H264) tag = MKTAG('a','v','c','1'); + else if (track->enc->codec_id == AV_CODEC_ID_AC3) tag = MKTAG('a','c','-','3'); + else if (track->enc->codec_id == AV_CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c'); + else if (track->enc->codec_id == AV_CODEC_ID_MOV_TEXT) tag = MKTAG('t','x','3','g'); + else if (track->enc->codec_id == AV_CODEC_ID_VC1) tag = MKTAG('v','c','-','1'); else if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) tag = MKTAG('m','p','4','v'); else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); @@ -794,14 +794,14 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track) } static const AVCodecTag codec_ipod_tags[] = { - { CODEC_ID_H264, MKTAG('a','v','c','1') }, - { CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, - { CODEC_ID_AAC, MKTAG('m','p','4','a') }, - { CODEC_ID_ALAC, MKTAG('a','l','a','c') }, - { CODEC_ID_AC3, MKTAG('a','c','-','3') }, - { CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') }, - { CODEC_ID_MOV_TEXT, MKTAG('t','e','x','t') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_H264, MKTAG('a','v','c','1') }, + { AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, + { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') }, + { AV_CODEC_ID_ALAC, MKTAG('a','l','a','c') }, + { AV_CODEC_ID_AC3, MKTAG('a','c','-','3') }, + { AV_CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') }, + { AV_CODEC_ID_MOV_TEXT, MKTAG('t','e','x','t') }, + { AV_CODEC_ID_NONE, 0 }, }; static int ipod_get_codec_tag(AVFormatContext *s, MOVTrack *track) @@ -889,13 +889,13 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) int tag = track->enc->codec_tag; if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL && - (track->enc->codec_id == CODEC_ID_DVVIDEO || - track->enc->codec_id == CODEC_ID_RAWVIDEO || - track->enc->codec_id == CODEC_ID_H263 || + (track->enc->codec_id == AV_CODEC_ID_DVVIDEO || + track->enc->codec_id == AV_CODEC_ID_RAWVIDEO || + track->enc->codec_id == AV_CODEC_ID_H263 || av_get_bits_per_sample(track->enc->codec_id)))) { // pcm audio - if (track->enc->codec_id == CODEC_ID_DVVIDEO) + if (track->enc->codec_id == AV_CODEC_ID_DVVIDEO) tag = mov_get_dv_codec_tag(s, track); - else if (track->enc->codec_id == CODEC_ID_RAWVIDEO) + else if (track->enc->codec_id == AV_CODEC_ID_RAWVIDEO) tag = mov_get_rawvideo_codec_tag(s, track); else if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) { tag = ff_codec_get_tag(ff_codec_movvideo_tags, track->enc->codec_id); @@ -923,14 +923,14 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) } static const AVCodecTag codec_3gp_tags[] = { - { CODEC_ID_H263, MKTAG('s','2','6','3') }, - { CODEC_ID_H264, MKTAG('a','v','c','1') }, - { CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, - { CODEC_ID_AAC, MKTAG('m','p','4','a') }, - { CODEC_ID_AMR_NB, MKTAG('s','a','m','r') }, - { CODEC_ID_AMR_WB, MKTAG('s','a','w','b') }, - { CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_H263, MKTAG('s','2','6','3') }, + { AV_CODEC_ID_H264, MKTAG('a','v','c','1') }, + { AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, + { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') }, + { AV_CODEC_ID_AMR_NB, MKTAG('s','a','m','r') }, + { AV_CODEC_ID_AMR_WB, MKTAG('s','a','w','b') }, + { AV_CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') }, + { AV_CODEC_ID_NONE, 0 }, }; static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) @@ -941,7 +941,7 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) tag = mp4_get_codec_tag(s, track); else if (track->mode == MODE_ISM) { tag = mp4_get_codec_tag(s, track); - if (!tag && track->enc->codec_id == CODEC_ID_WMAPRO) + if (!tag && track->enc->codec_id == AV_CODEC_ID_WMAPRO) tag = MKTAG('w', 'm', 'a', ' '); } else if (track->mode == MODE_IPOD) tag = ipod_get_codec_tag(s, track); @@ -1029,7 +1029,7 @@ static int mov_write_video_tag(AVIOContext *pb, MOVTrack *track) avio_wb16(pb, 0); /* Codec stream revision (=0) */ if (track->mode == MODE_MOV) { ffio_wfourcc(pb, "FFMP"); /* Vendor */ - if(track->enc->codec_id == CODEC_ID_RAWVIDEO) { + if(track->enc->codec_id == AV_CODEC_ID_RAWVIDEO) { avio_wb32(pb, 0); /* Temporal Quality */ avio_wb32(pb, 0x400); /* Spatial Quality = lossless*/ } else { @@ -1061,21 +1061,21 @@ static int mov_write_video_tag(AVIOContext *pb, MOVTrack *track) avio_wb16(pb, 0xffff); /* Reserved */ if(track->tag == MKTAG('m','p','4','v')) mov_write_esds_tag(pb, track); - else if(track->enc->codec_id == CODEC_ID_H263) + else if(track->enc->codec_id == AV_CODEC_ID_H263) mov_write_d263_tag(pb); - else if(track->enc->codec_id == CODEC_ID_AVUI || - track->enc->codec_id == CODEC_ID_SVQ3) { + else if(track->enc->codec_id == AV_CODEC_ID_AVUI || + track->enc->codec_id == AV_CODEC_ID_SVQ3) { mov_write_extradata_tag(pb, track); avio_wb32(pb, 0); - } else if(track->enc->codec_id == CODEC_ID_DNXHD) + } else if(track->enc->codec_id == AV_CODEC_ID_DNXHD) mov_write_avid_tag(pb, track); - else if(track->enc->codec_id == CODEC_ID_H264) { + else if(track->enc->codec_id == AV_CODEC_ID_H264) { mov_write_avcc_tag(pb, track); if(track->mode == MODE_IPOD) mov_write_uuid_tag_ipod(pb); } else if (track->enc->field_order != AV_FIELD_UNKNOWN) mov_write_fiel_tag(pb, track); - else if (track->enc->codec_id == CODEC_ID_VC1 && track->vos_len > 0) + else if (track->enc->codec_id == AV_CODEC_ID_VC1 && track->vos_len > 0) mov_write_dvc1_tag(pb, track); else if (track->vos_len > 0) mov_write_glbl_tag(pb, track); @@ -2302,7 +2302,7 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov) param_write_int(pb, "systemBitrate", track->enc->bit_rate); param_write_int(pb, "trackID", track_id); if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) { - if (track->enc->codec_id == CODEC_ID_H264) { + if (track->enc->codec_id == AV_CODEC_ID_H264) { uint8_t *ptr; int size = track->enc->extradata_size; if (!ff_avc_write_annexb_extradata(track->enc->extradata, &ptr, @@ -2313,7 +2313,7 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov) av_free(ptr); } param_write_string(pb, "FourCC", "H264"); - } else if (track->enc->codec_id == CODEC_ID_VC1) { + } else if (track->enc->codec_id == AV_CODEC_ID_VC1) { param_write_string(pb, "FourCC", "WVC1"); param_write_hex(pb, "CodecPrivateData", track->enc->extradata, track->enc->extradata_size); @@ -2323,9 +2323,9 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov) param_write_int(pb, "DisplayWidth", track->enc->width); param_write_int(pb, "DisplayHeight", track->enc->height); } else { - if (track->enc->codec_id == CODEC_ID_AAC) { + if (track->enc->codec_id == AV_CODEC_ID_AAC) { param_write_string(pb, "FourCC", "AACL"); - } else if (track->enc->codec_id == CODEC_ID_WMAPRO) { + } else if (track->enc->codec_id == AV_CODEC_ID_WMAPRO) { param_write_string(pb, "FourCC", "WMAP"); } param_write_hex(pb, "CodecPrivateData", track->enc->extradata, @@ -2657,7 +2657,7 @@ static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s) AVStream *st = s->streams[i]; if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) has_video = 1; - if (st->codec->codec_id == CODEC_ID_H264) + if (st->codec->codec_id == AV_CODEC_ID_H264) has_h264 = 1; } @@ -2748,7 +2748,7 @@ static void mov_write_uuidprof_tag(AVIOContext *pb, AVFormatContext *s) ffio_wfourcc(pb, "VPRF"); /* video */ avio_wb32(pb, 0x0); avio_wb32(pb, 0x1); /* TrackID */ - if (video_codec->codec_id == CODEC_ID_H264) { + if (video_codec->codec_id == AV_CODEC_ID_H264) { ffio_wfourcc(pb, "avc1"); avio_wb16(pb, 0x014D); avio_wb16(pb, 0x0015); @@ -2998,7 +2998,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) } } - if (enc->codec_id == CODEC_ID_AMR_NB) { + if (enc->codec_id == AV_CODEC_ID_AMR_NB) { /* We must find out how many AMR blocks there are in one packet */ static uint16_t packed_size[16] = {13, 14, 16, 18, 20, 21, 27, 32, 6, 0, 0, 0, 0, 0, 0, 1}; @@ -3012,8 +3012,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_ERROR, "fatal error, input is not a single packet, implement a AVParser for it\n"); return -1; } - } else if (enc->codec_id == CODEC_ID_ADPCM_MS || - enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) { + } else if (enc->codec_id == AV_CODEC_ID_ADPCM_MS || + enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) { samples_in_chunk = enc->frame_size; } else if (trk->sample_size) samples_in_chunk = size / trk->sample_size; @@ -3027,7 +3027,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) memcpy(trk->vos_data, enc->extradata, trk->vos_len); } - if (enc->codec_id == CODEC_ID_H264 && trk->vos_len > 0 && *(uint8_t *)trk->vos_data != 1) { + if (enc->codec_id == AV_CODEC_ID_H264 && trk->vos_len > 0 && *(uint8_t *)trk->vos_data != 1) { /* from x264 or from bytestream h264 */ /* nal reformating needed */ if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) { @@ -3037,7 +3037,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) } else { size = ff_avc_parse_nal_units(pb, pkt->data, pkt->size); } - } else if (enc->codec_id == CODEC_ID_AAC && pkt->size > 2 && + } else if (enc->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 && (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) { av_log(s, AV_LOG_ERROR, "malformated aac bitstream, use -absf aac_adtstoasc\n"); return -1; @@ -3045,8 +3045,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) avio_write(pb, pkt->data, size); } - if ((enc->codec_id == CODEC_ID_DNXHD || - enc->codec_id == CODEC_ID_AC3) && !trk->vos_len) { + if ((enc->codec_id == AV_CODEC_ID_DNXHD || + enc->codec_id == AV_CODEC_ID_AC3) && !trk->vos_len) { /* copy frame to create needed atoms */ trk->vos_len = size; trk->vos_data = av_malloc(size); @@ -3087,10 +3087,10 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) trk->flags |= MOV_TRACK_CTTS; trk->cluster[trk->entry].cts = pkt->pts - pkt->dts; trk->cluster[trk->entry].flags = 0; - if (enc->codec_id == CODEC_ID_VC1) { + if (enc->codec_id == AV_CODEC_ID_VC1) { mov_parse_vc1_frame(pkt, trk, mov->fragments); } else if (pkt->flags & AV_PKT_FLAG_KEY) { - if (mov->mode == MODE_MOV && enc->codec_id == CODEC_ID_MPEG2VIDEO && + if (mov->mode == MODE_MOV && enc->codec_id == AV_CODEC_ID_MPEG2VIDEO && trk->entry > 0) { // force sync sample for the first key frame mov_parse_mpeg2_frame(pkt, &trk->cluster[trk->entry].flags); if (trk->cluster[trk->entry].flags & MOV_PARTIAL_SYNC_SAMPLE) @@ -3196,7 +3196,7 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) MOVTrack *trk = &mov->tracks[i]; int ret; - if (trk->enc->codec_id == CODEC_ID_MOV_TEXT && + if (trk->enc->codec_id == AV_CODEC_ID_MOV_TEXT && trk->track_duration < pkt->dts && (trk->entry == 0 || !trk->last_sample_is_subtitle_end)) { ret = mov_write_subtitle_end_packet(s, i, trk->track_duration); @@ -3459,9 +3459,9 @@ static int mov_write_header(AVFormatContext *s) if(!st->codec->frame_size && !av_get_bits_per_sample(st->codec->codec_id)) { av_log(s, AV_LOG_WARNING, "track %d: codec frame size is not set\n", i); track->audio_vbr = 1; - }else if(st->codec->codec_id == CODEC_ID_ADPCM_MS || - st->codec->codec_id == CODEC_ID_ADPCM_IMA_WAV || - st->codec->codec_id == CODEC_ID_ILBC){ + }else if(st->codec->codec_id == AV_CODEC_ID_ADPCM_MS || + st->codec->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV || + st->codec->codec_id == AV_CODEC_ID_ILBC){ if (!st->codec->block_align) { av_log(s, AV_LOG_ERROR, "track %d: codec block align is not set for adpcm\n", i); goto error; @@ -3473,7 +3473,7 @@ static int mov_write_header(AVFormatContext *s) track->sample_size = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels; } if (track->mode != MODE_MOV && - track->enc->codec_id == CODEC_ID_MP3 && track->timescale < 16000) { + track->enc->codec_id == AV_CODEC_ID_MP3 && track->timescale < 16000) { av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not supported\n", i, track->enc->sample_rate); goto error; @@ -3586,7 +3586,7 @@ static int mov_write_trailer(AVFormatContext *s) */ for (i = 0; i < mov->nb_streams; i++) { MOVTrack *trk = &mov->tracks[i]; - if (trk->enc->codec_id == CODEC_ID_MOV_TEXT && + if (trk->enc->codec_id == AV_CODEC_ID_MOV_TEXT && !trk->last_sample_is_subtitle_end) { mov_write_subtitle_end_packet(s, i, trk->track_duration); trk->last_sample_is_subtitle_end = 1; @@ -3669,9 +3669,9 @@ AVOutputFormat ff_mov_muxer = { .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), .extensions = "mov", .priv_data_size = sizeof(MOVMuxContext), - .audio_codec = CODEC_ID_AAC, + .audio_codec = AV_CODEC_ID_AAC, .video_codec = CONFIG_LIBX264_ENCODER ? - CODEC_ID_H264 : CODEC_ID_MPEG4, + AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -3689,8 +3689,8 @@ AVOutputFormat ff_tgp_muxer = { .long_name = NULL_IF_CONFIG_SMALL("3GP (3GPP file format)"), .extensions = "3gp", .priv_data_size = sizeof(MOVMuxContext), - .audio_codec = CODEC_ID_AMR_NB, - .video_codec = CODEC_ID_H263, + .audio_codec = AV_CODEC_ID_AMR_NB, + .video_codec = AV_CODEC_ID_H263, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -3707,9 +3707,9 @@ AVOutputFormat ff_mp4_muxer = { .mime_type = "application/mp4", .extensions = "mp4", .priv_data_size = sizeof(MOVMuxContext), - .audio_codec = CODEC_ID_AAC, + .audio_codec = AV_CODEC_ID_AAC, .video_codec = CONFIG_LIBX264_ENCODER ? - CODEC_ID_H264 : CODEC_ID_MPEG4, + AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -3725,9 +3725,9 @@ AVOutputFormat ff_psp_muxer = { .long_name = NULL_IF_CONFIG_SMALL("PSP MP4 (MPEG-4 Part 14)"), .extensions = "mp4,psp", .priv_data_size = sizeof(MOVMuxContext), - .audio_codec = CODEC_ID_AAC, + .audio_codec = AV_CODEC_ID_AAC, .video_codec = CONFIG_LIBX264_ENCODER ? - CODEC_ID_H264 : CODEC_ID_MPEG4, + AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -3743,8 +3743,8 @@ AVOutputFormat ff_tg2_muxer = { .long_name = NULL_IF_CONFIG_SMALL("3GP2 (3GPP2 file format)"), .extensions = "3g2", .priv_data_size = sizeof(MOVMuxContext), - .audio_codec = CODEC_ID_AMR_NB, - .video_codec = CODEC_ID_H263, + .audio_codec = AV_CODEC_ID_AMR_NB, + .video_codec = AV_CODEC_ID_H263, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -3761,8 +3761,8 @@ AVOutputFormat ff_ipod_muxer = { .mime_type = "application/mp4", .extensions = "m4v,m4a", .priv_data_size = sizeof(MOVMuxContext), - .audio_codec = CODEC_ID_AAC, - .video_codec = CODEC_ID_H264, + .audio_codec = AV_CODEC_ID_AAC, + .video_codec = AV_CODEC_ID_H264, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -3779,8 +3779,8 @@ AVOutputFormat ff_ismv_muxer = { .mime_type = "application/mp4", .extensions = "ismv,isma", .priv_data_size = sizeof(MOVMuxContext), - .audio_codec = CODEC_ID_AAC, - .video_codec = CODEC_ID_H264, + .audio_codec = AV_CODEC_ID_AAC, + .video_codec = AV_CODEC_ID_H264, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index aa936c0e98..5bd0e9648b 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -166,7 +166,7 @@ static int mp3_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_MP3; + st->codec->codec_id = AV_CODEC_ID_MP3; st->need_parsing = AVSTREAM_PARSE_FULL_RAW; st->start_time = 0; diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 80d4675d86..0ce1ddc750 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -376,8 +376,8 @@ AVOutputFormat ff_mp2_muxer = { .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), .mime_type = "audio/x-mpeg", .extensions = "mp2,m2a", - .audio_codec = CODEC_ID_MP2, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .write_trailer = mp2_write_trailer, .flags = AVFMT_NOTIMESTAMPS, @@ -461,7 +461,7 @@ static int mp3_write_header(struct AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { - if (mp3->audio_stream_idx >= 0 || st->codec->codec_id != CODEC_ID_MP3) { + if (mp3->audio_stream_idx >= 0 || st->codec->codec_id != AV_CODEC_ID_MP3) { av_log(s, AV_LOG_ERROR, "Invalid audio stream. Exactly one MP3 " "audio stream is required.\n"); return AVERROR(EINVAL); @@ -511,8 +511,8 @@ AVOutputFormat ff_mp3_muxer = { .mime_type = "audio/x-mpeg", .extensions = "mp3", .priv_data_size = sizeof(MP3Context), - .audio_codec = CODEC_ID_MP3, - .video_codec = CODEC_ID_PNG, + .audio_codec = AV_CODEC_ID_MP3, + .video_codec = AV_CODEC_ID_PNG, .write_header = mp3_write_header, .write_packet = mp3_write_packet, .write_trailer = mp3_write_trailer, diff --git a/libavformat/mpc.c b/libavformat/mpc.c index 03e09e94c5..4ebc6ae184 100644 --- a/libavformat/mpc.c +++ b/libavformat/mpc.c @@ -89,7 +89,7 @@ static int mpc_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_MUSEPACK7; + st->codec->codec_id = AV_CODEC_ID_MUSEPACK7; st->codec->channels = 2; st->codec->bits_per_coded_sample = 16; diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index 28b64325e7..56ed7ade13 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -229,7 +229,7 @@ static int mpc8_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_MUSEPACK8; + st->codec->codec_id = AV_CODEC_ID_MUSEPACK8; st->codec->bits_per_coded_sample = 16; st->codec->extradata_size = 2; diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index f01e905982..54125ae9a2 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -377,7 +377,7 @@ static int mpegps_read_packet(AVFormatContext *s, int len, startcode, i, es_type, ret; int lpcm_header_len; int request_probe= 0; - enum CodecID codec_id = CODEC_ID_NONE; + enum AVCodecID codec_id = AV_CODEC_ID_NONE; enum AVMediaType type; int64_t pts, dts, dummy_pos; //dummy_pos is needed for the index building to work @@ -411,26 +411,26 @@ static int mpegps_read_packet(AVFormatContext *s, es_type = m->psm_es_type[startcode & 0xff]; if(es_type > 0 && es_type != STREAM_TYPE_PRIVATE_DATA){ if(es_type == STREAM_TYPE_VIDEO_MPEG1){ - codec_id = CODEC_ID_MPEG2VIDEO; + codec_id = AV_CODEC_ID_MPEG2VIDEO; type = AVMEDIA_TYPE_VIDEO; } else if(es_type == STREAM_TYPE_VIDEO_MPEG2){ - codec_id = CODEC_ID_MPEG2VIDEO; + codec_id = AV_CODEC_ID_MPEG2VIDEO; type = AVMEDIA_TYPE_VIDEO; } else if(es_type == STREAM_TYPE_AUDIO_MPEG1 || es_type == STREAM_TYPE_AUDIO_MPEG2){ - codec_id = CODEC_ID_MP3; + codec_id = AV_CODEC_ID_MP3; type = AVMEDIA_TYPE_AUDIO; } else if(es_type == STREAM_TYPE_AUDIO_AAC){ - codec_id = CODEC_ID_AAC; + codec_id = AV_CODEC_ID_AAC; type = AVMEDIA_TYPE_AUDIO; } else if(es_type == STREAM_TYPE_VIDEO_MPEG4){ - codec_id = CODEC_ID_MPEG4; + codec_id = AV_CODEC_ID_MPEG4; type = AVMEDIA_TYPE_VIDEO; } else if(es_type == STREAM_TYPE_VIDEO_H264){ - codec_id = CODEC_ID_H264; + codec_id = AV_CODEC_ID_H264; type = AVMEDIA_TYPE_VIDEO; } else if(es_type == STREAM_TYPE_AUDIO_AC3){ - codec_id = CODEC_ID_AC3; + codec_id = AV_CODEC_ID_AC3; type = AVMEDIA_TYPE_AUDIO; } else { goto skip; @@ -441,42 +441,42 @@ static int mpegps_read_packet(AVFormatContext *s, avio_read(s->pb, buf, 8); avio_seek(s->pb, -8, SEEK_CUR); if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1)) - codec_id = CODEC_ID_CAVS; + codec_id = AV_CODEC_ID_CAVS; else request_probe= 1; type = AVMEDIA_TYPE_VIDEO; } else if (startcode >= 0x1c0 && startcode <= 0x1df) { type = AVMEDIA_TYPE_AUDIO; - codec_id = m->sofdec > 0 ? CODEC_ID_ADPCM_ADX : CODEC_ID_MP2; + codec_id = m->sofdec > 0 ? AV_CODEC_ID_ADPCM_ADX : AV_CODEC_ID_MP2; } else if (startcode >= 0x80 && startcode <= 0x87) { type = AVMEDIA_TYPE_AUDIO; - codec_id = CODEC_ID_AC3; + codec_id = AV_CODEC_ID_AC3; } else if ( ( startcode >= 0x88 && startcode <= 0x8f) ||( startcode >= 0x98 && startcode <= 0x9f)) { /* 0x90 - 0x97 is reserved for SDDS in DVD specs */ type = AVMEDIA_TYPE_AUDIO; - codec_id = CODEC_ID_DTS; + codec_id = AV_CODEC_ID_DTS; } else if (startcode >= 0xa0 && startcode <= 0xaf) { type = AVMEDIA_TYPE_AUDIO; if(lpcm_header_len == 6) { - codec_id = CODEC_ID_MLP; + codec_id = AV_CODEC_ID_MLP; } else { - /* 16 bit form will be handled as CODEC_ID_PCM_S16BE */ - codec_id = CODEC_ID_PCM_DVD; + /* 16 bit form will be handled as AV_CODEC_ID_PCM_S16BE */ + codec_id = AV_CODEC_ID_PCM_DVD; } } else if (startcode >= 0xb0 && startcode <= 0xbf) { type = AVMEDIA_TYPE_AUDIO; - codec_id = CODEC_ID_TRUEHD; + codec_id = AV_CODEC_ID_TRUEHD; } else if (startcode >= 0xc0 && startcode <= 0xcf) { /* Used for both AC-3 and E-AC-3 in EVOB files */ type = AVMEDIA_TYPE_AUDIO; - codec_id = CODEC_ID_AC3; + codec_id = AV_CODEC_ID_AC3; } else if (startcode >= 0x20 && startcode <= 0x3f) { type = AVMEDIA_TYPE_SUBTITLE; - codec_id = CODEC_ID_DVD_SUBTITLE; + codec_id = AV_CODEC_ID_DVD_SUBTITLE; } else if (startcode >= 0xfd55 && startcode <= 0xfd5f) { type = AVMEDIA_TYPE_VIDEO; - codec_id = CODEC_ID_VC1; + codec_id = AV_CODEC_ID_VC1; } else { skip: /* skip packet */ @@ -491,7 +491,7 @@ static int mpegps_read_packet(AVFormatContext *s, st->codec->codec_type = type; st->codec->codec_id = codec_id; st->request_probe = request_probe; - if (codec_id != CODEC_ID_PCM_S16BE) + if (codec_id != AV_CODEC_ID_PCM_S16BE) st->need_parsing = AVSTREAM_PARSE_FULL; found: if(st->discard >= AVDISCARD_ALL) @@ -521,7 +521,7 @@ static int mpegps_read_packet(AVFormatContext *s, st->codec->sample_rate * st->codec->bits_per_coded_sample; if (st->codec->bits_per_coded_sample == 16) - st->codec->codec_id = CODEC_ID_PCM_S16BE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16BE; else if (st->codec->bits_per_coded_sample == 28) return AVERROR(EINVAL); } diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index c9f1e8e03e..f04bf52860 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -344,11 +344,11 @@ static int mpeg_mux_init(AVFormatContext *ctx) switch(st->codec->codec_type) { case AVMEDIA_TYPE_AUDIO: - if (st->codec->codec_id == CODEC_ID_AC3) { + if (st->codec->codec_id == AV_CODEC_ID_AC3) { stream->id = ac3_id++; - } else if (st->codec->codec_id == CODEC_ID_DTS) { + } else if (st->codec->codec_id == AV_CODEC_ID_DTS) { stream->id = dts_id++; - } else if (st->codec->codec_id == CODEC_ID_PCM_S16BE) { + } else if (st->codec->codec_id == AV_CODEC_ID_PCM_S16BE) { stream->id = lpcm_id++; for(j = 0; j < 4; j++) { if (lpcm_freq_tab[j] == st->codec->sample_rate) @@ -1151,8 +1151,8 @@ AVOutputFormat ff_mpeg1system_muxer = { .mime_type = "video/mpeg", .extensions = "mpg,mpeg", .priv_data_size = sizeof(MpegMuxContext), - .audio_codec = CODEC_ID_MP2, - .video_codec = CODEC_ID_MPEG1VIDEO, + .audio_codec = AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_MPEG1VIDEO, .write_header = mpeg_mux_init, .write_packet = mpeg_mux_write_packet, .write_trailer = mpeg_mux_end, @@ -1166,8 +1166,8 @@ AVOutputFormat ff_mpeg1vcd_muxer = { .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 Systems / MPEG program stream (VCD)"), .mime_type = "video/mpeg", .priv_data_size = sizeof(MpegMuxContext), - .audio_codec = CODEC_ID_MP2, - .video_codec = CODEC_ID_MPEG1VIDEO, + .audio_codec = AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_MPEG1VIDEO, .write_header = mpeg_mux_init, .write_packet = mpeg_mux_write_packet, .write_trailer = mpeg_mux_end, @@ -1182,8 +1182,8 @@ AVOutputFormat ff_mpeg2vob_muxer = { .mime_type = "video/mpeg", .extensions = "vob", .priv_data_size = sizeof(MpegMuxContext), - .audio_codec = CODEC_ID_MP2, - .video_codec = CODEC_ID_MPEG2VIDEO, + .audio_codec = AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_header = mpeg_mux_init, .write_packet = mpeg_mux_write_packet, .write_trailer = mpeg_mux_end, @@ -1200,8 +1200,8 @@ AVOutputFormat ff_mpeg2svcd_muxer = { .mime_type = "video/mpeg", .extensions = "vob", .priv_data_size = sizeof(MpegMuxContext), - .audio_codec = CODEC_ID_MP2, - .video_codec = CODEC_ID_MPEG2VIDEO, + .audio_codec = AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_header = mpeg_mux_init, .write_packet = mpeg_mux_write_packet, .write_trailer = mpeg_mux_end, @@ -1218,8 +1218,8 @@ AVOutputFormat ff_mpeg2dvd_muxer = { .mime_type = "video/mpeg", .extensions = "dvd", .priv_data_size = sizeof(MpegMuxContext), - .audio_codec = CODEC_ID_MP2, - .video_codec = CODEC_ID_MPEG2VIDEO, + .audio_codec = AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_header = mpeg_mux_init, .write_packet = mpeg_mux_write_packet, .write_trailer = mpeg_mux_end, diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 17329b9017..c2e3c8ccaa 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -521,64 +521,64 @@ static int parse_section_header(SectionHeader *h, typedef struct { uint32_t stream_type; enum AVMediaType codec_type; - enum CodecID codec_id; + enum AVCodecID codec_id; } StreamType; static const StreamType ISO_types[] = { - { 0x01, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO }, - { 0x02, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO }, - { 0x03, AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3 }, - { 0x04, AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3 }, - { 0x0f, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC }, - { 0x10, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4 }, + { 0x01, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG2VIDEO }, + { 0x02, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG2VIDEO }, + { 0x03, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_MP3 }, + { 0x04, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_MP3 }, + { 0x0f, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC }, + { 0x10, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 }, /* Makito encoder sets stream type 0x11 for AAC, * so auto-detect LOAS/LATM instead of hardcoding it. */ -// { 0x11, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC_LATM }, /* LATM syntax */ - { 0x1b, AVMEDIA_TYPE_VIDEO, CODEC_ID_H264 }, - { 0xd1, AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC }, - { 0xea, AVMEDIA_TYPE_VIDEO, CODEC_ID_VC1 }, +// { 0x11, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC_LATM }, /* LATM syntax */ + { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, + { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, + { 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 }, { 0 }, }; static const StreamType HDMV_types[] = { - { 0x80, AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_BLURAY }, - { 0x81, AVMEDIA_TYPE_AUDIO, CODEC_ID_AC3 }, - { 0x82, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, - { 0x83, AVMEDIA_TYPE_AUDIO, CODEC_ID_TRUEHD }, - { 0x84, AVMEDIA_TYPE_AUDIO, CODEC_ID_EAC3 }, - { 0x85, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, /* DTS HD */ - { 0x86, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, /* DTS HD MASTER*/ - { 0xa1, AVMEDIA_TYPE_AUDIO, CODEC_ID_EAC3 }, /* E-AC3 Secondary Audio */ - { 0xa2, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, /* DTS Express Secondary Audio */ - { 0x90, AVMEDIA_TYPE_SUBTITLE, CODEC_ID_HDMV_PGS_SUBTITLE }, + { 0x80, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_BLURAY }, + { 0x81, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 }, + { 0x82, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, + { 0x83, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_TRUEHD }, + { 0x84, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_EAC3 }, + { 0x85, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, /* DTS HD */ + { 0x86, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, /* DTS HD MASTER*/ + { 0xa1, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_EAC3 }, /* E-AC3 Secondary Audio */ + { 0xa2, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, /* DTS Express Secondary Audio */ + { 0x90, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_HDMV_PGS_SUBTITLE }, { 0 }, }; /* ATSC ? */ static const StreamType MISC_types[] = { - { 0x81, AVMEDIA_TYPE_AUDIO, CODEC_ID_AC3 }, - { 0x8a, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, + { 0x81, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 }, + { 0x8a, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, { 0 }, }; static const StreamType REGD_types[] = { - { MKTAG('d','r','a','c'), AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC }, - { MKTAG('A','C','-','3'), AVMEDIA_TYPE_AUDIO, CODEC_ID_AC3 }, - { MKTAG('B','S','S','D'), AVMEDIA_TYPE_AUDIO, CODEC_ID_S302M }, - { MKTAG('D','T','S','1'), AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, - { MKTAG('D','T','S','2'), AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, - { MKTAG('D','T','S','3'), AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, - { MKTAG('V','C','-','1'), AVMEDIA_TYPE_VIDEO, CODEC_ID_VC1 }, + { MKTAG('d','r','a','c'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, + { MKTAG('A','C','-','3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 }, + { MKTAG('B','S','S','D'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_S302M }, + { MKTAG('D','T','S','1'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, + { MKTAG('D','T','S','2'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, + { MKTAG('D','T','S','3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, + { MKTAG('V','C','-','1'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 }, { 0 }, }; /* descriptor present */ static const StreamType DESC_types[] = { - { 0x6a, AVMEDIA_TYPE_AUDIO, CODEC_ID_AC3 }, /* AC-3 descriptor */ - { 0x7a, AVMEDIA_TYPE_AUDIO, CODEC_ID_EAC3 }, /* E-AC-3 descriptor */ - { 0x7b, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, - { 0x56, AVMEDIA_TYPE_SUBTITLE, CODEC_ID_DVB_TELETEXT }, - { 0x59, AVMEDIA_TYPE_SUBTITLE, CODEC_ID_DVB_SUBTITLE }, /* subtitling descriptor */ + { 0x6a, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 }, /* AC-3 descriptor */ + { 0x7a, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_EAC3 }, /* E-AC-3 descriptor */ + { 0x7b, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, + { 0x56, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_TELETEXT }, + { 0x59, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_SUBTITLE }, /* subtitling descriptor */ { 0 }, }; @@ -603,7 +603,7 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes, avpriv_set_pts_info(st, 33, 1, 90000); st->priv_data = pes; st->codec->codec_type = AVMEDIA_TYPE_DATA; - st->codec->codec_id = CODEC_ID_NONE; + st->codec->codec_id = AV_CODEC_ID_NONE; st->need_parsing = AVSTREAM_PARSE_FULL; pes->st = st; pes->stream_type = stream_type; @@ -617,7 +617,7 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes, mpegts_find_stream_type(st, pes->stream_type, ISO_types); if ((prog_reg_desc == AV_RL32("HDMV") || prog_reg_desc == AV_RL32("HDPR")) && - st->codec->codec_id == CODEC_ID_NONE) { + st->codec->codec_id == AV_CODEC_ID_NONE) { mpegts_find_stream_type(st, pes->stream_type, HDMV_types); if (pes->stream_type == 0x83) { // HDMV TrueHD streams also contain an AC3 coded version of the @@ -639,14 +639,14 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes, avpriv_set_pts_info(sub_st, 33, 1, 90000); sub_st->priv_data = sub_pes; sub_st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - sub_st->codec->codec_id = CODEC_ID_AC3; + sub_st->codec->codec_id = AV_CODEC_ID_AC3; sub_st->need_parsing = AVSTREAM_PARSE_FULL; sub_pes->sub_st = pes->sub_st = sub_st; } } - if (st->codec->codec_id == CODEC_ID_NONE) + if (st->codec->codec_id == AV_CODEC_ID_NONE) mpegts_find_stream_type(st, pes->stream_type, MISC_types); - if (st->codec->codec_id == CODEC_ID_NONE){ + if (st->codec->codec_id == AV_CODEC_ID_NONE){ st->codec->codec_id = old_codec_id; st->codec->codec_type= old_codec_type; } @@ -841,7 +841,7 @@ static int mpegts_push_data(MpegTSFilter *filter, code != 0x1ff && code != 0x1f2 && /* program_stream_directory, DSMCC_stream */ code != 0x1f8) { /* ITU-T Rec. H.222.1 type E stream */ pes->state = MPEGTS_PESHEADER; - if (pes->st->codec->codec_id == CODEC_ID_NONE && !pes->st->request_probe) { + if (pes->st->codec->codec_id == AV_CODEC_ID_NONE && !pes->st->request_probe) { av_dlog(pes->stream, "pid=%x stream_type=%x probing\n", pes->pid, pes->stream_type); pes->st->request_probe= 1; @@ -1246,19 +1246,19 @@ static void m4sl_cb(MpegTSFilter *filter, const uint8_t *section, int section_le ffio_init_context(&pb, mp4_descr[i].dec_config_descr, mp4_descr[i].dec_config_descr_len, 0, NULL, NULL, NULL, NULL); ff_mp4_read_dec_config_descr(s, st, &pb); - if (st->codec->codec_id == CODEC_ID_AAC && + if (st->codec->codec_id == AV_CODEC_ID_AAC && st->codec->extradata_size > 0) st->need_parsing = 0; - if (st->codec->codec_id == CODEC_ID_H264 && + if (st->codec->codec_id == AV_CODEC_ID_H264 && st->codec->extradata_size > 0) st->need_parsing = 0; - if (st->codec->codec_id <= CODEC_ID_NONE) { - } else if (st->codec->codec_id < CODEC_ID_FIRST_AUDIO) { + if (st->codec->codec_id <= AV_CODEC_ID_NONE) { + } else if (st->codec->codec_id < AV_CODEC_ID_FIRST_AUDIO) { st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - } else if (st->codec->codec_id < CODEC_ID_FIRST_SUBTITLE) { + } else if (st->codec->codec_id < AV_CODEC_ID_FIRST_SUBTITLE) { st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - } else if (st->codec->codec_id < CODEC_ID_FIRST_UNKNOWN) { + } else if (st->codec->codec_id < AV_CODEC_ID_FIRST_UNKNOWN) { st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; } } @@ -1289,7 +1289,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type av_dlog(fc, "tag: 0x%02x len=%d\n", desc_tag, desc_len); - if (st->codec->codec_id == CODEC_ID_NONE && + if (st->codec->codec_id == AV_CODEC_ID_NONE && stream_type == STREAM_TYPE_PRIVATE_DATA) mpegts_find_stream_type(st, desc_tag, DESC_types); @@ -1305,22 +1305,22 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type ffio_init_context(&pb, mp4_descr[i].dec_config_descr, mp4_descr[i].dec_config_descr_len, 0, NULL, NULL, NULL, NULL); ff_mp4_read_dec_config_descr(fc, st, &pb); - if (st->codec->codec_id == CODEC_ID_AAC && + if (st->codec->codec_id == AV_CODEC_ID_AAC && st->codec->extradata_size > 0) st->need_parsing = 0; - if (st->codec->codec_id == CODEC_ID_MPEG4SYSTEMS) + if (st->codec->codec_id == AV_CODEC_ID_MPEG4SYSTEMS) mpegts_open_section_filter(ts, pid, m4sl_cb, ts, 1); } break; case 0x1F: /* FMC descriptor */ get16(pp, desc_end); - if (mp4_descr_count > 0 && (st->codec->codec_id == CODEC_ID_AAC_LATM || st->request_probe>0) && + if (mp4_descr_count > 0 && (st->codec->codec_id == AV_CODEC_ID_AAC_LATM || st->request_probe>0) && mp4_descr->dec_config_descr_len && mp4_descr->es_id == pid) { AVIOContext pb; ffio_init_context(&pb, mp4_descr->dec_config_descr, mp4_descr->dec_config_descr_len, 0, NULL, NULL, NULL, NULL); ff_mp4_read_dec_config_descr(fc, st, &pb); - if (st->codec->codec_id == CODEC_ID_AAC && + if (st->codec->codec_id == AV_CODEC_ID_AAC && st->codec->extradata_size > 0){ st->request_probe= st->need_parsing = 0; st->codec->codec_type= AVMEDIA_TYPE_AUDIO; @@ -1383,7 +1383,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type case 0x05: /* registration descriptor */ st->codec->codec_tag = bytestream_get_le32(pp); av_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag); - if (st->codec->codec_id == CODEC_ID_NONE) + if (st->codec->codec_id == AV_CODEC_ID_NONE) mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types); break; case 0x52: /* stream identifier descriptor */ @@ -1970,7 +1970,7 @@ static int mpegts_read_header(AVFormatContext *s) goto fail; avpriv_set_pts_info(st, 60, 1, 27000000); st->codec->codec_type = AVMEDIA_TYPE_DATA; - st->codec->codec_id = CODEC_ID_MPEG2TS; + st->codec->codec_id = AV_CODEC_ID_MPEG2TS; /* we iterate until we find two PCRs to estimate the bitrate */ pcr_pid = -1; diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 2ed6f031a9..d8e67c7d35 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -278,30 +278,30 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) MpegTSWriteStream *ts_st = st->priv_data; AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL,0); switch(st->codec->codec_id) { - case CODEC_ID_MPEG1VIDEO: - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG1VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: stream_type = STREAM_TYPE_VIDEO_MPEG2; break; - case CODEC_ID_MPEG4: + case AV_CODEC_ID_MPEG4: stream_type = STREAM_TYPE_VIDEO_MPEG4; break; - case CODEC_ID_H264: + case AV_CODEC_ID_H264: stream_type = STREAM_TYPE_VIDEO_H264; break; - case CODEC_ID_DIRAC: + case AV_CODEC_ID_DIRAC: stream_type = STREAM_TYPE_VIDEO_DIRAC; break; - case CODEC_ID_MP2: - case CODEC_ID_MP3: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: stream_type = STREAM_TYPE_AUDIO_MPEG1; break; - case CODEC_ID_AAC: + case AV_CODEC_ID_AAC: stream_type = (ts->flags & MPEGTS_FLAG_AAC_LATM) ? STREAM_TYPE_AUDIO_AAC_LATM : STREAM_TYPE_AUDIO_AAC; break; - case CODEC_ID_AAC_LATM: + case AV_CODEC_ID_AAC_LATM: stream_type = STREAM_TYPE_AUDIO_AAC_LATM; break; - case CODEC_ID_AC3: + case AV_CODEC_ID_AC3: stream_type = STREAM_TYPE_AUDIO_AC3; break; default: @@ -316,12 +316,12 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) /* write optional descriptors here */ switch(st->codec->codec_type) { case AVMEDIA_TYPE_AUDIO: - if(st->codec->codec_id==CODEC_ID_EAC3){ + if(st->codec->codec_id==AV_CODEC_ID_EAC3){ *q++=0x7a; // EAC3 descriptor see A038 DVB SI *q++=1; // 1 byte, all flags sets to 0 *q++=0; // omit all fields... } - if(st->codec->codec_id==CODEC_ID_S302M){ + if(st->codec->codec_id==AV_CODEC_ID_S302M){ *q++ = 0x05; /* MPEG-2 registration descriptor*/ *q++ = 4; *q++ = 'B'; @@ -598,7 +598,7 @@ static int mpegts_write_header(AVFormatContext *s) service->pcr_pid = ts_st->pid; pcr_st = st; } - if (st->codec->codec_id == CODEC_ID_AAC && + if (st->codec->codec_id == AV_CODEC_ID_AAC && st->codec->extradata_size > 0) { AVStream *ast; @@ -912,17 +912,17 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, *q++ = 0x01; private_code = 0; if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { - if (st->codec->codec_id == CODEC_ID_DIRAC) { + if (st->codec->codec_id == AV_CODEC_ID_DIRAC) { *q++ = 0xfd; } else *q++ = 0xe0; } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && - (st->codec->codec_id == CODEC_ID_MP2 || - st->codec->codec_id == CODEC_ID_MP3 || - st->codec->codec_id == CODEC_ID_AAC)) { + (st->codec->codec_id == AV_CODEC_ID_MP2 || + st->codec->codec_id == AV_CODEC_ID_MP3 || + st->codec->codec_id == AV_CODEC_ID_AAC)) { *q++ = 0xc0; } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && - st->codec->codec_id == CODEC_ID_AC3 && + st->codec->codec_id == AV_CODEC_ID_AC3 && ts->m2ts_mode) { *q++ = 0xfd; } else { @@ -942,7 +942,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, flags |= 0x40; } if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && - st->codec->codec_id == CODEC_ID_DIRAC) { + st->codec->codec_id == AV_CODEC_ID_DIRAC) { /* set PES_extension_flag */ pes_extension = 1; flags |= 0x01; @@ -959,7 +959,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, */ if (ts->m2ts_mode && st->codec->codec_type == AVMEDIA_TYPE_AUDIO && - st->codec->codec_id == CODEC_ID_AC3) { + st->codec->codec_id == AV_CODEC_ID_AC3) { /* set PES_extension_flag */ pes_extension = 1; flags |= 0x01; @@ -987,7 +987,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, write_pts(q, 1, dts); q += 5; } - if (pes_extension && st->codec->codec_id == CODEC_ID_DIRAC) { + if (pes_extension && st->codec->codec_id == AV_CODEC_ID_DIRAC) { flags = 0x01; /* set PES_extension_flag_2 */ *q++ = flags; *q++ = 0x80 | 0x01; /* marker bit + extension length */ @@ -1000,7 +1000,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, /* For Blu-ray AC3 Audio Setting extended flags */ if (ts->m2ts_mode && pes_extension && - st->codec->codec_id == CODEC_ID_AC3) { + st->codec->codec_id == AV_CODEC_ID_AC3) { flags = 0x01; /* set PES_extension_flag_2 */ *q++ = flags; *q++ = 0x80 | 0x01; /* marker bit + extension length */ @@ -1086,7 +1086,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) } ts_st->first_pts_check = 0; - if (st->codec->codec_id == CODEC_ID_H264) { + if (st->codec->codec_id == AV_CODEC_ID_H264) { const uint8_t *p = buf, *buf_end = p+size; uint32_t state = -1; @@ -1113,7 +1113,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) buf = data; size = pkt->size+6; } - } else if (st->codec->codec_id == CODEC_ID_AAC) { + } else if (st->codec->codec_id == AV_CODEC_ID_AAC) { if (pkt->size < 2) { av_log(s, AV_LOG_ERROR, "AAC packet too short\n"); return AVERROR_INVALIDDATA; @@ -1255,8 +1255,8 @@ AVOutputFormat ff_mpegts_muxer = { .mime_type = "video/x-mpegts", .extensions = "ts,m2t,m2ts,mts", .priv_data_size = sizeof(MpegTSWrite), - .audio_codec = CODEC_ID_MP2, - .video_codec = CODEC_ID_MPEG2VIDEO, + .audio_codec = AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_header = mpegts_write_header, .write_packet = mpegts_write_packet, .write_trailer = mpegts_write_end, diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c index 100b9585de..f9c4062e58 100644 --- a/libavformat/mpegvideodec.c +++ b/libavformat/mpegvideodec.c @@ -58,4 +58,4 @@ static int mpegvideo_probe(AVProbeData *p) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(mpegvideo, "raw MPEG video", mpegvideo_probe, NULL, CODEC_ID_MPEG1VIDEO) +FF_DEF_RAWVIDEO_DEMUXER(mpegvideo, "raw MPEG video", mpegvideo_probe, NULL, AV_CODEC_ID_MPEG1VIDEO) diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c index 3e5a18fada..916938f3e9 100644 --- a/libavformat/mpjpeg.c +++ b/libavformat/mpjpeg.c @@ -61,8 +61,8 @@ AVOutputFormat ff_mpjpeg_muxer = { .long_name = NULL_IF_CONFIG_SMALL("MIME multipart JPEG"), .mime_type = "multipart/x-mixed-replace;boundary=" BOUNDARY_TAG, .extensions = "mjpg", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MJPEG, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MJPEG, .write_header = mpjpeg_write_header, .write_packet = mpjpeg_write_packet, .write_trailer = mpjpeg_write_trailer, diff --git a/libavformat/msnwc_tcp.c b/libavformat/msnwc_tcp.c index f8a631e311..be0245560d 100644 --- a/libavformat/msnwc_tcp.c +++ b/libavformat/msnwc_tcp.c @@ -82,7 +82,7 @@ static int msnwc_tcp_read_header(AVFormatContext *ctx) codec = st->codec; codec->codec_type = AVMEDIA_TYPE_VIDEO; - codec->codec_id = CODEC_ID_MIMIC; + codec->codec_id = AV_CODEC_ID_MIMIC; codec->codec_tag = MKTAG('M', 'L', '2', '0'); avpriv_set_pts_info(st, 32, 1, 1000); diff --git a/libavformat/mtv.c b/libavformat/mtv.c index 37719caacf..cb50033a57 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -135,7 +135,7 @@ static int mtv_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, mtv->video_fps); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_RAWVIDEO; + st->codec->codec_id = AV_CODEC_ID_RAWVIDEO; st->codec->pix_fmt = PIX_FMT_RGB565BE; st->codec->width = mtv->img_width; st->codec->height = mtv->img_height; @@ -151,7 +151,7 @@ static int mtv_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, AUDIO_SAMPLING_RATE); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_MP3; + st->codec->codec_id = AV_CODEC_ID_MP3; st->codec->bit_rate = mtv->audio_br; st->need_parsing = AVSTREAM_PARSE_FULL; diff --git a/libavformat/mvi.c b/libavformat/mvi.c index 9a6e9d7632..0833e11b5e 100644 --- a/libavformat/mvi.c +++ b/libavformat/mvi.c @@ -79,14 +79,14 @@ static int read_header(AVFormatContext *s) avpriv_set_pts_info(ast, 64, 1, ast->codec->sample_rate); ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_id = CODEC_ID_PCM_U8; + ast->codec->codec_id = AV_CODEC_ID_PCM_U8; ast->codec->channels = 1; ast->codec->bits_per_coded_sample = 8; ast->codec->bit_rate = ast->codec->sample_rate * 8; avpriv_set_pts_info(vst, 64, msecs_per_frame, 1000000); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_MOTIONPIXELS; + vst->codec->codec_id = AV_CODEC_ID_MOTIONPIXELS; mvi->get_int = (vst->codec->width * vst->codec->height < (1 << 16)) ? avio_rl16 : avio_rl24; diff --git a/libavformat/mxf.c b/libavformat/mxf.c index c5ac7531d5..224ade5d23 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -33,28 +33,28 @@ const MXFCodecUL ff_mxf_data_definition_uls[] = { const MXFCodecUL ff_mxf_codec_uls[] = { /* PictureEssenceCoding */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00 }, 14, CODEC_ID_MPEG2VIDEO }, /* MP@ML Long GoP */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 }, 14, CODEC_ID_MPEG2VIDEO }, /* D-10 50Mbps PAL */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00 }, 14, CODEC_ID_MPEG2VIDEO }, /* MP@HL Long GoP */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x02,0x00 }, 14, CODEC_ID_MPEG2VIDEO }, /* 422P@HL I-Frame */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x20,0x02,0x03 }, 14, CODEC_ID_MPEG4 }, /* XDCAM proxy_pal030926.mxf */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, 13, CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, CODEC_ID_RAWVIDEO }, /* Uncompressed */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x00 }, 15, CODEC_ID_RAWVIDEO }, /* Uncompressed 422 8-bit */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00 }, 13, CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14, CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14, CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x01 }, 16, CODEC_ID_V210 }, /* V210 */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* MP@ML Long GoP */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* D-10 50Mbps PAL */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* MP@HL Long GoP */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x02,0x00 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* 422P@HL I-Frame */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x20,0x02,0x03 }, 14, AV_CODEC_ID_MPEG4 }, /* XDCAM proxy_pal030926.mxf */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, 13, AV_CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, AV_CODEC_ID_RAWVIDEO }, /* Uncompressed */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x00 }, 15, AV_CODEC_ID_RAWVIDEO }, /* Uncompressed 422 8-bit */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00 }, 13, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14, AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x01 }, 16, AV_CODEC_ID_V210 }, /* V210 */ /* SoundEssenceCompression */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, 13, CODEC_ID_PCM_S16LE }, /* Uncompressed */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, CODEC_ID_PCM_S16LE }, - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x02,0x02,0x01,0x7E,0x00,0x00,0x00 }, 13, CODEC_ID_PCM_S16BE }, /* From Omneon MXF file */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x04,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00 }, 15, CODEC_ID_PCM_ALAW }, /* XDCAM Proxy C0023S01.mxf */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x01,0x00 }, 15, CODEC_ID_AC3 }, - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x05,0x00 }, 15, CODEC_ID_MP2 }, /* MP2 or MP3 */ - //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,0x00 }, 15, CODEC_ID_DOLBY_E }, /* Dolby-E */ - { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, 13, AV_CODEC_ID_PCM_S16LE }, /* Uncompressed */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, AV_CODEC_ID_PCM_S16LE }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x02,0x02,0x01,0x7E,0x00,0x00,0x00 }, 13, AV_CODEC_ID_PCM_S16BE }, /* From Omneon MXF file */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x04,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00 }, 15, AV_CODEC_ID_PCM_ALAW }, /* XDCAM Proxy C0023S01.mxf */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x01,0x00 }, 15, AV_CODEC_ID_AC3 }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x05,0x00 }, 15, AV_CODEC_ID_MP2 }, /* MP2 or MP3 */ + //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,0x00 }, 15, AV_CODEC_ID_DOLBY_E }, /* Dolby-E */ + { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; const MXFCodecUL ff_mxf_pixel_format_uls[] = { diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index b544d71f3f..3ddeb996e3 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -913,31 +913,31 @@ static void *mxf_resolve_strong_ref(MXFContext *mxf, UID *strong_ref, enum MXFMe static const MXFCodecUL mxf_picture_essence_container_uls[] = { // video essence container uls - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, 14, CODEC_ID_MPEG2VIDEO }, /* MPEG-ES Frame wrapped */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x41,0x01 }, 14, CODEC_ID_DVVIDEO }, /* DV 625 25mbps */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x05,0x00,0x00 }, 14, CODEC_ID_RAWVIDEO }, /* Uncompressed Picture */ - { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* MPEG-ES Frame wrapped */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x41,0x01 }, 14, AV_CODEC_ID_DVVIDEO }, /* DV 625 25mbps */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x05,0x00,0x00 }, 14, AV_CODEC_ID_RAWVIDEO }, /* Uncompressed Picture */ + { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; /* EC ULs for intra-only formats */ static const MXFCodecUL mxf_intra_only_essence_container_uls[] = { - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x00,0x00 }, 14, CODEC_ID_MPEG2VIDEO }, /* MXF-GC SMPTE D-10 Mappings */ - { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x00,0x00 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* MXF-GC SMPTE D-10 Mappings */ + { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; /* intra-only PictureEssenceCoding ULs, where no corresponding EC UL exists */ static const MXFCodecUL mxf_intra_only_picture_essence_coding_uls[] = { - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14, CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra Profiles */ - { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14, AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra Profiles */ + { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; static const MXFCodecUL mxf_sound_essence_container_uls[] = { // sound essence container uls - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x06,0x01,0x00 }, 14, CODEC_ID_PCM_S16LE }, /* BWF Frame wrapped */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x40,0x01 }, 14, CODEC_ID_MP2 }, /* MPEG-ES Frame wrapped, 0x40 ??? stream id */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 }, 14, CODEC_ID_PCM_S16LE }, /* D-10 Mapping 50Mbps PAL Extended Template */ - { { 0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0xFF,0x4B,0x46,0x41,0x41,0x00,0x0D,0x4D,0x4F }, 14, CODEC_ID_PCM_S16LE }, /* 0001GL00.MXF.A1.mxf_opatom.mxf */ - { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x06,0x01,0x00 }, 14, AV_CODEC_ID_PCM_S16LE }, /* BWF Frame wrapped */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x40,0x01 }, 14, AV_CODEC_ID_MP2 }, /* MPEG-ES Frame wrapped, 0x40 ??? stream id */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 }, 14, AV_CODEC_ID_PCM_S16LE }, /* D-10 Mapping 50Mbps PAL Extended Template */ + { { 0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0xFF,0x4B,0x46,0x41,0x41,0x00,0x0D,0x4D,0x4F }, 14, AV_CODEC_ID_PCM_S16LE }, /* 0001GL00.MXF.A1.mxf_opatom.mxf */ + { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; static int mxf_get_sorted_table_segments(MXFContext *mxf, int *nb_sorted_segments, MXFIndexTableSegment ***sorted_segments) @@ -1297,9 +1297,9 @@ finish_decoding_index: static int mxf_is_intra_only(MXFDescriptor *descriptor) { return mxf_get_codec_ul(mxf_intra_only_essence_container_uls, - &descriptor->essence_container_ul)->id != CODEC_ID_NONE || + &descriptor->essence_container_ul)->id != AV_CODEC_ID_NONE || mxf_get_codec_ul(mxf_intra_only_picture_essence_coding_uls, - &descriptor->essence_codec_ul)->id != CODEC_ID_NONE; + &descriptor->essence_codec_ul)->id != AV_CODEC_ID_NONE; } static int mxf_add_timecode_metadata(AVDictionary **pm, const char *key, AVTimecode *tc) @@ -1491,7 +1491,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { source_track->intra_only = mxf_is_intra_only(descriptor); container_ul = mxf_get_codec_ul(mxf_picture_essence_container_uls, essence_container_ul); - if (st->codec->codec_id == CODEC_ID_NONE) + if (st->codec->codec_id == AV_CODEC_ID_NONE) st->codec->codec_id = container_ul->id; st->codec->width = descriptor->width; st->codec->height = descriptor->height; /* Field height, not frame height */ @@ -1516,7 +1516,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) default: av_log(mxf->fc, AV_LOG_INFO, "Unknown frame layout type: %d\n", descriptor->frame_layout); } - if (st->codec->codec_id == CODEC_ID_RAWVIDEO) { + if (st->codec->codec_id == AV_CODEC_ID_RAWVIDEO) { st->codec->pix_fmt = descriptor->pix_fmt; if (st->codec->pix_fmt == PIX_FMT_NONE) { pix_fmt_ul = mxf_get_codec_ul(ff_mxf_pixel_format_uls, @@ -1536,7 +1536,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) st->need_parsing = AVSTREAM_PARSE_HEADERS; } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { container_ul = mxf_get_codec_ul(mxf_sound_essence_container_uls, essence_container_ul); - if (st->codec->codec_id == CODEC_ID_NONE) + if (st->codec->codec_id == AV_CODEC_ID_NONE) st->codec->codec_id = container_ul->id; st->codec->channels = descriptor->channels; st->codec->bits_per_coded_sample = descriptor->bits_per_sample; @@ -1544,18 +1544,18 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) if (descriptor->sample_rate.den > 0) st->codec->sample_rate = descriptor->sample_rate.num / descriptor->sample_rate.den; - /* TODO: implement CODEC_ID_RAWAUDIO */ - if (st->codec->codec_id == CODEC_ID_PCM_S16LE) { + /* TODO: implement AV_CODEC_ID_RAWAUDIO */ + if (st->codec->codec_id == AV_CODEC_ID_PCM_S16LE) { if (descriptor->bits_per_sample > 16 && descriptor->bits_per_sample <= 24) - st->codec->codec_id = CODEC_ID_PCM_S24LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S24LE; else if (descriptor->bits_per_sample == 32) - st->codec->codec_id = CODEC_ID_PCM_S32LE; - } else if (st->codec->codec_id == CODEC_ID_PCM_S16BE) { + st->codec->codec_id = AV_CODEC_ID_PCM_S32LE; + } else if (st->codec->codec_id == AV_CODEC_ID_PCM_S16BE) { if (descriptor->bits_per_sample > 16 && descriptor->bits_per_sample <= 24) - st->codec->codec_id = CODEC_ID_PCM_S24BE; + st->codec->codec_id = AV_CODEC_ID_PCM_S24BE; else if (descriptor->bits_per_sample == 32) - st->codec->codec_id = CODEC_ID_PCM_S32BE; - } else if (st->codec->codec_id == CODEC_ID_MP2) { + st->codec->codec_id = AV_CODEC_ID_PCM_S32BE; + } else if (st->codec->codec_id == AV_CODEC_ID_MP2) { st->need_parsing = AVSTREAM_PARSE_FULL; } } @@ -1764,10 +1764,10 @@ static int64_t round_to_kag(int64_t position, int kag_size) return ret == position ? ret : ret + kag_size; } -static int is_pcm(enum CodecID codec_id) +static int is_pcm(enum AVCodecID codec_id) { /* we only care about "normal" PCM codecs until we get samples */ - return codec_id >= CODEC_ID_PCM_S16LE && codec_id < CODEC_ID_PCM_S24DAUD; + return codec_id >= AV_CODEC_ID_PCM_S16LE && codec_id < AV_CODEC_ID_PCM_S24DAUD; } /** diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 11283b098e..6717d778f4 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -91,15 +91,15 @@ typedef struct { } MXFContainerEssenceEntry; static const struct { - enum CodecID id; + enum AVCodecID id; int index; } mxf_essence_mappings[] = { - { CODEC_ID_MPEG2VIDEO, 0 }, - { CODEC_ID_PCM_S24LE, 1 }, - { CODEC_ID_PCM_S16LE, 1 }, - { CODEC_ID_DVVIDEO, 15 }, - { CODEC_ID_DNXHD, 24 }, - { CODEC_ID_NONE } + { AV_CODEC_ID_MPEG2VIDEO, 0 }, + { AV_CODEC_ID_PCM_S24LE, 1 }, + { AV_CODEC_ID_PCM_S16LE, 1 }, + { AV_CODEC_ID_DVVIDEO, 15 }, + { AV_CODEC_ID_DNXHD, 24 }, + { AV_CODEC_ID_NONE } }; static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st); @@ -473,7 +473,7 @@ static void klv_encode_ber4_length(AVIOContext *pb, int len) /* * Get essence container ul index */ -static int mxf_get_essence_container_ul_index(enum CodecID id) +static int mxf_get_essence_container_ul_index(enum AVCodecID id) { int i; for (i = 0; mxf_essence_mappings[i].id; i++) @@ -931,9 +931,9 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke // video line map switch (st->codec->height) { - case 576: f1 = 23; f2 = st->codec->codec_id == CODEC_ID_DVVIDEO ? 335 : 336; break; + case 576: f1 = 23; f2 = st->codec->codec_id == AV_CODEC_ID_DVVIDEO ? 335 : 336; break; case 608: f1 = 7; f2 = 320; break; - case 480: f1 = 20; f2 = st->codec->codec_id == CODEC_ID_DVVIDEO ? 285 : 283; break; + case 480: f1 = 20; f2 = st->codec->codec_id == AV_CODEC_ID_DVVIDEO ? 285 : 283; break; case 512: f1 = 7; f2 = 270; break; case 720: f1 = 26; f2 = 0; break; // progressive case 1080: f1 = 21; f2 = 584; break; @@ -1749,8 +1749,8 @@ static int mxf_write_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "MXF D-10 only support one audio track\n"); return -1; } - if (st->codec->codec_id != CODEC_ID_PCM_S16LE && - st->codec->codec_id != CODEC_ID_PCM_S24LE) { + if (st->codec->codec_id != AV_CODEC_ID_PCM_S16LE && + st->codec->codec_id != AV_CODEC_ID_PCM_S24LE) { av_log(s, AV_LOG_ERROR, "MXF D-10 only support 16 or 24 bits le audio\n"); } sc->index = ((MXFStreamContext*)s->streams[0]->priv_data)->index + 1; @@ -1910,7 +1910,7 @@ static void mxf_write_d10_audio_packet(AVFormatContext *s, AVStream *st, AVPacke while (samples < end) { for (i = 0; i < st->codec->channels; i++) { uint32_t sample; - if (st->codec->codec_id == CODEC_ID_PCM_S24LE) { + if (st->codec->codec_id == AV_CODEC_ID_PCM_S24LE) { sample = AV_RL24(samples)<< 4; samples += 3; } else { @@ -1941,17 +1941,17 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) } } - if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO) { + if (st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO) { if (!mxf_parse_mpeg2_frame(s, st, pkt, &ie)) { av_log(s, AV_LOG_ERROR, "could not get mpeg2 profile and level\n"); return -1; } - } else if (st->codec->codec_id == CODEC_ID_DNXHD) { + } else if (st->codec->codec_id == AV_CODEC_ID_DNXHD) { if (!mxf_parse_dnxhd_frame(s, st, pkt)) { av_log(s, AV_LOG_ERROR, "could not get dnxhd profile\n"); return -1; } - } else if (st->codec->codec_id == CODEC_ID_DVVIDEO) { + } else if (st->codec->codec_id == AV_CODEC_ID_DVVIDEO) { if (!mxf_parse_dv_frame(s, st, pkt)) { av_log(s, AV_LOG_ERROR, "could not get dv profile\n"); return -1; @@ -2162,8 +2162,8 @@ AVOutputFormat ff_mxf_muxer = { .mime_type = "application/mxf", .extensions = "mxf", .priv_data_size = sizeof(MXFContext), - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_MPEG2VIDEO, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_header = mxf_write_header, .write_packet = mxf_write_packet, .write_trailer = mxf_write_footer, @@ -2176,8 +2176,8 @@ AVOutputFormat ff_mxf_d10_muxer = { .long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format) D-10 Mapping"), .mime_type = "application/mxf", .priv_data_size = sizeof(MXFContext), - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_MPEG2VIDEO, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_header = mxf_write_header, .write_packet = mxf_write_packet, .write_trailer = mxf_write_footer, diff --git a/libavformat/mxg.c b/libavformat/mxg.c index 6ecde121c6..be7e6db1c4 100644 --- a/libavformat/mxg.c +++ b/libavformat/mxg.c @@ -47,14 +47,14 @@ static int mxg_read_header(AVFormatContext *s) if (!video_st) return AVERROR(ENOMEM); video_st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - video_st->codec->codec_id = CODEC_ID_MXPEG; + video_st->codec->codec_id = AV_CODEC_ID_MXPEG; avpriv_set_pts_info(video_st, 64, 1, 1000000); audio_st = avformat_new_stream(s, NULL); if (!audio_st) return AVERROR(ENOMEM); audio_st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - audio_st->codec->codec_id = CODEC_ID_PCM_ALAW; + audio_st->codec->codec_id = AV_CODEC_ID_PCM_ALAW; audio_st->codec->channels = 1; audio_st->codec->sample_rate = 8000; audio_st->codec->bits_per_coded_sample = 8; diff --git a/libavformat/ncdec.c b/libavformat/ncdec.c index 7d7b390373..8cb7ed4bd4 100644 --- a/libavformat/ncdec.c +++ b/libavformat/ncdec.c @@ -52,7 +52,7 @@ static int nc_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MPEG4; + st->codec->codec_id = AV_CODEC_ID_MPEG4; st->need_parsing = AVSTREAM_PARSE_FULL; avpriv_set_pts_info(st, 64, 1, 100); diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index b660804be1..00f796ae3f 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -184,33 +184,33 @@ typedef struct { } NSVContext; static const AVCodecTag nsv_codec_video_tags[] = { - { CODEC_ID_VP3, MKTAG('V', 'P', '3', ' ') }, - { CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, - { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, - { CODEC_ID_VP5, MKTAG('V', 'P', '5', ' ') }, - { CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', ' ') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, - { CODEC_ID_VP8, MKTAG('V', 'P', '8', '0') }, + { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', ' ') }, + { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, + { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, + { AV_CODEC_ID_VP5, MKTAG('V', 'P', '5', ' ') }, + { AV_CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', ' ') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, + { AV_CODEC_ID_VP8, MKTAG('V', 'P', '8', '0') }, /* - { CODEC_ID_VP4, MKTAG('V', 'P', '4', ' ') }, - { CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') }, + { AV_CODEC_ID_VP4, MKTAG('V', 'P', '4', ' ') }, + { AV_CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') }, */ - { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */ - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') }, + { AV_CODEC_ID_NONE, 0 }, }; static const AVCodecTag nsv_codec_audio_tags[] = { - { CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, - { CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') }, - { CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') }, - { CODEC_ID_AAC, MKTAG('V', 'L', 'B', ' ') }, - { CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', ' ') }, - { CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, + { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') }, + { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') }, + { AV_CODEC_ID_AAC, MKTAG('V', 'L', 'B', ' ') }, + { AV_CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', ' ') }, + { AV_CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') }, + { AV_CODEC_ID_NONE, 0 }, }; //static int nsv_load_index(AVFormatContext *s); @@ -655,7 +655,7 @@ null_chunk_retry: } bps /= channels; // ??? if (bps == 8) - st[NSV_ST_AUDIO]->codec->codec_id = CODEC_ID_PCM_U8; + st[NSV_ST_AUDIO]->codec->codec_id = AV_CODEC_ID_PCM_U8; samplerate /= 4;/* UGH ??? XXX */ channels = 1; st[NSV_ST_AUDIO]->codec->channels = channels; diff --git a/libavformat/nullenc.c b/libavformat/nullenc.c index 99899923e2..7da297b63e 100644 --- a/libavformat/nullenc.c +++ b/libavformat/nullenc.c @@ -29,8 +29,8 @@ static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_null_muxer = { .name = "null", .long_name = NULL_IF_CONFIG_SMALL("raw null video"), - .audio_codec = AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE), - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE), + .video_codec = AV_CODEC_ID_RAWVIDEO, .write_packet = null_write_packet, .flags = AVFMT_NOFILE | AVFMT_NOTIMESTAMPS | AVFMT_RAWPICTURE, }; diff --git a/libavformat/nut.c b/libavformat/nut.c index 4684cbe20b..7e3c83a291 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -25,90 +25,90 @@ #include "internal.h" const AVCodecTag ff_nut_subtitle_tags[] = { - { CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') }, - { CODEC_ID_SSA , MKTAG('S', 'S', 'A', 0 ) }, - { CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') }, - { CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') }, - { CODEC_ID_NONE , 0 } + { AV_CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') }, + { AV_CODEC_ID_SSA , MKTAG('S', 'S', 'A', 0 ) }, + { AV_CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') }, + { AV_CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') }, + { AV_CODEC_ID_NONE , 0 } }; const AVCodecTag ff_nut_video_tags[] = { - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(15 , 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 12 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 12 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(12 , 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG(12 , 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 0 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 0 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG( 0 , 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG( 0 , 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 8 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 8 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 4 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 4 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', '4', 'B', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('R', '4', 'B', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 48 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'R', 'A', 64 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'B', 'A', 64 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(64 , 'B', 'R', 'A') }, - { CODEC_ID_RAWVIDEO, MKTAG(64 , 'R', 'B', 'A') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 10 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 12 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(12 , 11 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 12 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(12 , 10 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 12 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(12 , 0 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 14 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(14 , 11 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 14 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(14 , 10 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 14 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(14 , 0 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 8 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 8 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 8 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '2', 0 , 8 ) }, - { CODEC_ID_NONE , 0 } + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 0 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 0 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG( 0 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG( 0 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 4 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 4 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '4', 'B', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', 'B', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 48 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'R', 'A', 64 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'B', 'A', 64 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'B', 'R', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'R', 'B', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 10 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 14 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 14 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 14 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', 0 , 8 ) }, + { AV_CODEC_ID_NONE , 0 } }; void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){ diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index c025451221..f4813fe5ec 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -380,7 +380,7 @@ static int decode_stream_header(NUTContext *nut) av_log(s, AV_LOG_ERROR, "unknown stream class (%d)\n", class); return -1; } - if (class < 3 && st->codec->codec_id == CODEC_ID_NONE) + if (class < 3 && st->codec->codec_id == AV_CODEC_ID_NONE) av_log(s, AV_LOG_ERROR, "Unknown codec tag '0x%04x' for stream number %d\n", (unsigned int) tmp, stream_id); diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 6ace0d0bc2..05d2b08b96 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -37,20 +37,20 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint AV_WB24(out, 1); - if(c->codec_id == CODEC_ID_MPEG4){ + if(c->codec_id == AV_CODEC_ID_MPEG4){ if(key_frame){ return 3; }else{ out[3]= 0xB6; return 4; } - }else if(c->codec_id == CODEC_ID_MPEG1VIDEO || c->codec_id == CODEC_ID_MPEG2VIDEO){ + }else if(c->codec_id == AV_CODEC_ID_MPEG1VIDEO || c->codec_id == AV_CODEC_ID_MPEG2VIDEO){ return 3; - }else if(c->codec_id == CODEC_ID_H264){ + }else if(c->codec_id == AV_CODEC_ID_H264){ return 3; - }else if(c->codec_id == CODEC_ID_MP3 || c->codec_id == CODEC_ID_MP2){ + }else if(c->codec_id == AV_CODEC_ID_MP3 || c->codec_id == AV_CODEC_ID_MP2){ int lsf, mpeg25, sample_rate_index, bitrate_index, frame_size; - int layer= c->codec_id == CODEC_ID_MP3 ? 3 : 2; + int layer= c->codec_id == AV_CODEC_ID_MP3 ? 3 : 2; unsigned int header= 0xFFF00000; lsf = sample_rate < (24000+32000)/2; @@ -211,7 +211,7 @@ static void build_frame_code(AVFormatContext *s){ pred_table[2]=1; pred_table[3]=3; pred_table[4]=4; - }else if(codec->codec_id == CODEC_ID_VORBIS){ + }else if(codec->codec_id == AV_CODEC_ID_VORBIS){ pred_count=3; pred_table[0]=2; pred_table[1]=9; @@ -870,9 +870,9 @@ AVOutputFormat ff_nut_muxer = { .mime_type = "video/x-nut", .extensions = "nut", .priv_data_size = sizeof(NUTContext), - .audio_codec = CONFIG_LIBVORBIS ? CODEC_ID_VORBIS : - CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_MP2, - .video_codec = CODEC_ID_MPEG4, + .audio_codec = CONFIG_LIBVORBIS ? AV_CODEC_ID_VORBIS : + CONFIG_LIBMP3LAME ? AV_CODEC_ID_MP3 : AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_MPEG4, .write_header = nut_write_header, .write_packet = nut_write_packet, .write_trailer = nut_write_trailer, diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 21df6d2856..c192faad98 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -90,7 +90,7 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst, vst->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, vst->codec->codec_tag); if (vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G')) - vst->codec->codec_id = CODEC_ID_NUV; + vst->codec->codec_id = AV_CODEC_ID_NUV; } else avio_skip(pb, 4); @@ -158,7 +158,7 @@ static int nuv_header(AVFormatContext *s) { if (!vst) return AVERROR(ENOMEM); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_NUV; + vst->codec->codec_id = AV_CODEC_ID_NUV; vst->codec->width = width; vst->codec->height = height; vst->codec->bits_per_coded_sample = 10; @@ -177,7 +177,7 @@ static int nuv_header(AVFormatContext *s) { if (!ast) return AVERROR(ENOMEM); ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_id = CODEC_ID_PCM_S16LE; + ast->codec->codec_id = AV_CODEC_ID_PCM_S16LE; ast->codec->channels = 2; ast->codec->sample_rate = 44100; ast->codec->bit_rate = 2 * 2 * 44100 * 8; @@ -188,7 +188,7 @@ static int nuv_header(AVFormatContext *s) { ctx->a_id = -1; get_codec_data(pb, vst, ast, is_mythtv); - ctx->rtjpg_video = vst && vst->codec->codec_id == CODEC_ID_NUV; + ctx->rtjpg_video = vst && vst->codec->codec_id == AV_CODEC_ID_NUV; return 0; } diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index e2b48c1a32..26aeb28d7e 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -607,7 +607,7 @@ static void ogg_validate_keyframe(AVFormatContext *s, int idx, int pstart, int p { struct ogg *ogg = s->priv_data; struct ogg_stream *os = ogg->streams + idx; - if (psize && s->streams[idx]->codec->codec_id == CODEC_ID_THEORA) { + if (psize && s->streams[idx]->codec->codec_id == AV_CODEC_ID_THEORA) { if (!!(os->pflags & AV_PKT_FLAG_KEY) != !(os->buf[pstart] & 0x40)) { os->pflags ^= AV_PKT_FLAG_KEY; av_log(s, AV_LOG_WARNING, "Broken file, %skeyframe not correctly marked.\n", diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index b787d1b26c..97eda75c2a 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -214,7 +214,7 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st, // them as such, otherwise seeking will not work correctly at the very // least with old libogg versions. // Do not try to flush header packets though, that will create broken files. - if (st->codec->codec_id == CODEC_ID_THEORA && !header && + if (st->codec->codec_id == AV_CODEC_ID_THEORA && !header && (ogg_granule_to_timestamp(oggstream, granule) > ogg_granule_to_timestamp(oggstream, oggstream->last_granule) + 1 || ogg_key_granule(oggstream, granule))) { @@ -362,10 +362,10 @@ static int ogg_write_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) avpriv_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den); - if (st->codec->codec_id != CODEC_ID_VORBIS && - st->codec->codec_id != CODEC_ID_THEORA && - st->codec->codec_id != CODEC_ID_SPEEX && - st->codec->codec_id != CODEC_ID_FLAC) { + if (st->codec->codec_id != AV_CODEC_ID_VORBIS && + st->codec->codec_id != AV_CODEC_ID_THEORA && + st->codec->codec_id != AV_CODEC_ID_SPEEX && + st->codec->codec_id != AV_CODEC_ID_FLAC) { av_log(s, AV_LOG_ERROR, "Unsupported codec id in stream %d\n", i); return -1; } @@ -389,7 +389,7 @@ static int ogg_write_header(AVFormatContext *s) oggstream->serial_num = serial_num; st->priv_data = oggstream; - if (st->codec->codec_id == CODEC_ID_FLAC) { + if (st->codec->codec_id == AV_CODEC_ID_FLAC) { int err = ogg_build_flac_headers(st->codec, oggstream, st->codec->flags & CODEC_FLAG_BITEXACT, &s->metadata); @@ -398,7 +398,7 @@ static int ogg_write_header(AVFormatContext *s) av_freep(&st->priv_data); return err; } - } else if (st->codec->codec_id == CODEC_ID_SPEEX) { + } else if (st->codec->codec_id == AV_CODEC_ID_SPEEX) { int err = ogg_build_speex_headers(st->codec, oggstream, st->codec->flags & CODEC_FLAG_BITEXACT, &s->metadata); @@ -409,12 +409,12 @@ static int ogg_write_header(AVFormatContext *s) } } else { uint8_t *p; - const char *cstr = st->codec->codec_id == CODEC_ID_VORBIS ? "vorbis" : "theora"; - int header_type = st->codec->codec_id == CODEC_ID_VORBIS ? 3 : 0x81; - int framing_bit = st->codec->codec_id == CODEC_ID_VORBIS ? 1 : 0; + const char *cstr = st->codec->codec_id == AV_CODEC_ID_VORBIS ? "vorbis" : "theora"; + int header_type = st->codec->codec_id == AV_CODEC_ID_VORBIS ? 3 : 0x81; + int framing_bit = st->codec->codec_id == AV_CODEC_ID_VORBIS ? 1 : 0; if (avpriv_split_xiph_headers(st->codec->extradata, st->codec->extradata_size, - st->codec->codec_id == CODEC_ID_VORBIS ? 30 : 42, + st->codec->codec_id == AV_CODEC_ID_VORBIS ? 30 : 42, oggstream->header, oggstream->header_len) < 0) { av_log(s, AV_LOG_ERROR, "Extradata corrupted\n"); av_freep(&st->priv_data); @@ -431,7 +431,7 @@ static int ogg_write_header(AVFormatContext *s) bytestream_put_byte(&p, header_type); bytestream_put_buffer(&p, cstr, 6); - if (st->codec->codec_id == CODEC_ID_THEORA) { + if (st->codec->codec_id == AV_CODEC_ID_THEORA) { /** KFGSHIFT is the width of the less significant section of the granule position The less significant section is the frame count since the last keyframe */ oggstream->kfgshift = ((oggstream->header[0][40]&3)<<3)|(oggstream->header[0][41]>>5); @@ -491,7 +491,7 @@ static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt) int ret; int64_t granule; - if (st->codec->codec_id == CODEC_ID_THEORA) { + if (st->codec->codec_id == AV_CODEC_ID_THEORA) { int64_t pts = oggstream->vrev < 1 ? pkt->pts : pkt->pts + pkt->duration; int pframe_count; if (pkt->flags & AV_PKT_FLAG_KEY) @@ -530,8 +530,8 @@ static int ogg_write_trailer(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; OGGStreamContext *oggstream = st->priv_data; - if (st->codec->codec_id == CODEC_ID_FLAC || - st->codec->codec_id == CODEC_ID_SPEEX) { + if (st->codec->codec_id == AV_CODEC_ID_FLAC || + st->codec->codec_id == AV_CODEC_ID_SPEEX) { av_freep(&oggstream->header[0]); } av_freep(&oggstream->header[1]); @@ -546,8 +546,8 @@ AVOutputFormat ff_ogg_muxer = { .mime_type = "application/ogg", .extensions = "ogg,ogv,spx", .priv_data_size = sizeof(OGGContext), - .audio_codec = CODEC_ID_FLAC, - .video_codec = CODEC_ID_THEORA, + .audio_codec = AV_CODEC_ID_FLAC, + .video_codec = AV_CODEC_ID_THEORA, .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c index fc5891b091..053b74b74f 100644 --- a/libavformat/oggparsecelt.c +++ b/libavformat/oggparsecelt.c @@ -63,7 +63,7 @@ static int celt_header(AVFormatContext *s, int idx) /* unused bytes per packet field skipped */ extra_headers = AV_RL32(p + 56); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_CELT; + st->codec->codec_id = AV_CODEC_ID_CELT; st->codec->sample_rate = sample_rate; st->codec->channels = nb_channels; st->codec->frame_size = frame_size; diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c index abcf4fb15c..2a9d9006e3 100644 --- a/libavformat/oggparsedirac.c +++ b/libavformat/oggparsedirac.c @@ -33,7 +33,7 @@ static int dirac_header(AVFormatContext *s, int idx) GetBitContext gb; // already parsed the header - if (st->codec->codec_id == CODEC_ID_DIRAC) + if (st->codec->codec_id == AV_CODEC_ID_DIRAC) return 0; init_get_bits(&gb, os->buf + os->pstart + 13, (os->psize - 13) * 8); @@ -41,7 +41,7 @@ static int dirac_header(AVFormatContext *s, int idx) return -1; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_DIRAC; + st->codec->codec_id = AV_CODEC_ID_DIRAC; // dirac in ogg always stores timestamps as though the video were interlaced avpriv_set_pts_info(st, 64, st->codec->time_base.num, 2*st->codec->time_base.den); return 1; @@ -79,7 +79,7 @@ static int old_dirac_header(AVFormatContext *s, int idx) return 0; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_DIRAC; + st->codec->codec_id = AV_CODEC_ID_DIRAC; avpriv_set_pts_info(st, 64, AV_RB32(buf+12), AV_RB32(buf+8)); return 1; } diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index d852c26152..6edbd85653 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -59,7 +59,7 @@ flac_header (AVFormatContext * s, int idx) avpriv_flac_parse_streaminfo(st->codec, &si, streaminfo_start); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_FLAC; + st->codec->codec_id = AV_CODEC_ID_FLAC; st->need_parsing = AVSTREAM_PARSE_HEADERS; st->codec->extradata = @@ -80,7 +80,7 @@ old_flac_header (AVFormatContext * s, int idx) { AVStream *st = s->streams[idx]; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_FLAC; + st->codec->codec_id = AV_CODEC_ID_FLAC; return 0; } diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index 43243f042f..e60769efea 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -58,7 +58,7 @@ ogm_header(AVFormatContext *s, int idx) st->codec->codec_tag = tag; } else if (*p == 't') { st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = CODEC_ID_TEXT; + st->codec->codec_id = AV_CODEC_ID_TEXT; p += 12; } else { uint8_t acid[5]; @@ -70,7 +70,7 @@ ogm_header(AVFormatContext *s, int idx) cid = strtol(acid, NULL, 16); st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid); // our parser completely breaks AAC in Ogg - if (st->codec->codec_id != CODEC_ID_AAC) + if (st->codec->codec_id != AV_CODEC_ID_AAC) st->need_parsing = AVSTREAM_PARSE_FULL; } @@ -91,7 +91,7 @@ ogm_header(AVFormatContext *s, int idx) st->codec->bit_rate = bytestream_get_le32(&p) * 8; st->codec->sample_rate = time_unit ? spu * 10000000 / time_unit : 0; avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); - if (size >= 56 && st->codec->codec_id == CODEC_ID_AAC) { + if (size >= 56 && st->codec->codec_id == AV_CODEC_ID_AAC) { p += 4; size -= 4; } diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index b6357570ea..0e8f1ca5bb 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -52,7 +52,7 @@ static int opus_header(AVFormatContext *avf, int idx) if (os->psize < OPUS_HEAD_SIZE || (AV_RL8(packet + 8) & 0xF0) != 0) return AVERROR_INVALIDDATA; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_OPUS; + st->codec->codec_id = AV_CODEC_ID_OPUS; st->codec->channels = AV_RL8 (packet + 9); priv->pre_skip = AV_RL16(packet + 10); /*orig_sample_rate = AV_RL32(packet + 12);*/ diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c index 435ed0cedf..e4dfec5218 100644 --- a/libavformat/oggparsespeex.c +++ b/libavformat/oggparsespeex.c @@ -55,7 +55,7 @@ static int speex_header(AVFormatContext *s, int idx) { if (spxp->seq == 0) { int frames_per_packet; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_SPEEX; + st->codec->codec_id = AV_CODEC_ID_SPEEX; st->codec->sample_rate = AV_RL32(p + 36); st->codec->channels = AV_RL32(p + 48); diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c index d646efcbfc..ff68fe4734 100644 --- a/libavformat/oggparsetheora.c +++ b/libavformat/oggparsetheora.c @@ -107,7 +107,7 @@ theora_header (AVFormatContext * s, int idx) thp->gpmask = (1 << thp->gpshift) - 1; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_THEORA; + st->codec->codec_id = AV_CODEC_ID_THEORA; st->need_parsing = AVSTREAM_PARSE_HEADERS; } else if (os->buf[os->pstart] == 0x83) { diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 74f44995b8..38eb4b0b1c 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -256,7 +256,7 @@ vorbis_header (AVFormatContext * s, int idx) return -1; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_VORBIS; + st->codec->codec_id = AV_CODEC_ID_VORBIS; if (srate > 0) { st->codec->sample_rate = srate; diff --git a/libavformat/oma.c b/libavformat/oma.c index d4dfb1a265..9e4bfbdd77 100644 --- a/libavformat/oma.c +++ b/libavformat/oma.c @@ -25,10 +25,10 @@ const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0, 0, 0}; const AVCodecTag ff_oma_codec_tags[] = { - { CODEC_ID_ATRAC3, OMA_CODECID_ATRAC3 }, - { CODEC_ID_ATRAC3P, OMA_CODECID_ATRAC3P }, - { CODEC_ID_MP3, OMA_CODECID_MP3 }, - { CODEC_ID_PCM_S16BE, OMA_CODECID_LPCM }, + { AV_CODEC_ID_ATRAC3, OMA_CODECID_ATRAC3 }, + { AV_CODEC_ID_ATRAC3P, OMA_CODECID_ATRAC3P }, + { AV_CODEC_ID_MP3, OMA_CODECID_MP3 }, + { AV_CODEC_ID_PCM_S16BE, OMA_CODECID_LPCM }, { 0 }, }; diff --git a/libavformat/omaenc.c b/libavformat/omaenc.c index c3ee0e8de1..ea28e109c4 100644 --- a/libavformat/omaenc.c +++ b/libavformat/omaenc.c @@ -98,7 +98,7 @@ AVOutputFormat ff_oma_muxer = { .long_name = NULL_IF_CONFIG_SMALL("Sony OpenMG audio"), .mime_type = "audio/x-oma", .extensions = "oma", - .audio_codec = CODEC_ID_ATRAC3, + .audio_codec = AV_CODEC_ID_ATRAC3, .write_header = oma_write_header, .write_packet = ff_raw_write_packet, .codec_tag = (const AVCodecTag* const []){ff_oma_codec_tags, 0}, diff --git a/libavformat/paf.c b/libavformat/paf.c index 41d9140326..8fe2ac5638 100644 --- a/libavformat/paf.c +++ b/libavformat/paf.c @@ -107,7 +107,7 @@ static int read_header(AVFormatContext *s) avio_skip(pb, 4); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; vst->codec->codec_tag = 0; - vst->codec->codec_id = CODEC_ID_PAF_VIDEO; + vst->codec->codec_id = AV_CODEC_ID_PAF_VIDEO; avpriv_set_pts_info(vst, 64, 1, 10); ast = avformat_new_stream(s, 0); @@ -117,7 +117,7 @@ static int read_header(AVFormatContext *s) ast->start_time = 0; ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; ast->codec->codec_tag = 0; - ast->codec->codec_id = CODEC_ID_PAF_AUDIO; + ast->codec->codec_id = AV_CODEC_ID_PAF_AUDIO; ast->codec->channels = 2; ast->codec->sample_rate = 22050; avpriv_set_pts_info(ast, 64, 1, 22050); diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index 7a1eb41624..4ac3c6d89e 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -77,61 +77,61 @@ AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \ }; PCMDEF(f64be, "PCM 64-bit floating-point big-endian", - NULL, CODEC_ID_PCM_F64BE) + NULL, AV_CODEC_ID_PCM_F64BE) PCMDEF(f64le, "PCM 64-bit floating-point little-endian", - NULL, CODEC_ID_PCM_F64LE) + NULL, AV_CODEC_ID_PCM_F64LE) PCMDEF(f32be, "PCM 32-bit floating-point big-endian", - NULL, CODEC_ID_PCM_F32BE) + NULL, AV_CODEC_ID_PCM_F32BE) PCMDEF(f32le, "PCM 32-bit floating-point little-endian", - NULL, CODEC_ID_PCM_F32LE) + NULL, AV_CODEC_ID_PCM_F32LE) PCMDEF(s32be, "PCM signed 32-bit big-endian", - NULL, CODEC_ID_PCM_S32BE) + NULL, AV_CODEC_ID_PCM_S32BE) PCMDEF(s32le, "PCM signed 32-bit little-endian", - NULL, CODEC_ID_PCM_S32LE) + NULL, AV_CODEC_ID_PCM_S32LE) PCMDEF(s24be, "PCM signed 24-bit big-endian", - NULL, CODEC_ID_PCM_S24BE) + NULL, AV_CODEC_ID_PCM_S24BE) PCMDEF(s24le, "PCM signed 24-bit little-endian", - NULL, CODEC_ID_PCM_S24LE) + NULL, AV_CODEC_ID_PCM_S24LE) PCMDEF(s16be, "PCM signed 16-bit big-endian", - AV_NE("sw", NULL), CODEC_ID_PCM_S16BE) + AV_NE("sw", NULL), AV_CODEC_ID_PCM_S16BE) PCMDEF(s16le, "PCM signed 16-bit little-endian", - AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE) + AV_NE(NULL, "sw"), AV_CODEC_ID_PCM_S16LE) PCMDEF(s8, "PCM signed 8-bit", - "sb", CODEC_ID_PCM_S8) + "sb", AV_CODEC_ID_PCM_S8) PCMDEF(u32be, "PCM unsigned 32-bit big-endian", - NULL, CODEC_ID_PCM_U32BE) + NULL, AV_CODEC_ID_PCM_U32BE) PCMDEF(u32le, "PCM unsigned 32-bit little-endian", - NULL, CODEC_ID_PCM_U32LE) + NULL, AV_CODEC_ID_PCM_U32LE) PCMDEF(u24be, "PCM unsigned 24-bit big-endian", - NULL, CODEC_ID_PCM_U24BE) + NULL, AV_CODEC_ID_PCM_U24BE) PCMDEF(u24le, "PCM unsigned 24-bit little-endian", - NULL, CODEC_ID_PCM_U24LE) + NULL, AV_CODEC_ID_PCM_U24LE) PCMDEF(u16be, "PCM unsigned 16-bit big-endian", - AV_NE("uw", NULL), CODEC_ID_PCM_U16BE) + AV_NE("uw", NULL), AV_CODEC_ID_PCM_U16BE) PCMDEF(u16le, "PCM unsigned 16-bit little-endian", - AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE) + AV_NE(NULL, "uw"), AV_CODEC_ID_PCM_U16LE) PCMDEF(u8, "PCM unsigned 8-bit", - "ub", CODEC_ID_PCM_U8) + "ub", AV_CODEC_ID_PCM_U8) PCMDEF(alaw, "PCM A-law", - "al", CODEC_ID_PCM_ALAW) + "al", AV_CODEC_ID_PCM_ALAW) PCMDEF(mulaw, "PCM mu-law", - "ul", CODEC_ID_PCM_MULAW) + "ul", AV_CODEC_ID_PCM_MULAW) diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c index b7877ddd32..3e4f308057 100644 --- a/libavformat/pcmenc.c +++ b/libavformat/pcmenc.c @@ -28,67 +28,67 @@ AVOutputFormat ff_pcm_ ## name_ ## _muxer = { \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ .extensions = ext, \ .audio_codec = codec, \ - .video_codec = CODEC_ID_NONE, \ + .video_codec = AV_CODEC_ID_NONE, \ .write_packet = ff_raw_write_packet, \ .flags = AVFMT_NOTIMESTAMPS, \ }; PCMDEF(f64be, "PCM 64-bit floating-point big-endian", - NULL, CODEC_ID_PCM_F64BE) + NULL, AV_CODEC_ID_PCM_F64BE) PCMDEF(f64le, "PCM 64-bit floating-point little-endian", - NULL, CODEC_ID_PCM_F64LE) + NULL, AV_CODEC_ID_PCM_F64LE) PCMDEF(f32be, "PCM 32-bit floating-point big-endian", - NULL, CODEC_ID_PCM_F32BE) + NULL, AV_CODEC_ID_PCM_F32BE) PCMDEF(f32le, "PCM 32-bit floating-point little-endian", - NULL, CODEC_ID_PCM_F32LE) + NULL, AV_CODEC_ID_PCM_F32LE) PCMDEF(s32be, "PCM signed 32-bit big-endian", - NULL, CODEC_ID_PCM_S32BE) + NULL, AV_CODEC_ID_PCM_S32BE) PCMDEF(s32le, "PCM signed 32-bit little-endian", - NULL, CODEC_ID_PCM_S32LE) + NULL, AV_CODEC_ID_PCM_S32LE) PCMDEF(s24be, "PCM signed 24-bit big-endian", - NULL, CODEC_ID_PCM_S24BE) + NULL, AV_CODEC_ID_PCM_S24BE) PCMDEF(s24le, "PCM signed 24-bit little-endian", - NULL, CODEC_ID_PCM_S24LE) + NULL, AV_CODEC_ID_PCM_S24LE) PCMDEF(s16be, "PCM signed 16-bit big-endian", - AV_NE("sw", NULL), CODEC_ID_PCM_S16BE) + AV_NE("sw", NULL), AV_CODEC_ID_PCM_S16BE) PCMDEF(s16le, "PCM signed 16-bit little-endian", - AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE) + AV_NE(NULL, "sw"), AV_CODEC_ID_PCM_S16LE) PCMDEF(s8, "PCM signed 8-bit", - "sb", CODEC_ID_PCM_S8) + "sb", AV_CODEC_ID_PCM_S8) PCMDEF(u32be, "PCM unsigned 32-bit big-endian", - NULL, CODEC_ID_PCM_U32BE) + NULL, AV_CODEC_ID_PCM_U32BE) PCMDEF(u32le, "PCM unsigned 32-bit little-endian", - NULL, CODEC_ID_PCM_U32LE) + NULL, AV_CODEC_ID_PCM_U32LE) PCMDEF(u24be, "PCM unsigned 24-bit big-endian", - NULL, CODEC_ID_PCM_U24BE) + NULL, AV_CODEC_ID_PCM_U24BE) PCMDEF(u24le, "PCM unsigned 24-bit little-endian", - NULL, CODEC_ID_PCM_U24LE) + NULL, AV_CODEC_ID_PCM_U24LE) PCMDEF(u16be, "PCM unsigned 16-bit big-endian", - AV_NE("uw", NULL), CODEC_ID_PCM_U16BE) + AV_NE("uw", NULL), AV_CODEC_ID_PCM_U16BE) PCMDEF(u16le, "PCM unsigned 16-bit little-endian", - AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE) + AV_NE(NULL, "uw"), AV_CODEC_ID_PCM_U16LE) PCMDEF(u8, "PCM unsigned 8-bit", - "ub", CODEC_ID_PCM_U8) + "ub", AV_CODEC_ID_PCM_U8) PCMDEF(alaw, "PCM A-law", - "al", CODEC_ID_PCM_ALAW) + "al", AV_CODEC_ID_PCM_ALAW) PCMDEF(mulaw, "PCM mu-law", - "ul", CODEC_ID_PCM_MULAW) + "ul", AV_CODEC_ID_PCM_MULAW) diff --git a/libavformat/pmpdec.c b/libavformat/pmpdec.c index 593a355b6b..2ea37ef030 100644 --- a/libavformat/pmpdec.c +++ b/libavformat/pmpdec.c @@ -45,7 +45,7 @@ static int pmp_header(AVFormatContext *s) AVIOContext *pb = s->pb; int tb_num, tb_den; int index_cnt; - int audio_codec_id = CODEC_ID_NONE; + int audio_codec_id = AV_CODEC_ID_NONE; int srate, channels; int i; uint64_t pos; @@ -56,10 +56,10 @@ static int pmp_header(AVFormatContext *s) avio_skip(pb, 8); switch (avio_rl32(pb)) { case 0: - vst->codec->codec_id = CODEC_ID_MPEG4; + vst->codec->codec_id = AV_CODEC_ID_MPEG4; break; case 1: - vst->codec->codec_id = CODEC_ID_H264; + vst->codec->codec_id = AV_CODEC_ID_H264; break; default: av_log(s, AV_LOG_ERROR, "Unsupported video format\n"); @@ -77,11 +77,11 @@ static int pmp_header(AVFormatContext *s) switch (avio_rl32(pb)) { case 0: - audio_codec_id = CODEC_ID_MP3; + audio_codec_id = AV_CODEC_ID_MP3; break; case 1: av_log(s, AV_LOG_ERROR, "AAC not yet correctly supported\n"); - audio_codec_id = CODEC_ID_AAC; + audio_codec_id = AV_CODEC_ID_AAC; break; default: av_log(s, AV_LOG_ERROR, "Unsupported audio format\n"); diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index b978e01f41..49b34413a6 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -204,7 +204,7 @@ static int str_read_packet(AVFormatContext *s, str->channels[channel].video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MDEC; + st->codec->codec_id = AV_CODEC_ID_MDEC; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = AV_RL16(§or[0x28]); st->codec->height = AV_RL16(§or[0x2A]); @@ -251,7 +251,7 @@ static int str_read_packet(AVFormatContext *s, str->channels[channel].audio_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ADPCM_XA; + st->codec->codec_id = AV_CODEC_ID_ADPCM_XA; st->codec->codec_tag = 0; /* no fourcc */ st->codec->channels = (fmt&1)?2:1; st->codec->sample_rate = (fmt&4)?18900:37800; diff --git a/libavformat/pva.c b/libavformat/pva.c index 0e1605d326..ff8ccee852 100644 --- a/libavformat/pva.c +++ b/libavformat/pva.c @@ -60,7 +60,7 @@ static int pva_read_header(AVFormatContext *s) { if (!(st = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MPEG2VIDEO; + st->codec->codec_id = AV_CODEC_ID_MPEG2VIDEO; st->need_parsing = AVSTREAM_PARSE_FULL; avpriv_set_pts_info(st, 32, 1, 90000); av_add_index_entry(st, 0, 0, 0, 0, AVINDEX_KEYFRAME); @@ -68,7 +68,7 @@ static int pva_read_header(AVFormatContext *s) { if (!(st = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_MP2; + st->codec->codec_id = AV_CODEC_ID_MP2; st->need_parsing = AVSTREAM_PARSE_FULL; avpriv_set_pts_info(st, 33, 1, 90000); av_add_index_entry(st, 0, 0, 0, 0, AVINDEX_KEYFRAME); diff --git a/libavformat/qcp.c b/libavformat/qcp.c index 4d91c05e6e..11fc71a466 100644 --- a/libavformat/qcp.c +++ b/libavformat/qcp.c @@ -98,7 +98,7 @@ static int qcp_read_header(AVFormatContext *s) st->codec->channels = 1; avio_read(pb, buf, 16); if (is_qcelp_13k_guid(buf)) { - st->codec->codec_id = CODEC_ID_QCELP; + st->codec->codec_id = AV_CODEC_ID_QCELP; } else if (!memcmp(buf, guid_evrc, 16)) { av_log(s, AV_LOG_ERROR, "EVRC codec is not supported.\n"); return AVERROR_PATCHWELCOME; diff --git a/libavformat/r3d.c b/libavformat/r3d.c index f95f940dd7..35da81eff1 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -62,7 +62,7 @@ static int r3d_read_red1(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_JPEG2000; + st->codec->codec_id = AV_CODEC_ID_JPEG2000; tmp = avio_r8(s->pb); // major version tmp2 = avio_r8(s->pb); // minor version @@ -101,7 +101,7 @@ static int r3d_read_red1(AVFormatContext *s) if (!ast) return AVERROR(ENOMEM); ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_id = CODEC_ID_PCM_S32BE; + ast->codec->codec_id = AV_CODEC_ID_PCM_S32BE; ast->codec->channels = tmp; avpriv_set_pts_info(ast, 32, 1, st->time_base.den); } diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 25d17b6c1e..974e58ca31 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -33,14 +33,14 @@ int ff_raw_read_header(AVFormatContext *s) { AVStream *st; - enum CodecID id; + enum AVCodecID id; st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); id = s->iformat->raw_codec_id; - if (id == CODEC_ID_RAWVIDEO) { + if (id == AV_CODEC_ID_RAWVIDEO) { st->codec->codec_type = AVMEDIA_TYPE_VIDEO; } else { st->codec->codec_type = AVMEDIA_TYPE_AUDIO; @@ -53,7 +53,7 @@ int ff_raw_read_header(AVFormatContext *s) st->codec->channels = 1; - if (id == CODEC_ID_ADPCM_G722) + if (id == AV_CODEC_ID_ADPCM_G722) st->codec->sample_rate = 16000; if (s1 && s1->sample_rate) @@ -189,7 +189,7 @@ AVInputFormat ff_g722_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "g722,722", - .raw_codec_id = CODEC_ID_ADPCM_G722, + .raw_codec_id = AV_CODEC_ID_ADPCM_G722, }; #endif @@ -201,12 +201,12 @@ AVInputFormat ff_latm_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "latm", - .raw_codec_id = CODEC_ID_AAC_LATM, + .raw_codec_id = AV_CODEC_ID_AAC_LATM, }; #endif #if CONFIG_MJPEG_DEMUXER -FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg,mpo", CODEC_ID_MJPEG) +FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg,mpo", AV_CODEC_ID_MJPEG) #endif #if CONFIG_MLP_DEMUXER @@ -217,7 +217,7 @@ AVInputFormat ff_mlp_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "mlp", - .raw_codec_id = CODEC_ID_MLP, + .raw_codec_id = AV_CODEC_ID_MLP, }; #endif @@ -229,7 +229,7 @@ AVInputFormat ff_truehd_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "thd", - .raw_codec_id = CODEC_ID_TRUEHD, + .raw_codec_id = AV_CODEC_ID_TRUEHD, }; #endif @@ -241,10 +241,10 @@ AVInputFormat ff_shorten_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK, .extensions = "shn", - .raw_codec_id = CODEC_ID_SHORTEN, + .raw_codec_id = AV_CODEC_ID_SHORTEN, }; #endif #if CONFIG_VC1_DEMUXER -FF_DEF_RAWVIDEO_DEMUXER(vc1, "raw VC-1", NULL, "vc1", CODEC_ID_VC1) +FF_DEF_RAWVIDEO_DEMUXER(vc1, "raw VC-1", NULL, "vc1", AV_CODEC_ID_VC1) #endif diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index f9b92f5b43..94e68c5ee4 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -38,8 +38,8 @@ AVOutputFormat ff_ac3_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw AC-3"), .mime_type = "audio/x-ac3", .extensions = "ac3", - .audio_codec = CODEC_ID_AC3, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_AC3, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -50,8 +50,8 @@ AVOutputFormat ff_adx_muxer = { .name = "adx", .long_name = NULL_IF_CONFIG_SMALL("CRI ADX"), .extensions = "adx", - .audio_codec = CODEC_ID_ADPCM_ADX, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_ADPCM_ADX, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -62,8 +62,8 @@ AVOutputFormat ff_cavsvideo_muxer = { .name = "cavsvideo", .long_name = NULL_IF_CONFIG_SMALL("raw Chinese AVS (Audio Video Standard) video"), .extensions = "cavs", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_CAVS, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_CAVS, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -74,8 +74,8 @@ AVOutputFormat ff_dirac_muxer = { .name = "dirac", .long_name = NULL_IF_CONFIG_SMALL("raw Dirac"), .extensions = "drc", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_DIRAC, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_DIRAC, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -86,8 +86,8 @@ AVOutputFormat ff_dnxhd_muxer = { .name = "dnxhd", .long_name = NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"), .extensions = "dnxhd", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_DNXHD, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_DNXHD, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -99,8 +99,8 @@ AVOutputFormat ff_dts_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw DTS"), .mime_type = "audio/x-dca", .extensions = "dts", - .audio_codec = CODEC_ID_DTS, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_DTS, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -112,8 +112,8 @@ AVOutputFormat ff_eac3_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw E-AC-3"), .mime_type = "audio/x-eac3", .extensions = "eac3", - .audio_codec = CODEC_ID_EAC3, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_EAC3, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -125,8 +125,8 @@ AVOutputFormat ff_g722_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw G.722"), .mime_type = "audio/G722", .extensions = "g722", - .audio_codec = CODEC_ID_ADPCM_G722, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_ADPCM_G722, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -138,8 +138,8 @@ AVOutputFormat ff_g723_1_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw G.723.1"), .mime_type = "audio/g723", .extensions = "tco,rco", - .audio_codec = CODEC_ID_G723_1, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_G723_1, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .flags= AVFMT_NOTIMESTAMPS, }; @@ -151,8 +151,8 @@ AVOutputFormat ff_h261_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw H.261"), .mime_type = "video/x-h261", .extensions = "h261", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_H261, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_H261, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -164,8 +164,8 @@ AVOutputFormat ff_h263_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw H.263"), .mime_type = "video/x-h263", .extensions = "h263", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_H263, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_H263, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -176,8 +176,8 @@ AVOutputFormat ff_h264_muxer = { .name = "h264", .long_name = NULL_IF_CONFIG_SMALL("raw H.264 video"), .extensions = "h264", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_H264, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_H264, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -188,8 +188,8 @@ AVOutputFormat ff_m4v_muxer = { .name = "m4v", .long_name = NULL_IF_CONFIG_SMALL("raw MPEG-4 video"), .extensions = "m4v", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MPEG4, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MPEG4, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -201,8 +201,8 @@ AVOutputFormat ff_mjpeg_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw MJPEG video"), .mime_type = "video/x-mjpeg", .extensions = "mjpg,mjpeg", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MJPEG, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MJPEG, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -213,8 +213,8 @@ AVOutputFormat ff_mlp_muxer = { .name = "mlp", .long_name = NULL_IF_CONFIG_SMALL("raw MLP"), .extensions = "mlp", - .audio_codec = CODEC_ID_MLP, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_MLP, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -226,8 +226,8 @@ AVOutputFormat ff_mpeg1video_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw MPEG-1 video"), .mime_type = "video/x-mpeg", .extensions = "mpg,mpeg,m1v", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MPEG1VIDEO, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MPEG1VIDEO, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -238,8 +238,8 @@ AVOutputFormat ff_mpeg2video_muxer = { .name = "mpeg2video", .long_name = NULL_IF_CONFIG_SMALL("raw MPEG-2 video"), .extensions = "m2v", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MPEG2VIDEO, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -250,8 +250,8 @@ AVOutputFormat ff_rawvideo_muxer = { .name = "rawvideo", .long_name = NULL_IF_CONFIG_SMALL("raw video"), .extensions = "yuv,rgb", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_RAWVIDEO, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -262,8 +262,8 @@ AVOutputFormat ff_truehd_muxer = { .name = "truehd", .long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"), .extensions = "thd", - .audio_codec = CODEC_ID_TRUEHD, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_TRUEHD, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index c349a5338f..2828c8d472 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -68,6 +68,6 @@ AVInputFormat ff_rawvideo_demuxer = { .read_packet = rawvideo_read_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "yuv,cif,qcif,rgb", - .raw_codec_id = CODEC_ID_RAWVIDEO, + .raw_codec_id = AV_CODEC_ID_RAWVIDEO, .priv_class = &rawvideo_demuxer_class, }; diff --git a/libavformat/rdt.c b/libavformat/rdt.c index d2437ee73f..24d901cc9b 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -309,7 +309,7 @@ rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st, if (res < 0) return res; if (res > 0) { - if (st->codec->codec_id == CODEC_ID_AAC) { + if (st->codec->codec_id == AV_CODEC_ID_AAC) { memcpy (rdt->buffer, buf + pos, len - pos); rdt->rmctx->pb = avio_alloc_context (rdt->buffer, len - pos, 0, NULL, NULL, NULL, NULL); @@ -322,7 +322,7 @@ get_cache: ff_rm_retrieve_cache (rdt->rmctx, rdt->rmctx->pb, st, rdt->rmst[st->index], pkt); if (rdt->audio_pkt_cnt == 0 && - st->codec->codec_id == CODEC_ID_AAC) + st->codec->codec_id == AV_CODEC_ID_AAC) av_freep(&rdt->rmctx->pb); } pkt->stream_index = st->index; @@ -551,7 +551,7 @@ rdt_free_context (PayloadContext *rdt) static RTPDynamicProtocolHandler ff_rdt_ ## n ## _handler = { \ .enc_name = s, \ .codec_type = t, \ - .codec_id = CODEC_ID_NONE, \ + .codec_id = AV_CODEC_ID_NONE, \ .parse_sdp_a_line = rdt_parse_sdp_line, \ .alloc = rdt_new_context, \ .free = rdt_free_context, \ diff --git a/libavformat/realtextdec.c b/libavformat/realtextdec.c index 88a7fdd0db..cc7c1841b5 100644 --- a/libavformat/realtextdec.c +++ b/libavformat/realtextdec.c @@ -68,7 +68,7 @@ static int realtext_read_header(AVFormatContext *s) return AVERROR(ENOMEM); avpriv_set_pts_info(st, 64, 1, 100); st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = CODEC_ID_REALTEXT; + st->codec->codec_id = AV_CODEC_ID_REALTEXT; av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); diff --git a/libavformat/riff.c b/libavformat/riff.c index bf14c45d5c..73e6aa59be 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -30,363 +30,363 @@ /* Note: when encoding, the first matching tag is used, so order is important if multiple tags possible for a given codec. */ const AVCodecTag ff_codec_bmp_tags[] = { - { CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, - { CODEC_ID_H264, MKTAG('h', '2', '6', '4') }, - { CODEC_ID_H264, MKTAG('X', '2', '6', '4') }, - { CODEC_ID_H264, MKTAG('x', '2', '6', '4') }, - { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, - { CODEC_ID_H264, MKTAG('D', 'A', 'V', 'C') }, - { CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') }, - { CODEC_ID_H264, MKTAG('Q', '2', '6', '4') }, /* QNAP surveillance system */ - { CODEC_ID_H263, MKTAG('H', '2', '6', '3') }, - { CODEC_ID_H263, MKTAG('X', '2', '6', '3') }, - { CODEC_ID_H263, MKTAG('T', '2', '6', '3') }, - { CODEC_ID_H263, MKTAG('L', '2', '6', '3') }, - { CODEC_ID_H263, MKTAG('V', 'X', '1', 'K') }, - { CODEC_ID_H263, MKTAG('Z', 'y', 'G', 'o') }, - { CODEC_ID_H263, MKTAG('M', '2', '6', '3') }, - { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') }, - { CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */ - { CODEC_ID_H261, MKTAG('H', '2', '6', '1') }, - { CODEC_ID_H263, MKTAG('U', '2', '6', '3') }, - { CODEC_ID_MPEG4, MKTAG('F', 'M', 'P', '4') }, - { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, - { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0') }, - { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, - { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, - { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, - { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */ - { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') }, - { CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, - { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, - { CODEC_ID_MPEG4, MKTAG('U', 'M', 'P', '4') }, - { CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') }, - { CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') }, - { CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') }, - { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, - { CODEC_ID_MPEG4, MKTAG('W', 'A', 'W', 'V') }, /* WaWv MPEG-4 Video Codec */ - { CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') }, - { CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') }, - { CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') }, - { CODEC_ID_MPEG4, MKTAG('M', 'V', 'X', 'M') }, - { CODEC_ID_MPEG4, MKTAG('P', 'M', '4', 'V') }, - { CODEC_ID_MPEG4, MKTAG('S', 'M', 'P', '4') }, - { CODEC_ID_MPEG4, MKTAG('D', 'X', 'G', 'M') }, - { CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') }, - { CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') }, - { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') }, - { CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') }, /* flipped video */ - { CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') }, - { CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') }, - { CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') }, - { CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') }, /* Ephv MPEG-4 */ - { CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') }, - { CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') }, /* Divio MPEG-4 */ - { CODEC_ID_MPEG4, MKTAG('S', 'N', '4', '0') }, - { CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') }, - { CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') }, - { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') }, - { CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */ - { CODEC_ID_MPEG4, MKTAG('S', 'M', '4', 'V') }, - { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') }, - { CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') }, - { CODEC_ID_MPEG4, MKTAG('Q', 'M', 'P', '4') }, /* QNAP Systems */ - { CODEC_ID_MPEG4, MKTAG('P', 'L', 'V', '1') }, /* Pelco DVR MPEG-4 */ - { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, - { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, - { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') }, - { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '5') }, - { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '6') }, - { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '4') }, - { CODEC_ID_MSMPEG4V3, MKTAG('D', 'V', 'X', '3') }, - { CODEC_ID_MSMPEG4V3, MKTAG('A', 'P', '4', '1') }, - { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '1') }, - { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '0') }, - { CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') }, - { CODEC_ID_MSMPEG4V2, MKTAG('D', 'I', 'V', '2') }, - { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') }, - { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') }, - { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') }, - { CODEC_ID_WMV2, MKTAG('W', 'M', 'V', '2') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'd') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') }, - { CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') }, /* Canopus DV */ - { CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', 'H') }, /* Canopus DV */ - { CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', '5') }, /* Canopus DV */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 's') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'i', 's') }, - { CODEC_ID_DVVIDEO, MKTAG('p', 'd', 'v', 'c') }, - { CODEC_ID_DVVIDEO, MKTAG('S', 'L', '2', '5') }, - { CODEC_ID_DVVIDEO, MKTAG('S', 'L', 'D', 'V') }, - { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') }, - { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') }, - { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('P', 'I', 'M', '2') }, - { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, - { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) }, - { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) }, - { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) }, - { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */ - { CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') }, /* Matrox MPEG2 intra-only */ - { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', 'v') }, - { CODEC_ID_MPEG1VIDEO, MKTAG('B', 'W', '1', '0') }, - { CODEC_ID_MPEG1VIDEO, MKTAG('X', 'M', 'P', 'G') }, /* Xing MPEG intra only */ - { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, - { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, - { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, - { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, - { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, - { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ - { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */ - { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'P', 'G') }, - { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ - { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, - { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, - { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, - { CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') }, - { CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') }, - { CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */ - { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */ - { CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */ - { CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */ - { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') }, - { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') }, - { CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') }, - { CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */ - { CODEC_ID_MJPEG, MKTAG('M', 'M', 'J', 'P') }, - { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, - { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, - { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, - { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) }, - { CODEC_ID_RAWVIDEO, MKTAG( 3 , 0 , 0 , 0 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('V', '4', '2', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'N', 'V') }, - { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'V') }, - { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('u', 'y', 'v', '1') }, - { CODEC_ID_RAWVIDEO, MKTAG('2', 'V', 'u', '1') }, - { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, - { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, - { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('P', '4', '2', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '6') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '2', '4') }, - { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('V', 'Y', 'U', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('I', 'Y', 'U', 'V') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '8', '0', '0') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '8', ' ', ' ') }, - { CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') }, - { CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */ - { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', '1') }, - { CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '1', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '2', '1') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'V', '9') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') }, - { CODEC_ID_RAWVIDEO, MKTAG('a', 'u', 'v', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'Y', 'U') }, - { CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') }, - { CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, - { CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, - { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, - { CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, - { CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, - { CODEC_ID_AYUV, MKTAG('A', 'Y', 'U', 'V') }, - { CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, - { CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, - { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, - { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, - { CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') }, - { CODEC_ID_INDEO5, MKTAG('I', 'V', '5', '0') }, - { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, - { CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, - { CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, - { CODEC_ID_VP6F, MKTAG('V', 'P', '6', 'F') }, - { CODEC_ID_VP6F, MKTAG('F', 'L', 'V', '4') }, - { CODEC_ID_VP8, MKTAG('V', 'P', '8', '0') }, - { CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') }, - { CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') }, - { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') }, - { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') }, - { CODEC_ID_XAN_WC4, MKTAG('X', 'x', 'a', 'n') }, - { CODEC_ID_MIMIC, MKTAG('L', 'M', '2', '0') }, - { CODEC_ID_MSRLE, MKTAG('m', 'r', 'l', 'e') }, - { CODEC_ID_MSRLE, MKTAG( 1 , 0 , 0 , 0 ) }, - { CODEC_ID_MSRLE, MKTAG( 2 , 0 , 0 , 0 ) }, - { CODEC_ID_MSVIDEO1, MKTAG('M', 'S', 'V', 'C') }, - { CODEC_ID_MSVIDEO1, MKTAG('m', 's', 'v', 'c') }, - { CODEC_ID_MSVIDEO1, MKTAG('C', 'R', 'A', 'M') }, - { CODEC_ID_MSVIDEO1, MKTAG('c', 'r', 'a', 'm') }, - { CODEC_ID_MSVIDEO1, MKTAG('W', 'H', 'A', 'M') }, - { CODEC_ID_MSVIDEO1, MKTAG('w', 'h', 'a', 'm') }, - { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, - { CODEC_ID_TRUEMOTION1, MKTAG('D', 'U', 'C', 'K') }, - { CODEC_ID_TRUEMOTION1, MKTAG('P', 'V', 'E', 'Z') }, - { CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') }, - { CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') }, - { CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') }, - { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') }, - { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') }, - { CODEC_ID_FLV1, MKTAG('S', '2', '6', '3') }, - { CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') }, - { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, - { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') }, - { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') }, - { CODEC_ID_VIXL, MKTAG('V', 'I', 'X', 'L') }, - { CODEC_ID_QPEG, MKTAG('Q', 'P', 'E', 'G') }, - { CODEC_ID_QPEG, MKTAG('Q', '1', '.', '0') }, - { CODEC_ID_QPEG, MKTAG('Q', '1', '.', '1') }, - { CODEC_ID_WMV3, MKTAG('W', 'M', 'V', '3') }, - { CODEC_ID_WMV3IMAGE, MKTAG('W', 'M', 'V', 'P') }, - { CODEC_ID_VC1, MKTAG('W', 'V', 'C', '1') }, - { CODEC_ID_VC1, MKTAG('W', 'M', 'V', 'A') }, - { CODEC_ID_VC1IMAGE, MKTAG('W', 'V', 'P', '2') }, - { CODEC_ID_LOCO, MKTAG('L', 'O', 'C', 'O') }, - { CODEC_ID_WNV1, MKTAG('W', 'N', 'V', '1') }, - { CODEC_ID_WNV1, MKTAG('Y', 'U', 'V', '8') }, - { CODEC_ID_AASC, MKTAG('A', 'A', 'S', '4') }, - { CODEC_ID_AASC, MKTAG('A', 'A', 'S', 'C') }, - { CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') }, - { CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') }, - { CODEC_ID_THEORA, MKTAG('t', 'h', 'e', 'o') }, - { CODEC_ID_TRUEMOTION2, MKTAG('T', 'M', '2', '0') }, - { CODEC_ID_CSCD, MKTAG('C', 'S', 'C', 'D') }, - { CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') }, - { CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') }, - { CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') }, - { CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, - { CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') }, - { CODEC_ID_JPEG2000, MKTAG('L', 'J', '2', 'C') }, - { CODEC_ID_JPEG2000, MKTAG('L', 'J', '2', 'K') }, - { CODEC_ID_JPEG2000, MKTAG('I', 'P', 'J', '2') }, - { CODEC_ID_VMNC, MKTAG('V', 'M', 'n', 'c') }, - { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, - { CODEC_ID_PNG, MKTAG('M', 'P', 'N', 'G') }, - { CODEC_ID_PNG, MKTAG('P', 'N', 'G', '1') }, - { CODEC_ID_CLJR, MKTAG('C', 'L', 'J', 'R') }, - { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, - { CODEC_ID_RPZA, MKTAG('a', 'z', 'p', 'r') }, - { CODEC_ID_RPZA, MKTAG('R', 'P', 'Z', 'A') }, - { CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') }, - { CODEC_ID_SP5X, MKTAG('S', 'P', '5', '4') }, - { CODEC_ID_AURA, MKTAG('A', 'U', 'R', 'A') }, - { CODEC_ID_AURA2, MKTAG('A', 'U', 'R', '2') }, - { CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, - { CODEC_ID_KGV1, MKTAG('K', 'G', 'V', '1') }, - { CODEC_ID_LAGARITH, MKTAG('L', 'A', 'G', 'S') }, - { CODEC_ID_G2M, MKTAG('G', '2', 'M', '2') }, - { CODEC_ID_G2M, MKTAG('G', '2', 'M', '3') }, - { CODEC_ID_G2M, MKTAG('G', '2', 'M', '4') }, - { CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'F') }, - { CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'A') }, - { CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'G') }, - { CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '0') }, - { CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '2') }, - { CODEC_ID_VBLE, MKTAG('V', 'B', 'L', 'E') }, - { CODEC_ID_ESCAPE130, MKTAG('E', '1', '3', '0') }, - { CODEC_ID_DXTORY, MKTAG('x', 't', 'o', 'r') }, - { CODEC_ID_ZEROCODEC, MKTAG('Z', 'E', 'C', 'O') }, - { CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, - { CODEC_ID_FLIC, MKTAG('A', 'F', 'L', 'C') }, - { CODEC_ID_EXR, MKTAG('e', 'x', 'r', ' ') }, - { CODEC_ID_MSS1, MKTAG('M', 'S', 'S', '1') }, - { CODEC_ID_MSA1, MKTAG('M', 'S', 'A', '1') }, - { CODEC_ID_TSCC2, MKTAG('T', 'S', 'C', '2') }, - { CODEC_ID_MTS2, MKTAG('M', 'T', 'S', '2') }, - { CODEC_ID_CLLC, MKTAG('C', 'L', 'L', 'C') }, - { CODEC_ID_NONE, 0 } + { AV_CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, + { AV_CODEC_ID_H264, MKTAG('h', '2', '6', '4') }, + { AV_CODEC_ID_H264, MKTAG('X', '2', '6', '4') }, + { AV_CODEC_ID_H264, MKTAG('x', '2', '6', '4') }, + { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, + { AV_CODEC_ID_H264, MKTAG('D', 'A', 'V', 'C') }, + { AV_CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') }, + { AV_CODEC_ID_H264, MKTAG('Q', '2', '6', '4') }, /* QNAP surveillance system */ + { AV_CODEC_ID_H263, MKTAG('H', '2', '6', '3') }, + { AV_CODEC_ID_H263, MKTAG('X', '2', '6', '3') }, + { AV_CODEC_ID_H263, MKTAG('T', '2', '6', '3') }, + { AV_CODEC_ID_H263, MKTAG('L', '2', '6', '3') }, + { AV_CODEC_ID_H263, MKTAG('V', 'X', '1', 'K') }, + { AV_CODEC_ID_H263, MKTAG('Z', 'y', 'G', 'o') }, + { AV_CODEC_ID_H263, MKTAG('M', '2', '6', '3') }, + { AV_CODEC_ID_H263P, MKTAG('H', '2', '6', '3') }, + { AV_CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */ + { AV_CODEC_ID_H261, MKTAG('H', '2', '6', '1') }, + { AV_CODEC_ID_H263, MKTAG('U', '2', '6', '3') }, + { AV_CODEC_ID_MPEG4, MKTAG('F', 'M', 'P', '4') }, + { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, + { AV_CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0') }, + { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, + { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, + { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, + { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */ + { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') }, + { AV_CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, + { AV_CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, + { AV_CODEC_ID_MPEG4, MKTAG('U', 'M', 'P', '4') }, + { AV_CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') }, + { AV_CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') }, + { AV_CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') }, + { AV_CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, + { AV_CODEC_ID_MPEG4, MKTAG('W', 'A', 'W', 'V') }, /* WaWv MPEG-4 Video Codec */ + { AV_CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') }, + { AV_CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') }, + { AV_CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') }, + { AV_CODEC_ID_MPEG4, MKTAG('M', 'V', 'X', 'M') }, + { AV_CODEC_ID_MPEG4, MKTAG('P', 'M', '4', 'V') }, + { AV_CODEC_ID_MPEG4, MKTAG('S', 'M', 'P', '4') }, + { AV_CODEC_ID_MPEG4, MKTAG('D', 'X', 'G', 'M') }, + { AV_CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') }, + { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') }, + { AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') }, + { AV_CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') }, /* flipped video */ + { AV_CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') }, + { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') }, + { AV_CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') }, + { AV_CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') }, /* Ephv MPEG-4 */ + { AV_CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') }, + { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') }, /* Divio MPEG-4 */ + { AV_CODEC_ID_MPEG4, MKTAG('S', 'N', '4', '0') }, + { AV_CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') }, + { AV_CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') }, + { AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') }, + { AV_CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */ + { AV_CODEC_ID_MPEG4, MKTAG('S', 'M', '4', 'V') }, + { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') }, + { AV_CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') }, + { AV_CODEC_ID_MPEG4, MKTAG('Q', 'M', 'P', '4') }, /* QNAP Systems */ + { AV_CODEC_ID_MPEG4, MKTAG('P', 'L', 'V', '1') }, /* Pelco DVR MPEG-4 */ + { AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '5') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '6') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '4') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'V', 'X', '3') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('A', 'P', '4', '1') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '1') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '0') }, + { AV_CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') }, + { AV_CODEC_ID_MSMPEG4V2, MKTAG('D', 'I', 'V', '2') }, + { AV_CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') }, + { AV_CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') }, + { AV_CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') }, + { AV_CODEC_ID_WMV2, MKTAG('W', 'M', 'V', '2') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'd') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') }, /* Canopus DV */ + { AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', 'H') }, /* Canopus DV */ + { AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', '5') }, /* Canopus DV */ + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 's') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'i', 's') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('p', 'd', 'v', 'c') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('S', 'L', '2', '5') }, + { AV_CODEC_ID_DVVIDEO, MKTAG('S', 'L', 'D', 'V') }, + { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') }, + { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') }, + { AV_CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('P', 'I', 'M', '2') }, + { AV_CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, + { AV_CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) }, + { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') }, /* Matrox MPEG2 intra-only */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', 'v') }, + { AV_CODEC_ID_MPEG1VIDEO, MKTAG('B', 'W', '1', '0') }, + { AV_CODEC_ID_MPEG1VIDEO, MKTAG('X', 'M', 'P', 'G') }, /* Xing MPEG intra only */ + { AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, + { AV_CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, + { AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, + { AV_CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, + { AV_CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, + { AV_CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ + { AV_CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */ + { AV_CODEC_ID_JPEGLS, MKTAG('M', 'J', 'P', 'G') }, + { AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ + { AV_CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, + { AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, + { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, + { AV_CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') }, + { AV_CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') }, + { AV_CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */ + { AV_CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */ + { AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */ + { AV_CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */ + { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') }, + { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') }, + { AV_CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') }, + { AV_CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */ + { AV_CODEC_ID_MJPEG, MKTAG('M', 'M', 'J', 'P') }, + { AV_CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, + { AV_CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, + { AV_CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG( 3 , 0 , 0 , 0 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('V', '4', '2', '2') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'N', 'V') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'V') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('u', 'y', 'v', '1') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('2', 'V', 'u', '1') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('P', '4', '2', '2') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '2') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '6') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '2', '4') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('V', 'Y', 'U', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('I', 'Y', 'U', 'V') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '8', '0', '0') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '8', ' ', ' ') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', '1') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '1', '2') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '2', '1') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'V', '9') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('a', 'u', 'v', '2') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'Y', 'U') }, + { AV_CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') }, + { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, + { AV_CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, + { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, + { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, + { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, + { AV_CODEC_ID_AYUV, MKTAG('A', 'Y', 'U', 'V') }, + { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, + { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, + { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, + { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, + { AV_CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') }, + { AV_CODEC_ID_INDEO5, MKTAG('I', 'V', '5', '0') }, + { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, + { AV_CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, + { AV_CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, + { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, + { AV_CODEC_ID_VP6F, MKTAG('V', 'P', '6', 'F') }, + { AV_CODEC_ID_VP6F, MKTAG('F', 'L', 'V', '4') }, + { AV_CODEC_ID_VP8, MKTAG('V', 'P', '8', '0') }, + { AV_CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') }, + { AV_CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') }, + { AV_CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') }, + { AV_CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') }, + { AV_CODEC_ID_XAN_WC4, MKTAG('X', 'x', 'a', 'n') }, + { AV_CODEC_ID_MIMIC, MKTAG('L', 'M', '2', '0') }, + { AV_CODEC_ID_MSRLE, MKTAG('m', 'r', 'l', 'e') }, + { AV_CODEC_ID_MSRLE, MKTAG( 1 , 0 , 0 , 0 ) }, + { AV_CODEC_ID_MSRLE, MKTAG( 2 , 0 , 0 , 0 ) }, + { AV_CODEC_ID_MSVIDEO1, MKTAG('M', 'S', 'V', 'C') }, + { AV_CODEC_ID_MSVIDEO1, MKTAG('m', 's', 'v', 'c') }, + { AV_CODEC_ID_MSVIDEO1, MKTAG('C', 'R', 'A', 'M') }, + { AV_CODEC_ID_MSVIDEO1, MKTAG('c', 'r', 'a', 'm') }, + { AV_CODEC_ID_MSVIDEO1, MKTAG('W', 'H', 'A', 'M') }, + { AV_CODEC_ID_MSVIDEO1, MKTAG('w', 'h', 'a', 'm') }, + { AV_CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, + { AV_CODEC_ID_TRUEMOTION1, MKTAG('D', 'U', 'C', 'K') }, + { AV_CODEC_ID_TRUEMOTION1, MKTAG('P', 'V', 'E', 'Z') }, + { AV_CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') }, + { AV_CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') }, + { AV_CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') }, + { AV_CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') }, + { AV_CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') }, + { AV_CODEC_ID_FLV1, MKTAG('S', '2', '6', '3') }, + { AV_CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') }, + { AV_CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, + { AV_CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') }, + { AV_CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') }, + { AV_CODEC_ID_VIXL, MKTAG('V', 'I', 'X', 'L') }, + { AV_CODEC_ID_QPEG, MKTAG('Q', 'P', 'E', 'G') }, + { AV_CODEC_ID_QPEG, MKTAG('Q', '1', '.', '0') }, + { AV_CODEC_ID_QPEG, MKTAG('Q', '1', '.', '1') }, + { AV_CODEC_ID_WMV3, MKTAG('W', 'M', 'V', '3') }, + { AV_CODEC_ID_WMV3IMAGE, MKTAG('W', 'M', 'V', 'P') }, + { AV_CODEC_ID_VC1, MKTAG('W', 'V', 'C', '1') }, + { AV_CODEC_ID_VC1, MKTAG('W', 'M', 'V', 'A') }, + { AV_CODEC_ID_VC1IMAGE, MKTAG('W', 'V', 'P', '2') }, + { AV_CODEC_ID_LOCO, MKTAG('L', 'O', 'C', 'O') }, + { AV_CODEC_ID_WNV1, MKTAG('W', 'N', 'V', '1') }, + { AV_CODEC_ID_WNV1, MKTAG('Y', 'U', 'V', '8') }, + { AV_CODEC_ID_AASC, MKTAG('A', 'A', 'S', '4') }, + { AV_CODEC_ID_AASC, MKTAG('A', 'A', 'S', 'C') }, + { AV_CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') }, + { AV_CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') }, + { AV_CODEC_ID_THEORA, MKTAG('t', 'h', 'e', 'o') }, + { AV_CODEC_ID_TRUEMOTION2, MKTAG('T', 'M', '2', '0') }, + { AV_CODEC_ID_CSCD, MKTAG('C', 'S', 'C', 'D') }, + { AV_CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') }, + { AV_CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') }, + { AV_CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') }, + { AV_CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, + { AV_CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') }, + { AV_CODEC_ID_JPEG2000, MKTAG('L', 'J', '2', 'C') }, + { AV_CODEC_ID_JPEG2000, MKTAG('L', 'J', '2', 'K') }, + { AV_CODEC_ID_JPEG2000, MKTAG('I', 'P', 'J', '2') }, + { AV_CODEC_ID_VMNC, MKTAG('V', 'M', 'n', 'c') }, + { AV_CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, + { AV_CODEC_ID_PNG, MKTAG('M', 'P', 'N', 'G') }, + { AV_CODEC_ID_PNG, MKTAG('P', 'N', 'G', '1') }, + { AV_CODEC_ID_CLJR, MKTAG('C', 'L', 'J', 'R') }, + { AV_CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, + { AV_CODEC_ID_RPZA, MKTAG('a', 'z', 'p', 'r') }, + { AV_CODEC_ID_RPZA, MKTAG('R', 'P', 'Z', 'A') }, + { AV_CODEC_ID_RPZA, MKTAG('r', 'p', 'z', 'a') }, + { AV_CODEC_ID_SP5X, MKTAG('S', 'P', '5', '4') }, + { AV_CODEC_ID_AURA, MKTAG('A', 'U', 'R', 'A') }, + { AV_CODEC_ID_AURA2, MKTAG('A', 'U', 'R', '2') }, + { AV_CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, + { AV_CODEC_ID_KGV1, MKTAG('K', 'G', 'V', '1') }, + { AV_CODEC_ID_LAGARITH, MKTAG('L', 'A', 'G', 'S') }, + { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '2') }, + { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '3') }, + { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '4') }, + { AV_CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'F') }, + { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'A') }, + { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'G') }, + { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '0') }, + { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '2') }, + { AV_CODEC_ID_VBLE, MKTAG('V', 'B', 'L', 'E') }, + { AV_CODEC_ID_ESCAPE130, MKTAG('E', '1', '3', '0') }, + { AV_CODEC_ID_DXTORY, MKTAG('x', 't', 'o', 'r') }, + { AV_CODEC_ID_ZEROCODEC, MKTAG('Z', 'E', 'C', 'O') }, + { AV_CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, + { AV_CODEC_ID_FLIC, MKTAG('A', 'F', 'L', 'C') }, + { AV_CODEC_ID_EXR, MKTAG('e', 'x', 'r', ' ') }, + { AV_CODEC_ID_MSS1, MKTAG('M', 'S', 'S', '1') }, + { AV_CODEC_ID_MSA1, MKTAG('M', 'S', 'A', '1') }, + { AV_CODEC_ID_TSCC2, MKTAG('T', 'S', 'C', '2') }, + { AV_CODEC_ID_MTS2, MKTAG('M', 'T', 'S', '2') }, + { AV_CODEC_ID_CLLC, MKTAG('C', 'L', 'L', 'C') }, + { AV_CODEC_ID_NONE, 0 } }; const AVCodecTag ff_codec_wav_tags[] = { - { CODEC_ID_PCM_S16LE, 0x0001 }, - { CODEC_ID_PCM_U8, 0x0001 }, /* must come after s16le in this list */ - { CODEC_ID_PCM_S24LE, 0x0001 }, - { CODEC_ID_PCM_S32LE, 0x0001 }, - { CODEC_ID_ADPCM_MS, 0x0002 }, - { CODEC_ID_PCM_F32LE, 0x0003 }, - { CODEC_ID_PCM_F64LE, 0x0003 }, /* must come after f32le in this list */ - { CODEC_ID_PCM_ALAW, 0x0006 }, - { CODEC_ID_PCM_MULAW, 0x0007 }, - { CODEC_ID_WMAVOICE, 0x000A }, - { CODEC_ID_ADPCM_IMA_WAV, 0x0011 }, - { CODEC_ID_PCM_ZORK, 0x0011 }, /* must come after adpcm_ima_wav in this list */ - { CODEC_ID_ADPCM_YAMAHA, 0x0020 }, - { CODEC_ID_TRUESPEECH, 0x0022 }, - { CODEC_ID_GSM_MS, 0x0031 }, - { CODEC_ID_AMR_NB, 0x0038 }, /* rogue format number */ - { CODEC_ID_G723_1, 0x0042 }, - { CODEC_ID_ADPCM_G726, 0x0045 }, - { CODEC_ID_MP2, 0x0050 }, - { CODEC_ID_MP3, 0x0055 }, - { CODEC_ID_AMR_NB, 0x0057 }, - { CODEC_ID_AMR_WB, 0x0058 }, - { CODEC_ID_ADPCM_IMA_DK4, 0x0061 }, /* rogue format number */ - { CODEC_ID_ADPCM_IMA_DK3, 0x0062 }, /* rogue format number */ - { CODEC_ID_ADPCM_IMA_WAV, 0x0069 }, - { CODEC_ID_VOXWARE, 0x0075 }, - { CODEC_ID_AAC, 0x00ff }, - { CODEC_ID_SIPR, 0x0130 }, - { CODEC_ID_WMAV1, 0x0160 }, - { CODEC_ID_WMAV2, 0x0161 }, - { CODEC_ID_WMAPRO, 0x0162 }, - { CODEC_ID_WMALOSSLESS, 0x0163 }, - { CODEC_ID_ADPCM_CT, 0x0200 }, - { CODEC_ID_ATRAC3, 0x0270 }, - { CODEC_ID_ADPCM_G722, 0x028F }, - { CODEC_ID_IMC, 0x0401 }, - { CODEC_ID_IAC, 0x0402 }, - { CODEC_ID_GSM_MS, 0x1500 }, - { CODEC_ID_TRUESPEECH, 0x1501 }, - { CODEC_ID_AAC, 0x1600 }, /* ADTS AAC */ - { CODEC_ID_AAC_LATM, 0x1602 }, - { CODEC_ID_AC3, 0x2000 }, - { CODEC_ID_DTS, 0x2001 }, - { CODEC_ID_SONIC, 0x2048 }, - { CODEC_ID_SONIC_LS, 0x2048 }, - { CODEC_ID_PCM_MULAW, 0x6c75 }, - { CODEC_ID_AAC, 0x706d }, - { CODEC_ID_AAC, 0x4143 }, - { CODEC_ID_SPEEX, 0xA109 }, - { CODEC_ID_FLAC, 0xF1AC }, - { CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' }, - { CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id? + { AV_CODEC_ID_PCM_S16LE, 0x0001 }, + { AV_CODEC_ID_PCM_U8, 0x0001 }, /* must come after s16le in this list */ + { AV_CODEC_ID_PCM_S24LE, 0x0001 }, + { AV_CODEC_ID_PCM_S32LE, 0x0001 }, + { AV_CODEC_ID_ADPCM_MS, 0x0002 }, + { AV_CODEC_ID_PCM_F32LE, 0x0003 }, + { AV_CODEC_ID_PCM_F64LE, 0x0003 }, /* must come after f32le in this list */ + { AV_CODEC_ID_PCM_ALAW, 0x0006 }, + { AV_CODEC_ID_PCM_MULAW, 0x0007 }, + { AV_CODEC_ID_WMAVOICE, 0x000A }, + { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0011 }, + { AV_CODEC_ID_PCM_ZORK, 0x0011 }, /* must come after adpcm_ima_wav in this list */ + { AV_CODEC_ID_ADPCM_YAMAHA, 0x0020 }, + { AV_CODEC_ID_TRUESPEECH, 0x0022 }, + { AV_CODEC_ID_GSM_MS, 0x0031 }, + { AV_CODEC_ID_AMR_NB, 0x0038 }, /* rogue format number */ + { AV_CODEC_ID_G723_1, 0x0042 }, + { AV_CODEC_ID_ADPCM_G726, 0x0045 }, + { AV_CODEC_ID_MP2, 0x0050 }, + { AV_CODEC_ID_MP3, 0x0055 }, + { AV_CODEC_ID_AMR_NB, 0x0057 }, + { AV_CODEC_ID_AMR_WB, 0x0058 }, + { AV_CODEC_ID_ADPCM_IMA_DK4, 0x0061 }, /* rogue format number */ + { AV_CODEC_ID_ADPCM_IMA_DK3, 0x0062 }, /* rogue format number */ + { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0069 }, + { AV_CODEC_ID_VOXWARE, 0x0075 }, + { AV_CODEC_ID_AAC, 0x00ff }, + { AV_CODEC_ID_SIPR, 0x0130 }, + { AV_CODEC_ID_WMAV1, 0x0160 }, + { AV_CODEC_ID_WMAV2, 0x0161 }, + { AV_CODEC_ID_WMAPRO, 0x0162 }, + { AV_CODEC_ID_WMALOSSLESS, 0x0163 }, + { AV_CODEC_ID_ADPCM_CT, 0x0200 }, + { AV_CODEC_ID_ATRAC3, 0x0270 }, + { AV_CODEC_ID_ADPCM_G722, 0x028F }, + { AV_CODEC_ID_IMC, 0x0401 }, + { AV_CODEC_ID_IAC, 0x0402 }, + { AV_CODEC_ID_GSM_MS, 0x1500 }, + { AV_CODEC_ID_TRUESPEECH, 0x1501 }, + { AV_CODEC_ID_AAC, 0x1600 }, /* ADTS AAC */ + { AV_CODEC_ID_AAC_LATM, 0x1602 }, + { AV_CODEC_ID_AC3, 0x2000 }, + { AV_CODEC_ID_DTS, 0x2001 }, + { AV_CODEC_ID_SONIC, 0x2048 }, + { AV_CODEC_ID_SONIC_LS, 0x2048 }, + { AV_CODEC_ID_PCM_MULAW, 0x6c75 }, + { AV_CODEC_ID_AAC, 0x706d }, + { AV_CODEC_ID_AAC, 0x4143 }, + { AV_CODEC_ID_SPEEX, 0xA109 }, + { AV_CODEC_ID_FLAC, 0xF1AC }, + { AV_CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' }, + { AV_CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id? /* FIXME: All of the IDs below are not 16 bit and thus illegal. */ // for NuppelVideo (nuv.c) - { CODEC_ID_PCM_S16LE, MKTAG('R', 'A', 'W', 'A') }, - { CODEC_ID_MP3, MKTAG('L', 'A', 'M', 'E') }, - { CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_PCM_S16LE, MKTAG('R', 'A', 'W', 'A') }, + { AV_CODEC_ID_MP3, MKTAG('L', 'A', 'M', 'E') }, + { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, + { AV_CODEC_ID_NONE, 0 }, }; const AVCodecGuid ff_codec_wav_guids[] = { - {CODEC_ID_AC3, {0x2C,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}}, - {CODEC_ID_ATRAC3P, {0xBF,0xAA,0x23,0xE9,0x58,0xCB,0x71,0x44,0xA1,0x19,0xFF,0xFA,0x01,0xE4,0xCE,0x62}}, - {CODEC_ID_EAC3, {0xAF,0x87,0xFB,0xA7,0x02,0x2D,0xFB,0x42,0xA4,0xD4,0x05,0xCD,0x93,0x84,0x3B,0xDD}}, - {CODEC_ID_MP2, {0x2B,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}}, - {CODEC_ID_NONE} + {AV_CODEC_ID_AC3, {0x2C,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}}, + {AV_CODEC_ID_ATRAC3P, {0xBF,0xAA,0x23,0xE9,0x58,0xCB,0x71,0x44,0xA1,0x19,0xFF,0xFA,0x01,0xE4,0xCE,0x62}}, + {AV_CODEC_ID_EAC3, {0xAF,0x87,0xFB,0xA7,0x02,0x2D,0xFB,0x42,0xA4,0xD4,0x05,0xCD,0x93,0x84,0x3B,0xDD}}, + {AV_CODEC_ID_MP2, {0x2B,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}}, + {AV_CODEC_ID_NONE} }; const AVMetadataConv ff_riff_info_conv[] = { @@ -462,7 +462,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) } avio_wl16(pb, enc->channels); avio_wl32(pb, enc->sample_rate); - if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS || enc->codec_id == CODEC_ID_G723_1) { + if (enc->codec_id == AV_CODEC_ID_MP2 || enc->codec_id == AV_CODEC_ID_MP3 || enc->codec_id == AV_CODEC_ID_GSM_MS || enc->codec_id == AV_CODEC_ID_G723_1) { bps = 0; } else { if (!(bps = av_get_bits_per_sample(enc->codec_id))) { @@ -476,27 +476,27 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) av_log(enc, AV_LOG_WARNING, "requested bits_per_coded_sample (%d) and actually stored (%d) differ\n", enc->bits_per_coded_sample, bps); } - if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) { + if (enc->codec_id == AV_CODEC_ID_MP2 || enc->codec_id == AV_CODEC_ID_MP3) { /* this is wrong, but it seems many demuxers do not work if this is set correctly */ blkalign = frame_size; //blkalign = 144 * enc->bit_rate/enc->sample_rate; - } else if (enc->codec_id == CODEC_ID_AC3) { + } else if (enc->codec_id == AV_CODEC_ID_AC3) { blkalign = 3840; //maximum bytes per frame - } else if (enc->codec_id == CODEC_ID_G723_1) { + } else if (enc->codec_id == AV_CODEC_ID_G723_1) { blkalign = 24; } else if (enc->block_align != 0) { /* specified by the codec */ blkalign = enc->block_align; } else blkalign = bps * enc->channels / av_gcd(8, bps); - if (enc->codec_id == CODEC_ID_PCM_U8 || - enc->codec_id == CODEC_ID_PCM_S24LE || - enc->codec_id == CODEC_ID_PCM_S32LE || - enc->codec_id == CODEC_ID_PCM_F32LE || - enc->codec_id == CODEC_ID_PCM_F64LE || - enc->codec_id == CODEC_ID_PCM_S16LE) { + if (enc->codec_id == AV_CODEC_ID_PCM_U8 || + enc->codec_id == AV_CODEC_ID_PCM_S24LE || + enc->codec_id == AV_CODEC_ID_PCM_S32LE || + enc->codec_id == AV_CODEC_ID_PCM_F32LE || + enc->codec_id == AV_CODEC_ID_PCM_F64LE || + enc->codec_id == AV_CODEC_ID_PCM_S16LE) { bytespersec = enc->sample_rate * blkalign; - } else if (enc->codec_id == CODEC_ID_G723_1) { + } else if (enc->codec_id == AV_CODEC_ID_G723_1) { bytespersec = 800; } else { bytespersec = enc->bit_rate / 8; @@ -504,14 +504,14 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) avio_wl32(pb, bytespersec); /* bytes per second */ avio_wl16(pb, blkalign); /* block align */ avio_wl16(pb, bps); /* bits per sample */ - if (enc->codec_id == CODEC_ID_MP3) { + if (enc->codec_id == AV_CODEC_ID_MP3) { hdrsize += 12; bytestream_put_le16(&riff_extradata, 1); /* wID */ bytestream_put_le32(&riff_extradata, 2); /* fdwFlags */ bytestream_put_le16(&riff_extradata, 1152); /* nBlockSize */ bytestream_put_le16(&riff_extradata, 1); /* nFramesPerBlock */ bytestream_put_le16(&riff_extradata, 1393); /* nCodecDelay */ - } else if (enc->codec_id == CODEC_ID_MP2) { + } else if (enc->codec_id == AV_CODEC_ID_MP2) { hdrsize += 22; bytestream_put_le16(&riff_extradata, 2); /* fwHeadLayer */ bytestream_put_le32(&riff_extradata, enc->bit_rate); /* dwHeadBitrate */ @@ -521,12 +521,12 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) bytestream_put_le16(&riff_extradata, 16); /* fwHeadFlags */ bytestream_put_le32(&riff_extradata, 0); /* dwPTSLow */ bytestream_put_le32(&riff_extradata, 0); /* dwPTSHigh */ - } else if (enc->codec_id == CODEC_ID_G723_1) { + } else if (enc->codec_id == AV_CODEC_ID_G723_1) { hdrsize += 20; bytestream_put_le32(&riff_extradata, 0x9ace0002); /* extradata needed for msacm g723.1 codec */ bytestream_put_le32(&riff_extradata, 0xaea2f732); bytestream_put_le16(&riff_extradata, 0xacde); - } else if (enc->codec_id == CODEC_ID_GSM_MS || enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) { + } else if (enc->codec_id == AV_CODEC_ID_GSM_MS || enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) { hdrsize += 2; bytestream_put_le16(&riff_extradata, frame_size); /* wSamplesPerBlock */ } else if(enc->extradata_size){ @@ -644,36 +644,36 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size) if (size > 0) avio_skip(pb, size); } - if (codec->codec_id == CODEC_ID_AAC_LATM) { + if (codec->codec_id == AV_CODEC_ID_AAC_LATM) { /* channels and sample_rate values are those prior to applying SBR and/or PS */ codec->channels = 0; codec->sample_rate = 0; } /* override bits_per_coded_sample for G.726 */ - if (codec->codec_id == CODEC_ID_ADPCM_G726) + if (codec->codec_id == AV_CODEC_ID_ADPCM_G726) codec->bits_per_coded_sample = codec->bit_rate / codec->sample_rate; return 0; } -enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps) +enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps) { - enum CodecID id; + enum AVCodecID id; id = ff_codec_get_id(ff_codec_wav_tags, tag); if (id <= 0) return id; /* handle specific u8 codec */ - if (id == CODEC_ID_PCM_S16LE && bps == 8) - id = CODEC_ID_PCM_U8; - if (id == CODEC_ID_PCM_S16LE && bps == 24) - id = CODEC_ID_PCM_S24LE; - if (id == CODEC_ID_PCM_S16LE && bps == 32) - id = CODEC_ID_PCM_S32LE; - if (id == CODEC_ID_PCM_F32LE && bps == 64) - id = CODEC_ID_PCM_F64LE; - if (id == CODEC_ID_ADPCM_IMA_WAV && bps == 8) - id = CODEC_ID_PCM_ZORK; + if (id == AV_CODEC_ID_PCM_S16LE && bps == 8) + id = AV_CODEC_ID_PCM_U8; + if (id == AV_CODEC_ID_PCM_S16LE && bps == 24) + id = AV_CODEC_ID_PCM_S24LE; + if (id == AV_CODEC_ID_PCM_S16LE && bps == 32) + id = AV_CODEC_ID_PCM_S32LE; + if (id == AV_CODEC_ID_PCM_F32LE && bps == 64) + id = AV_CODEC_ID_PCM_F64LE; + if (id == AV_CODEC_ID_ADPCM_IMA_WAV && bps == 8) + id = AV_CODEC_ID_PCM_ZORK; return id; } @@ -736,11 +736,11 @@ void ff_get_guid(AVIOContext *s, ff_asf_guid *g) enum CodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid) { int i; - for (i = 0; guids[i].id != CODEC_ID_NONE; i++) { + for (i = 0; guids[i].id != AV_CODEC_ID_NONE; i++) { if (!ff_guidcmp(guids[i].guid, guid)) return guids[i].id; } - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } int ff_read_riff_info(AVFormatContext *s, int64_t size) diff --git a/libavformat/riff.h b/libavformat/riff.h index 78516df273..df94c225c6 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -48,14 +48,14 @@ int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize); void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf); int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc); -enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps); +enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps); int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size); extern const AVCodecTag ff_codec_bmp_tags[]; extern const AVCodecTag ff_codec_wav_tags[]; -unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum CodecID id); -enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag); +unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id); +enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag); void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale); typedef uint8_t ff_asf_guid[16]; diff --git a/libavformat/rl2.c b/libavformat/rl2.c index e9c961b3f1..73d6b2767a 100644 --- a/libavformat/rl2.c +++ b/libavformat/rl2.c @@ -114,7 +114,7 @@ static av_cold int rl2_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_RL2; + st->codec->codec_id = AV_CODEC_ID_RL2; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = 320; st->codec->height = 200; @@ -146,7 +146,7 @@ static av_cold int rl2_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_PCM_U8; + st->codec->codec_id = AV_CODEC_ID_PCM_U8; st->codec->codec_tag = 1; st->codec->channels = channels; st->codec->bits_per_coded_sample = 8; diff --git a/libavformat/rm.c b/libavformat/rm.c index 769a83f134..0591a1735a 100644 --- a/libavformat/rm.c +++ b/libavformat/rm.c @@ -29,19 +29,19 @@ const char * const ff_rm_metadata[4] = { }; const AVCodecTag ff_rm_codec_tags[] = { - { CODEC_ID_RV10, MKTAG('R','V','1','0') }, - { CODEC_ID_RV20, MKTAG('R','V','2','0') }, - { CODEC_ID_RV20, MKTAG('R','V','T','R') }, - { CODEC_ID_RV30, MKTAG('R','V','3','0') }, - { CODEC_ID_RV40, MKTAG('R','V','4','0') }, - { CODEC_ID_AC3, MKTAG('d','n','e','t') }, - { CODEC_ID_RA_144, MKTAG('l','p','c','J') }, - { CODEC_ID_RA_288, MKTAG('2','8','_','8') }, - { CODEC_ID_COOK, MKTAG('c','o','o','k') }, - { CODEC_ID_ATRAC3, MKTAG('a','t','r','c') }, - { CODEC_ID_SIPR, MKTAG('s','i','p','r') }, - { CODEC_ID_AAC, MKTAG('r','a','a','c') }, - { CODEC_ID_AAC, MKTAG('r','a','c','p') }, - { CODEC_ID_RALF, MKTAG('L','S','D',':') }, - { CODEC_ID_NONE }, + { AV_CODEC_ID_RV10, MKTAG('R','V','1','0') }, + { AV_CODEC_ID_RV20, MKTAG('R','V','2','0') }, + { AV_CODEC_ID_RV20, MKTAG('R','V','T','R') }, + { AV_CODEC_ID_RV30, MKTAG('R','V','3','0') }, + { AV_CODEC_ID_RV40, MKTAG('R','V','4','0') }, + { AV_CODEC_ID_AC3, MKTAG('d','n','e','t') }, + { AV_CODEC_ID_RA_144, MKTAG('l','p','c','J') }, + { AV_CODEC_ID_RA_288, MKTAG('2','8','_','8') }, + { AV_CODEC_ID_COOK, MKTAG('c','o','o','k') }, + { AV_CODEC_ID_ATRAC3, MKTAG('a','t','r','c') }, + { AV_CODEC_ID_SIPR, MKTAG('s','i','p','r') }, + { AV_CODEC_ID_AAC, MKTAG('r','a','a','c') }, + { AV_CODEC_ID_AAC, MKTAG('r','a','c','p') }, + { AV_CODEC_ID_RALF, MKTAG('L','S','D',':') }, + { AV_CODEC_ID_NONE }, }; diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index cce43319c1..03379a4f10 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -155,7 +155,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb, st->codec->sample_rate = 8000; st->codec->channels = 1; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_RA_144; + st->codec->codec_id = AV_CODEC_ID_RA_144; ast->deint_id = DEINT_ID_INT0; } else { int flavor, sub_packet_h, coded_framesize, sub_packet_size; @@ -196,18 +196,18 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb, st->codec->codec_tag); switch (st->codec->codec_id) { - case CODEC_ID_AC3: + case AV_CODEC_ID_AC3: st->need_parsing = AVSTREAM_PARSE_FULL; break; - case CODEC_ID_RA_288: + case AV_CODEC_ID_RA_288: st->codec->extradata_size= 0; ast->audio_framesize = st->codec->block_align; st->codec->block_align = coded_framesize; break; - case CODEC_ID_COOK: + case AV_CODEC_ID_COOK: st->need_parsing = AVSTREAM_PARSE_HEADERS; - case CODEC_ID_ATRAC3: - case CODEC_ID_SIPR: + case AV_CODEC_ID_ATRAC3: + case AV_CODEC_ID_SIPR: avio_rb16(pb); avio_r8(pb); if (version == 5) avio_r8(pb); @@ -218,7 +218,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb, } ast->audio_framesize = st->codec->block_align; - if (st->codec->codec_id == CODEC_ID_SIPR) { + if (st->codec->codec_id == AV_CODEC_ID_SIPR) { if (flavor > 3) { av_log(s, AV_LOG_ERROR, "bad SIPR file flavor %d\n", flavor); @@ -236,7 +236,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb, return ret; break; - case CODEC_ID_AAC: + case AV_CODEC_ID_AAC: avio_rb16(pb); avio_r8(pb); if (version == 5) avio_r8(pb); @@ -332,7 +332,7 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb, st->codec->codec_id = ff_codec_get_id(ff_rm_codec_tags, st->codec->codec_tag); // av_log(s, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0')); - if (st->codec->codec_id == CODEC_ID_NONE) + if (st->codec->codec_id == AV_CODEC_ID_NONE) goto fail1; st->codec->width = avio_rb16(pb); st->codec->height = avio_rb16(pb); @@ -714,7 +714,7 @@ rm_ac3_swap_bytes (AVStream *st, AVPacket *pkt) uint8_t *ptr; int j; - if (st->codec->codec_id == CODEC_ID_AC3) { + if (st->codec->codec_id == AV_CODEC_ID_AC3) { ptr = pkt->data; for (j=0;j<pkt->size;j+=2) { FFSWAP(int, ptr[0], ptr[1]); @@ -821,7 +821,7 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb, #if 0 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { - if(st->codec->codec_id == CODEC_ID_RV20){ + if(st->codec->codec_id == AV_CODEC_ID_RV20){ int seq= 128*(pkt->data[2]&0x7F) + (pkt->data[3]>>1); av_log(s, AV_LOG_DEBUG, "%d %"PRId64" %d\n", *timestamp, *timestamp*512LL/25, seq); diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 390b7f6215..6376322d5c 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -242,7 +242,7 @@ static int rv10_write_header(AVFormatContext *ctx, /* video codec info */ avio_wb32(s,34); /* size */ ffio_wfourcc(s, "VIDO"); - if(stream->enc->codec_id == CODEC_ID_RV10) + if(stream->enc->codec_id == AV_CODEC_ID_RV10) ffio_wfourcc(s,"RV10"); else ffio_wfourcc(s,"RV20"); @@ -256,7 +256,7 @@ static int rv10_write_header(AVFormatContext *ctx, /* Seems to be the codec version: only use basic H263. The next versions seems to add a diffential DC coding as in MPEG... nothing new under the sun */ - if(stream->enc->codec_id == CODEC_ID_RV10) + if(stream->enc->codec_id == AV_CODEC_ID_RV10) avio_wb32(s,0x10000000); else avio_wb32(s,0x20103001); @@ -364,7 +364,7 @@ static int rm_write_audio(AVFormatContext *s, const uint8_t *buf, int size, int write_packet_header(s, stream, size, !!(flags & AV_PKT_FLAG_KEY)); - if (stream->enc->codec_id == CODEC_ID_AC3) { + if (stream->enc->codec_id == AV_CODEC_ID_AC3) { /* for AC-3, the words seem to be reversed */ for(i=0;i<size;i+=2) { buf1[i] = buf[i+1]; @@ -471,8 +471,8 @@ AVOutputFormat ff_rm_muxer = { .mime_type = "application/vnd.rn-realmedia", .extensions = "rm,ra", .priv_data_size = sizeof(RMMuxContext), - .audio_codec = CODEC_ID_AC3, - .video_codec = CODEC_ID_RV10, + .audio_codec = AV_CODEC_ID_AC3, + .video_codec = AV_CODEC_ID_RV10, .write_header = rm_write_header, .write_packet = rm_write_packet, .write_trailer = rm_write_trailer, diff --git a/libavformat/rpl.c b/libavformat/rpl.c index 96af67d521..b790597e33 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -156,22 +156,22 @@ static int rpl_read_header(AVFormatContext *s) switch (vst->codec->codec_tag) { #if 0 case 122: - vst->codec->codec_id = CODEC_ID_ESCAPE122; + vst->codec->codec_id = AV_CODEC_ID_ESCAPE122; break; #endif case 124: - vst->codec->codec_id = CODEC_ID_ESCAPE124; + vst->codec->codec_id = AV_CODEC_ID_ESCAPE124; // The header is wrong here, at least sometimes vst->codec->bits_per_coded_sample = 16; break; case 130: - vst->codec->codec_id = CODEC_ID_ESCAPE130; + vst->codec->codec_id = AV_CODEC_ID_ESCAPE130; break; default: av_log(s, AV_LOG_WARNING, "RPL video format %i not supported yet!\n", vst->codec->codec_tag); - vst->codec->codec_id = CODEC_ID_NONE; + vst->codec->codec_id = AV_CODEC_ID_NONE; } // Audio headers @@ -197,12 +197,12 @@ static int rpl_read_header(AVFormatContext *s) ast->codec->bits_per_coded_sample * ast->codec->channels; - ast->codec->codec_id = CODEC_ID_NONE; + ast->codec->codec_id = AV_CODEC_ID_NONE; switch (audio_format) { case 1: if (ast->codec->bits_per_coded_sample == 16) { // 16-bit audio is always signed - ast->codec->codec_id = CODEC_ID_PCM_S16LE; + ast->codec->codec_id = AV_CODEC_ID_PCM_S16LE; break; } // There are some other formats listed as legal per the spec; @@ -212,15 +212,15 @@ static int rpl_read_header(AVFormatContext *s) if (ast->codec->bits_per_coded_sample == 8) { // The samples with this kind of audio that I have // are all unsigned. - ast->codec->codec_id = CODEC_ID_PCM_U8; + ast->codec->codec_id = AV_CODEC_ID_PCM_U8; break; } else if (ast->codec->bits_per_coded_sample == 4) { - ast->codec->codec_id = CODEC_ID_ADPCM_IMA_EA_SEAD; + ast->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_EA_SEAD; break; } break; } - if (ast->codec->codec_id == CODEC_ID_NONE) { + if (ast->codec->codec_id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_WARNING, "RPL audio format %i not supported yet!\n", audio_format); diff --git a/libavformat/rso.c b/libavformat/rso.c index 178fd3f224..7d88f0f5bc 100644 --- a/libavformat/rso.c +++ b/libavformat/rso.c @@ -24,7 +24,7 @@ #include "rso.h" const AVCodecTag ff_codec_rso_tags[] = { - { CODEC_ID_PCM_U8, 0x0100 }, - { CODEC_ID_ADPCM_IMA_WAV, 0x0101 }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_PCM_U8, 0x0100 }, + { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0101 }, + { AV_CODEC_ID_NONE, 0 }, }; diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c index e07d5f5179..7a22217a63 100644 --- a/libavformat/rsodec.c +++ b/libavformat/rsodec.c @@ -32,7 +32,7 @@ static int rso_read_header(AVFormatContext *s) AVIOContext *pb = s->pb; int id, rate, bps; unsigned int size; - enum CodecID codec; + enum AVCodecID codec; AVStream *st; id = avio_rb16(pb); @@ -42,7 +42,7 @@ static int rso_read_header(AVFormatContext *s) codec = ff_codec_get_id(ff_codec_rso_tags, id); - if (codec == CODEC_ID_ADPCM_IMA_WAV) { + if (codec == AV_CODEC_ID_ADPCM_IMA_WAV) { av_log(s, AV_LOG_ERROR, "ADPCM in RSO not implemented\n"); return AVERROR_PATCHWELCOME; } diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c index 3d18c6022f..9f10fd72e9 100644 --- a/libavformat/rsoenc.c +++ b/libavformat/rsoenc.c @@ -49,7 +49,7 @@ static int rso_write_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } - if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) { + if (enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) { av_log(s, AV_LOG_ERROR, "ADPCM in RSO not implemented\n"); return AVERROR_PATCHWELCOME; } @@ -104,8 +104,8 @@ AVOutputFormat ff_rso_muxer = { .name = "rso", .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO"), .extensions = "rso", - .audio_codec = CODEC_ID_PCM_U8, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_PCM_U8, + .video_codec = AV_CODEC_ID_NONE, .write_header = rso_write_header, .write_packet = rso_write_packet, .write_trailer = rso_write_trailer, diff --git a/libavformat/rtp.c b/libavformat/rtp.c index 2a801625e9..f9e444746a 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -37,38 +37,38 @@ static const struct int pt; const char enc_name[6]; enum AVMediaType codec_type; - enum CodecID codec_id; + enum AVCodecID codec_id; int clock_rate; int audio_channels; } AVRtpPayloadTypes[]= { - {0, "PCMU", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_MULAW, 8000, 1}, - {3, "GSM", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, - {4, "G723", AVMEDIA_TYPE_AUDIO, CODEC_ID_G723_1, 8000, 1}, - {5, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, - {6, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 16000, 1}, - {7, "LPC", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, - {8, "PCMA", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_ALAW, 8000, 1}, - {9, "G722", AVMEDIA_TYPE_AUDIO, CODEC_ID_ADPCM_G722, 8000, 1}, - {10, "L16", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 2}, - {11, "L16", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 1}, - {12, "QCELP", AVMEDIA_TYPE_AUDIO, CODEC_ID_QCELP, 8000, 1}, - {13, "CN", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, - {14, "MPA", AVMEDIA_TYPE_AUDIO, CODEC_ID_MP2, -1, -1}, - {14, "MPA", AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3, -1, -1}, - {15, "G728", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, - {16, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 11025, 1}, - {17, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 22050, 1}, - {18, "G729", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, - {25, "CelB", AVMEDIA_TYPE_VIDEO, CODEC_ID_NONE, 90000, -1}, - {26, "JPEG", AVMEDIA_TYPE_VIDEO, CODEC_ID_MJPEG, 90000, -1}, - {28, "nv", AVMEDIA_TYPE_VIDEO, CODEC_ID_NONE, 90000, -1}, - {31, "H261", AVMEDIA_TYPE_VIDEO, CODEC_ID_H261, 90000, -1}, - {32, "MPV", AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG1VIDEO, 90000, -1}, - {32, "MPV", AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO, 90000, -1}, - {33, "MP2T", AVMEDIA_TYPE_DATA, CODEC_ID_MPEG2TS, 90000, -1}, - {34, "H263", AVMEDIA_TYPE_VIDEO, CODEC_ID_H263, 90000, -1}, - {-1, "", AVMEDIA_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1} + {0, "PCMU", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_MULAW, 8000, 1}, + {3, "GSM", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1}, + {4, "G723", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_G723_1, 8000, 1}, + {5, "DVI4", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1}, + {6, "DVI4", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 16000, 1}, + {7, "LPC", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1}, + {8, "PCMA", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_ALAW, 8000, 1}, + {9, "G722", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_ADPCM_G722, 8000, 1}, + {10, "L16", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_S16BE, 44100, 2}, + {11, "L16", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_S16BE, 44100, 1}, + {12, "QCELP", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_QCELP, 8000, 1}, + {13, "CN", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1}, + {14, "MPA", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_MP2, -1, -1}, + {14, "MPA", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_MP3, -1, -1}, + {15, "G728", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1}, + {16, "DVI4", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 11025, 1}, + {17, "DVI4", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 22050, 1}, + {18, "G729", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1}, + {25, "CelB", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_NONE, 90000, -1}, + {26, "JPEG", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MJPEG, 90000, -1}, + {28, "nv", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_NONE, 90000, -1}, + {31, "H261", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H261, 90000, -1}, + {32, "MPV", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG1VIDEO, 90000, -1}, + {32, "MPV", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG2VIDEO, 90000, -1}, + {33, "MP2T", AVMEDIA_TYPE_DATA, AV_CODEC_ID_MPEG2TS, 90000, -1}, + {34, "H263", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H263, 90000, -1}, + {-1, "", AVMEDIA_TYPE_UNKNOWN, AV_CODEC_ID_NONE, -1, -1} }; int ff_rtp_get_codec_info(AVCodecContext *codec, int payload_type) @@ -77,7 +77,7 @@ int ff_rtp_get_codec_info(AVCodecContext *codec, int payload_type) for (i = 0; AVRtpPayloadTypes[i].pt >= 0; i++) if (AVRtpPayloadTypes[i].pt == payload_type) { - if (AVRtpPayloadTypes[i].codec_id != CODEC_ID_NONE) { + if (AVRtpPayloadTypes[i].codec_id != AV_CODEC_ID_NONE) { codec->codec_type = AVRtpPayloadTypes[i].codec_type; codec->codec_id = AVRtpPayloadTypes[i].codec_id; if (AVRtpPayloadTypes[i].audio_channels > 0) @@ -106,13 +106,13 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec) /* static payload type */ for (i = 0; AVRtpPayloadTypes[i].pt >= 0; ++i) if (AVRtpPayloadTypes[i].codec_id == codec->codec_id) { - if (codec->codec_id == CODEC_ID_H263 && (!fmt || + if (codec->codec_id == AV_CODEC_ID_H263 && (!fmt || !fmt->oformat->priv_class || !av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190"))) continue; /* G722 has 8000 as nominal rate even if the sample rate is 16000, * see section 4.5.2 in RFC 3551. */ - if (codec->codec_id == CODEC_ID_ADPCM_G722 && + if (codec->codec_id == AV_CODEC_ID_ADPCM_G722 && codec->sample_rate == 16000 && codec->channels == 1) return AVRtpPayloadTypes[i].pt; if (codec->codec_type == AVMEDIA_TYPE_AUDIO && @@ -140,7 +140,7 @@ const char *ff_rtp_enc_name(int payload_type) return ""; } -enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type) +enum AVCodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type) { int i; @@ -149,5 +149,5 @@ enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type) return AVRtpPayloadTypes[i].codec_id; } - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } diff --git a/libavformat/rtp.h b/libavformat/rtp.h index 03fdb606ca..fa3e1fa1bd 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -63,10 +63,10 @@ const char *ff_rtp_enc_name(int payload_type); * * @param buf A pointer to the string containing the encoding name * @param codec_type The codec type - * @return In case of unknown encoding name, CODEC_ID_NONE is returned; + * @return In case of unknown encoding name, AV_CODEC_ID_NONE is returned; * otherwise, the codec id is returned */ -enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type); +enum AVCodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type); #define RTP_PT_PRIVATE 96 #define RTP_VERSION 2 diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 989695ee78..0be047cd49 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -47,7 +47,7 @@ static RTPDynamicProtocolHandler ff_realmedia_mp3_dynamic_handler = { .enc_name = "X-MP3-draft-00", .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = CODEC_ID_MP3ADU, + .codec_id = AV_CODEC_ID_MP3ADU, }; /* statistics functions */ @@ -365,7 +365,7 @@ void ff_rtp_send_punch_packets(URLContext* rtp_handle) /** * open a new RTP parse context for stream 'st'. 'st' can be NULL for * MPEG2TS streams to indicate that they should be demuxed inside the - * rtp demux (otherwise CODEC_ID_MPEG2TS packets are returned) + * rtp demux (otherwise AV_CODEC_ID_MPEG2TS packets are returned) */ RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, int queue_size) { @@ -389,19 +389,19 @@ RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext } } else if (st) { switch(st->codec->codec_id) { - case CODEC_ID_MPEG1VIDEO: - case CODEC_ID_MPEG2VIDEO: - case CODEC_ID_MP2: - case CODEC_ID_MP3: - case CODEC_ID_MPEG4: - case CODEC_ID_H263: - case CODEC_ID_H264: + case AV_CODEC_ID_MPEG1VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: + case AV_CODEC_ID_MPEG4: + case AV_CODEC_ID_H263: + case AV_CODEC_ID_H264: st->need_parsing = AVSTREAM_PARSE_FULL; break; - case CODEC_ID_VORBIS: + case AV_CODEC_ID_VORBIS: st->need_parsing = AVSTREAM_PARSE_HEADERS; break; - case CODEC_ID_ADPCM_G722: + case AV_CODEC_ID_ADPCM_G722: /* According to RFC 3551, the stream clock rate is 8000 * even if the sample rate is 16000. */ if (st->codec->sample_rate == 8000) @@ -538,8 +538,8 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt, } else { // at this point, the RTP header has been stripped; This is ASSUMING that there is only 1 CSRC, which in't wise. switch(st->codec->codec_id) { - case CODEC_ID_MP2: - case CODEC_ID_MP3: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: /* better than nothing: skip mpeg audio RTP header */ if (len <= 4) return -1; @@ -549,8 +549,8 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt, av_new_packet(pkt, len); memcpy(pkt->data, buf, len); break; - case CODEC_ID_MPEG1VIDEO: - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG1VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: /* better than nothing: skip mpeg video RTP header */ if (len <= 4) return -1; diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index db44443479..907403286f 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -116,7 +116,7 @@ struct RTPDynamicProtocolHandler_s { // fields from AVRtpDynamicPayloadType_s const char enc_name[50]; /* XXX: still why 50 ? ;-) */ enum AVMediaType codec_type; - enum CodecID codec_id; + enum AVCodecID codec_id; int static_payload_id; /* 0 means no payload id is set. 0 is a valid * payload ID (PCMU), too, but that format doesn't * require any custom depacketization code. */ diff --git a/libavformat/rtpdec_amr.c b/libavformat/rtpdec_amr.c index 86033cf8d2..6051dce716 100644 --- a/libavformat/rtpdec_amr.c +++ b/libavformat/rtpdec_amr.c @@ -64,9 +64,9 @@ static int amr_handle_packet(AVFormatContext *ctx, const uint8_t *speech_data; uint8_t *ptr; - if (st->codec->codec_id == CODEC_ID_AMR_NB) { + if (st->codec->codec_id == AV_CODEC_ID_AMR_NB) { frame_sizes = frame_sizes_nb; - } else if (st->codec->codec_id == CODEC_ID_AMR_WB) { + } else if (st->codec->codec_id == AV_CODEC_ID_AMR_WB) { frame_sizes = frame_sizes_wb; } else { av_log(ctx, AV_LOG_ERROR, "Bad codec ID\n"); @@ -192,7 +192,7 @@ static int amr_parse_sdp_line(AVFormatContext *s, int st_index, RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler = { .enc_name = "AMR", .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = CODEC_ID_AMR_NB, + .codec_id = AV_CODEC_ID_AMR_NB, .parse_sdp_a_line = amr_parse_sdp_line, .alloc = amr_new_context, .free = amr_free_context, @@ -202,7 +202,7 @@ RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler = { RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler = { .enc_name = "AMR-WB", .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = CODEC_ID_AMR_WB, + .codec_id = AV_CODEC_ID_AMR_WB, .parse_sdp_a_line = amr_parse_sdp_line, .alloc = amr_new_context, .free = amr_free_context, diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 84503f1749..e37fde7906 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -298,7 +298,7 @@ static void asfrtp_free_context(PayloadContext *asf) RTPDynamicProtocolHandler ff_ms_rtp_ ## n ## _handler = { \ .enc_name = s, \ .codec_type = t, \ - .codec_id = CODEC_ID_NONE, \ + .codec_id = AV_CODEC_ID_NONE, \ .parse_sdp_a_line = asfrtp_parse_sdp_line, \ .alloc = asfrtp_new_context, \ .free = asfrtp_free_context, \ diff --git a/libavformat/rtpdec_g726.c b/libavformat/rtpdec_g726.c index 20450d8dfb..ec37f09155 100644 --- a/libavformat/rtpdec_g726.c +++ b/libavformat/rtpdec_g726.c @@ -36,7 +36,7 @@ static int g726_ ## bitrate ##_init(AVFormatContext *s, int st_index, PayloadCon RTPDynamicProtocolHandler ff_g726_ ## bitrate ## _dynamic_handler = { \ .enc_name = "G726-" #bitrate, \ .codec_type = AVMEDIA_TYPE_AUDIO, \ - .codec_id = CODEC_ID_ADPCM_G726, \ + .codec_id = AV_CODEC_ID_ADPCM_G726, \ .init = g726_ ## bitrate ## _init, \ } diff --git a/libavformat/rtpdec_h263.c b/libavformat/rtpdec_h263.c index 6c22a24715..e604dc1c42 100644 --- a/libavformat/rtpdec_h263.c +++ b/libavformat/rtpdec_h263.c @@ -91,13 +91,13 @@ int ff_h263_handle_packet(AVFormatContext *ctx, PayloadContext *data, RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler = { .enc_name = "H263-1998", .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_H263, + .codec_id = AV_CODEC_ID_H263, .parse_packet = ff_h263_handle_packet, }; RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler = { .enc_name = "H263-2000", .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_H263, + .codec_id = AV_CODEC_ID_H263, .parse_packet = ff_h263_handle_packet, }; diff --git a/libavformat/rtpdec_h263_rfc2190.c b/libavformat/rtpdec_h263_rfc2190.c index 92102f3f51..163d4eaba7 100644 --- a/libavformat/rtpdec_h263_rfc2190.c +++ b/libavformat/rtpdec_h263_rfc2190.c @@ -198,7 +198,7 @@ static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data, RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler = { .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_H263, + .codec_id = AV_CODEC_ID_H263, .parse_packet = h263_handle_packet, .alloc = h263_new_context, .free = h263_free_context, diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index 063836af3f..f8a2272203 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -69,7 +69,7 @@ static int sdp_parse_fmtp_config_h264(AVStream *stream, char *attr, char *value) { AVCodecContext *codec = stream->codec; - assert(codec->codec_id == CODEC_ID_H264); + assert(codec->codec_id == AV_CODEC_ID_H264); assert(h264_data != NULL); if (!strcmp(attr, "packetization-mode")) { @@ -383,7 +383,7 @@ static int parse_h264_sdp_line(AVFormatContext *s, int st_index, RTPDynamicProtocolHandler ff_h264_dynamic_handler = { .enc_name = "H264", .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_H264, + .codec_id = AV_CODEC_ID_H264, .parse_sdp_a_line = parse_h264_sdp_line, .alloc = h264_new_context, .free = h264_free_context, diff --git a/libavformat/rtpdec_ilbc.c b/libavformat/rtpdec_ilbc.c index 247c779bfc..2bd86147de 100644 --- a/libavformat/rtpdec_ilbc.c +++ b/libavformat/rtpdec_ilbc.c @@ -68,6 +68,6 @@ static int ilbc_parse_sdp_line(AVFormatContext *s, int st_index, RTPDynamicProtocolHandler ff_ilbc_dynamic_handler = { .enc_name = "iLBC", .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = CODEC_ID_ILBC, + .codec_id = AV_CODEC_ID_ILBC, .parse_sdp_a_line = ilbc_parse_sdp_line, }; diff --git a/libavformat/rtpdec_latm.c b/libavformat/rtpdec_latm.c index cc24c82c50..2ea141b88e 100644 --- a/libavformat/rtpdec_latm.c +++ b/libavformat/rtpdec_latm.c @@ -180,7 +180,7 @@ static int latm_parse_sdp_line(AVFormatContext *s, int st_index, RTPDynamicProtocolHandler ff_mp4a_latm_dynamic_handler = { .enc_name = "MP4A-LATM", .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = CODEC_ID_AAC, + .codec_id = AV_CODEC_ID_AAC, .parse_sdp_a_line = latm_parse_sdp_line, .alloc = latm_new_context, .free = latm_free_context, diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index ab405c0bf6..7b16d12dfa 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -202,7 +202,7 @@ static int parse_fmtp(AVStream *stream, PayloadContext *data, return res; } - if (codec->codec_id == CODEC_ID_AAC) { + if (codec->codec_id == AV_CODEC_ID_AAC) { /* Looking for a known attribute */ for (i = 0; attr_names[i].str; ++i) { if (!av_strcasecmp(attr, attr_names[i].str)) { @@ -235,14 +235,14 @@ static int parse_sdp_line(AVFormatContext *s, int st_index, RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = { .enc_name = "MP4V-ES", .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_MPEG4, + .codec_id = AV_CODEC_ID_MPEG4, .parse_sdp_a_line = parse_sdp_line, }; RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = { .enc_name = "mpeg4-generic", .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = CODEC_ID_AAC, + .codec_id = AV_CODEC_ID_AAC, .parse_sdp_a_line = parse_sdp_line, .alloc = new_context, .free = free_context, diff --git a/libavformat/rtpdec_qcelp.c b/libavformat/rtpdec_qcelp.c index d6ef4fce02..7e1d0b7972 100644 --- a/libavformat/rtpdec_qcelp.c +++ b/libavformat/rtpdec_qcelp.c @@ -221,7 +221,7 @@ static int qcelp_parse_packet(AVFormatContext *ctx, PayloadContext *data, RTPDynamicProtocolHandler ff_qcelp_dynamic_handler = { .enc_name = "x-Purevoice", .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = CODEC_ID_QCELP, + .codec_id = AV_CODEC_ID_QCELP, .static_payload_id = 12, .alloc = qcelp_new_context, .free = qcelp_free_context, diff --git a/libavformat/rtpdec_qdm2.c b/libavformat/rtpdec_qdm2.c index 0802b80dc3..f203fcfb74 100644 --- a/libavformat/rtpdec_qdm2.c +++ b/libavformat/rtpdec_qdm2.c @@ -259,14 +259,14 @@ static int qdm2_parse_packet(AVFormatContext *s, PayloadContext *qdm, return res; p += res; - /* We set codec_id to CODEC_ID_NONE initially to + /* We set codec_id to AV_CODEC_ID_NONE initially to * delay decoder initialization since extradata is * carried within the RTP stream, not SDP. Here, - * by setting codec_id to CODEC_ID_QDM2, we are signalling + * by setting codec_id to AV_CODEC_ID_QDM2, we are signalling * to the decoder that it is OK to initialize. */ - st->codec->codec_id = CODEC_ID_QDM2; + st->codec->codec_id = AV_CODEC_ID_QDM2; } - if (st->codec->codec_id == CODEC_ID_NONE) + if (st->codec->codec_id == AV_CODEC_ID_NONE) return AVERROR(EAGAIN); /* subpackets */ @@ -310,7 +310,7 @@ static void qdm2_extradata_free(PayloadContext *qdm) RTPDynamicProtocolHandler ff_qdm2_dynamic_handler = { .enc_name = "X-QDM", .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = CODEC_ID_NONE, + .codec_id = AV_CODEC_ID_NONE, .alloc = qdm2_extradata_new, .free = qdm2_extradata_free, .parse_packet = qdm2_parse_packet, diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c index 33cb3dab4e..4decdca19c 100644 --- a/libavformat/rtpdec_qt.c +++ b/libavformat/rtpdec_qt.c @@ -244,7 +244,7 @@ static void qt_rtp_free(PayloadContext *qt) RTPDynamicProtocolHandler ff_ ## m ## _rtp_ ## n ## _handler = { \ .enc_name = s, \ .codec_type = t, \ - .codec_id = CODEC_ID_NONE, \ + .codec_id = AV_CODEC_ID_NONE, \ .alloc = qt_rtp_new, \ .free = qt_rtp_free, \ .parse_packet = qt_rtp_parse_packet, \ diff --git a/libavformat/rtpdec_svq3.c b/libavformat/rtpdec_svq3.c index 7800766ecf..99c4c52dee 100644 --- a/libavformat/rtpdec_svq3.c +++ b/libavformat/rtpdec_svq3.c @@ -68,12 +68,12 @@ static int svq3_parse_packet (AVFormatContext *s, PayloadContext *sv, AV_WB32(st->codec->extradata + 4, len); memcpy(st->codec->extradata + 8, buf, len); - /* We set codec_id to CODEC_ID_NONE initially to + /* We set codec_id to AV_CODEC_ID_NONE initially to * delay decoder initialization since extradata is * carried within the RTP stream, not SDP. Here, - * by setting codec_id to CODEC_ID_SVQ3, we are signalling + * by setting codec_id to AV_CODEC_ID_SVQ3, we are signalling * to the decoder that it is OK to initialize. */ - st->codec->codec_id = CODEC_ID_SVQ3; + st->codec->codec_id = AV_CODEC_ID_SVQ3; return AVERROR(EAGAIN); } @@ -127,7 +127,7 @@ static void svq3_extradata_free(PayloadContext *sv) RTPDynamicProtocolHandler ff_svq3_dynamic_handler = { .enc_name = "X-SV3V-ES", .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_NONE, // see if (config_packet) above + .codec_id = AV_CODEC_ID_NONE, // see if (config_packet) above .alloc = svq3_extradata_new, .free = svq3_extradata_free, .parse_packet = svq3_parse_packet, diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c index bfc96570d1..e24bbb6a6f 100644 --- a/libavformat/rtpdec_vp8.c +++ b/libavformat/rtpdec_vp8.c @@ -147,7 +147,7 @@ static void vp8_free_context(PayloadContext *vp8) RTPDynamicProtocolHandler ff_vp8_dynamic_handler = { .enc_name = "VP8", .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_VP8, + .codec_id = AV_CODEC_ID_VP8, .alloc = vp8_new_context, .free = vp8_free_context, .parse_packet = vp8_handle_packet, diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index 771a13d9d2..2457f660b8 100644 --- a/libavformat/rtpdec_xiph.c +++ b/libavformat/rtpdec_xiph.c @@ -390,7 +390,7 @@ static int xiph_parse_sdp_line(AVFormatContext *s, int st_index, RTPDynamicProtocolHandler ff_theora_dynamic_handler = { .enc_name = "theora", .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_THEORA, + .codec_id = AV_CODEC_ID_THEORA, .parse_sdp_a_line = xiph_parse_sdp_line, .alloc = xiph_new_context, .free = xiph_free_context, @@ -400,7 +400,7 @@ RTPDynamicProtocolHandler ff_theora_dynamic_handler = { RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = { .enc_name = "vorbis", .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = CODEC_ID_VORBIS, + .codec_id = AV_CODEC_ID_VORBIS, .parse_sdp_a_line = xiph_parse_sdp_line, .alloc = xiph_new_context, .free = xiph_free_context, diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index bda43a095c..6af23f760a 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -46,35 +46,35 @@ static const AVClass rtp_muxer_class = { #define RTCP_SR_SIZE 28 -static int is_supported(enum CodecID id) +static int is_supported(enum AVCodecID id) { switch(id) { - case CODEC_ID_H263: - case CODEC_ID_H263P: - case CODEC_ID_H264: - case CODEC_ID_MPEG1VIDEO: - case CODEC_ID_MPEG2VIDEO: - case CODEC_ID_MPEG4: - case CODEC_ID_AAC: - case CODEC_ID_MP2: - case CODEC_ID_MP3: - case CODEC_ID_PCM_ALAW: - case CODEC_ID_PCM_MULAW: - case CODEC_ID_PCM_S8: - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_U16BE: - case CODEC_ID_PCM_U16LE: - case CODEC_ID_PCM_U8: - case CODEC_ID_MPEG2TS: - case CODEC_ID_AMR_NB: - case CODEC_ID_AMR_WB: - case CODEC_ID_VORBIS: - case CODEC_ID_THEORA: - case CODEC_ID_VP8: - case CODEC_ID_ADPCM_G722: - case CODEC_ID_ADPCM_G726: - case CODEC_ID_ILBC: + case AV_CODEC_ID_H263: + case AV_CODEC_ID_H263P: + case AV_CODEC_ID_H264: + case AV_CODEC_ID_MPEG1VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG4: + case AV_CODEC_ID_AAC: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_U16BE: + case AV_CODEC_ID_PCM_U16LE: + case AV_CODEC_ID_PCM_U8: + case AV_CODEC_ID_MPEG2TS: + case AV_CODEC_ID_AMR_NB: + case AV_CODEC_ID_AMR_WB: + case AV_CODEC_ID_VORBIS: + case AV_CODEC_ID_THEORA: + case AV_CODEC_ID_VP8: + case AV_CODEC_ID_ADPCM_G722: + case AV_CODEC_ID_ADPCM_G726: + case AV_CODEC_ID_ILBC: return 1; default: return 0; @@ -152,43 +152,43 @@ static int rtp_write_header(AVFormatContext *s1) avpriv_set_pts_info(st, 32, 1, 90000); switch(st->codec->codec_id) { - case CODEC_ID_MP2: - case CODEC_ID_MP3: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: s->buf_ptr = s->buf + 4; break; - case CODEC_ID_MPEG1VIDEO: - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG1VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: break; - case CODEC_ID_MPEG2TS: + case AV_CODEC_ID_MPEG2TS: n = s->max_payload_size / TS_PACKET_SIZE; if (n < 1) n = 1; s->max_payload_size = n * TS_PACKET_SIZE; s->buf_ptr = s->buf; break; - case CODEC_ID_H264: + case AV_CODEC_ID_H264: /* check for H.264 MP4 syntax */ if (st->codec->extradata_size > 4 && st->codec->extradata[0] == 1) { s->nal_length_size = (st->codec->extradata[4] & 0x03) + 1; } break; - case CODEC_ID_VORBIS: - case CODEC_ID_THEORA: + case AV_CODEC_ID_VORBIS: + case AV_CODEC_ID_THEORA: if (!s->max_frames_per_packet) s->max_frames_per_packet = 15; s->max_frames_per_packet = av_clip(s->max_frames_per_packet, 1, 15); s->max_payload_size -= 6; // ident+frag+tdt/vdt+pkt_num+pkt_length s->num_frames = 0; goto defaultcase; - case CODEC_ID_VP8: + case AV_CODEC_ID_VP8: av_log(s1, AV_LOG_ERROR, "RTP VP8 payload implementation is " "incompatible with the latest spec drafts.\n"); break; - case CODEC_ID_ADPCM_G722: + case AV_CODEC_ID_ADPCM_G722: /* Due to a historical error, the clock rate for G722 in RTP is * 8000, even if the sample rate is 16000. See RFC 3551. */ avpriv_set_pts_info(st, 32, 1, 8000); break; - case CODEC_ID_ILBC: + case AV_CODEC_ID_ILBC: if (st->codec->block_align != 38 && st->codec->block_align != 50) { av_log(s1, AV_LOG_ERROR, "Incorrect iLBC block size specified\n"); goto fail; @@ -198,11 +198,11 @@ static int rtp_write_header(AVFormatContext *s1) s->max_frames_per_packet = FFMIN(s->max_frames_per_packet, s->max_payload_size / st->codec->block_align); goto defaultcase; - case CODEC_ID_AMR_NB: - case CODEC_ID_AMR_WB: + case AV_CODEC_ID_AMR_NB: + case AV_CODEC_ID_AMR_WB: if (!s->max_frames_per_packet) s->max_frames_per_packet = 12; - if (st->codec->codec_id == CODEC_ID_AMR_NB) + if (st->codec->codec_id == AV_CODEC_ID_AMR_NB) n = 31; else n = 61; @@ -215,7 +215,7 @@ static int rtp_write_header(AVFormatContext *s1) av_log(s1, AV_LOG_ERROR, "Only mono is supported\n"); goto fail; } - case CODEC_ID_AAC: + case AV_CODEC_ID_AAC: s->num_frames = 0; default: defaultcase: @@ -457,54 +457,54 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) s->cur_timestamp = s->base_timestamp + pkt->pts; switch(st->codec->codec_id) { - case CODEC_ID_PCM_MULAW: - case CODEC_ID_PCM_ALAW: - case CODEC_ID_PCM_U8: - case CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_U8: + case AV_CODEC_ID_PCM_S8: rtp_send_samples(s1, pkt->data, size, 8 * st->codec->channels); break; - case CODEC_ID_PCM_U16BE: - case CODEC_ID_PCM_U16LE: - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_U16BE: + case AV_CODEC_ID_PCM_U16LE: + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S16LE: rtp_send_samples(s1, pkt->data, size, 16 * st->codec->channels); break; - case CODEC_ID_ADPCM_G722: + case AV_CODEC_ID_ADPCM_G722: /* The actual sample size is half a byte per sample, but since the * stream clock rate is 8000 Hz while the sample rate is 16000 Hz, * the correct parameter for send_samples_bits is 8 bits per stream * clock. */ rtp_send_samples(s1, pkt->data, size, 8 * st->codec->channels); break; - case CODEC_ID_ADPCM_G726: + case AV_CODEC_ID_ADPCM_G726: rtp_send_samples(s1, pkt->data, size, st->codec->bits_per_coded_sample * st->codec->channels); break; - case CODEC_ID_MP2: - case CODEC_ID_MP3: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: rtp_send_mpegaudio(s1, pkt->data, size); break; - case CODEC_ID_MPEG1VIDEO: - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG1VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: ff_rtp_send_mpegvideo(s1, pkt->data, size); break; - case CODEC_ID_AAC: + case AV_CODEC_ID_AAC: if (s->flags & FF_RTP_FLAG_MP4A_LATM) ff_rtp_send_latm(s1, pkt->data, size); else ff_rtp_send_aac(s1, pkt->data, size); break; - case CODEC_ID_AMR_NB: - case CODEC_ID_AMR_WB: + case AV_CODEC_ID_AMR_NB: + case AV_CODEC_ID_AMR_WB: ff_rtp_send_amr(s1, pkt->data, size); break; - case CODEC_ID_MPEG2TS: + case AV_CODEC_ID_MPEG2TS: rtp_send_mpegts_raw(s1, pkt->data, size); break; - case CODEC_ID_H264: + case AV_CODEC_ID_H264: ff_rtp_send_h264(s1, pkt->data, size); break; - case CODEC_ID_H263: + case AV_CODEC_ID_H263: if (s->flags & FF_RTP_FLAG_RFC2190) { int mb_info_size = 0; const uint8_t *mb_info = @@ -514,17 +514,17 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) break; } /* Fallthrough */ - case CODEC_ID_H263P: + case AV_CODEC_ID_H263P: ff_rtp_send_h263(s1, pkt->data, size); break; - case CODEC_ID_VORBIS: - case CODEC_ID_THEORA: + case AV_CODEC_ID_VORBIS: + case AV_CODEC_ID_THEORA: ff_rtp_send_xiph(s1, pkt->data, size); break; - case CODEC_ID_VP8: + case AV_CODEC_ID_VP8: ff_rtp_send_vp8(s1, pkt->data, size); break; - case CODEC_ID_ILBC: + case AV_CODEC_ID_ILBC: rtp_send_ilbc(s1, pkt->data, size); break; default: @@ -548,8 +548,8 @@ AVOutputFormat ff_rtp_muxer = { .name = "rtp", .long_name = NULL_IF_CONFIG_SMALL("RTP output"), .priv_data_size = sizeof(RTPMuxContext), - .audio_codec = CODEC_ID_PCM_MULAW, - .video_codec = CODEC_ID_MPEG4, + .audio_codec = AV_CODEC_ID_PCM_MULAW, + .video_codec = AV_CODEC_ID_MPEG4, .write_header = rtp_write_header, .write_packet = rtp_write_packet, .write_trailer = rtp_write_trailer, diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 7c6e24e107..633ec39ecb 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -207,7 +207,7 @@ static int sdp_parse_rtpmap(AVFormatContext *s, codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type); } - if (codec->codec_id == CODEC_ID_NONE) { + if (codec->codec_id == AV_CODEC_ID_NONE) { RTPDynamicProtocolHandler *handler = ff_rtp_handler_find_by_name(buf, codec->codec_type); init_rtp_handler(handler, rtsp_st, codec); diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c index b89eb02956..bad6fbd3a2 100644 --- a/libavformat/rtspenc.c +++ b/libavformat/rtspenc.c @@ -237,8 +237,8 @@ AVOutputFormat ff_rtsp_muxer = { .name = "rtsp", .long_name = NULL_IF_CONFIG_SMALL("RTSP output"), .priv_data_size = sizeof(RTSPState), - .audio_codec = CODEC_ID_AAC, - .video_codec = CODEC_ID_MPEG4, + .audio_codec = AV_CODEC_ID_AAC, + .video_codec = AV_CODEC_ID_MPEG4, .write_header = rtsp_write_header, .write_packet = rtsp_write_packet, .write_trailer = rtsp_write_close, diff --git a/libavformat/samidec.c b/libavformat/samidec.c index 5995d86fcf..5f29364028 100644 --- a/libavformat/samidec.c +++ b/libavformat/samidec.c @@ -56,7 +56,7 @@ static int sami_read_header(AVFormatContext *s) return AVERROR(ENOMEM); avpriv_set_pts_info(st, 64, 1, 1000); st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = CODEC_ID_SAMI; + st->codec->codec_id = AV_CODEC_ID_SAMI; av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprint_init(&hdr_buf, 0, AV_BPRINT_SIZE_UNLIMITED); diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c index ba5ce1baeb..3de615d25d 100644 --- a/libavformat/sapenc.c +++ b/libavformat/sapenc.c @@ -256,8 +256,8 @@ AVOutputFormat ff_sap_muxer = { .name = "sap", .long_name = NULL_IF_CONFIG_SMALL("SAP output"), .priv_data_size = sizeof(struct SAPState), - .audio_codec = CODEC_ID_AAC, - .video_codec = CODEC_ID_MPEG4, + .audio_codec = AV_CODEC_ID_AAC, + .video_codec = AV_CODEC_ID_MPEG4, .write_header = sap_write_header, .write_packet = sap_write_packet, .write_trailer = sap_write_close, diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c index 07319309c1..b0b01abe22 100644 --- a/libavformat/sbgdec.c +++ b/libavformat/sbgdec.c @@ -1414,7 +1414,7 @@ static av_cold int sbg_read_header(AVFormatContext *avf) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_FFWAVESYNTH; + st->codec->codec_id = AV_CODEC_ID_FFWAVESYNTH; st->codec->channels = 2; st->codec->channel_layout = AV_CH_LAYOUT_STEREO; st->codec->sample_rate = sbg->sample_rate; diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 352dea0335..48dfb86649 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -257,10 +257,10 @@ static char *xiph_extradata2config(AVCodecContext *c) int first_header_size; switch (c->codec_id) { - case CODEC_ID_THEORA: + case AV_CODEC_ID_THEORA: first_header_size = 42; break; - case CODEC_ID_VORBIS: + case AV_CODEC_ID_VORBIS: first_header_size = 30; break; default: @@ -388,7 +388,7 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, char *config = NULL; switch (c->codec_id) { - case CODEC_ID_H264: { + case AV_CODEC_ID_H264: { int mode = 1; if (fmt && fmt->oformat->priv_class && av_opt_flag_is_set(fmt->priv_data, "rtpflags", "h264_mode0")) @@ -402,21 +402,21 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, payload_type, mode, config ? config : ""); break; } - case CODEC_ID_H263: - case CODEC_ID_H263P: + case AV_CODEC_ID_H263: + case AV_CODEC_ID_H263P: /* a=framesize is required by 3GPP TS 26.234 (PSS). It * actually specifies the maximum video size, but we only know * the current size. This is required for playback on Android * stagefright and on Samsung bada. */ if (!fmt || !fmt->oformat->priv_class || !av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190") || - c->codec_id == CODEC_ID_H263P) + c->codec_id == AV_CODEC_ID_H263P) av_strlcatf(buff, size, "a=rtpmap:%d H263-2000/90000\r\n" "a=framesize:%d %d-%d\r\n", payload_type, payload_type, c->width, c->height); break; - case CODEC_ID_MPEG4: + case AV_CODEC_ID_MPEG4: if (c->extradata_size) { config = extradata2config(c); } @@ -425,7 +425,7 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, payload_type, payload_type, config ? config : ""); break; - case CODEC_ID_AAC: + case AV_CODEC_ID_AAC: if (fmt && fmt->oformat && fmt->oformat->priv_class && av_opt_flag_is_set(fmt->priv_data, "rtpflags", "latm")) { config = latm_context2config(c); @@ -456,37 +456,37 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, payload_type, config); } break; - case CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S16BE: if (payload_type >= RTP_PT_PRIVATE) av_strlcatf(buff, size, "a=rtpmap:%d L16/%d/%d\r\n", payload_type, c->sample_rate, c->channels); break; - case CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_MULAW: if (payload_type >= RTP_PT_PRIVATE) av_strlcatf(buff, size, "a=rtpmap:%d PCMU/%d/%d\r\n", payload_type, c->sample_rate, c->channels); break; - case CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_ALAW: if (payload_type >= RTP_PT_PRIVATE) av_strlcatf(buff, size, "a=rtpmap:%d PCMA/%d/%d\r\n", payload_type, c->sample_rate, c->channels); break; - case CODEC_ID_AMR_NB: + case AV_CODEC_ID_AMR_NB: av_strlcatf(buff, size, "a=rtpmap:%d AMR/%d/%d\r\n" "a=fmtp:%d octet-align=1\r\n", payload_type, c->sample_rate, c->channels, payload_type); break; - case CODEC_ID_AMR_WB: + case AV_CODEC_ID_AMR_WB: av_strlcatf(buff, size, "a=rtpmap:%d AMR-WB/%d/%d\r\n" "a=fmtp:%d octet-align=1\r\n", payload_type, c->sample_rate, c->channels, payload_type); break; - case CODEC_ID_VORBIS: + case AV_CODEC_ID_VORBIS: if (c->extradata_size) config = xiph_extradata2config(c); else @@ -499,7 +499,7 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, payload_type, c->sample_rate, c->channels, payload_type, config); break; - case CODEC_ID_THEORA: { + case AV_CODEC_ID_THEORA: { const char *pix_fmt; if (c->extradata_size) config = xiph_extradata2config(c); @@ -531,17 +531,17 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, c->width, c->height, pix_fmt, config); break; } - case CODEC_ID_VP8: + case AV_CODEC_ID_VP8: av_strlcatf(buff, size, "a=rtpmap:%d VP8/90000\r\n", payload_type); break; - case CODEC_ID_ADPCM_G722: + case AV_CODEC_ID_ADPCM_G722: if (payload_type >= RTP_PT_PRIVATE) av_strlcatf(buff, size, "a=rtpmap:%d G722/%d/%d\r\n", payload_type, 8000, c->channels); break; - case CODEC_ID_ADPCM_G726: { + case AV_CODEC_ID_ADPCM_G726: { if (payload_type >= RTP_PT_PRIVATE) av_strlcatf(buff, size, "a=rtpmap:%d G726-%d/%d\r\n", payload_type, @@ -549,7 +549,7 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, c->sample_rate); break; } - case CODEC_ID_ILBC: + case AV_CODEC_ID_ILBC: av_strlcatf(buff, size, "a=rtpmap:%d iLBC/%d\r\n" "a=fmtp:%d mode=%d\r\n", payload_type, c->sample_rate, diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index dea1afa3f0..d497d7b31f 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -50,12 +50,12 @@ typedef struct FilmDemuxContext { int video_stream_index; int audio_stream_index; - enum CodecID audio_type; + enum AVCodecID audio_type; unsigned int audio_samplerate; unsigned int audio_bits; unsigned int audio_channels; - enum CodecID video_type; + enum AVCodecID video_type; unsigned int sample_count; film_sample *sample_table; unsigned int current_sample; @@ -102,7 +102,7 @@ static int film_read_header(AVFormatContext *s) if (avio_read(pb, scratch, 20) != 20) return AVERROR(EIO); /* make some assumptions about the audio parameters */ - film->audio_type = CODEC_ID_PCM_S8; + film->audio_type = AV_CODEC_ID_PCM_S8; film->audio_samplerate = 22050; film->audio_channels = 1; film->audio_bits = 8; @@ -114,27 +114,27 @@ static int film_read_header(AVFormatContext *s) film->audio_channels = scratch[21]; film->audio_bits = scratch[22]; if (scratch[23] == 2) - film->audio_type = CODEC_ID_ADPCM_ADX; + film->audio_type = AV_CODEC_ID_ADPCM_ADX; else if (film->audio_channels > 0) { if (film->audio_bits == 8) - film->audio_type = CODEC_ID_PCM_S8; + film->audio_type = AV_CODEC_ID_PCM_S8; else if (film->audio_bits == 16) - film->audio_type = CODEC_ID_PCM_S16BE; + film->audio_type = AV_CODEC_ID_PCM_S16BE; else - film->audio_type = CODEC_ID_NONE; + film->audio_type = AV_CODEC_ID_NONE; } else - film->audio_type = CODEC_ID_NONE; + film->audio_type = AV_CODEC_ID_NONE; } if (AV_RB32(&scratch[0]) != FDSC_TAG) return AVERROR_INVALIDDATA; if (AV_RB32(&scratch[8]) == CVID_TAG) { - film->video_type = CODEC_ID_CINEPAK; + film->video_type = AV_CODEC_ID_CINEPAK; } else if (AV_RB32(&scratch[8]) == RAW_TAG) { - film->video_type = CODEC_ID_RAWVIDEO; + film->video_type = AV_CODEC_ID_RAWVIDEO; } else { - film->video_type = CODEC_ID_NONE; + film->video_type = AV_CODEC_ID_NONE; } /* initialize the decoder streams */ @@ -149,7 +149,7 @@ static int film_read_header(AVFormatContext *s) st->codec->width = AV_RB32(&scratch[16]); st->codec->height = AV_RB32(&scratch[12]); - if (film->video_type == CODEC_ID_RAWVIDEO) { + if (film->video_type == AV_CODEC_ID_RAWVIDEO) { if (scratch[20] == 24) { st->codec->pix_fmt = PIX_FMT_RGB24; } else { @@ -170,7 +170,7 @@ static int film_read_header(AVFormatContext *s) st->codec->channels = film->audio_channels; st->codec->sample_rate = film->audio_samplerate; - if (film->audio_type == CODEC_ID_ADPCM_ADX) { + if (film->audio_type == AV_CODEC_ID_ADPCM_ADX) { st->codec->bits_per_coded_sample = 18 * 8 / 32; st->codec->block_align = st->codec->channels * 18; st->need_parsing = AVSTREAM_PARSE_FULL; @@ -219,10 +219,10 @@ static int film_read_header(AVFormatContext *s) film->sample_table[i].stream = film->audio_stream_index; film->sample_table[i].pts = audio_frame_counter; - if (film->audio_type == CODEC_ID_ADPCM_ADX) + if (film->audio_type == AV_CODEC_ID_ADPCM_ADX) audio_frame_counter += (film->sample_table[i].sample_size * 32 / (18 * film->audio_channels)); - else if (film->audio_type != CODEC_ID_NONE) + else if (film->audio_type != AV_CODEC_ID_NONE) audio_frame_counter += (film->sample_table[i].sample_size / (film->audio_channels * film->audio_bits / 8)); } else { @@ -257,14 +257,14 @@ static int film_read_packet(AVFormatContext *s, /* do a special song and dance when loading FILM Cinepak chunks */ if ((sample->stream == film->video_stream_index) && - (film->video_type == CODEC_ID_CINEPAK)) { + (film->video_type == AV_CODEC_ID_CINEPAK)) { pkt->pos= avio_tell(pb); if (av_new_packet(pkt, sample->sample_size)) return AVERROR(ENOMEM); avio_read(pb, pkt->data, sample->sample_size); } else if ((sample->stream == film->audio_stream_index) && (film->audio_channels == 2) && - (film->audio_type != CODEC_ID_ADPCM_ADX)) { + (film->audio_type != AV_CODEC_ID_ADPCM_ADX)) { /* stereo PCM needs to be interleaved */ if (ffio_limit(pb, sample->sample_size) != sample->sample_size) diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index cdeb1740ca..98aa5b8c09 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -111,7 +111,7 @@ static int vmd_read_header(AVFormatContext *s) avpriv_set_pts_info(vst, 33, 1, 10); vmd->video_stream_index = vst->index; vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = vmd->is_indeo3 ? CODEC_ID_INDEO3 : CODEC_ID_VMDVIDEO; + vst->codec->codec_id = vmd->is_indeo3 ? AV_CODEC_ID_INDEO3 : AV_CODEC_ID_VMDVIDEO; vst->codec->codec_tag = 0; /* no fourcc */ vst->codec->width = AV_RL16(&vmd->vmd_header[12]); vst->codec->height = AV_RL16(&vmd->vmd_header[14]); @@ -131,7 +131,7 @@ static int vmd_read_header(AVFormatContext *s) return AVERROR(ENOMEM); vmd->audio_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_VMDAUDIO; + st->codec->codec_id = AV_CODEC_ID_VMDAUDIO; st->codec->codec_tag = 0; /* no fourcc */ st->codec->channels = (vmd->vmd_header[811] & 0x80) ? 2 : 1; st->codec->sample_rate = vmd->sample_rate; diff --git a/libavformat/siff.c b/libavformat/siff.c index 23d422edf0..df94dbfdd0 100644 --- a/libavformat/siff.c +++ b/libavformat/siff.c @@ -77,7 +77,7 @@ static int create_audio_stream(AVFormatContext *s, SIFFContext *c) if (!ast) return -1; ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_id = CODEC_ID_PCM_U8; + ast->codec->codec_id = AV_CODEC_ID_PCM_U8; ast->codec->channels = 1; ast->codec->bits_per_coded_sample = 8; ast->codec->sample_rate = c->rate; @@ -121,7 +121,7 @@ static int siff_parse_vbv1(AVFormatContext *s, SIFFContext *c, AVIOContext *pb) if (!st) return -1; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_VB; + st->codec->codec_id = AV_CODEC_ID_VB; st->codec->codec_tag = MKTAG('V', 'B', 'V', '1'); st->codec->width = width; st->codec->height = height; diff --git a/libavformat/smacker.c b/libavformat/smacker.c index b52ba0c2f2..cf1ab858d8 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -163,7 +163,7 @@ static int smacker_read_header(AVFormatContext *s) st->codec->height = smk->height; st->codec->pix_fmt = PIX_FMT_PAL8; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_SMACKVIDEO; + st->codec->codec_id = AV_CODEC_ID_SMACKVIDEO; st->codec->codec_tag = smk->magic; /* Smacker uses 100000 as internal timebase */ if(smk->pts_inc < 0) @@ -182,20 +182,20 @@ static int smacker_read_header(AVFormatContext *s) smk->indexes[i] = ast[i]->index; ast[i]->codec->codec_type = AVMEDIA_TYPE_AUDIO; if (smk->aflags[i] & SMK_AUD_BINKAUD) { - ast[i]->codec->codec_id = CODEC_ID_BINKAUDIO_RDFT; + ast[i]->codec->codec_id = AV_CODEC_ID_BINKAUDIO_RDFT; } else if (smk->aflags[i] & SMK_AUD_USEDCT) { - ast[i]->codec->codec_id = CODEC_ID_BINKAUDIO_DCT; + ast[i]->codec->codec_id = AV_CODEC_ID_BINKAUDIO_DCT; } else if (smk->aflags[i] & SMK_AUD_PACKED){ - ast[i]->codec->codec_id = CODEC_ID_SMACKAUDIO; + ast[i]->codec->codec_id = AV_CODEC_ID_SMACKAUDIO; ast[i]->codec->codec_tag = MKTAG('S', 'M', 'K', 'A'); } else { - ast[i]->codec->codec_id = CODEC_ID_PCM_U8; + ast[i]->codec->codec_id = AV_CODEC_ID_PCM_U8; } ast[i]->codec->channels = (smk->aflags[i] & SMK_AUD_STEREO) ? 2 : 1; ast[i]->codec->sample_rate = smk->rates[i]; ast[i]->codec->bits_per_coded_sample = (smk->aflags[i] & SMK_AUD_16BITS) ? 16 : 8; - if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == CODEC_ID_PCM_U8) - ast[i]->codec->codec_id = CODEC_ID_PCM_S16LE; + if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == AV_CODEC_ID_PCM_U8) + ast[i]->codec->codec_id = AV_CODEC_ID_PCM_S16LE; avpriv_set_pts_info(ast[i], 64, 1, ast[i]->codec->sample_rate * ast[i]->codec->channels * ast[i]->codec->bits_per_coded_sample / 8); } diff --git a/libavformat/smjpeg.c b/libavformat/smjpeg.c index 82316ed448..4edf5e8ac4 100644 --- a/libavformat/smjpeg.c +++ b/libavformat/smjpeg.c @@ -29,12 +29,12 @@ #include "smjpeg.h" const AVCodecTag ff_codec_smjpeg_video_tags[] = { - { CODEC_ID_MJPEG, MKTAG('J', 'F', 'I', 'F') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_MJPEG, MKTAG('J', 'F', 'I', 'F') }, + { AV_CODEC_ID_NONE, 0 }, }; const AVCodecTag ff_codec_smjpeg_audio_tags[] = { - { CODEC_ID_ADPCM_IMA_SMJPEG, MKTAG('A', 'P', 'C', 'M') }, - { CODEC_ID_PCM_S16LE, MKTAG('N', 'O', 'N', 'E') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_ADPCM_IMA_SMJPEG, MKTAG('A', 'P', 'C', 'M') }, + { AV_CODEC_ID_PCM_S16LE, MKTAG('N', 'O', 'N', 'E') }, + { AV_CODEC_ID_NONE, 0 }, }; diff --git a/libavformat/smjpegenc.c b/libavformat/smjpegenc.c index d0451c32b2..6dbaa2358c 100644 --- a/libavformat/smjpegenc.c +++ b/libavformat/smjpegenc.c @@ -139,8 +139,8 @@ AVOutputFormat ff_smjpeg_muxer = { .name = "smjpeg", .long_name = NULL_IF_CONFIG_SMALL("Loki SDL MJPEG"), .priv_data_size = sizeof(SMJPEGMuxContext), - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_MJPEG, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_MJPEG, .write_header = smjpeg_write_header, .write_packet = smjpeg_write_packet, .write_trailer = smjpeg_write_trailer, diff --git a/libavformat/smush.c b/libavformat/smush.c index 79e23747c2..d9a58c6cb5 100644 --- a/libavformat/smush.c +++ b/libavformat/smush.c @@ -135,7 +135,7 @@ static int smush_read_header(AVFormatContext *ctx) vst->duration = vst->nb_frames = nframes; vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_SANM; + vst->codec->codec_id = AV_CODEC_ID_SANM; vst->codec->codec_tag = 0; vst->codec->width = width; vst->codec->height = height; @@ -162,7 +162,7 @@ static int smush_read_header(AVFormatContext *ctx) ast->start_time = 0; ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_id = CODEC_ID_VIMA; + ast->codec->codec_id = AV_CODEC_ID_VIMA; ast->codec->codec_tag = 0; ast->codec->sample_rate = sample_rate; ast->codec->channels = channels; diff --git a/libavformat/sol.c b/libavformat/sol.c index 7df107a946..aca5a860eb 100644 --- a/libavformat/sol.c +++ b/libavformat/sol.c @@ -47,21 +47,21 @@ static int sol_probe(AVProbeData *p) #define SOL_16BIT 4 #define SOL_STEREO 16 -static enum CodecID sol_codec_id(int magic, int type) +static enum AVCodecID sol_codec_id(int magic, int type) { if (magic == 0x0B8D) { - if (type & SOL_DPCM) return CODEC_ID_SOL_DPCM; - else return CODEC_ID_PCM_U8; + if (type & SOL_DPCM) return AV_CODEC_ID_SOL_DPCM; + else return AV_CODEC_ID_PCM_U8; } if (type & SOL_DPCM) { - if (type & SOL_16BIT) return CODEC_ID_SOL_DPCM; - else if (magic == 0x0C8D) return CODEC_ID_SOL_DPCM; - else return CODEC_ID_SOL_DPCM; + if (type & SOL_16BIT) return AV_CODEC_ID_SOL_DPCM; + else if (magic == 0x0C8D) return AV_CODEC_ID_SOL_DPCM; + else return AV_CODEC_ID_SOL_DPCM; } - if (type & SOL_16BIT) return CODEC_ID_PCM_S16LE; - return CODEC_ID_PCM_U8; + if (type & SOL_16BIT) return AV_CODEC_ID_PCM_S16LE; + return AV_CODEC_ID_PCM_U8; } static int sol_codec_type(int magic, int type) @@ -87,7 +87,7 @@ static int sol_read_header(AVFormatContext *s) unsigned int magic,tag; AVIOContext *pb = s->pb; unsigned int id, channels, rate, type; - enum CodecID codec; + enum AVCodecID codec; AVStream *st; /* check ".snd" header */ @@ -104,7 +104,7 @@ static int sol_read_header(AVFormatContext *s) codec = sol_codec_id(magic, type); channels = sol_channels(magic, type); - if (codec == CODEC_ID_SOL_DPCM) + if (codec == AV_CODEC_ID_SOL_DPCM) id = sol_codec_type(magic, type); else id = 0; diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c index fe59fd47a2..4c951bbd73 100644 --- a/libavformat/soxdec.c +++ b/libavformat/soxdec.c @@ -58,14 +58,14 @@ static int sox_read_header(AVFormatContext *s) st->codec->codec_type = AVMEDIA_TYPE_AUDIO; if (avio_rl32(pb) == SOX_TAG) { - st->codec->codec_id = CODEC_ID_PCM_S32LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S32LE; header_size = avio_rl32(pb); avio_skip(pb, 8); /* sample count */ sample_rate = av_int2double(avio_rl64(pb)); st->codec->channels = avio_rl32(pb); comment_size = avio_rl32(pb); } else { - st->codec->codec_id = CODEC_ID_PCM_S32BE; + st->codec->codec_id = AV_CODEC_ID_PCM_S32BE; header_size = avio_rb32(pb); avio_skip(pb, 8); /* sample count */ sample_rate = av_int2double(avio_rb64(pb)); diff --git a/libavformat/soxenc.c b/libavformat/soxenc.c index e68b7e568f..6b4412de18 100644 --- a/libavformat/soxenc.c +++ b/libavformat/soxenc.c @@ -55,14 +55,14 @@ static int sox_write_header(AVFormatContext *s) sox->header_size = SOX_FIXED_HDR + comment_size; - if (enc->codec_id == CODEC_ID_PCM_S32LE) { + if (enc->codec_id == AV_CODEC_ID_PCM_S32LE) { ffio_wfourcc(pb, ".SoX"); avio_wl32(pb, sox->header_size); avio_wl64(pb, 0); /* number of samples */ avio_wl64(pb, av_double2int(enc->sample_rate)); avio_wl32(pb, enc->channels); avio_wl32(pb, comment_size); - } else if (enc->codec_id == CODEC_ID_PCM_S32BE) { + } else if (enc->codec_id == AV_CODEC_ID_PCM_S32BE) { ffio_wfourcc(pb, "XoS."); avio_wb32(pb, sox->header_size); avio_wb64(pb, 0); /* number of samples */ @@ -103,7 +103,7 @@ static int sox_write_trailer(AVFormatContext *s) int64_t file_size = avio_tell(pb); int64_t num_samples = (file_size - sox->header_size - 4LL) >> 2LL; avio_seek(pb, 8, SEEK_SET); - if (enc->codec_id == CODEC_ID_PCM_S32LE) { + if (enc->codec_id == AV_CODEC_ID_PCM_S32LE) { avio_wl64(pb, num_samples); } else avio_wb64(pb, num_samples); @@ -120,8 +120,8 @@ AVOutputFormat ff_sox_muxer = { .long_name = NULL_IF_CONFIG_SMALL("SoX native"), .extensions = "sox", .priv_data_size = sizeof(SoXContext), - .audio_codec = CODEC_ID_PCM_S32LE, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_PCM_S32LE, + .video_codec = AV_CODEC_ID_NONE, .write_header = sox_write_header, .write_packet = sox_write_packet, .write_trailer = sox_write_trailer, diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c index e8faa92903..dce33461fe 100644 --- a/libavformat/spdifdec.c +++ b/libavformat/spdifdec.c @@ -33,7 +33,7 @@ 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; @@ -41,19 +41,19 @@ static int spdif_get_offset_and_codec(AVFormatContext *s, 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); @@ -63,31 +63,31 @@ static int spdif_get_offset_and_codec(AVFormatContext *s, 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 */ @@ -112,7 +112,7 @@ static int spdif_probe(AVProbeData *p) 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; @@ -165,7 +165,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt) { 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; diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index da688aa393..9489939ee6 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -442,24 +442,24 @@ static int spdif_write_header(AVFormatContext *s) IEC61937Context *ctx = s->priv_data; switch (s->streams[0]->codec->codec_id) { - case CODEC_ID_AC3: + case AV_CODEC_ID_AC3: ctx->header_info = spdif_header_ac3; break; - case CODEC_ID_EAC3: + case AV_CODEC_ID_EAC3: ctx->header_info = spdif_header_eac3; break; - case CODEC_ID_MP1: - case CODEC_ID_MP2: - case CODEC_ID_MP3: + case AV_CODEC_ID_MP1: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: ctx->header_info = spdif_header_mpeg; break; - case CODEC_ID_DTS: + case AV_CODEC_ID_DTS: ctx->header_info = spdif_header_dts; break; - case CODEC_ID_AAC: + case AV_CODEC_ID_AAC: ctx->header_info = spdif_header_aac; break; - case CODEC_ID_TRUEHD: + case AV_CODEC_ID_TRUEHD: ctx->header_info = spdif_header_truehd; ctx->hd_buf = av_malloc(MAT_FRAME_SIZE); if (!ctx->hd_buf) @@ -547,8 +547,8 @@ AVOutputFormat ff_spdif_muxer = { .long_name = NULL_IF_CONFIG_SMALL("IEC 61937 (used on S/PDIF - IEC958)"), .extensions = "spdif", .priv_data_size = sizeof(IEC61937Context), - .audio_codec = CODEC_ID_AC3, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_AC3, + .video_codec = AV_CODEC_ID_NONE, .write_header = spdif_write_header, .write_packet = spdif_write_packet, .write_trailer = spdif_write_trailer, diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c index 28b18b4b99..a66ced377e 100644 --- a/libavformat/srtdec.c +++ b/libavformat/srtdec.c @@ -47,7 +47,7 @@ static int srt_read_header(AVFormatContext *s) return AVERROR(ENOMEM); avpriv_set_pts_info(st, 64, 1, 1000); st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = CODEC_ID_SRT; + st->codec->codec_id = AV_CODEC_ID_SRT; return 0; } diff --git a/libavformat/srtenc.c b/libavformat/srtenc.c index 171c45b445..7fe559f487 100644 --- a/libavformat/srtenc.c +++ b/libavformat/srtenc.c @@ -41,8 +41,8 @@ static int srt_write_header(AVFormatContext *avf) "SRT supports only a single subtitles stream.\n"); return AVERROR(EINVAL); } - if (avf->streams[0]->codec->codec_id != CODEC_ID_TEXT && - avf->streams[0]->codec->codec_id != CODEC_ID_SRT) { + if (avf->streams[0]->codec->codec_id != AV_CODEC_ID_TEXT && + avf->streams[0]->codec->codec_id != AV_CODEC_ID_SRT) { av_log(avf, AV_LOG_ERROR, "Unsupported subtitles codec: %s\n", avcodec_get_name(avf->streams[0]->codec->codec_id)); @@ -55,7 +55,7 @@ static int srt_write_header(AVFormatContext *avf) static int srt_write_packet(AVFormatContext *avf, AVPacket *pkt) { SRTContext *srt = avf->priv_data; - int write_ts = avf->streams[0]->codec->codec_id != CODEC_ID_SRT; + int write_ts = avf->streams[0]->codec->codec_id != AV_CODEC_ID_SRT; srt->index++; if (write_ts) { @@ -95,5 +95,5 @@ AVOutputFormat ff_srt_muxer = { .write_header = srt_write_header, .write_packet = srt_write_packet, .flags = AVFMT_VARIABLE_FPS, - .subtitle_codec = CODEC_ID_TEXT, + .subtitle_codec = AV_CODEC_ID_TEXT, }; diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c index ac68fc151d..e708a28621 100644 --- a/libavformat/subviewerdec.c +++ b/libavformat/subviewerdec.c @@ -76,7 +76,7 @@ static int subviewer_read_header(AVFormatContext *s) return AVERROR(ENOMEM); avpriv_set_pts_info(st, 64, 1, 100); st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = CODEC_ID_SUBVIEWER; + st->codec->codec_id = AV_CODEC_ID_SUBVIEWER; av_bprint_init(&header, 0, AV_BPRINT_SIZE_UNLIMITED); diff --git a/libavformat/swf.h b/libavformat/swf.h index 5326192871..2f920f7dd3 100644 --- a/libavformat/swf.h +++ b/libavformat/swf.h @@ -92,18 +92,18 @@ typedef struct { } SWFContext; static const AVCodecTag swf_codec_tags[] = { - {CODEC_ID_FLV1, 0x02}, - {CODEC_ID_VP6F, 0x04}, - {CODEC_ID_NONE, 0}, + { AV_CODEC_ID_FLV1, 0x02}, + { AV_CODEC_ID_VP6F, 0x04}, + { AV_CODEC_ID_NONE, 0}, }; static const AVCodecTag swf_audio_codec_tags[] = { - {CODEC_ID_PCM_S16LE, 0x00}, - {CODEC_ID_ADPCM_SWF, 0x01}, - {CODEC_ID_MP3, 0x02}, - {CODEC_ID_PCM_S16LE, 0x03}, - //{CODEC_ID_NELLYMOSER, 0x06}, - {CODEC_ID_NONE, 0}, + { AV_CODEC_ID_PCM_S16LE, 0x00}, + { AV_CODEC_ID_ADPCM_SWF, 0x01}, + { AV_CODEC_ID_MP3, 0x02}, + { AV_CODEC_ID_PCM_S16LE, 0x03}, + //{ AV_CODEC_ID_NELLYMOSER, 0x06}, + { AV_CODEC_ID_NONE, 0}, }; #endif /* AVFORMAT_SWF_H */ diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index f74f453a85..1e974fef69 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -211,7 +211,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) for (i = 0; i < s->nb_streams; i++) { st = s->streams[i]; if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->id == -1) { - if (st->codec->codec_id == CODEC_ID_MP3) { + if (st->codec->codec_id == AV_CODEC_ID_MP3) { avio_skip(pb, 4); if ((res = av_get_packet(pb, pkt, len-4)) < 0) return res; @@ -227,7 +227,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) } else if (tag == TAG_JPEG2) { for (i=0; i<s->nb_streams; i++) { st = s->streams[i]; - if (st->codec->codec_id == CODEC_ID_MJPEG && st->id == -2) + if (st->codec->codec_id == AV_CODEC_ID_MJPEG && st->id == -2) break; } if (i == s->nb_streams) { @@ -236,7 +236,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) return -1; vst->id = -2; /* -2 to avoid clash with video stream and audio stream */ vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_MJPEG; + vst->codec->codec_id = AV_CODEC_ID_MJPEG; avpriv_set_pts_info(vst, 64, 256, swf->frame_rate); st = vst; } diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 9eb2540955..3443da0ed2 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -187,7 +187,7 @@ static int swf_write_header(AVFormatContext *s) for(i=0;i<s->nb_streams;i++) { AVCodecContext *enc = s->streams[i]->codec; if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { - if (enc->codec_id == CODEC_ID_MP3) { + if (enc->codec_id == AV_CODEC_ID_MP3) { swf->audio_enc = enc; swf->audio_fifo= av_fifo_alloc(AUDIO_FIFO_SIZE); if (!swf->audio_fifo) @@ -197,9 +197,9 @@ static int swf_write_header(AVFormatContext *s) return -1; } } else { - if (enc->codec_id == CODEC_ID_VP6F || - enc->codec_id == CODEC_ID_FLV1 || - enc->codec_id == CODEC_ID_MJPEG) { + if (enc->codec_id == AV_CODEC_ID_VP6F || + enc->codec_id == AV_CODEC_ID_FLV1 || + enc->codec_id == AV_CODEC_ID_MJPEG) { swf->video_enc = enc; } else { av_log(s, AV_LOG_ERROR, "SWF muxer only supports VP6, FLV1 and MJPEG\n"); @@ -230,9 +230,9 @@ static int swf_write_header(AVFormatContext *s) if (!strcmp("avm2", s->oformat->name)) version = 9; - else if (swf->video_enc && swf->video_enc->codec_id == CODEC_ID_VP6F) + else if (swf->video_enc && swf->video_enc->codec_id == AV_CODEC_ID_VP6F) version = 8; /* version 8 and above support VP6 codec */ - else if (swf->video_enc && swf->video_enc->codec_id == CODEC_ID_FLV1) + else if (swf->video_enc && swf->video_enc->codec_id == AV_CODEC_ID_FLV1) version = 6; /* version 6 and above support FLV1 codec */ else version = 4; /* version 4 for mpeg audio support */ @@ -254,7 +254,7 @@ static int swf_write_header(AVFormatContext *s) } /* define a shape with the jpeg inside */ - if (swf->video_enc && swf->video_enc->codec_id == CODEC_ID_MJPEG) { + if (swf->video_enc && swf->video_enc->codec_id == AV_CODEC_ID_MJPEG) { put_swf_tag(s, TAG_DEFINESHAPE); avio_wl16(pb, SHAPE_ID); /* ID of shape */ @@ -297,7 +297,7 @@ static int swf_write_header(AVFormatContext *s) put_swf_end_tag(s); } - if (swf->audio_enc && swf->audio_enc->codec_id == CODEC_ID_MP3) { + if (swf->audio_enc && swf->audio_enc->codec_id == AV_CODEC_ID_MP3) { int v = 0; /* start sound */ @@ -337,8 +337,8 @@ static int swf_write_video(AVFormatContext *s, if (swf->swf_frame_number == 16000) av_log(enc, AV_LOG_INFO, "warning: Flash Player limit of 16000 frames reached\n"); - if (enc->codec_id == CODEC_ID_VP6F || - enc->codec_id == CODEC_ID_FLV1) { + if (enc->codec_id == AV_CODEC_ID_VP6F || + enc->codec_id == AV_CODEC_ID_FLV1) { if (swf->video_frame_number == 0) { /* create a new video object */ put_swf_tag(s, TAG_VIDEOSTREAM); @@ -376,7 +376,7 @@ static int swf_write_video(AVFormatContext *s, avio_wl16(pb, swf->video_frame_number++); avio_write(pb, buf, size); put_swf_end_tag(s); - } else if (enc->codec_id == CODEC_ID_MJPEG) { + } else if (enc->codec_id == AV_CODEC_ID_MJPEG) { if (swf->swf_frame_number > 0) { /* remove the shape */ put_swf_tag(s, TAG_REMOVEOBJECT); @@ -509,8 +509,8 @@ AVOutputFormat ff_swf_muxer = { .mime_type = "application/x-shockwave-flash", .extensions = "swf", .priv_data_size = sizeof(SWFContext), - .audio_codec = CODEC_ID_MP3, - .video_codec = CODEC_ID_FLV1, + .audio_codec = AV_CODEC_ID_MP3, + .video_codec = AV_CODEC_ID_FLV1, .write_header = swf_write_header, .write_packet = swf_write_packet, .write_trailer = swf_write_trailer, @@ -523,8 +523,8 @@ AVOutputFormat ff_avm2_muxer = { .long_name = NULL_IF_CONFIG_SMALL("SWF (ShockWave Flash) (AVM2)"), .mime_type = "application/x-shockwave-flash", .priv_data_size = sizeof(SWFContext), - .audio_codec = CODEC_ID_MP3, - .video_codec = CODEC_ID_FLV1, + .audio_codec = AV_CODEC_ID_MP3, + .video_codec = AV_CODEC_ID_FLV1, .write_header = swf_write_header, .write_packet = swf_write_packet, .write_trailer = swf_write_trailer, diff --git a/libavformat/thp.c b/libavformat/thp.c index e71cbc4bd4..0e96b53a4b 100644 --- a/libavformat/thp.c +++ b/libavformat/thp.c @@ -105,7 +105,7 @@ static int thp_read_header(AVFormatContext *s) is required. */ avpriv_set_pts_info(st, 64, thp->fps.den, thp->fps.num); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_THP; + st->codec->codec_id = AV_CODEC_ID_THP; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = avio_rb32(pb); st->codec->height = avio_rb32(pb); @@ -125,7 +125,7 @@ static int thp_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ADPCM_THP; + st->codec->codec_id = AV_CODEC_ID_ADPCM_THP; st->codec->codec_tag = 0; /* no fourcc */ st->codec->channels = avio_rb32(pb); /* numChannels. */ st->codec->sample_rate = avio_rb32(pb); /* Frequency. */ diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c index f7a9ff3bb3..88941b7311 100644 --- a/libavformat/tiertexseq.c +++ b/libavformat/tiertexseq.c @@ -214,7 +214,7 @@ static int seq_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 32, 1, SEQ_FRAME_RATE); seq->video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_TIERTEXSEQVIDEO; + st->codec->codec_id = AV_CODEC_ID_TIERTEXSEQVIDEO; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = SEQ_FRAME_W; st->codec->height = SEQ_FRAME_H; @@ -228,7 +228,7 @@ static int seq_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 32, 1, SEQ_SAMPLE_RATE); seq->audio_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_PCM_S16BE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16BE; st->codec->codec_tag = 0; /* no tag */ st->codec->channels = 1; st->codec->sample_rate = SEQ_SAMPLE_RATE; diff --git a/libavformat/tmv.c b/libavformat/tmv.c index c1d6044fa0..513436982c 100644 --- a/libavformat/tmv.c +++ b/libavformat/tmv.c @@ -111,7 +111,7 @@ static int tmv_read_header(AVFormatContext *s) } ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_id = CODEC_ID_PCM_U8; + ast->codec->codec_id = AV_CODEC_ID_PCM_U8; ast->codec->channels = features & TMV_STEREO ? 2 : 1; ast->codec->bits_per_coded_sample = 8; ast->codec->bit_rate = ast->codec->sample_rate * @@ -123,7 +123,7 @@ static int tmv_read_header(AVFormatContext *s) av_reduce(&fps.num, &fps.den, fps.num, fps.den, 0xFFFFFFFFLL); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_TMV; + vst->codec->codec_id = AV_CODEC_ID_TMV; vst->codec->pix_fmt = PIX_FMT_PAL8; vst->codec->width = char_cols * 8; vst->codec->height = char_rows * 8; diff --git a/libavformat/tta.c b/libavformat/tta.c index dc58dcda4d..1440c8000a 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -102,7 +102,7 @@ static int tta_read_header(AVFormatContext *s) avio_skip(s->pb, 4); // seektable crc st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_TTA; + st->codec->codec_id = AV_CODEC_ID_TTA; st->codec->channels = channels; st->codec->sample_rate = samplerate; st->codec->bits_per_coded_sample = bps; diff --git a/libavformat/tty.c b/libavformat/tty.c index 6d8a6eb541..b86dd79ca0 100644 --- a/libavformat/tty.c +++ b/libavformat/tty.c @@ -85,7 +85,7 @@ static int read_header(AVFormatContext *avctx) } st->codec->codec_tag = 0; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_ANSI; + st->codec->codec_id = AV_CODEC_ID_ANSI; if (s->video_size && (ret = av_parse_video_size(&width, &height, s->video_size)) < 0) { av_log (avctx, AV_LOG_ERROR, "Couldn't parse video size.\n"); diff --git a/libavformat/txd.c b/libavformat/txd.c index f6060330ba..9e02d874ad 100644 --- a/libavformat/txd.c +++ b/libavformat/txd.c @@ -44,7 +44,7 @@ static int txd_read_header(AVFormatContext *s) { if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_TXD; + st->codec->codec_id = AV_CODEC_ID_TXD; st->codec->time_base.den = 5; st->codec->time_base.num = 1; /* the parameters will be extracted from the compressed bitstream */ diff --git a/libavformat/utils.c b/libavformat/utils.c index 23b72b5b7b..be86a87fc1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -218,7 +218,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, #if CONFIG_IMAGE2_MUXER if (!short_name && filename && av_filename_number_test(filename) && - ff_guess_image2_codec(filename) != CODEC_ID_NONE) { + ff_guess_image2_codec(filename) != AV_CODEC_ID_NONE) { return av_guess_format("image2", NULL, NULL); } #endif @@ -243,17 +243,17 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, return fmt_found; } -enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, +enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, const char *filename, const char *mime_type, enum AVMediaType type){ if(type == AVMEDIA_TYPE_VIDEO){ - enum CodecID codec_id= CODEC_ID_NONE; + enum AVCodecID codec_id= AV_CODEC_ID_NONE; #if CONFIG_IMAGE2_MUXER if(!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")){ codec_id= ff_guess_image2_codec(filename); } #endif - if(codec_id == CODEC_ID_NONE) + if(codec_id == AV_CODEC_ID_NONE) codec_id= fmt->video_codec; return codec_id; }else if(type == AVMEDIA_TYPE_AUDIO) @@ -261,7 +261,7 @@ enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, else if (type == AVMEDIA_TYPE_SUBTITLE) return fmt->subtitle_codec; else - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } AVInputFormat *av_find_input_format(const char *short_name) @@ -399,17 +399,17 @@ AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened){ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, AVProbeData *pd) { static const struct { - const char *name; enum CodecID id; enum AVMediaType type; + const char *name; enum AVCodecID id; enum AVMediaType type; } fmt_id_type[] = { - { "aac" , CODEC_ID_AAC , AVMEDIA_TYPE_AUDIO }, - { "ac3" , CODEC_ID_AC3 , AVMEDIA_TYPE_AUDIO }, - { "dts" , CODEC_ID_DTS , AVMEDIA_TYPE_AUDIO }, - { "eac3" , CODEC_ID_EAC3 , AVMEDIA_TYPE_AUDIO }, - { "h264" , CODEC_ID_H264 , AVMEDIA_TYPE_VIDEO }, - { "loas" , CODEC_ID_AAC_LATM , AVMEDIA_TYPE_AUDIO }, - { "m4v" , CODEC_ID_MPEG4 , AVMEDIA_TYPE_VIDEO }, - { "mp3" , CODEC_ID_MP3 , AVMEDIA_TYPE_AUDIO }, - { "mpegvideo", CODEC_ID_MPEG2VIDEO, AVMEDIA_TYPE_VIDEO }, + { "aac" , AV_CODEC_ID_AAC , AVMEDIA_TYPE_AUDIO }, + { "ac3" , AV_CODEC_ID_AC3 , AVMEDIA_TYPE_AUDIO }, + { "dts" , AV_CODEC_ID_DTS , AVMEDIA_TYPE_AUDIO }, + { "eac3" , AV_CODEC_ID_EAC3 , AVMEDIA_TYPE_AUDIO }, + { "h264" , AV_CODEC_ID_H264 , AVMEDIA_TYPE_VIDEO }, + { "loas" , AV_CODEC_ID_AAC_LATM , AVMEDIA_TYPE_AUDIO }, + { "m4v" , AV_CODEC_ID_MPEG4 , AVMEDIA_TYPE_VIDEO }, + { "mp3" , AV_CODEC_ID_MP3 , AVMEDIA_TYPE_AUDIO }, + { "mpegvideo", AV_CODEC_ID_MPEG2VIDEO, AVMEDIA_TYPE_VIDEO }, { 0 } }; int score; @@ -698,12 +698,12 @@ no_packet: if(end || av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){ int score= set_codec_from_probe_data(s, st, pd); - if( (st->codec->codec_id != CODEC_ID_NONE && score > AVPROBE_SCORE_MAX/4) + if( (st->codec->codec_id != AV_CODEC_ID_NONE && score > AVPROBE_SCORE_MAX/4) || end){ pd->buf_size=0; av_freep(&pd->buf); st->request_probe= -1; - if(st->codec->codec_id != CODEC_ID_NONE){ + if(st->codec->codec_id != AV_CODEC_ID_NONE){ av_log(s, AV_LOG_DEBUG, "probed stream %d\n", st->index); }else av_log(s, AV_LOG_WARNING, "probed stream %d failed\n", st->index); @@ -799,11 +799,11 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) static int determinable_frame_size(AVCodecContext *avctx) { - if (/*avctx->codec_id == CODEC_ID_AAC ||*/ - avctx->codec_id == CODEC_ID_MP1 || - avctx->codec_id == CODEC_ID_MP2 || - avctx->codec_id == CODEC_ID_MP3/* || - avctx->codec_id == CODEC_ID_CELT*/) + if (/*avctx->codec_id == AV_CODEC_ID_AAC ||*/ + avctx->codec_id == AV_CODEC_ID_MP1 || + avctx->codec_id == AV_CODEC_ID_MP2 || + avctx->codec_id == AV_CODEC_ID_MP3/* || + avctx->codec_id == AV_CODEC_ID_CELT*/) return 1; return 0; } @@ -878,22 +878,22 @@ static int is_intra_only(AVCodecContext *enc){ return 1; }else if(enc->codec_type == AVMEDIA_TYPE_VIDEO){ switch(enc->codec_id){ - case CODEC_ID_MJPEG: - case CODEC_ID_MJPEGB: - case CODEC_ID_LJPEG: - case CODEC_ID_PRORES: - case CODEC_ID_RAWVIDEO: - case CODEC_ID_V210: - case CODEC_ID_DVVIDEO: - case CODEC_ID_HUFFYUV: - case CODEC_ID_FFVHUFF: - case CODEC_ID_ASV1: - case CODEC_ID_ASV2: - case CODEC_ID_VCR1: - case CODEC_ID_DNXHD: - case CODEC_ID_JPEG2000: - case CODEC_ID_MDEC: - case CODEC_ID_UTVIDEO: + case AV_CODEC_ID_MJPEG: + case AV_CODEC_ID_MJPEGB: + case AV_CODEC_ID_LJPEG: + case AV_CODEC_ID_PRORES: + case AV_CODEC_ID_RAWVIDEO: + case AV_CODEC_ID_V210: + case AV_CODEC_ID_DVVIDEO: + case AV_CODEC_ID_HUFFYUV: + case AV_CODEC_ID_FFVHUFF: + case AV_CODEC_ID_ASV1: + case AV_CODEC_ID_ASV2: + case AV_CODEC_ID_VCR1: + case AV_CODEC_ID_DNXHD: + case AV_CODEC_ID_JPEG2000: + case AV_CODEC_ID_MDEC: + case AV_CODEC_ID_UTVIDEO: return 1; default: break; } @@ -903,7 +903,7 @@ static int is_intra_only(AVCodecContext *enc){ static int has_decode_delay_been_guessed(AVStream *st) { - if(st->codec->codec_id != CODEC_ID_H264) return 1; + if(st->codec->codec_id != AV_CODEC_ID_H264) return 1; #if CONFIG_H264_DECODER if(st->codec->has_b_frames && avpriv_h264_has_num_reorder_frames(st->codec) == st->codec->has_b_frames) @@ -1015,7 +1015,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE) pkt->dts= AV_NOPTS_VALUE; - if (st->codec->codec_id != CODEC_ID_H264 && pc && pc->pict_type == AV_PICTURE_TYPE_B) + if (st->codec->codec_id != AV_CODEC_ID_H264 && pc && pc->pict_type == AV_PICTURE_TYPE_B) //FIXME Set low_delay = 0 when has_b_frames = 1 st->codec->has_b_frames = 1; @@ -1088,7 +1088,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, // presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), pkt->stream_index, pc, pkt->duration); /* interpolate PTS and DTS if they are not present */ //We skip H264 currently because delay and has_b_frames are not reliably set - if((delay==0 || (delay==1 && pc)) && st->codec->codec_id != CODEC_ID_H264){ + if((delay==0 || (delay==1 && pc)) && st->codec->codec_id != AV_CODEC_ID_H264){ if (presentation_delayed) { /* DTS = decompression timestamp */ /* PTS = presentation timestamp */ @@ -1146,7 +1146,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]); if(pkt->dts == AV_NOPTS_VALUE) pkt->dts= st->pts_buffer[0]; - if(st->codec->codec_id == CODEC_ID_H264){ // we skipped it above so we try here + if(st->codec->codec_id == AV_CODEC_ID_H264){ // we skipped it above so we try here update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts); // this should happen on the first packet } if(pkt->dts > st->cur_dts) @@ -1919,7 +1919,7 @@ static int seek_frame_generic(AVFormatContext *s, if(stream_index == pkt.stream_index && pkt.dts > timestamp){ if(pkt.flags & AV_PKT_FLAG_KEY) break; - if(nonkey++ > 1000 && st->codec->codec_id != CODEC_ID_CDGRAPHICS){ + if(nonkey++ > 1000 && st->codec->codec_id != AV_CODEC_ID_CDGRAPHICS){ av_log(s, AV_LOG_ERROR,"seek_frame_generic failed as this stream seems to contain no keyframes after the target timestamp, %d non keyframes found\n", nonkey); break; } @@ -2321,10 +2321,10 @@ static int has_codec_parameters(AVStream *st, const char **errmsg_ptr) FAIL("unspecified pixel format"); break; case AVMEDIA_TYPE_DATA: - if(avctx->codec_id == CODEC_ID_NONE) return 1; + if(avctx->codec_id == AV_CODEC_ID_NONE) return 1; } - if (avctx->codec_id == CODEC_ID_NONE) + if (avctx->codec_id == AV_CODEC_ID_NONE) FAIL("unknown codec"); return 1; } @@ -2396,9 +2396,9 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option return ret; } -unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum CodecID id) +unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id) { - while (tags->id != CODEC_ID_NONE) { + while (tags->id != AV_CODEC_ID_NONE) { if (tags->id == id) return tags->tag; tags++; @@ -2406,21 +2406,21 @@ unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum CodecID id) return 0; } -enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag) +enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag) { int i; - for(i=0; tags[i].id != CODEC_ID_NONE;i++) { + for(i=0; tags[i].id != AV_CODEC_ID_NONE;i++) { if(tag == tags[i].tag) return tags[i].id; } - for(i=0; tags[i].id != CODEC_ID_NONE; i++) { + for(i=0; tags[i].id != AV_CODEC_ID_NONE; i++) { if (avpriv_toupper4(tag) == avpriv_toupper4(tags[i].tag)) return tags[i].id; } - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } -unsigned int av_codec_get_tag(const AVCodecTag * const *tags, enum CodecID id) +unsigned int av_codec_get_tag(const AVCodecTag * const *tags, enum AVCodecID id) { int i; for(i=0; tags && tags[i]; i++){ @@ -2430,14 +2430,14 @@ unsigned int av_codec_get_tag(const AVCodecTag * const *tags, enum CodecID id) return 0; } -enum CodecID av_codec_get_id(const AVCodecTag * const *tags, unsigned int tag) +enum AVCodecID av_codec_get_id(const AVCodecTag * const *tags, unsigned int tag) { int i; for(i=0; tags && tags[i]; i++){ - enum CodecID id= ff_codec_get_id(tags[i], tag); - if(id!=CODEC_ID_NONE) return id; + enum AVCodecID id= ff_codec_get_id(tags[i], tag); + if(id!=AV_CODEC_ID_NONE) return id; } - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } static void compute_chapters_end(AVFormatContext *s) @@ -2479,8 +2479,8 @@ static int tb_unreliable(AVCodecContext *c){ || c->time_base.den < 5L*c->time_base.num /* || c->codec_tag == AV_RL32("DIVX") || c->codec_tag == AV_RL32("XVID")*/ - || c->codec_id == CODEC_ID_MPEG2VIDEO - || c->codec_id == CODEC_ID_H264 + || c->codec_id == AV_CODEC_ID_MPEG2VIDEO + || c->codec_id == AV_CODEC_ID_H264 ) return 1; return 0; @@ -2780,7 +2780,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) for(i=0;i<ic->nb_streams;i++) { st = ic->streams[i]; if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { - if(st->codec->codec_id == CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_coded_sample){ + if(st->codec->codec_id == AV_CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_coded_sample){ uint32_t tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt); if(ff_find_pix_fmt(ff_raw_pix_fmt_tags, tag) == st->codec->pix_fmt) st->codec->codec_tag= tag; @@ -3223,7 +3223,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st) { const AVCodecTag *avctag; int n; - enum CodecID id = CODEC_ID_NONE; + enum AVCodecID id = AV_CODEC_ID_NONE; unsigned int tag = 0; /** @@ -3234,7 +3234,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st) */ for (n = 0; s->oformat->codec_tag[n]; n++) { avctag = s->oformat->codec_tag[n]; - while (avctag->id != CODEC_ID_NONE) { + while (avctag->id != AV_CODEC_ID_NONE) { if (avpriv_toupper4(avctag->tag) == avpriv_toupper4(st->codec->codec_tag)) { id = avctag->id; if (id == st->codec->codec_id) @@ -3245,7 +3245,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st) avctag++; } } - if (id != CODEC_ID_NONE) + if (id != AV_CODEC_ID_NONE) return 0; if (tag && (st->codec->strict_std_compliance >= FF_COMPLIANCE_NORMAL)) return 0; @@ -3314,7 +3314,7 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) if(s->oformat->codec_tag){ if( st->codec->codec_tag - && st->codec->codec_id == CODEC_ID_RAWVIDEO + && st->codec->codec_id == AV_CODEC_ID_RAWVIDEO && (av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id) == 0 || av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id) ==MKTAG('r', 'a', 'w', ' ')) && !validate_codec_tag(s, st)){ //the current rawvideo encoding system ends up setting the wrong codec_tag for avi/mov, we override it here @@ -4464,7 +4464,7 @@ int64_t ff_iso8601_to_unix_time(const char *datestr) #endif } -int avformat_query_codec(AVOutputFormat *ofmt, enum CodecID codec_id, int std_compliance) +int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance) { if (ofmt) { if (ofmt->query_codec) diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c index 1f1ec222b7..e411a257f1 100644 --- a/libavformat/vc1test.c +++ b/libavformat/vc1test.c @@ -59,7 +59,7 @@ static int vc1t_read_header(AVFormatContext *s) return -1; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_WMV3; + st->codec->codec_id = AV_CODEC_ID_WMV3; st->codec->extradata = av_malloc(VC1_EXTRADATA_SIZE); st->codec->extradata_size = VC1_EXTRADATA_SIZE; diff --git a/libavformat/vc1testenc.c b/libavformat/vc1testenc.c index 56c723c729..e084516b60 100644 --- a/libavformat/vc1testenc.c +++ b/libavformat/vc1testenc.c @@ -30,7 +30,7 @@ static int vc1test_write_header(AVFormatContext *s) AVCodecContext *avc = s->streams[0]->codec; AVIOContext *pb = s->pb; - if (avc->codec_id != CODEC_ID_WMV3) { + if (avc->codec_id != AV_CODEC_ID_WMV3) { av_log(s, AV_LOG_ERROR, "Only WMV3 is accepted!\n"); return -1; } @@ -87,8 +87,8 @@ AVOutputFormat ff_vc1t_muxer = { .long_name = NULL_IF_CONFIG_SMALL("VC-1 test bitstream"), .extensions = "rcv", .priv_data_size = sizeof(RCVContext), - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_WMV3, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_WMV3, .write_header = vc1test_write_header, .write_packet = vc1test_write_packet, .write_trailer = vc1test_write_trailer, diff --git a/libavformat/voc.c b/libavformat/voc.c index 53e02f9464..2a972344d3 100644 --- a/libavformat/voc.c +++ b/libavformat/voc.c @@ -25,13 +25,13 @@ const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A"; const AVCodecTag ff_voc_codec_tags[] = { - {CODEC_ID_PCM_U8, 0x00}, - {CODEC_ID_ADPCM_SBPRO_4, 0x01}, - {CODEC_ID_ADPCM_SBPRO_3, 0x02}, - {CODEC_ID_ADPCM_SBPRO_2, 0x03}, - {CODEC_ID_PCM_S16LE, 0x04}, - {CODEC_ID_PCM_ALAW, 0x06}, - {CODEC_ID_PCM_MULAW, 0x07}, - {CODEC_ID_ADPCM_CT, 0x0200}, - {CODEC_ID_NONE, 0}, + {AV_CODEC_ID_PCM_U8, 0x00}, + {AV_CODEC_ID_ADPCM_SBPRO_4, 0x01}, + {AV_CODEC_ID_ADPCM_SBPRO_3, 0x02}, + {AV_CODEC_ID_ADPCM_SBPRO_2, 0x03}, + {AV_CODEC_ID_PCM_S16LE, 0x04}, + {AV_CODEC_ID_PCM_ALAW, 0x06}, + {AV_CODEC_ID_PCM_MULAW, 0x07}, + {AV_CODEC_ID_ADPCM_CT, 0x0200}, + {AV_CODEC_ID_NONE, 0}, }; diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index 91e787ea10..62215fc735 100644 --- a/libavformat/vocdec.c +++ b/libavformat/vocdec.c @@ -137,12 +137,12 @@ ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) if (tmp_codec >= 0) { tmp_codec = ff_codec_get_id(ff_voc_codec_tags, tmp_codec); - if (dec->codec_id == CODEC_ID_NONE) + if (dec->codec_id == AV_CODEC_ID_NONE) dec->codec_id = tmp_codec; else if (dec->codec_id != tmp_codec) av_log(s, AV_LOG_WARNING, "Ignoring mid-stream change in audio codec\n"); - if (dec->codec_id == CODEC_ID_NONE) { - if (s->audio_codec_id == CODEC_ID_NONE) { + if (dec->codec_id == AV_CODEC_ID_NONE) { + if (s->audio_codec_id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_ERROR, "unknown codec tag\n"); return AVERROR(EINVAL); } diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index 5deda78579..d97cdc4c15 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -95,8 +95,8 @@ AVOutputFormat ff_voc_muxer = { .mime_type = "audio/x-voc", .extensions = "voc", .priv_data_size = sizeof(VocEncContext), - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_NONE, .write_header = voc_write_header, .write_packet = voc_write_packet, .write_trailer = voc_write_trailer, diff --git a/libavformat/vqf.c b/libavformat/vqf.c index 196cd39994..5fff84e049 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -105,7 +105,7 @@ static int vqf_read_header(AVFormatContext *s) header_size = avio_rb32(s->pb); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_TWINVQ; + st->codec->codec_id = AV_CODEC_ID_TWINVQ; st->start_time = 0; do { diff --git a/libavformat/wav.c b/libavformat/wav.c index caf01a2e7d..7b3724c733 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -219,8 +219,8 @@ AVOutputFormat ff_wav_muxer = { .mime_type = "audio/x-wav", .extensions = "wav", .priv_data_size = sizeof(WAVContext), - .audio_codec = CODEC_ID_PCM_S16LE, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_PCM_S16LE, + .video_codec = AV_CODEC_ID_NONE, .write_header = wav_write_header, .write_packet = wav_write_packet, .write_trailer = wav_write_trailer, @@ -496,7 +496,7 @@ static int wav_read_header(AVFormatContext *s) avio_r8(pb); vst->id = 1; vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_MJPEG; + vst->codec->codec_id = AV_CODEC_ID_MJPEG; vst->codec->width = avio_rl24(pb); vst->codec->height = avio_rl24(pb); size = avio_rl24(pb); @@ -672,10 +672,10 @@ static int wav_read_seek(AVFormatContext *s, st = s->streams[0]; switch (st->codec->codec_id) { - case CODEC_ID_MP2: - case CODEC_ID_MP3: - case CODEC_ID_AC3: - case CODEC_ID_DTS: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: + case AV_CODEC_ID_AC3: + case AV_CODEC_ID_DTS: /* use generic seeking with dynamically generated indexes */ return -1; default: diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c index 45bdde0c57..836f567a20 100644 --- a/libavformat/wc3movie.c +++ b/libavformat/wc3movie.c @@ -169,7 +169,7 @@ static int wc3_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 33, 1, WC3_FRAME_FPS); wc3->video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_XAN_WC3; + st->codec->codec_id = AV_CODEC_ID_XAN_WC3; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = wc3->width; st->codec->height = wc3->height; @@ -180,7 +180,7 @@ static int wc3_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 33, 1, WC3_FRAME_FPS); wc3->audio_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_PCM_S16LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; st->codec->codec_tag = 1; st->codec->channels = WC3_AUDIO_CHANNELS; st->codec->bits_per_coded_sample = WC3_AUDIO_BITS; diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c index 6dee8b535f..2762cba405 100644 --- a/libavformat/westwood_aud.c +++ b/libavformat/westwood_aud.c @@ -106,10 +106,10 @@ static int wsaud_read_header(AVFormatContext *s) av_log_ask_for_sample(s, "Stereo WS-SND1 is not supported.\n"); return AVERROR_PATCHWELCOME; } - st->codec->codec_id = CODEC_ID_WESTWOOD_SND1; + st->codec->codec_id = AV_CODEC_ID_WESTWOOD_SND1; break; case 99: - st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS; + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_WS; st->codec->bits_per_coded_sample = 4; st->codec->bit_rate = channels * sample_rate * 4; break; @@ -144,7 +144,7 @@ static int wsaud_read_packet(AVFormatContext *s, chunk_size = AV_RL16(&preamble[0]); - if (st->codec->codec_id == CODEC_ID_WESTWOOD_SND1) { + if (st->codec->codec_id == AV_CODEC_ID_WESTWOOD_SND1) { /* For Westwood SND1 audio we need to add the output size and input size to the start of the packet to match what is in VQA. Specifically, this is needed to signal when a packet should be diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c index 89a985605e..708f3e5fc3 100644 --- a/libavformat/westwood_vqa.c +++ b/libavformat/westwood_vqa.c @@ -94,7 +94,7 @@ static int wsvqa_read_header(AVFormatContext *s) st->start_time = 0; wsvqa->video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_WS_VQA; + st->codec->codec_id = AV_CODEC_ID_WS_VQA; st->codec->codec_tag = 0; /* no fourcc */ /* skip to the start of the VQA header */ @@ -211,15 +211,15 @@ static int wsvqa_read_packet(AVFormatContext *s, switch (chunk_type) { case SND0_TAG: if (wsvqa->bps == 16) - st->codec->codec_id = CODEC_ID_PCM_S16LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; else - st->codec->codec_id = CODEC_ID_PCM_U8; + st->codec->codec_id = AV_CODEC_ID_PCM_U8; break; case SND1_TAG: - st->codec->codec_id = CODEC_ID_WESTWOOD_SND1; + st->codec->codec_id = AV_CODEC_ID_WESTWOOD_SND1; break; case SND2_TAG: - st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS; + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_WS; st->codec->extradata_size = 2; st->codec->extradata = av_mallocz(2 + FF_INPUT_BUFFER_PADDING_SIZE); if (!st->codec->extradata) diff --git a/libavformat/wtv.c b/libavformat/wtv.c index 7a29309e58..d85c3cfc10 100644 --- a/libavformat/wtv.c +++ b/libavformat/wtv.c @@ -71,6 +71,6 @@ const ff_asf_guid ff_format_mpeg2_video = {0xE3,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}; const AVCodecGuid ff_video_guids[] = { - {CODEC_ID_MPEG2VIDEO, {0x26,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}}, - {CODEC_ID_NONE} + {AV_CODEC_ID_MPEG2VIDEO, {0x26,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}}, + {AV_CODEC_ID_NONE} }; diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index b21b0970f2..2999382ee4 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -430,7 +430,7 @@ static void get_attachment(AVFormatContext *s, AVIOContext *pb, int length) if (!st) goto done; av_dict_set(&st->metadata, "title", description, 0); - st->codec->codec_id = CODEC_ID_MJPEG; + st->codec->codec_id = AV_CODEC_ID_MJPEG; st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT; st->codec->extradata = av_mallocz(filesize); if (!st->codec->extradata) @@ -550,9 +550,9 @@ static void parse_mpeg1waveformatex(AVStream *st) { /* fwHeadLayer */ switch (AV_RL16(st->codec->extradata)) { - case 0x0001 : st->codec->codec_id = CODEC_ID_MP1; break; - case 0x0002 : st->codec->codec_id = CODEC_ID_MP2; break; - case 0x0004 : st->codec->codec_id = CODEC_ID_MP3; break; + case 0x0001 : st->codec->codec_id = AV_CODEC_ID_MP1; break; + case 0x0002 : st->codec->codec_id = AV_CODEC_ID_MP2; break; + case 0x0004 : st->codec->codec_id = AV_CODEC_ID_MP3; break; } st->codec->bit_rate = AV_RL32(st->codec->extradata + 2); /* dwHeadBitrate */ @@ -649,7 +649,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, av_log(s, AV_LOG_WARNING, "MPEG1WAVEFORMATEX underflow\n"); } else { st->codec->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids, subtype); - if (st->codec->codec_id == CODEC_ID_NONE) + if (st->codec->codec_id == AV_CODEC_ID_NONE) av_log(s, AV_LOG_WARNING, "unknown subtype:"FF_PRI_GUID"\n", FF_ARG_GUID(subtype)); } return st; @@ -674,7 +674,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, } else { st->codec->codec_id = ff_codec_guid_get_id(ff_video_guids, subtype); } - if (st->codec->codec_id == CODEC_ID_NONE) + if (st->codec->codec_id == AV_CODEC_ID_NONE) av_log(s, AV_LOG_WARNING, "unknown subtype:"FF_PRI_GUID"\n", FF_ARG_GUID(subtype)); return st; } else if (!ff_guidcmp(mediatype, mediatype_mpeg2_pes) && @@ -685,7 +685,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, if (ff_guidcmp(formattype, ff_format_none)) av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype)); avio_skip(pb, size); - st->codec->codec_id = CODEC_ID_DVB_SUBTITLE; + st->codec->codec_id = AV_CODEC_ID_DVB_SUBTITLE; return st; } else if (!ff_guidcmp(mediatype, mediatype_mstvcaption) && (!ff_guidcmp(subtype, mediasubtype_teletext) || !ff_guidcmp(subtype, mediasubtype_dtvccdata))) { @@ -695,7 +695,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, if (ff_guidcmp(formattype, ff_format_none)) av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype)); avio_skip(pb, size); - st->codec->codec_id = CODEC_ID_DVB_TELETEXT; + st->codec->codec_id = AV_CODEC_ID_DVB_TELETEXT; return st; } else if (!ff_guidcmp(mediatype, mediatype_mpeg2_sections) && !ff_guidcmp(subtype, mediasubtype_mpeg2_sections)) { diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index be83c54f71..1f2c7eb180 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -116,7 +116,7 @@ static int write_pad(AVIOContext *pb, int size) static const ff_asf_guid *get_codec_guid(enum CodecID id, const AVCodecGuid *av_guid) { int i; - for (i = 0; av_guid[i].id != CODEC_ID_NONE; i++) { + for (i = 0; av_guid[i].id != AV_CODEC_ID_NONE; i++) { if (id == av_guid[i].id) return &(av_guid[i].guid); } @@ -713,8 +713,8 @@ AVOutputFormat ff_wtv_muxer = { .long_name = NULL_IF_CONFIG_SMALL("Windows Television (WTV)"), .extensions = "wtv", .priv_data_size = sizeof(WtvContext), - .audio_codec = CODEC_ID_AC3, - .video_codec = CODEC_ID_MPEG2VIDEO, + .audio_codec = AV_CODEC_ID_AC3, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_header = write_header, .write_packet = write_packet, .write_trailer = write_trailer, diff --git a/libavformat/wv.c b/libavformat/wv.c index 95d5044dbd..50e5e5383b 100644 --- a/libavformat/wv.c +++ b/libavformat/wv.c @@ -248,7 +248,7 @@ static int wv_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_WAVPACK; + st->codec->codec_id = AV_CODEC_ID_WAVPACK; st->codec->channels = wc->chan; st->codec->channel_layout = wc->chmask; st->codec->sample_rate = wc->rate; diff --git a/libavformat/wvenc.c b/libavformat/wvenc.c index 0f9bbf222b..d225ed4280 100644 --- a/libavformat/wvenc.c +++ b/libavformat/wvenc.c @@ -38,7 +38,7 @@ static int write_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "only one stream is supported\n"); return AVERROR(EINVAL); } - if (codec->codec_id != CODEC_ID_WAVPACK) { + if (codec->codec_id != AV_CODEC_ID_WAVPACK) { av_log(s, AV_LOG_ERROR, "unsupported codec\n"); return AVERROR(EINVAL); } @@ -92,8 +92,8 @@ AVOutputFormat ff_wv_muxer = { .long_name = NULL_IF_CONFIG_SMALL("WavPack"), .priv_data_size = sizeof(WVMuxContext), .extensions = "wv", - .audio_codec = CODEC_ID_WAVPACK, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_WAVPACK, + .video_codec = AV_CODEC_ID_NONE, .write_header = write_header, .write_packet = write_packet, .write_trailer = write_trailer, diff --git a/libavformat/xa.c b/libavformat/xa.c index f9d9f47ba3..e3d36e61b5 100644 --- a/libavformat/xa.c +++ b/libavformat/xa.c @@ -74,7 +74,7 @@ static int xa_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ADPCM_EA_MAXIS_XA; + st->codec->codec_id = AV_CODEC_ID_ADPCM_EA_MAXIS_XA; avio_skip(pb, 4); /* Skip the XA ID */ xa->out_size = avio_rl32(pb); avio_skip(pb, 2); /* Skip the tag */ diff --git a/libavformat/xmv.c b/libavformat/xmv.c index b4accdf1cd..f250aad0b2 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -80,7 +80,7 @@ typedef struct XMVAudioPacket { uint16_t block_align; ///< Bytes per compressed block. uint16_t block_samples; ///< Decompressed samples per compressed block. - enum CodecID codec_id; ///< The codec ID of the compression scheme. + enum AVCodecID codec_id; ///< The codec ID of the compression scheme. uint32_t data_size; ///< The size of the remaining audio data. uint64_t data_offset; ///< The offset of the audio data within the file. @@ -155,7 +155,7 @@ static int xmv_read_header(AVFormatContext *s) avpriv_set_pts_info(vst, 32, 1, 1000); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_WMV2; + vst->codec->codec_id = AV_CODEC_ID_WMV2; vst->codec->codec_tag = MKBETAG('W', 'M', 'V', '2'); vst->codec->width = avio_rl32(pb); vst->codec->height = avio_rl32(pb); diff --git a/libavformat/xwma.c b/libavformat/xwma.c index f8561d1522..04c36296d1 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -84,7 +84,7 @@ static int xwma_read_header(AVFormatContext *s) * extradata for that. Thus, ask the user for feedback, but try to go on * anyway. */ - if (st->codec->codec_id != CODEC_ID_WMAV2) { + if (st->codec->codec_id != AV_CODEC_ID_WMAV2) { av_log(s, AV_LOG_WARNING, "unexpected codec (tag 0x04%x; id %d)\n", st->codec->codec_tag, st->codec->codec_id); av_log_ask_for_sample(s, NULL); diff --git a/libavformat/yop.c b/libavformat/yop.c index 7fd28af0e2..1185a3efc7 100644 --- a/libavformat/yop.c +++ b/libavformat/yop.c @@ -77,14 +77,14 @@ static int yop_read_header(AVFormatContext *s) // Audio audio_dec = audio_stream->codec; audio_dec->codec_type = AVMEDIA_TYPE_AUDIO; - audio_dec->codec_id = CODEC_ID_ADPCM_IMA_APC; + audio_dec->codec_id = AV_CODEC_ID_ADPCM_IMA_APC; audio_dec->channels = 1; audio_dec->sample_rate = 22050; // Video video_dec = video_stream->codec; video_dec->codec_type = AVMEDIA_TYPE_VIDEO; - video_dec->codec_id = CODEC_ID_YOP; + video_dec->codec_id = AV_CODEC_ID_YOP; avio_skip(pb, 6); diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 547b0dfcc0..5b6d2df282 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -214,7 +214,7 @@ static int yuv4_write_header(AVFormatContext *s) if (s->nb_streams != 1) return AVERROR(EIO); - if (s->streams[0]->codec->codec_id != CODEC_ID_RAWVIDEO) { + if (s->streams[0]->codec->codec_id != AV_CODEC_ID_RAWVIDEO) { av_log(s, AV_LOG_ERROR, "A non-rawvideo stream was selected, but yuv4mpeg only handles rawvideo streams\n"); return AVERROR(EINVAL); @@ -269,8 +269,8 @@ AVOutputFormat ff_yuv4mpegpipe_muxer = { .long_name = NULL_IF_CONFIG_SMALL("YUV4MPEG pipe"), .extensions = "y4m", .priv_data_size = sizeof(int), - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_RAWVIDEO, .write_header = yuv4_write_header, .write_packet = yuv4_write_packet, .flags = AVFMT_RAWPICTURE, @@ -485,7 +485,7 @@ static int yuv4_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, rated, raten); st->codec->pix_fmt = pix_fmt; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_RAWVIDEO; + st->codec->codec_id = AV_CODEC_ID_RAWVIDEO; st->sample_aspect_ratio = (AVRational){ aspectn, aspectd }; st->codec->chroma_sample_location = chroma_sample_location; |