har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/dovi_isom: Don't use AVFormatContext* for logctx

Browse Source 
Pass it as void* instead. While just at it, also constify
the pointee of AVDOVIDecoderConfigurationRecord* in
ff_isom_put_dvcc_dvvc().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-08-08 10:52:44 +02:00
parent 3b75375c9c
commit a08ff28059
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/dovi_isom.c
View File

@ -28,7 +28,8 @@
#include "avformat.h" #include "avformat.h"
#include "dovi_isom.h" #include "dovi_isom.h"
int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size) int ff_isom_parse_dvcc_dvvc(void *logctx, AVStream *st,
const uint8_t *buf_ptr, uint64_t size)
{ {
uint32_t buf; uint32_t buf;
AVDOVIDecoderConfigurationRecord *dovi; AVDOVIDecoderConfigurationRecord *dovi;
@ -70,7 +71,7 @@ int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf
return ret; return ret;
} }
av_log(s, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, " av_log(logctx, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, "
"rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n",
dovi->dv_version_major, dovi->dv_version_minor, dovi->dv_version_major, dovi->dv_version_minor,
dovi->dv_profile, dovi->dv_level, dovi->dv_profile, dovi->dv_level,
@ -82,8 +83,8 @@ int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf
return 0; return 0;
} }
void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], void ff_isom_put_dvcc_dvvc(void *logctx, uint8_t out[ISOM_DVCC_DVVC_SIZE],
AVDOVIDecoderConfigurationRecord *dovi) const AVDOVIDecoderConfigurationRecord *dovi)
{ {
PutBitContext pb; PutBitContext pb;
@ -106,7 +107,8 @@ void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE],
flush_put_bits(&pb); flush_put_bits(&pb);
av_log(s, AV_LOG_DEBUG, "DOVI in %s box, version: %d.%d, profile: %d, level: %d, " av_log(logctx, AV_LOG_DEBUG,
"DOVI in %s box, version: %d.%d, profile: %d, level: %d, "
"rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n",
dovi->dv_profile > 10 ? "dvwC" : (dovi->dv_profile > 7 ? "dvvC" : "dvcC"), dovi->dv_profile > 10 ? "dvwC" : (dovi->dv_profile > 7 ? "dvvC" : "dvcC"),
dovi->dv_version_major, dovi->dv_version_minor, dovi->dv_version_major, dovi->dv_version_minor,

7
libavformat/dovi_isom.h
View File

@ -28,8 +28,9 @@
#define ISOM_DVCC_DVVC_SIZE 24 #define ISOM_DVCC_DVVC_SIZE 24
int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size); int ff_isom_parse_dvcc_dvvc(void *logctx, AVStream *st,
void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], const uint8_t *buf_ptr, uint64_t size);
AVDOVIDecoderConfigurationRecord *dovi); void ff_isom_put_dvcc_dvvc(void *logctx, uint8_t out[ISOM_DVCC_DVVC_SIZE],
const AVDOVIDecoderConfigurationRecord *dovi);
#endif /* AVFORMAT_DOVI_ISOM_H */ #endif /* AVFORMAT_DOVI_ISOM_H */