summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-05-13 21:46:08 +0200
committerwm4 <wm4@nowhere>2016-05-13 21:46:08 +0200
commit7d2c6d60da0bb3340f7a53f45d066a4b27aadb91 (patch)
tree3e49104104e2a20639c8703f0ba316569ea8839e
parentc9d8bc088c727b5a151f7845443aac079e8eb397 (diff)
downloadmpv-7d2c6d60da0bb3340f7a53f45d066a4b27aadb91.tar.bz2
mpv-7d2c6d60da0bb3340f7a53f45d066a4b27aadb91.tar.xz
vo_opengl: minor simplification
Make the find_plane_format function take a bit count. This also makes the function's comment true for the first time the function and its comment exist. (It was commented as taking bits, but always took bytes.)
-rw-r--r--video/out/opengl/video.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index 8ba0597fa3..ca10dada27 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -2782,15 +2782,15 @@ static void packed_fmt_swizzle(char w[5], const struct gl_format *texfmt,
w[4] = '\0';
}
-// Like gl_find_unorm_format(), but takes bits (not bytes), and but if no fixed
+// Like gl_find_unorm_format(), but takes bits (not bytes), and if no fixed
// point format is available, return an unsigned integer format.
-static const struct gl_format *find_plane_format(GL *gl, int bytes_per_comp,
- int n_channels)
+static const struct gl_format *find_plane_format(GL *gl, int bits, int n_channels)
{
- const struct gl_format *f = gl_find_unorm_format(gl, bytes_per_comp, n_channels);
+ int bytes = (bits + 7) / 8;
+ const struct gl_format *f = gl_find_unorm_format(gl, bytes, n_channels);
if (f)
return f;
- return gl_find_uint_format(gl, bytes_per_comp, n_channels);
+ return gl_find_uint_format(gl, bytes, n_channels);
}
static void init_image_desc(struct gl_video *p, int fmt)
@@ -2826,7 +2826,7 @@ static bool init_format(struct gl_video *p, int fmt, bool test_only)
if (desc.flags & (MP_IMGFLAG_YUV_P | MP_IMGFLAG_RGB_P)) {
int bits = desc.component_bits;
if ((desc.flags & MP_IMGFLAG_NE) && bits >= 8 && bits <= 16) {
- plane_format[0] = find_plane_format(gl, (bits + 7) / 8, 1);
+ plane_format[0] = find_plane_format(gl, bits, 1);
for (int n = 1; n < desc.num_planes; n++)
plane_format[n] = plane_format[0];
// RGB/planar
@@ -2840,8 +2840,8 @@ static bool init_format(struct gl_video *p, int fmt, bool test_only)
if (desc.flags & MP_IMGFLAG_YUV_NV) {
int bits = desc.component_bits;
if ((desc.flags & MP_IMGFLAG_NE) && bits >= 8 && bits <= 16) {
- plane_format[0] = find_plane_format(gl, (bits + 7) / 8, 1);
- plane_format[1] = find_plane_format(gl, (bits + 7) / 8, 2);
+ plane_format[0] = find_plane_format(gl, bits, 1);
+ plane_format[1] = find_plane_format(gl, bits, 2);
if (desc.flags & MP_IMGFLAG_YUV_NV_SWAP)
snprintf(color_swizzle, sizeof(color_swizzle), "rbga");
goto supported;