Skip to content

F
ffmpeg-mt
Commit 4d29e6c1 authored by stefano's avatar stefano
Browse files
Options

Globally prefer enum PixelFormat over int when it makes sense. 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18129 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 792dbcf2
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 36 deletions
libavcodec/avcodec.h
View file @ 4d29e6c1
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 22 #define LIBAVCODEC_VERSION_MINOR 22
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
...@@ -2661,7 +2661,7 @@ void av_resample_close(struct AVResampleContext *c); ...@@ -2661,7 +2661,7 @@ void av_resample_close(struct AVResampleContext *c);
* @param height the height of the picture * @param height the height of the picture
* @return zero if successful, a negative value if not * @return zero if successful, a negative value if not
*/ */
int avpicture_alloc(AVPicture *picture, int pix_fmt, int width, int height); int avpicture_alloc(AVPicture *picture, enum PixelFormat pix_fmt, int width, int height);
/** /**
* Free a picture previously allocated by avpicture_alloc(). * Free a picture previously allocated by avpicture_alloc().
...@@ -2689,7 +2689,7 @@ void avpicture_free(AVPicture *picture); ...@@ -2689,7 +2689,7 @@ void avpicture_free(AVPicture *picture);
*/ */
int avpicture_fill(AVPicture *picture, uint8_t *ptr, int avpicture_fill(AVPicture *picture, uint8_t *ptr,
int pix_fmt, int width, int height); int pix_fmt, int width, int height);
int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height, int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
unsigned char *dest, int dest_size); unsigned char *dest, int dest_size);
/** /**
...@@ -2704,9 +2704,9 @@ int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height, ...@@ -2704,9 +2704,9 @@ int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height,
* @param height the height of the image * @param height the height of the image
* @return Image data size in bytes or -1 on error (e.g. too large dimensions). * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
*/ */
int avpicture_get_size(int pix_fmt, int width, int height); int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);
void avcodec_get_chroma_sub_sample(int pix_fmt, int *h_shift, int *v_shift); void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift);
const char *avcodec_get_pix_fmt_name(int pix_fmt); const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);
void avcodec_set_dimensions(AVCodecContext *s, int width, int height); void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
enum PixelFormat avcodec_get_pix_fmt(const char* name); enum PixelFormat avcodec_get_pix_fmt(const char* name);
unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat p); unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat p);
...@@ -2735,7 +2735,7 @@ unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat p); ...@@ -2735,7 +2735,7 @@ unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat p);
* @param[in] has_alpha Whether the source pixel format alpha channel is used. * @param[in] has_alpha Whether the source pixel format alpha channel is used.
* @return Combination of flags informing you what kind of losses will occur. * @return Combination of flags informing you what kind of losses will occur.
*/ */
int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int src_pix_fmt, int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_pix_fmt,
int has_alpha); int has_alpha);
/** /**
...@@ -2760,7 +2760,7 @@ int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int src_pix_fmt, ...@@ -2760,7 +2760,7 @@ int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int src_pix_fmt,
* @param[out] loss_ptr Combination of flags informing you what kind of losses will occur. * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
* @return The best pixel format to convert to or -1 if none was found. * @return The best pixel format to convert to or -1 if none was found.
*/ */
int avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, int src_pix_fmt, enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt,
int has_alpha, int *loss_ptr); int has_alpha, int *loss_ptr);
...@@ -2774,7 +2774,7 @@ int avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, int src_pix_fmt, ...@@ -2774,7 +2774,7 @@ int avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, int src_pix_fmt,
* a negative value to print the corresponding header. * a negative value to print the corresponding header.
* Meaningful values for obtaining a pixel format info vary from 0 to PIX_FMT_NB -1. * Meaningful values for obtaining a pixel format info vary from 0 to PIX_FMT_NB -1.
*/ */
void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt); void avcodec_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt);
#define FF_ALPHA_TRANSP 0x0001 /* image has some totally transparent pixels */ #define FF_ALPHA_TRANSP 0x0001 /* image has some totally transparent pixels */
#define FF_ALPHA_SEMI_TRANSP 0x0002 /* image has some transparent pixels */ #define FF_ALPHA_SEMI_TRANSP 0x0002 /* image has some transparent pixels */
...@@ -2784,12 +2784,12 @@ void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt); ...@@ -2784,12 +2784,12 @@ void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt);
* @return ored mask of FF_ALPHA_xxx constants * @return ored mask of FF_ALPHA_xxx constants
*/ */
int img_get_alpha_info(const AVPicture *src, int img_get_alpha_info(const AVPicture *src,
int pix_fmt, int width, int height); enum PixelFormat pix_fmt, int width, int height);
/* deinterlace a picture */ /* deinterlace a picture */
/* deinterlace - if not supported return -1 */ /* deinterlace - if not supported return -1 */
int avpicture_deinterlace(AVPicture *dst, const AVPicture *src, int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
int pix_fmt, int width, int height); enum PixelFormat pix_fmt, int width, int height);
/* external high level API */ /* external high level API */
...@@ -3365,18 +3365,18 @@ void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size); ...@@ -3365,18 +3365,18 @@ void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size);
* Copy image 'src' to 'dst'. * Copy image 'src' to 'dst'.
*/ */
void av_picture_copy(AVPicture *dst, const AVPicture *src, void av_picture_copy(AVPicture *dst, const AVPicture *src,
int pix_fmt, int width, int height); enum PixelFormat pix_fmt, int width, int height);
/** /**
* Crop image top and left side. * Crop image top and left side.
*/ */
int av_picture_crop(AVPicture *dst, const AVPicture *src, int av_picture_crop(AVPicture *dst, const AVPicture *src,
int pix_fmt, int top_band, int left_band); enum PixelFormat pix_fmt, int top_band, int left_band);
/** /**
* Pad image. * Pad image.
*/ */
int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt, int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum PixelFormat pix_fmt,
int padtop, int padbottom, int padleft, int padright, int *color); int padtop, int padbottom, int padleft, int padright, int *color);
unsigned int av_xiphlacing(unsigned char *s, unsigned int v); unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
......
libavcodec/imgconvert.c
View file @ 4d29e6c1
...@@ -443,13 +443,13 @@ static const PixFmtInfo pix_fmt_info[PIX_FMT_NB] = { ...@@ -443,13 +443,13 @@ static const PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
}, },
}; };
void avcodec_get_chroma_sub_sample(int pix_fmt, int *h_shift, int *v_shift) void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift)
{ {
*h_shift = pix_fmt_info[pix_fmt].x_chroma_shift; *h_shift = pix_fmt_info[pix_fmt].x_chroma_shift;
*v_shift = pix_fmt_info[pix_fmt].y_chroma_shift; *v_shift = pix_fmt_info[pix_fmt].y_chroma_shift;
} }
const char *avcodec_get_pix_fmt_name(int pix_fmt) const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt)
{ {
if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB) if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB)
return NULL; return NULL;
...@@ -467,7 +467,7 @@ enum PixelFormat avcodec_get_pix_fmt(const char* name) ...@@ -467,7 +467,7 @@ enum PixelFormat avcodec_get_pix_fmt(const char* name)
return PIX_FMT_NONE; return PIX_FMT_NONE;
} }
void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt) void avcodec_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt)
{ {
/* print header */ /* print header */
if (pix_fmt < 0) if (pix_fmt < 0)
...@@ -533,7 +533,7 @@ int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt){ ...@@ -533,7 +533,7 @@ int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt){
return 0; return 0;
} }
int ff_fill_linesize(AVPicture *picture, int pix_fmt, int width) int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width)
{ {
int w2; int w2;
const PixFmtInfo *pinfo; const PixFmtInfo *pinfo;
...@@ -621,7 +621,7 @@ int ff_fill_linesize(AVPicture *picture, int pix_fmt, int width) ...@@ -621,7 +621,7 @@ int ff_fill_linesize(AVPicture *picture, int pix_fmt, int width)
return 0; return 0;
} }
int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt, int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt,
int height) int height)
{ {
int size, h2, size2; int size, h2, size2;
...@@ -712,7 +712,7 @@ int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt, ...@@ -712,7 +712,7 @@ int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt,
} }
int avpicture_fill(AVPicture *picture, uint8_t *ptr, int avpicture_fill(AVPicture *picture, uint8_t *ptr,
int pix_fmt, int width, int height) enum PixelFormat pix_fmt, int width, int height)
{ {
if(avcodec_check_dimensions(NULL, width, height)) if(avcodec_check_dimensions(NULL, width, height))
...@@ -724,7 +724,7 @@ int avpicture_fill(AVPicture *picture, uint8_t *ptr, ...@@ -724,7 +724,7 @@ int avpicture_fill(AVPicture *picture, uint8_t *ptr,
return ff_fill_pointer(picture, ptr, pix_fmt, height); return ff_fill_pointer(picture, ptr, pix_fmt, height);
} }
int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height, int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
unsigned char *dest, int dest_size) unsigned char *dest, int dest_size)
{ {
const PixFmtInfo* pf = &pix_fmt_info[pix_fmt]; const PixFmtInfo* pf = &pix_fmt_info[pix_fmt];
...@@ -783,7 +783,7 @@ int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height, ...@@ -783,7 +783,7 @@ int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height,
return size; return size;
} }
int avpicture_get_size(int pix_fmt, int width, int height) int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height)
{ {
AVPicture dummy_pict; AVPicture dummy_pict;
if(avcodec_check_dimensions(NULL, width, height)) if(avcodec_check_dimensions(NULL, width, height))
...@@ -800,7 +800,7 @@ int avpicture_get_size(int pix_fmt, int width, int height) ...@@ -800,7 +800,7 @@ int avpicture_get_size(int pix_fmt, int width, int height)
return avpicture_fill(&dummy_pict, NULL, pix_fmt, width, height); return avpicture_fill(&dummy_pict, NULL, pix_fmt, width, height);
} }
int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int src_pix_fmt, int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_pix_fmt,
int has_alpha) int has_alpha)
{ {
const PixFmtInfo *pf, *ps; const PixFmtInfo *pf, *ps;
...@@ -855,7 +855,7 @@ int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int src_pix_fmt, ...@@ -855,7 +855,7 @@ int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int src_pix_fmt,
return loss; return loss;
} }
static int avg_bits_per_pixel(int pix_fmt) static int avg_bits_per_pixel(enum PixelFormat pix_fmt)
{ {
int bits; int bits;
const PixFmtInfo *pf; const PixFmtInfo *pf;
...@@ -898,12 +898,13 @@ static int avg_bits_per_pixel(int pix_fmt) ...@@ -898,12 +898,13 @@ static int avg_bits_per_pixel(int pix_fmt)
return bits; return bits;
} }
static int avcodec_find_best_pix_fmt1(int64_t pix_fmt_mask, static enum PixelFormat avcodec_find_best_pix_fmt1(int64_t pix_fmt_mask,
int src_pix_fmt, enum PixelFormat src_pix_fmt,
int has_alpha, int has_alpha,
int loss_mask) int loss_mask)
{ {
int dist, i, loss, min_dist, dst_pix_fmt; int dist, i, loss, min_dist;
enum PixelFormat dst_pix_fmt;
/* find exact color match with smallest size */ /* find exact color match with smallest size */
dst_pix_fmt = -1; dst_pix_fmt = -1;
...@@ -923,10 +924,11 @@ static int avcodec_find_best_pix_fmt1(int64_t pix_fmt_mask, ...@@ -923,10 +924,11 @@ static int avcodec_find_best_pix_fmt1(int64_t pix_fmt_mask,
return dst_pix_fmt; return dst_pix_fmt;
} }
int avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, int src_pix_fmt, enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt,
int has_alpha, int *loss_ptr) int has_alpha, int *loss_ptr)
{ {
int dst_pix_fmt, loss_mask, i; enum PixelFormat dst_pix_fmt;
int loss_mask, i;
static const int loss_mask_order[] = { static const int loss_mask_order[] = {
~0, /* no loss first */ ~0, /* no loss first */
~FF_LOSS_ALPHA, ~FF_LOSS_ALPHA,
...@@ -1010,7 +1012,7 @@ int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane) ...@@ -1010,7 +1012,7 @@ int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane)
} }
void av_picture_copy(AVPicture *dst, const AVPicture *src, void av_picture_copy(AVPicture *dst, const AVPicture *src,
int pix_fmt, int width, int height) enum PixelFormat pix_fmt, int width, int height)
{ {
int i; int i;
const PixFmtInfo *pf = &pix_fmt_info[pix_fmt]; const PixFmtInfo *pf = &pix_fmt_info[pix_fmt];
...@@ -1131,7 +1133,7 @@ void ff_shrink88(uint8_t *dst, int dst_wrap, ...@@ -1131,7 +1133,7 @@ void ff_shrink88(uint8_t *dst, int dst_wrap,
int avpicture_alloc(AVPicture *picture, int avpicture_alloc(AVPicture *picture,
int pix_fmt, int width, int height) enum PixelFormat pix_fmt, int width, int height)
{ {
int size; int size;
void *ptr; void *ptr;
...@@ -1188,7 +1190,7 @@ int av_picture_crop(AVPicture *dst, const AVPicture *src, ...@@ -1188,7 +1190,7 @@ int av_picture_crop(AVPicture *dst, const AVPicture *src,
} }
int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width,
int pix_fmt, int padtop, int padbottom, int padleft, int padright, enum PixelFormat pix_fmt, int padtop, int padbottom, int padleft, int padright,
int *color) int *color)
{ {
uint8_t *optr; uint8_t *optr;
...@@ -1274,7 +1276,7 @@ static int get_alpha_info_pal8(const AVPicture *src, int width, int height) ...@@ -1274,7 +1276,7 @@ static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
} }
int img_get_alpha_info(const AVPicture *src, int img_get_alpha_info(const AVPicture *src,
int pix_fmt, int width, int height) enum PixelFormat pix_fmt, int width, int height)
{ {
const PixFmtInfo *pf = &pix_fmt_info[pix_fmt]; const PixFmtInfo *pf = &pix_fmt_info[pix_fmt];
int ret; int ret;
...@@ -1480,7 +1482,7 @@ static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap, ...@@ -1480,7 +1482,7 @@ static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap,
} }
int avpicture_deinterlace(AVPicture *dst, const AVPicture *src, int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
int pix_fmt, int width, int height) enum PixelFormat pix_fmt, int width, int height)
{ {
int i; int i;
......
libavcodec/imgconvert.h
View file @ 4d29e6c1
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
#include <stdint.h> #include <stdint.h>
#include "avcodec.h" #include "avcodec.h"
int ff_fill_linesize(AVPicture *picture, int pix_fmt, int width); int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width);
int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt, int height); int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height);
int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane); int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment