opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-01 05:31:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reimplement av_picture_data_copy() avoiding the use of PixFmtInfo

Browse Source 
information.

Required for moving the function to libavcore.

Originally committed as revision 25066 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2010-09-07 21:23:52 +00:00
parent 03ff61167e
commit e7eb2033ff
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libavcodec/imgconvert.c
View File

@ -799,17 +799,26 @@ void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
uint8_t *src_data[4], int src_linesize[4], uint8_t *src_data[4], int src_linesize[4],
enum PixelFormat pix_fmt, int width, int height) enum PixelFormat pix_fmt, int width, int height)
{ {
int i;
const PixFmtInfo *pf = &pix_fmt_info[pix_fmt];
const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
switch(pf->pixel_type) { if (desc->flags & PIX_FMT_HWACCEL)
case FF_PIXEL_PACKED: return;
case FF_PIXEL_PLANAR:
for(i = 0; i < pf->nb_channels; i++) { if (desc->flags & PIX_FMT_PAL) {
int h; av_image_copy_plane(dst_data[0], dst_linesize[0],
src_data[0], src_linesize[0],
width, height);
/* copy the palette */
memcpy(dst_data[1], src_data[1], 4*256);
} else {
int i, planes_nb = 0;
for (i = 0; i < desc->nb_components; i++)
planes_nb = FFMAX(planes_nb, desc->comp[i].plane + 1);
for (i = 0; i < planes_nb; i++) {
int h = height;
int bwidth = av_image_get_linesize(pix_fmt, width, i); int bwidth = av_image_get_linesize(pix_fmt, width, i);
h = height;
if (i == 1 || i == 2) { if (i == 1 || i == 2) {
h= -((-height)>>desc->log2_chroma_h); h= -((-height)>>desc->log2_chroma_h);
} }
@ -817,14 +826,6 @@ void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
src_data[i], src_linesize[i], src_data[i], src_linesize[i],
bwidth, h); bwidth, h);
} }
break;
case FF_PIXEL_PALETTE:
av_image_copy_plane(dst_data[0], dst_linesize[0],
src_data[0], src_linesize[0],
width, height);
/* copy the palette */
memcpy(dst_data[1], src_data[1], 4*256);
break;
} }
} }