lavu: add av_get_pix_fmt_name() convenience function

Also deprecate avcodec_get_pix_fmt_name() in its favor.

Stefano Sabatini committed 15 years ago

Commit 8f653e21 parent 26513857 files · +34 −5Browse files

Unified · Split

7 files

@@ -13,6 +13,10 @@ 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-05-XX - xxxxxx - lavu 51.X.0 - pixdesc.h
		17	Add av_get_pix_fmt_name() in libavutil/pixdesc.h, and deprecate
		18	avcodec_get_pix_fmt_name() in libavcodec/avcodec.h in its favor.
		19
16	2011-05-25 - 30315a8 - lavf 53.1.0 - avformat.h	20	2011-05-25 - 30315a8 - lavf 53.1.0 - avformat.h
17	Add fps_probe_size to AVFormatContext.	21	Add fps_probe_size to AVFormatContext.
18		22

@@ -3306,7 +3306,15 @@ int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, · 3305 unmodified lines
3306	*/	3306	*/
3307	int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);	3307	int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);
3308	void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int h_shift, int v_shift);	3308	void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int h_shift, int v_shift);
		3309
		3310	#if FF_API_GET_PIX_FMT_NAME
		3311	/**
		3312	* @deprecated Deprecated in favor of av_get_pix_fmt_name().
		3313	*/
		3314	attribute_deprecated
3309	const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);	3315	const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);
		3316	#endif
		3317
3310	void avcodec_set_dimensions(AVCodecContext *s, int width, int height);	3318	void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
3311		3319
3312	/**	3320	/**

     *v_shift = av_pix_fmt_descriptors[pix_fmt].log2_chroma_h;
 }
+#if FF_API_GET_PIX_FMT_NAME
 const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt)
 {
-    if ((unsigned)pix_fmt >= PIX_FMT_NB)
+    return av_get_pix_fmt_name(pix_fmt);
-        return NULL;
-    else
-        return av_pix_fmt_descriptors[pix_fmt].name;
 }
+#endif
 int ff_is_hwaccel_pix_fmt(enum PixelFormat pix_fmt)
 {

@@ -65,5 +65,8 @@ · 64 unmodified lines
65	#ifndef FF_API_FLAC_GLOBAL_OPTS	65	#ifndef FF_API_FLAC_GLOBAL_OPTS
66	#define FF_API_FLAC_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)	66	#define FF_API_FLAC_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
67	#endif	67	#endif
		68	#ifndef FF_API_GET_PIX_FMT_NAME
		69	#define FF_API_GET_PIX_FMT_NAME (LIBAVCODEC_VERSION_MAJOR < 54)
		70	#endif
68		71
69	#endif /* AVCODEC_VERSION_H */	72	#endif /* AVCODEC_VERSION_H */

@@ -40,7 +40,7 @@ · 39 unmodified lines
40	#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)	40	#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
41		41
42	#define LIBAVUTIL_VERSION_MAJOR 51	42	#define LIBAVUTIL_VERSION_MAJOR 51
43	#define LIBAVUTIL_VERSION_MINOR 1	43	#define LIBAVUTIL_VERSION_MINOR 2
44	#define LIBAVUTIL_VERSION_MICRO 0	44	#define LIBAVUTIL_VERSION_MICRO 0
45		45
46	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	46	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

     return PIX_FMT_NONE;
 }
+const char *av_get_pix_fmt_name(enum PixelFormat pix_fmt)
+{
+    return (unsigned)pix_fmt < PIX_FMT_NB ?
+        av_pix_fmt_descriptors[pix_fmt].name : NULL;
+}
 #if HAVE_BIGENDIAN
 #   define X_NE(be, le) be
 #else

 #define AVUTIL_PIXDESC_H
 #include <inttypes.h>
+#include "pixfmt.h"
 typedef struct AVComponentDescriptor{
     uint16_t plane        :2;            ///< which of the 4 planes contains the component
  */
 enum PixelFormat av_get_pix_fmt(const char *name);
+/**
+ * Return the short name for a pixel format, NULL in case pix_fmt is
+ * unknown.
+ *
+ * @see av_get_pix_fmt(), av_get_pix_fmt_string()
+ */
+const char *av_get_pix_fmt_name(enum PixelFormat pix_fmt);
 /**
  * Print in buf the string corresponding to the pixel format with
  * number pix_fmt, or an header if pix_fmt is negative.

Keyboard shortcuts