mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-11 02:24:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/ffmpegcolorspace/: Use correct _fill function to get correct strides.

Browse source 
Original commit message from CVS:
* gst/ffmpegcolorspace/gstffmpegcodecmap.c:
(gst_ffmpegcsp_avpicture_fill):
* gst/ffmpegcolorspace/imgconvert.c: (avpicture_get_size),
(avpicture_alloc):
* gst/ffmpegcolorspace/imgconvert_template.h:
Use correct _fill function to get correct strides.
This commit is contained in:
Wim Taymans 2004-11-03 15:46:16 +00:00
parent 30cf349ece
commit 3e13fd8044
4 changed files with 24 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2004-11-03 Wim Taymans <wim@fluendo.com>
* gst/ffmpegcolorspace/gstffmpegcodecmap.c:
(gst_ffmpegcsp_avpicture_fill):
* gst/ffmpegcolorspace/imgconvert.c: (avpicture_get_size),
(avpicture_alloc):
* gst/ffmpegcolorspace/imgconvert_template.h:
Use correct _fill function to get correct strides.
2004-11-02 David Schleef <ds@schleef.org>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header),

8
gst/ffmpegcolorspace/gstffmpegcodecmap.c
View file

@ -726,6 +726,7 @@ gst_ffmpegcsp_avpicture_fill (AVPicture * picture,
case PIX_FMT_RGB555:
case PIX_FMT_RGB565:
case PIX_FMT_YUV422:
case PIX_FMT_UYVY422:
stride = ROUND_UP_4 (width * 2);
size = stride * height;
picture->data[0] = ptr;
@ -733,6 +734,13 @@ gst_ffmpegcsp_avpicture_fill (AVPicture * picture,
picture->data[2] = NULL;
picture->linesize[0] = stride;
return size;
case PIX_FMT_UYVY411:
/* FIXME, probably not the right stride */
picture->data[0] = ptr;
picture->data[1] = NULL;
picture->data[2] = NULL;
picture->linesize[0] = width + width / 2;
return size + size / 2;
case PIX_FMT_GRAY8:
stride = ROUND_UP_4 (width);
size = stride * height;

100
gst/ffmpegcolorspace/imgconvert.c
View file

@ -30,6 +30,7 @@
#include "avcodec.h"
#include "dsputil.h"
#include "gstffmpegcodecmap.h"
#include <string.h>
#include <stdlib.h>
@ -260,98 +261,6 @@ avcodec_get_pix_fmt (const char *name)
return i;
}
/* Picture field are filled with 'ptr' addresses. Also return size */
int
avpicture_fill (AVPicture * picture, uint8_t * ptr,
int pix_fmt, int width, int height)
{
int size, w2, h2, size2;
PixFmtInfo *pinfo;
pinfo = &pix_fmt_info[pix_fmt];
size = width * 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_YUVJ420P:
case PIX_FMT_YUVJ422P:
case PIX_FMT_YUVJ444P:
w2 = (width + (1 << pinfo->x_chroma_shift) - 1) >> pinfo->x_chroma_shift;
h2 = (height + (1 << pinfo->y_chroma_shift) - 1) >> pinfo->y_chroma_shift;
size2 = w2 * h2;
picture->data[0] = ptr;
picture->data[1] = picture->data[0] + size;
picture->data[2] = picture->data[1] + size2;
picture->linesize[0] = width;
picture->linesize[1] = w2;
picture->linesize[2] = w2;
return size + 2 * size2;
case PIX_FMT_RGB24:
case PIX_FMT_BGR24:
picture->data[0] = ptr;
picture->data[1] = NULL;
picture->data[2] = NULL;
picture->linesize[0] = width * 3;
return size * 3;
case PIX_FMT_RGBA32:
picture->data[0] = ptr;
picture->data[1] = NULL;
picture->data[2] = NULL;
picture->linesize[0] = width * 4;
return size * 4;
case PIX_FMT_RGB555:
case PIX_FMT_RGB565:
case PIX_FMT_YUV422:
picture->data[0] = ptr;
picture->data[1] = NULL;
picture->data[2] = NULL;
picture->linesize[0] = width * 2;
return size * 2;
case PIX_FMT_UYVY422:
picture->data[0] = ptr;
picture->data[1] = NULL;
picture->data[2] = NULL;
picture->linesize[0] = width * 2;
return size * 2;
case PIX_FMT_UYVY411:
picture->data[0] = ptr;
picture->data[1] = NULL;
picture->data[2] = NULL;
picture->linesize[0] = width + width / 2;
return size + size / 2;
case PIX_FMT_GRAY8:
picture->data[0] = ptr;
picture->data[1] = NULL;
picture->data[2] = NULL;
picture->linesize[0] = width;
return size;
case PIX_FMT_MONOWHITE:
case PIX_FMT_MONOBLACK:
picture->data[0] = ptr;
picture->data[1] = NULL;
picture->data[2] = NULL;
picture->linesize[0] = (width + 7) >> 3;
return picture->linesize[0] * height;
case PIX_FMT_PAL8:
size2 = (size + 3) & ~3;
picture->data[0] = ptr;
picture->data[1] = ptr + size2; /* palette is stored here as 256 32 bit words */
picture->data[2] = NULL;
picture->linesize[0] = width;
picture->linesize[1] = 4;
return size2 + 256 * 4;
default:
picture->data[0] = NULL;
picture->data[1] = NULL;
picture->data[2] = NULL;
picture->data[3] = NULL;
return -1;
}
}
int
avpicture_layout (const AVPicture * src, int pix_fmt, int width, int height,
unsigned char *dest, int dest_size)
@ -409,7 +318,8 @@ avpicture_get_size (int pix_fmt, int width, int height)
{
AVPicture dummy_pict;
return avpicture_fill (&dummy_pict, NULL, pix_fmt, width, height);
return gst_ffmpegcsp_avpicture_fill (&dummy_pict, NULL, pix_fmt, width,
height);
}
/**
@ -1861,7 +1771,7 @@ avpicture_alloc (AVPicture * picture, int pix_fmt, int width, int height)
ptr = av_malloc (size);
if (!ptr)
goto fail;
avpicture_fill (picture, ptr, pix_fmt, width, height);
gst_ffmpegcsp_avpicture_fill (picture, ptr, pix_fmt, width, height);
return 0;
fail:
memset (picture, 0, sizeof (AVPicture));
@ -2254,6 +2164,7 @@ deinterlace_line (uint8_t * dst,
}
for (; size > 3; size -= 4) {
DEINT_LINE_LUM lum_m4 += 4;
lum_m3 += 4;
lum_m2 += 4;
lum_m1 += 4;
@ -2298,6 +2209,7 @@ deinterlace_line_inplace (uint8_t * lum_m4, uint8_t * lum_m3, uint8_t * lum_m2,
}
for (; size > 3; size -= 4) {
DEINT_INPLACE_LINE_LUM lum_m4 += 4;
lum_m3 += 4;
lum_m2 += 4;
lum_m1 += 4;

1
gst/ffmpegcolorspace/imgconvert_template.h
View file

@ -256,6 +256,7 @@ static void glue(RGB_NAME, _to_yuv420p)(AVPicture *dst, const AVPicture *src,
cb[0] = RGB_TO_U_CCIR(r1, g1, b1, 2);
cr[0] = RGB_TO_V_CCIR(r1, g1, b1, 2);
cb++;
cr++;
p += -wrap3 + 2 * BPP;