diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-30 03:44:57 +0400 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-30 03:44:57 +0400 |
commit | e7bd48a6aef974ec694447cf5244f6b031b61fce (patch) | |
tree | 9a5beff837d4dcd1e749270c49aaf53689ab6eae /libavcodec/imgconvert.c | |
parent | 740dfe7012a41350292f77692867595d8cfa5370 (diff) |
Move fill_image_linesize() and fill_image_data_ptr() from
libavcodec/imgconvert.c and make them public in libavcore/imgutils.h,
with the names av_fill_image_linesizes() and av_fill_image_pointers().
Originally committed as revision 24583 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r-- | libavcodec/imgconvert.c | 144 |
1 files changed, 3 insertions, 141 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index cd9c741918..70e6c0b4ff 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -36,6 +36,7 @@ #include "imgconvert.h" #include "libavutil/colorspace.h" #include "libavutil/pixdesc.h" +#include "libavcore/imgutils.h" #if HAVE_MMX #include "x86/mmx.h" @@ -490,154 +491,15 @@ int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt){ return 0; } -static int fill_image_linesize(int linesize[4], enum PixelFormat pix_fmt, int width) -{ - int i; - const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; - int max_plane_step [4]; - int max_plane_step_comp[4]; - - memset(linesize, 0, 4*sizeof(linesize[0])); - - if (desc->flags & PIX_FMT_HWACCEL) - return -1; - - if (desc->flags & PIX_FMT_BITSTREAM) { - linesize[0] = (width * (desc->comp[0].step_minus1+1) + 7) >> 3; - return 0; - } - - memset(max_plane_step , 0, sizeof(max_plane_step )); - memset(max_plane_step_comp, 0, sizeof(max_plane_step_comp)); - for (i = 0; i < 4; i++) { - const AVComponentDescriptor *comp = &(desc->comp[i]); - if ((comp->step_minus1+1) > max_plane_step[comp->plane]) { - max_plane_step [comp->plane] = comp->step_minus1+1; - max_plane_step_comp[comp->plane] = i; - } - } - - for (i = 0; i < 4; i++) { - int s = (max_plane_step_comp[i] == 1 || max_plane_step_comp[i] == 2) ? desc->log2_chroma_w : 0; - linesize[i] = max_plane_step[i] * (((width + (1 << s) - 1)) >> s); - } - - return 0; -} - int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width) { - return fill_image_linesize(picture->linesize, pix_fmt, width); -} - -static int fill_image_data_ptr(uint8_t *data[4], uint8_t *ptr, enum PixelFormat pix_fmt, - int height, const int linesize[4]) -{ - int size, h2, size2; - const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; - - size = linesize[0] * height; - switch(pix_fmt) { - case PIX_FMT_YUV420P: - case PIX_FMT_YUV422P: - case PIX_FMT_YUV444P: - case PIX_FMT_YUV410P: - case PIX_FMT_YUV411P: - case PIX_FMT_YUV440P: - case PIX_FMT_YUVJ420P: - case PIX_FMT_YUVJ422P: - case PIX_FMT_YUVJ444P: - case PIX_FMT_YUVJ440P: - case PIX_FMT_YUV420P16LE: - case PIX_FMT_YUV422P16LE: - case PIX_FMT_YUV444P16LE: - case PIX_FMT_YUV420P16BE: - case PIX_FMT_YUV422P16BE: - case PIX_FMT_YUV444P16BE: - h2 = (height + (1 << desc->log2_chroma_h) - 1) >> desc->log2_chroma_h; - size2 = linesize[1] * h2; - data[0] = ptr; - data[1] = data[0] + size; - data[2] = data[1] + size2; - data[3] = NULL; - return size + 2 * size2; - case PIX_FMT_YUVA420P: - h2 = (height + (1 << desc->log2_chroma_h) - 1) >> desc->log2_chroma_h; - size2 = linesize[1] * h2; - data[0] = ptr; - data[1] = data[0] + size; - data[2] = data[1] + size2; - data[3] = data[1] + size2 + size2; - return 2 * size + 2 * size2; - case PIX_FMT_NV12: - case PIX_FMT_NV21: - h2 = (height + (1 << desc->log2_chroma_h) - 1) >> desc->log2_chroma_h; - size2 = linesize[1] * h2; - data[0] = ptr; - data[1] = data[0] + size; - data[2] = NULL; - data[3] = NULL; - return size + size2; - case PIX_FMT_RGB24: - case PIX_FMT_BGR24: - case PIX_FMT_ARGB: - case PIX_FMT_ABGR: - case PIX_FMT_RGBA: - case PIX_FMT_BGRA: - case PIX_FMT_RGB48BE: - case PIX_FMT_RGB48LE: - case PIX_FMT_GRAY16BE: - case PIX_FMT_GRAY16LE: - case PIX_FMT_BGR444BE: - case PIX_FMT_BGR444LE: - case PIX_FMT_BGR555BE: - case PIX_FMT_BGR555LE: - case PIX_FMT_BGR565BE: - case PIX_FMT_BGR565LE: - case PIX_FMT_RGB444BE: - case PIX_FMT_RGB444LE: - case PIX_FMT_RGB555BE: - case PIX_FMT_RGB555LE: - case PIX_FMT_RGB565BE: - case PIX_FMT_RGB565LE: - case PIX_FMT_YUYV422: - case PIX_FMT_UYVY422: - case PIX_FMT_UYYVYY411: - case PIX_FMT_RGB4: - case PIX_FMT_BGR4: - case PIX_FMT_MONOWHITE: - case PIX_FMT_MONOBLACK: - case PIX_FMT_Y400A: - data[0] = ptr; - data[1] = NULL; - data[2] = NULL; - data[3] = NULL; - return size; - case PIX_FMT_PAL8: - case PIX_FMT_RGB8: - case PIX_FMT_BGR8: - case PIX_FMT_RGB4_BYTE: - case PIX_FMT_BGR4_BYTE: - case PIX_FMT_GRAY8: - size2 = (size + 3) & ~3; - data[0] = ptr; - data[1] = ptr + size2; /* palette is stored here as 256 32 bit words */ - data[2] = NULL; - data[3] = NULL; - return size2 + 256 * 4; - default: - data[0] = NULL; - data[1] = NULL; - data[2] = NULL; - data[3] = NULL; - return -1; - } + return av_fill_image_linesizes(picture->linesize, pix_fmt, width); } int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height) { - return fill_image_data_ptr(picture->data, ptr, pix_fmt, height, picture->linesize); + return av_fill_image_pointers(picture->data, pix_fmt, height, ptr, picture->linesize); } int avpicture_fill(AVPicture *picture, uint8_t *ptr, |