summaryrefslogtreecommitdiffstats
path: root/sub/dec_sub.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-28 21:19:36 +0200
committerwm4 <wm4@nowhere>2012-10-16 07:26:28 +0200
commitffb7a2fe17af204635db6694b5b49b6368be91e6 (patch)
tree2aa0814e4cf37443bb01b50a23c19b28547a99f1 /sub/dec_sub.h
parent65ea69f56476aabb0755ae80b7dc565df23ab426 (diff)
downloadmpv-ffb7a2fe17af204635db6694b5b49b6368be91e6.tar.bz2
mpv-ffb7a2fe17af204635db6694b5b49b6368be91e6.tar.xz
sub: create sub_bitmap array even when using libass
One sub_bitmaps struct could contain either a libass ASS_Image list, or a mplayer native list of sub-bitmaps. This caused code duplication in vo_vdpau.c and bitmap_packer.c. Avoid this by creating such a sub_bitmap array even with libass. This basically copies the list and recreates it in mplayer's native format. It gets rid of the code duplication, and will make implementing extended subtitle and OSD rendering in other VOs easier. Also do some cosmetic changes and other preparations for the following commits.
Diffstat (limited to 'sub/dec_sub.h')
-rw-r--r--sub/dec_sub.h49
1 files changed, 35 insertions, 14 deletions
diff --git a/sub/dec_sub.h b/sub/dec_sub.h
index c71a2348aa..df6aaf9b91 100644
--- a/sub/dec_sub.h
+++ b/sub/dec_sub.h
@@ -1,14 +1,22 @@
#ifndef MPLAYER_DEC_SUB_H
#define MPLAYER_DEC_SUB_H
+#include <stdbool.h>
+#include <stdint.h>
+
+#define MAX_OSD_PARTS 8
+
struct sh_sub;
struct osd_state;
struct ass_track;
-enum sub_bitmap_type {
+enum sub_bitmap_format {
SUBBITMAP_EMPTY,
- SUBBITMAP_LIBASS,
- SUBBITMAP_RGBA,
+ SUBBITMAP_LIBASS, // A8, with a per-surface blend color (libass.color)
+ SUBBITMAP_RGBA, // B8G8R8A8
+ SUBBITMAP_OLD, // I8A8 (monochrome), premultiplied alpha
+
+ SUBBITMAP_COUNT
};
typedef struct mp_eosd_res {
@@ -16,21 +24,34 @@ typedef struct mp_eosd_res {
int mt, mb, ml, mr; // borders (top, bottom, left, right)
} mp_eosd_res_t;
+struct sub_bitmap {
+ void *bitmap;
+ int stride;
+ int w, h;
+ int x, y;
+ // Note: not clipped, going outside the screen area is allowed
+ int dw, dh;
+
+ union {
+ struct {
+ uint32_t color;
+ } libass;
+ };
+};
+
typedef struct sub_bitmaps {
- enum sub_bitmap_type type;
+ int render_index; // for VO cache state (limited by MAX_OSD_PARTS)
- struct ass_image *imgs;
+ enum sub_bitmap_format format;
+ bool scaled; // if false, dw==w && dh==h
- struct sub_bitmap {
- int w, h;
- int x, y;
- // Note: not clipped, going outside the screen area is allowed
- int dw, dh;
- void *bitmap;
- } *parts;
- int part_count;
+ struct sub_bitmap *parts;
+ int num_parts;
+
+ // Provided for VOs with old code
+ struct ass_image *imgs;
- bool scaled;
+ // Incremented on each change
int bitmap_id, bitmap_pos_id;
} mp_eosd_images_t;