lavc: add avcodec_get_type() for mapping codec_id -> type.

Anton Khirnov committed 15 years ago

Commit bca06e71 parent 7f5bf4f4 files · +27 −2Browse files

Unified · Split

4 files

@@ -13,6 +13,9 @@ libavutil: 2011-04-18 · 12 unmodified lines
13		13
14	API changes, most recent first:	14	API changes, most recent first:
15		15
		16	2011-08-xx - xxxxxxx - lavc 53.8.0
		17	Add avcodec_get_type().
		18
16	2011-08-06 - 2f63440 - lavf 53.4.0	19	2011-08-06 - 2f63440 - lavf 53.4.0
17	Add error_recognition to AVFormatContext.	20	Add error_recognition to AVFormatContext.
18		21

     CODEC_ID_DFA,
     /* various PCM "codecs" */
+    CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
     CODEC_ID_PCM_S16LE= 0x10000,
     CODEC_ID_PCM_S16BE,
     CODEC_ID_PCM_U16LE,
     CODEC_ID_QDMC,
     /* subtitle codecs */
+    CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
     CODEC_ID_DVD_SUBTITLE= 0x17000,
     CODEC_ID_DVB_SUBTITLE,
     CODEC_ID_TEXT,  ///< raw UTF-8 text
     CODEC_ID_SRT,
     /* other specific kind of codecs (generally used for attachments) */
+    CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
     CODEC_ID_TTF= 0x18000,
     CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
  */
 int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
+/**
+ * Get the type of the given codec.
+ */
+enum AVMediaType avcodec_get_type(enum CodecID codec_id);
 #endif /* AVCODEC_AVCODEC_H */

@@ -1301,3 +1301,17 @@ int avcodec_thread_init(AVCodecContext *s, int thread_count) · 1300 unmodified lines
1301	return ff_thread_init(s);	1301	return ff_thread_init(s);
1302	}	1302	}
1303	#endif	1303	#endif
		1304
		1305	enum AVMediaType avcodec_get_type(enum CodecID codec_id)
		1306	{
		1307	if (codec_id <= CODEC_ID_NONE)
		1308	return AVMEDIA_TYPE_UNKNOWN;
		1309	else if (codec_id < CODEC_ID_FIRST_AUDIO)
		1310	return AVMEDIA_TYPE_VIDEO;
		1311	else if (codec_id < CODEC_ID_FIRST_SUBTITLE)
		1312	return AVMEDIA_TYPE_AUDIO;
		1313	else if (codec_id < CODEC_ID_FIRST_UNKNOWN)
		1314	return AVMEDIA_TYPE_SUBTITLE;
		1315
		1316	return AVMEDIA_TYPE_UNKNOWN;
		1317	}

@@ -21,8 +21,8 @@ · 20 unmodified lines
21	#define AVCODEC_VERSION_H	21	#define AVCODEC_VERSION_H
22		22
23	#define LIBAVCODEC_VERSION_MAJOR 53	23	#define LIBAVCODEC_VERSION_MAJOR 53
24	#define LIBAVCODEC_VERSION_MINOR 7	24	#define LIBAVCODEC_VERSION_MINOR 8
25	#define LIBAVCODEC_VERSION_MICRO 1	25	#define LIBAVCODEC_VERSION_MICRO 0
26		26
27	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \	27	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
28	LIBAVCODEC_VERSION_MINOR, \	28	LIBAVCODEC_VERSION_MINOR, \

Keyboard shortcuts