mirror of
https://github.com/mpv-player/mpv
synced 2025-01-16 03:51:48 +00:00
a2e7642d3c
Until now, feeding packets to the decoder in advance was done for text subtitles only. This was possible because libass buffers all subtitle data anyway (in ASS_Track). sd_lavc, responsible for bitmap subs, does not do this. But it can buffer a small number of subtitle frames ahead. Enable this. Repurpose the sub_accept_packets_in_advance(). Instead of "can take all packets" it means "can take 1 packet" now. (The old meaning is still needed locally in dec_sub.c; keep it there.) It asks the decoder whether there is place for at least 1 subtitle packet. sd_lavc implements it and returns true if its internal fixed-size subtitle queue still has a free slot. (The implementation of this in dec_sub.c isn't entirely clean. For one, decode_chain() ignores this mechanism, so it's implied that bitmap subtitles do not use the subtitle filter chain in any advanced way.) Also fix 2 bugs in the sd_lavc queue handling. Subtitles must be checked in reverse, because the first entry will often have endpts==NOPTS, which would always match. alloc_sub() must cycle the queue buffer, because it reuses memory allocations (like sub.imgs) by design.
54 lines
1.6 KiB
C
54 lines
1.6 KiB
C
#ifndef MPLAYER_DEC_SUB_H
|
|
#define MPLAYER_DEC_SUB_H
|
|
|
|
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
#include <pthread.h>
|
|
|
|
#include "osd.h"
|
|
|
|
struct sh_stream;
|
|
struct ass_track;
|
|
struct mpv_global;
|
|
struct demux_packet;
|
|
struct ass_library;
|
|
struct ass_renderer;
|
|
|
|
struct dec_sub;
|
|
struct sd;
|
|
|
|
enum sd_ctrl {
|
|
SD_CTRL_SUB_STEP,
|
|
SD_CTRL_SET_VIDEO_PARAMS,
|
|
SD_CTRL_GET_RESOLUTION,
|
|
SD_CTRL_SET_TOP,
|
|
};
|
|
|
|
struct dec_sub *sub_create(struct mpv_global *global);
|
|
void sub_destroy(struct dec_sub *sub);
|
|
void sub_lock(struct dec_sub *sub);
|
|
void sub_unlock(struct dec_sub *sub);
|
|
|
|
void sub_set_video_res(struct dec_sub *sub, int w, int h);
|
|
void sub_set_video_fps(struct dec_sub *sub, double fps);
|
|
void sub_set_extradata(struct dec_sub *sub, void *data, int data_len);
|
|
void sub_set_ass_renderer(struct dec_sub *sub, struct ass_library *ass_library,
|
|
struct ass_renderer *ass_renderer,
|
|
pthread_mutex_t *ass_lock);
|
|
void sub_init_from_sh(struct dec_sub *sub, struct sh_stream *sh);
|
|
|
|
bool sub_is_initialized(struct dec_sub *sub);
|
|
|
|
bool sub_read_all_packets(struct dec_sub *sub, struct sh_stream *sh);
|
|
bool sub_accepts_packet_in_advance(struct dec_sub *sub);
|
|
void sub_decode(struct dec_sub *sub, struct demux_packet *packet);
|
|
void sub_get_bitmaps(struct dec_sub *sub, struct mp_osd_res dim, double pts,
|
|
struct sub_bitmaps *res);
|
|
bool sub_has_get_text(struct dec_sub *sub);
|
|
char *sub_get_text(struct dec_sub *sub, double pts);
|
|
void sub_reset(struct dec_sub *sub);
|
|
|
|
int sub_control(struct dec_sub *sub, enum sd_ctrl cmd, void *arg);
|
|
|
|
#endif
|