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

avcodec/mpegvideo: Move timecode_frame_start to Mpeg1Context 

It is only used there and only by the main thread.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-01-25 14:18:01 +01:00
parent 01f60973a4
commit 757be51ded
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mpeg12dec.c
View File

@ -75,6 +75,7 @@ typedef struct Mpeg1Context {
int tmpgexs;
int first_slice;
int extradata_decoded;
int64_t timecode_frame_start; /*< GOP timecode frame start number, in non drop frame format */
} Mpeg1Context;
#define MB_TYPE_ZERO_MV 0x20000000
@ -2443,7 +2444,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx,
init_get_bits(&s->gb, buf, buf_size * 8);
tc = s-> timecode_frame_start = get_bits(&s->gb, 25);
tc = s1->timecode_frame_start = get_bits(&s->gb, 25);
s1->closed_gop = get_bits1(&s->gb);
/* broken_link indicates that after editing the
@ -2854,19 +2855,19 @@ static int mpeg_decode_frame(AVCodecContext *avctx, void *data,
if (ret<0 || *got_output) {
s2->current_picture_ptr = NULL;
if (s2->timecode_frame_start != -1 && *got_output) {
if (s->timecode_frame_start != -1 && *got_output) {
char tcbuf[AV_TIMECODE_STR_SIZE];
AVFrameSideData *tcside = av_frame_new_side_data(picture,
AV_FRAME_DATA_GOP_TIMECODE,
sizeof(int64_t));
if (!tcside)
return AVERROR(ENOMEM);
memcpy(tcside->data, &s2->timecode_frame_start, sizeof(int64_t));
memcpy(tcside->data, &s->timecode_frame_start, sizeof(int64_t));
av_timecode_make_mpeg_tc_string(tcbuf, s2->timecode_frame_start);
av_timecode_make_mpeg_tc_string(tcbuf, s->timecode_frame_start);
av_dict_set(&picture->metadata, "timecode", tcbuf, 0);
s2->timecode_frame_start = -1;
s->timecode_frame_start = -1;
}
}

1
libavcodec/mpegvideo.h
View File

@ -443,7 +443,6 @@ typedef struct MpegEncContext {
// picture structure defines are loaded from mpegutils.h
int picture_structure;
int64_t timecode_frame_start; ///< GOP timecode frame start number, in non drop frame format
int intra_dc_precision;
int frame_pred_frame_dct;
int top_field_first;