From d8bde114fd9685111274713c03985c72de3377b1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 9 Mar 2013 08:49:56 +0100 Subject: Prefix CODEC_ID_ with AV_ The old names have been deprecated a while ago, but were needed for supporting older ffmpeg/libav versions. The deprecated identifiers have been removed from recent Libav and FFmpeg git. This change breaks compatibility with Libav 0.8.x and equivalent FFmpeg releases. --- audio/decode/ad_lavc.c | 2 +- audio/decode/ad_spdif.c | 28 ++++++++++++------------ compat/libav.h | 2 +- core/av_common.c | 58 ++++++++++++++++++++++++------------------------- demux/codec_tags.c | 2 +- demux/demux.c | 20 ++++++++--------- demux/demux_lavf.c | 18 +++++++-------- sub/sd_lavc.c | 10 ++++----- video/image_writer.c | 12 +++++----- 9 files changed, 76 insertions(+), 76 deletions(-) diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index 1f59280275..382d4eacc5 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -160,7 +160,7 @@ static int setup_format(sh_audio_t *sh_audio, int container_samplerate = sh_audio->container_out_samplerate; if (!container_samplerate && sh_audio->wf) container_samplerate = sh_audio->wf->nSamplesPerSec; - if (lavc_context->codec_id == CODEC_ID_AAC + if (lavc_context->codec_id == AV_CODEC_ID_AAC && samplerate == 2 * container_samplerate) broken_srate = true; else if (container_samplerate) diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c index 128b1bd8a9..ad735dde7d 100644 --- a/audio/decode/ad_spdif.c +++ b/audio/decode/ad_spdif.c @@ -73,13 +73,13 @@ static int preinit(sh_audio_t *sh) } static int codecs[] = { - CODEC_ID_AAC, - CODEC_ID_AC3, - CODEC_ID_DTS, - CODEC_ID_EAC3, - CODEC_ID_MP3, - CODEC_ID_TRUEHD, - CODEC_ID_NONE + AV_CODEC_ID_AAC, + AV_CODEC_ID_AC3, + AV_CODEC_ID_DTS, + AV_CODEC_ID_EAC3, + AV_CODEC_ID_MP3, + AV_CODEC_ID_TRUEHD, + AV_CODEC_ID_NONE }; static int init(sh_audio_t *sh, const char *decoder) @@ -149,21 +149,21 @@ static int init(sh_audio_t *sh, const char *decoder) sh->ds->buffer_pos -= in_size; switch (lavf_ctx->streams[0]->codec->codec_id) { - case CODEC_ID_AAC: + case AV_CODEC_ID_AAC: spdif_ctx->iec61937_packet_size = 16384; sh->sample_format = AF_FORMAT_IEC61937_LE; sh->samplerate = srate; sh->channels = 2; sh->i_bps = bps; break; - case CODEC_ID_AC3: + case AV_CODEC_ID_AC3: spdif_ctx->iec61937_packet_size = 6144; sh->sample_format = AF_FORMAT_AC3_LE; sh->samplerate = srate; sh->channels = 2; sh->i_bps = bps; break; - case CODEC_ID_DTS: + case AV_CODEC_ID_DTS: if(sh->opts->dtshd) { opt = av_opt_find(&lavf_ctx->oformat->priv_class, "dtshd_rate", NULL, 0, 0); @@ -185,21 +185,21 @@ static int init(sh_audio_t *sh, const char *decoder) sh->i_bps = bps; } break; - case CODEC_ID_EAC3: + case AV_CODEC_ID_EAC3: spdif_ctx->iec61937_packet_size = 24576; sh->sample_format = AF_FORMAT_IEC61937_LE; sh->samplerate = 192000; sh->channels = 2; sh->i_bps = bps; break; - case CODEC_ID_MP3: + case AV_CODEC_ID_MP3: spdif_ctx->iec61937_packet_size = 4608; sh->sample_format = AF_FORMAT_MPEG2; sh->samplerate = srate; sh->channels = 2; sh->i_bps = bps; break; - case CODEC_ID_TRUEHD: + case AV_CODEC_ID_TRUEHD: spdif_ctx->iec61937_packet_size = 61440; sh->sample_format = AF_FORMAT_IEC61937_LE; sh->samplerate = 192000; @@ -307,7 +307,7 @@ static void uninit(sh_audio_t *sh) static void add_decoders(struct mp_decoder_list *list) { - for (int n = 0; codecs[n] != CODEC_ID_NONE; n++) { + for (int n = 0; codecs[n] != AV_CODEC_ID_NONE; n++) { const char *format = mp_codec_from_av_codec_id(codecs[n]); if (format) { mp_add_decoder(list, "spdif", format, format, diff --git a/compat/libav.h b/compat/libav.h index 62ce1bb529..ef588fe025 100644 --- a/compat/libav.h +++ b/compat/libav.h @@ -29,7 +29,7 @@ #endif #if (LIBAVUTIL_VERSION_MICRO < 100) || (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 53, 100)) -#define AV_CODEC_ID_SUBRIP CODEC_ID_TEXT +#define AV_CODEC_ID_SUBRIP AV_CODEC_ID_TEXT #endif #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 36, 0) diff --git a/core/av_common.c b/core/av_common.c index 87baf1ac23..20ca02f484 100644 --- a/core/av_common.c +++ b/core/av_common.c @@ -90,11 +90,11 @@ void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type) int mp_codec_to_av_codec_id(const char *codec) { - int id = CODEC_ID_NONE; + int id = AV_CODEC_ID_NONE; const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name(codec); if (desc) id = desc->id; - if (id == CODEC_ID_NONE) { + if (id == AV_CODEC_ID_NONE) { AVCodec *avcodec = avcodec_find_decoder_by_name(codec); if (avcodec) id = avcodec->id; @@ -124,37 +124,37 @@ struct mp_av_codec { }; // Some decoders have a different name from the canonical codec name, for -// example the codec "dts" CODEC_ID_DTS has the decoder named "dca", and +// example the codec "dts" AV_CODEC_ID_DTS has the decoder named "dca", and // avcodec_find_decoder_by_name("dts") would return 0. We always want the // canonical name. // On newer lavc versions, avcodec_descriptor_get_by_name("dts") will return -// CODEC_ID_DTS, which is what we want, but for older versions we need this +// AV_CODEC_ID_DTS, which is what we want, but for older versions we need this // lookup table. struct mp_av_codec mp_av_codec_id_list[] = { - {"ra_144", CODEC_ID_RA_144}, - {"ra_288", CODEC_ID_RA_288}, - {"smackaudio", CODEC_ID_SMACKAUDIO}, - {"dts", CODEC_ID_DTS}, - {"musepack7", CODEC_ID_MUSEPACK7}, - {"musepack8", CODEC_ID_MUSEPACK8}, - {"amr_nb", CODEC_ID_AMR_NB}, - {"amr_wb", CODEC_ID_AMR_WB}, - {"adpcm_g722", CODEC_ID_ADPCM_G722}, - {"adpcm_g726", CODEC_ID_ADPCM_G726}, - {"westwood_snd1", CODEC_ID_WESTWOOD_SND1}, - {"mp4als", CODEC_ID_MP4ALS}, - {"vixl", CODEC_ID_VIXL}, - {"flv1", CODEC_ID_FLV1}, - {"msmpeg4v3", CODEC_ID_MSMPEG4V3}, - {"jpeg2000", CODEC_ID_JPEG2000}, - {"ulti", CODEC_ID_ULTI}, - {"smackvideo", CODEC_ID_SMACKVIDEO}, - {"tscc", CODEC_ID_TSCC}, - {"cscd", CODEC_ID_CSCD}, - {"tgv", CODEC_ID_TGV}, - {"roq", CODEC_ID_ROQ}, - {"idcin", CODEC_ID_IDCIN}, - {"ws_vqa", CODEC_ID_WS_VQA}, + {"ra_144", AV_CODEC_ID_RA_144}, + {"ra_288", AV_CODEC_ID_RA_288}, + {"smackaudio", AV_CODEC_ID_SMACKAUDIO}, + {"dts", AV_CODEC_ID_DTS}, + {"musepack7", AV_CODEC_ID_MUSEPACK7}, + {"musepack8", AV_CODEC_ID_MUSEPACK8}, + {"amr_nb", AV_CODEC_ID_AMR_NB}, + {"amr_wb", AV_CODEC_ID_AMR_WB}, + {"adpcm_g722", AV_CODEC_ID_ADPCM_G722}, + {"adpcm_g726", AV_CODEC_ID_ADPCM_G726}, + {"westwood_snd1", AV_CODEC_ID_WESTWOOD_SND1}, + {"mp4als", AV_CODEC_ID_MP4ALS}, + {"vixl", AV_CODEC_ID_VIXL}, + {"flv1", AV_CODEC_ID_FLV1}, + {"msmpeg4v3", AV_CODEC_ID_MSMPEG4V3}, + {"jpeg2000", AV_CODEC_ID_JPEG2000}, + {"ulti", AV_CODEC_ID_ULTI}, + {"smackvideo", AV_CODEC_ID_SMACKVIDEO}, + {"tscc", AV_CODEC_ID_TSCC}, + {"cscd", AV_CODEC_ID_CSCD}, + {"tgv", AV_CODEC_ID_TGV}, + {"roq", AV_CODEC_ID_ROQ}, + {"idcin", AV_CODEC_ID_IDCIN}, + {"ws_vqa", AV_CODEC_ID_WS_VQA}, {0}, }; @@ -165,7 +165,7 @@ int mp_codec_to_av_codec_id(const char *codec) return mp_av_codec_id_list[n].codec_id; } AVCodec *avcodec = avcodec_find_decoder_by_name(codec); - return avcodec ? avcodec->id : CODEC_ID_NONE; + return avcodec ? avcodec->id : AV_CODEC_ID_NONE; } const char *mp_codec_from_av_codec_id(int codec_id) diff --git a/demux/codec_tags.c b/demux/codec_tags.c index 429da5582c..d1a6cee65f 100644 --- a/demux/codec_tags.c +++ b/demux/codec_tags.c @@ -349,7 +349,7 @@ static const char *lookup_tag(const struct mp_codec_tag *mp_table, } const struct AVCodecTag *av_tags[] = {av_table, NULL}; int id = av_codec_get_id(av_tags, tag); - return id == CODEC_ID_NONE ? NULL : mp_codec_from_av_codec_id(id); + return id == AV_CODEC_ID_NONE ? NULL : mp_codec_from_av_codec_id(id); } void mp_set_video_codec_from_tag(struct sh_video *sh) diff --git a/demux/demux.c b/demux/demux.c index a99a050ee2..eaf1062cb2 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -496,18 +496,18 @@ void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp) static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parser, const char *format) { - enum CodecID codec_id = mp_codec_to_av_codec_id(format); + enum AVCodecID codec_id = mp_codec_to_av_codec_id(format); switch (codec_id) { - case CODEC_ID_AAC_LATM: - case CODEC_ID_AC3: - case CODEC_ID_EAC3: - case CODEC_ID_DTS: - case CODEC_ID_FLAC: - case CODEC_ID_MLP: - case CODEC_ID_MP3: - case CODEC_ID_MP2: - case CODEC_ID_TRUEHD: + case AV_CODEC_ID_AAC_LATM: + case AV_CODEC_ID_AC3: + case AV_CODEC_ID_EAC3: + case AV_CODEC_ID_DTS: + case AV_CODEC_ID_FLAC: + case AV_CODEC_ID_MLP: + case AV_CODEC_ID_MP3: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_TRUEHD: *avctx = avcodec_alloc_context3(NULL); if (!*avctx) return; diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 50f9f1e8f0..843bd171e4 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -403,22 +403,22 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) case AVMEDIA_TYPE_SUBTITLE: { sh_sub_t *sh_sub; char type; - if (codec->codec_id == CODEC_ID_TEXT || + if (codec->codec_id == AV_CODEC_ID_TEXT || codec->codec_id == AV_CODEC_ID_SUBRIP) type = 't'; - else if (codec->codec_id == CODEC_ID_MOV_TEXT) + else if (codec->codec_id == AV_CODEC_ID_MOV_TEXT) type = 'm'; - else if (codec->codec_id == CODEC_ID_SSA) + else if (codec->codec_id == AV_CODEC_ID_SSA) type = 'a'; - else if (codec->codec_id == CODEC_ID_DVD_SUBTITLE) + else if (codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE) type = 'v'; - else if (codec->codec_id == CODEC_ID_XSUB) + else if (codec->codec_id == AV_CODEC_ID_XSUB) type = 'x'; - else if (codec->codec_id == CODEC_ID_DVB_SUBTITLE) + else if (codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE) type = 'b'; - else if (codec->codec_id == CODEC_ID_DVB_TELETEXT) + else if (codec->codec_id == AV_CODEC_ID_DVB_TELETEXT) type = 'd'; - else if (codec->codec_id == CODEC_ID_HDMV_PGS_SUBTITLE) + else if (codec->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE) type = 'p'; else break; @@ -440,7 +440,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) AVDictionaryEntry *ftag = av_dict_get(st->metadata, "filename", NULL, 0); char *filename = ftag ? ftag->value : NULL; - if (st->codec->codec_id == CODEC_ID_TTF) + if (st->codec->codec_id == AV_CODEC_ID_TTF) demuxer_add_attachment(demuxer, bstr0(filename), bstr0("application/x-truetype-font"), (struct bstr){codec->extradata, diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index f1f93b480e..e3f7af408a 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -65,16 +65,16 @@ static int init(struct sh_sub *sh, struct osd_state *osd) if (sh->initialized) return 0; struct sd_lavc_priv *priv = talloc_zero(NULL, struct sd_lavc_priv); - enum CodecID cid = CODEC_ID_NONE; + enum AVCodecID cid = AV_CODEC_ID_NONE; switch (sh->type) { case 'b': - cid = CODEC_ID_DVB_SUBTITLE; break; + cid = AV_CODEC_ID_DVB_SUBTITLE; break; case 'p': - cid = CODEC_ID_HDMV_PGS_SUBTITLE; break; + cid = AV_CODEC_ID_HDMV_PGS_SUBTITLE; break; case 'x': - cid = CODEC_ID_XSUB; break; + cid = AV_CODEC_ID_XSUB; break; case 'v': - cid = CODEC_ID_DVD_SUBTITLE; break; + cid = AV_CODEC_ID_DVD_SUBTITLE; break; } AVCodecContext *ctx = NULL; AVCodec *sub_codec = avcodec_find_decoder(cid); diff --git a/video/image_writer.c b/video/image_writer.c index 7802923e15..a65024124e 100644 --- a/video/image_writer.c +++ b/video/image_writer.c @@ -105,7 +105,7 @@ static int write_lavc(struct image_writer_ctx *ctx, mp_image_t *image, FILE *fp) avctx->width = image->w; avctx->height = image->h; avctx->pix_fmt = imgfmt2pixfmt(image->imgfmt); - if (ctx->writer->lavc_codec == CODEC_ID_PNG) + if (ctx->writer->lavc_codec == AV_CODEC_ID_PNG) avctx->compression_level = ctx->opts->png_compression; if (avcodec_open2(avctx, codec, NULL) < 0) { @@ -208,18 +208,18 @@ static int write_jpeg(struct image_writer_ctx *ctx, mp_image_t *image, FILE *fp) #endif static const struct img_writer img_writers[] = { - { "png", write_lavc, .lavc_codec = CODEC_ID_PNG }, - { "ppm", write_lavc, .lavc_codec = CODEC_ID_PPM }, + { "png", write_lavc, .lavc_codec = AV_CODEC_ID_PNG }, + { "ppm", write_lavc, .lavc_codec = AV_CODEC_ID_PPM }, { "pgm", write_lavc, - .lavc_codec = CODEC_ID_PGM, + .lavc_codec = AV_CODEC_ID_PGM, .pixfmts = (int[]) { IMGFMT_Y8, 0 }, }, { "pgmyuv", write_lavc, - .lavc_codec = CODEC_ID_PGMYUV, + .lavc_codec = AV_CODEC_ID_PGMYUV, .pixfmts = (int[]) { IMGFMT_420P, 0 }, }, { "tga", write_lavc, - .lavc_codec = CODEC_ID_TARGA, + .lavc_codec = AV_CODEC_ID_TARGA, .pixfmts = (int[]) { IMGFMT_BGR24, IMGFMT_BGRA, IMGFMT_BGR15_LE, IMGFMT_Y8, 0}, }, -- cgit v1.2.3