Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

recorder: add support for attachments (fonts)

Browse Source 
Though, only when the output format is matroska, to avoid muxing errors.
This is quite useful when the input has ASS subtitles, as they tend to
rely on embedded fonts.
This commit is contained in:
TheAMM
2021-05-29 01:28:15 +03:00
committed by Jan Ekström
parent f9527497c6
commit 4d3df1c842
4 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
common/recorder.c
View File

@@ -23,6 +23,7 @@
#include "common/common.h"
#include "common/global.h"
#include "common/msg.h"
#include "demux/demux.h"
#include "demux/packet.h"
#include "demux/stheader.h"
@@ -119,7 +120,9 @@ static int add_stream(struct mp_recorder *priv, struct sh_stream *sh)
struct mp_recorder *mp_recorder_create(struct mpv_global *global,
const char *target_file,
struct sh_stream **streams,
int num_streams)
int num_streams,
struct demux_attachment **attachments,
int num_attachments)
{
struct mp_recorder *priv = talloc_zero(NULL, struct mp_recorder);
@@ -153,6 +156,35 @@ struct mp_recorder *mp_recorder_create(struct mpv_global *global,
}
}
if (!strcmp(priv->mux->oformat->name, "matroska")) {
// Only attach attachments (fonts) to matroska - mp4, nut, mpegts don't
// like them, and we find that out too late in the muxing process.
AVStream *a_stream = NULL;
for (int i = 0; i < num_attachments; ++i) {
a_stream = avformat_new_stream(priv->mux, NULL);
if (!a_stream) {
MP_ERR(priv, "Can't mux one of the attachments.\n");
goto error;
}
struct demux_attachment *attachment = attachments[i];
a_stream->codecpar->codec_type = AVMEDIA_TYPE_ATTACHMENT;
a_stream->codecpar->extradata = av_mallocz(
attachment->data_size + AV_INPUT_BUFFER_PADDING_SIZE
);
if (!a_stream->codecpar->extradata) {
goto error;
}
memcpy(a_stream->codecpar->extradata,
attachment->data, attachment->data_size);
a_stream->codecpar->extradata_size = attachment->data_size;
av_dict_set(&a_stream->metadata, "filename", attachment->name, 0);
av_dict_set(&a_stream->metadata, "mimetype", attachment->type, 0);
}
}
// Not sure how to write this in a "standard" way. It appears only mkv
// and mp4 support this directly.
char version[200];