case PIX_FMT_RGBA:
case PIX_FMT_YUV422P10LE:
case PIX_FMT_YUV422P:
+ case PIX_FMT_YUV444P:
return size().height;
default:
- assert (false);
+ throw PixelFormatError ("lines()", _pixel_format);
}
return 0;
case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P10LE:
case PIX_FMT_YUV422P:
+ case PIX_FMT_YUV444P:
return 3;
case PIX_FMT_RGB24:
case PIX_FMT_RGBA:
return 1;
default:
- assert (false);
+ throw PixelFormatError ("components()", _pixel_format);
}
return 0;
case PIX_FMT_YUV422P:
pp_format = PP_FORMAT_422;
break;
+ case PIX_FMT_YUV444P:
+ pp_format = PP_FORMAT_444;
default:
- assert (false);
+ throw PixelFormatError ("post_process", pixel_format());
}
pp_mode* mode = pp_get_mode_by_name_and_quality (pp.c_str (), PP_QUALITY_MAX);
for (int y = 0; y < cropped_size.height; ++y) {
memcpy (out_p, in_p + crop_left_in_bytes, cropped_width_in_bytes);
- in_p += line_size()[c];
- out_p += out->line_size()[c];
+ in_p += stride()[c];
+ out_p += out->stride()[c];
}
}
switch (_pixel_format) {
case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P:
+ case PIX_FMT_YUV444P:
memset (data()[0], 0, lines(0) * stride()[0]);
memset (data()[1], 0x7f, lines(1) * stride()[1]);
memset (data()[2], 0x7f, lines(2) * stride()[2]);
for (int i = 0; i < components(); ++i) {
uint8_t* p = data()[i];
for (int y = 0; y < lines(i); ++y) {
- socket->read_definite_and_consume (p, line_size()[i], 30);
+ socket->read (p, line_size()[i]);
p += stride()[i];
}
}
for (int i = 0; i < components(); ++i) {
uint8_t* p = data()[i];
for (int y = 0; y < lines(i); ++y) {
- socket->write (p, line_size()[i], 30);
+ socket->write (p, line_size()[i]);
p += stride()[i];
}
}
} else {
return 1;
}
+ case PIX_FMT_YUV444P:
+ return 3;
default:
assert (false);
}
: Image (p)
, _buffer (b)
{
-
+ _line_size = (int *) av_malloc (4 * sizeof (int));
+ _line_size[0] = _line_size[1] = _line_size[2] = _line_size[3] = 0;
+
+ for (int i = 0; i < components(); ++i) {
+ _line_size[i] = size().width * bytes_per_pixel(i);
+ }
}
FilterBufferImage::~FilterBufferImage ()
{
avfilter_unref_buffer (_buffer);
+ av_free (_line_size);
}
uint8_t **
int *
FilterBufferImage::line_size () const
{
- return _buffer->linesize;
+ return _line_size;
}
int *
FilterBufferImage::stride () const
{
- /* XXX? */
+ /* I've seen images where the _buffer->linesize is larger than the width
+ (by a small amount), suggesting that _buffer->linesize is what we call
+ stride. But I'm not sure.
+ */
return _buffer->linesize;
}