RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_dec: export subtitle_header in Decoder 

This way the encoder does not need to access the decoder AVCodecContext,
which will allow to make it private in future commits.
This commit is contained in:
Anton Khirnov 2024-01-10 12:20:32 +01:00
parent 3b84140a1b
commit b43d4a0692
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.h
View File

@ -281,7 +281,8 @@ typedef struct FilterGraph {
} FilterGraph;
typedef struct Decoder {
char dummy;
const uint8_t *subtitle_header;
int subtitle_header_size;
} Decoder;
typedef struct InputStream {

3
fftools/ffmpeg_dec.c
View File

@ -969,5 +969,8 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx)
if (ret < 0)
return ret;
dp->dec.subtitle_header = ist->dec_ctx->subtitle_header;
dp->dec.subtitle_header_size = ist->dec_ctx->subtitle_header_size;
return 0;
}

19
fftools/ffmpeg_enc.c
View File

@ -171,7 +171,7 @@ int enc_open(void *opaque, const AVFrame *frame)
InputStream *ist = ost->ist;
Encoder *e = ost->enc;
AVCodecContext *enc_ctx = ost->enc_ctx;
AVCodecContext *dec_ctx = NULL;
Decoder *dec;
const AVCodec *enc = enc_ctx->codec;
OutputFile *of = ost->file;
FrameData *fd;
@ -193,9 +193,8 @@ int enc_open(void *opaque, const AVFrame *frame)
if (ret < 0)
return ret;
if (ist) {
dec_ctx = ist->dec_ctx;
}
if (ist)
dec = ist->decoder;
// the timebase is chosen by filtering code
if (ost->type == AVMEDIA_TYPE_AUDIO || ost->type == AVMEDIA_TYPE_VIDEO) {
@ -279,14 +278,16 @@ int enc_open(void *opaque, const AVFrame *frame)
enc_ctx->width = ost->ist->par->width;
enc_ctx->height = ost->ist->par->height;
}
if (dec_ctx && dec_ctx->subtitle_header) {
av_assert0(dec);
if (dec->subtitle_header) {
/* ASS code assumes this buffer is null terminated so add extra byte. */
enc_ctx->subtitle_header = av_mallocz(dec_ctx->subtitle_header_size + 1);
enc_ctx->subtitle_header = av_mallocz(dec->subtitle_header_size + 1);
if (!enc_ctx->subtitle_header)
return AVERROR(ENOMEM);
memcpy(enc_ctx->subtitle_header, dec_ctx->subtitle_header,
dec_ctx->subtitle_header_size);
enc_ctx->subtitle_header_size = dec_ctx->subtitle_header_size;
memcpy(enc_ctx->subtitle_header, dec->subtitle_header,
dec->subtitle_header_size);
enc_ctx->subtitle_header_size = dec->subtitle_header_size;
}
break;