Use ffmpeg calls for pixel parameters; add (and alter, hmm) tests to suit.

1 files changed, 38 insertions, 87 deletions

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 6464d2368..0b887ea62 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -35,6 +35,7 @@ extern "C" {
 #include <libavfilter/avfiltergraph.h>
 #include <libpostproc/postprocess.h>
 #include <libavutil/pixfmt.h>
+#include <libavutil/pixdesc.h>
 }
 #include "image.h"
 #include "exceptions.h"
@@ -58,64 +59,32 @@ Image::swap (Image& other)
 int
 Image::lines (int n) const
 {
-	switch (_pixel_format) {
-	case PIX_FMT_YUV420P:
-		if (n == 0) {
-			return size().height;
-		} else {
-			return size().height / 2;
-		}
-		break;
-	case PIX_FMT_RGB24:
-	case PIX_FMT_RGBA:
-	case PIX_FMT_YUV422P:
-	case PIX_FMT_YUV422P10LE:
-	case PIX_FMT_YUV422P16LE:
-	case PIX_FMT_YUV422P16BE:
-	case PIX_FMT_YUV444P:
-	case PIX_FMT_YUV444P9BE:
-	case PIX_FMT_YUV444P9LE:
-	case PIX_FMT_YUV444P10BE:
-	case PIX_FMT_YUV444P10LE:
-	case PIX_FMT_UYVY422:
+	if (n == 0) {
 		return size().height;
-	default:
+	}
+	
+	AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format);
+	if (!d) {
 		throw PixelFormatError (N_("lines()"), _pixel_format);
 	}
-
-	return 0;
+	
+	return size().height / pow(2, d->log2_chroma_h);
 }
 
 /** @return Number of components */
 int
 Image::components () const
 {
-	switch (_pixel_format) {
-	case PIX_FMT_YUV420P:
-	case PIX_FMT_YUV422P9BE:
-	case PIX_FMT_YUV422P9LE:
-	case PIX_FMT_YUV422P10BE:
-	case PIX_FMT_YUV422P10LE:
-	case PIX_FMT_YUV422P16LE:
-	case PIX_FMT_YUV422P16BE:
-	case PIX_FMT_YUV422P:
-	case PIX_FMT_YUV444P:
-	case PIX_FMT_YUV444P9BE:
-	case PIX_FMT_YUV444P9LE:
-	case PIX_FMT_YUV444P10BE:
-	case PIX_FMT_YUV444P10LE:
-	case PIX_FMT_YUV444P16LE:
-	case PIX_FMT_YUV444P16BE:
-		return 3;
-	case PIX_FMT_RGB24:
-	case PIX_FMT_RGBA:
-	case PIX_FMT_UYVY422:
-		return 1;
-	default:
+	AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format);
+	if (!d) {
 		throw PixelFormatError (N_("components()"), _pixel_format);
 	}
 
-	return 0;
+	if ((d->flags & PIX_FMT_PLANAR) == 0) {
+		return 1;
+	}
+	
+	return d->nb_components;
 }
 
 shared_ptr<Image>
@@ -429,54 +398,36 @@ Image::write_to_socket (shared_ptr<Socket> socket) const
 float
 Image::bytes_per_pixel (int c) const
 {
-	if (c == 3) {
+	AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format);
+	if (!d) {
+		throw PixelFormatError (N_("lines()"), _pixel_format);
+	}
+
+	if (c >= components()) {
 		return 0;
 	}
+
+	float bpp[4] = { 0, 0, 0, 0 };
+
+	bpp[0] = floor ((d->comp[0].depth_minus1 + 1 + 7) / 8);
+	if (d->nb_components > 1) {
+		bpp[1] = floor ((d->comp[1].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+	}
+	if (d->nb_components > 2) {
+		bpp[2] = floor ((d->comp[2].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+	}
+	if (d->nb_components > 3) {
+		bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+	}
 	
-	switch (_pixel_format) {
-	case PIX_FMT_RGB24:
-		if (c == 0) {
-			return 3;
-		} else {
-			return 0;
-		}
-	case PIX_FMT_RGBA:
-		if (c == 0) {
-			return 4;
-		} else {
-			return 0;
-		}
-	case PIX_FMT_YUV420P:
-	case PIX_FMT_YUV422P:
-		if (c == 0) {
-			return 1;
-		} else {
-			return 0.5;
-		}
-	case PIX_FMT_YUV422P10LE:
-	case PIX_FMT_YUV422P16LE:
-		if (c == 0) {
-			return 2;
-		} else {
-			return 1;
-		}
-	case PIX_FMT_UYVY422:
-		return 2;
-	case PIX_FMT_YUV444P:
-		return 3;
-	case PIX_FMT_YUV444P9BE:
-	case PIX_FMT_YUV444P9LE:
-	case PIX_FMT_YUV444P10LE:
-	case PIX_FMT_YUV444P10BE:
-		return 6;
-	default:
-		throw PixelFormatError (N_("bytes_per_pixel()"), _pixel_format);
+	if ((d->flags & PIX_FMT_PLANAR) == 0) {
+		/* Not planar; sum them up */
+		return bpp[0] + bpp[1] + bpp[2] + bpp[3];
 	}
 
-	return 0;
+	return bpp[c];
 }
 
-
 /** Construct a SimpleImage of a given size and format, allocating memory
  *  as required.
  *