From 628ea9eeb046bfa68fa481eaad96cddf8c25caa1 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Sep 2020 17:40:43 +0200 Subject: [PATCH] ffmpeg: delete dead code --- .../media/plugins/ffmpeg/CodecTable.cpp | 90 ------------------- 1 file changed, 90 deletions(-) diff --git a/src/add-ons/media/plugins/ffmpeg/CodecTable.cpp b/src/add-ons/media/plugins/ffmpeg/CodecTable.cpp index b27337f53e..acd8ea7c2f 100644 --- a/src/add-ons/media/plugins/ffmpeg/CodecTable.cpp +++ b/src/add-ons/media/plugins/ffmpeg/CodecTable.cpp @@ -12,16 +12,6 @@ extern "C" { } -typedef AVCodecID CodecID; - - -//XXX: newer versions have it in libavformat/internal.h -typedef struct AVCodecTag { - CodecID id; - unsigned int tag; -} AVCodecTag; - - struct AVInputFamily gAVInputFamilies[] = { { B_AIFF_FORMAT_FAMILY, "aiff" }, { B_AVI_FORMAT_FAMILY, "avi" }, @@ -34,86 +24,6 @@ static const int32 sMaxFormatCount = 1024; media_format gAVCodecFormats[sMaxFormatCount]; -status_t -register_avcodec_tags(media_format_family family, const char *avname, int &index) -{ - AVInputFormat *inputFormat = av_find_input_format(avname); - if (inputFormat == NULL) - return B_MEDIA_NO_HANDLER; - - BMediaFormats mediaFormats; - if (mediaFormats.InitCheck() != B_OK) - return B_ERROR; - - for (int tagSet = 0; inputFormat->codec_tag[tagSet]; tagSet++) { - const AVCodecTag *tags = inputFormat->codec_tag[tagSet]; - if (tags == NULL) - continue; - - for (; tags->id != AV_CODEC_ID_NONE; tags++) { - // XXX: we might want to keep some strange PCM codecs too... - // skip unwanted codec tags - if (tags->tag == AV_CODEC_ID_RAWVIDEO - || (tags->tag >= AV_CODEC_ID_PCM_S16LE - && tags->tag < AV_CODEC_ID_ADPCM_IMA_QT) - || tags->tag >= AV_CODEC_ID_DVD_SUBTITLE) - continue; - - if (index >= sMaxFormatCount) { - fprintf(stderr, "Maximum format count reached for auto-generated " - "AVCodec to media_format mapping, but there are still more " - "AVCodecs compiled into libavcodec!\n"); - break; - } - - media_format format; - // Determine media type - if (tags->tag < AV_CODEC_ID_PCM_S16LE) - format.type = B_MEDIA_ENCODED_VIDEO; - else - format.type = B_MEDIA_ENCODED_AUDIO; - - media_format_description description; - memset(&description, 0, sizeof(description)); - - // Hard-code everything to B_MISC_FORMAT_FAMILY to ease matching - // later on. - description.family = family; - switch (family) { - case B_AIFF_FORMAT_FAMILY: - description.u.aiff.codec = tags->tag; - break; - case B_AVI_FORMAT_FAMILY: - description.u.avi.codec = tags->tag; - break; - case B_MPEG_FORMAT_FAMILY: - description.u.mpeg.id = tags->tag; - break; - case B_QUICKTIME_FORMAT_FAMILY: - description.u.quicktime.codec = tags->tag; - break; - case B_WAV_FORMAT_FAMILY: - description.u.wav.codec = tags->tag; - break; - default: - break; - } - - format.require_flags = 0; - format.deny_flags = B_MEDIA_MAUI_UNDEFINED_FLAGS; - - if (mediaFormats.MakeFormatFor(&description, 1, &format) != B_OK) - return B_ERROR; - - gAVCodecFormats[index] = format; - - index++; - } - } - return B_OK; -} - - status_t build_decoder_formats(media_format** _formats, size_t* _count) {