highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg: merge DemuxPktData into FrameData

Browse Source 
This way we can propagate arbitrary data from the demuxer all the way
into the muxer, using a single struct.
This commit is contained in:
Anton Khirnov
2023-11-24 09:49:37 +01:00
parent 5475f665f6
commit c9f38210fc
4 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fftools/ffmpeg.h
View File

@@ -115,12 +115,6 @@ typedef struct {
} AudioChannelMap;
#endif
typedef struct DemuxPktData {
// estimated dts in AV_TIME_BASE_Q,
// to be used when real dts is missing
int64_t dts_est;
} DemuxPktData;
typedef struct OptionsContext {
OptionGroup *g;
@@ -622,6 +616,10 @@ typedef struct OutputFile {
// optionally attached as opaque_ref to decoded AVFrames
typedef struct FrameData {
// demuxer-estimated dts in AV_TIME_BASE_Q,
// to be used when real dts is missing
int64_t dts_est;
// properties that come from the decoder
struct {
uint64_t frame_num;
@@ -723,6 +721,9 @@ FrameData *frame_data(AVFrame *frame);
const FrameData *frame_data_c(AVFrame *frame);
FrameData *packet_data (AVPacket *pkt);
const FrameData *packet_data_c(AVPacket *pkt);
/**
* Set up fallback filtering parameters from a decoder context. They will only
* be used if no frames are ever sent on this input, otherwise the actual