virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

avformat/vpcc: Generalize the AVFormatContext parameter to void*

Browse Source 
This parameter is only used as a logging context; don't require
a full AVFormatContext here.
This commit is contained in:
Martin Storsjö
2025-10-23 13:35:12 +03:00
parent 549b45459e
commit d015382f4a
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/vpcc.c
View File

@@ -35,7 +35,7 @@ enum VPX_CHROMA_SUBSAMPLING
VPX_SUBSAMPLING_444 = 3, VPX_SUBSAMPLING_444 = 3,
}; };
static int get_vpx_chroma_subsampling(AVFormatContext *s, static int get_vpx_chroma_subsampling(void *logctx,
enum AVPixelFormat pixel_format, enum AVPixelFormat pixel_format,
enum AVChromaLocation chroma_location) enum AVChromaLocation chroma_location)
{ {
@@ -51,15 +51,15 @@ static int get_vpx_chroma_subsampling(AVFormatContext *s,
return VPX_SUBSAMPLING_444; return VPX_SUBSAMPLING_444;
} }
} }
av_log(s, AV_LOG_ERROR, "Unsupported pixel format (%d)\n", pixel_format); av_log(logctx, AV_LOG_ERROR, "Unsupported pixel format (%d)\n", pixel_format);
return -1; return -1;
} }
static int get_bit_depth(AVFormatContext *s, enum AVPixelFormat pixel_format) static int get_bit_depth(void *logctx, enum AVPixelFormat pixel_format)
{ {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pixel_format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pixel_format);
if (desc == NULL) { if (desc == NULL) {
av_log(s, AV_LOG_ERROR, "Unsupported pixel format (%d)\n", av_log(logctx, AV_LOG_ERROR, "Unsupported pixel format (%d)\n",
pixel_format); pixel_format);
return -1; return -1;
} }
@@ -150,16 +150,16 @@ static void parse_bitstream(GetBitContext *gb, int *profile, int *bit_depth) {
*bit_depth = *profile <= 1 ? 8 : 10 + get_bits1(gb) * 2; *bit_depth = *profile <= 1 ? 8 : 10 + get_bits1(gb) * 2;
} }
int ff_isom_get_vpcc_features(AVFormatContext *s, AVCodecParameters *par, int ff_isom_get_vpcc_features(void *logctx, AVCodecParameters *par,
const uint8_t *data, int len, const uint8_t *data, int len,
AVRational *frame_rate, VPCC *vpcc) AVRational *frame_rate, VPCC *vpcc)
{ {
int profile = par->profile; int profile = par->profile;
int level = par->level == AV_LEVEL_UNKNOWN ? int level = par->level == AV_LEVEL_UNKNOWN ?
get_vp9_level(par, frame_rate) : par->level; get_vp9_level(par, frame_rate) : par->level;
int bit_depth = get_bit_depth(s, par->format); int bit_depth = get_bit_depth(logctx, par->format);
int vpx_chroma_subsampling = int vpx_chroma_subsampling =
get_vpx_chroma_subsampling(s, par->format, par->chroma_location); get_vpx_chroma_subsampling(logctx, par->format, par->chroma_location);
int vpx_video_full_range_flag = int vpx_video_full_range_flag =
get_vpx_video_full_range_flag(par->color_range); get_vpx_video_full_range_flag(par->color_range);
@@ -186,7 +186,7 @@ int ff_isom_get_vpcc_features(AVFormatContext *s, AVCodecParameters *par,
} }
if (profile == AV_PROFILE_UNKNOWN || !bit_depth) if (profile == AV_PROFILE_UNKNOWN || !bit_depth)
av_log(s, AV_LOG_WARNING, "VP9 profile and/or bit depth not set or could not be derived\n"); av_log(logctx, AV_LOG_WARNING, "VP9 profile and/or bit depth not set or could not be derived\n");
vpcc->profile = profile; vpcc->profile = profile;
vpcc->level = level; vpcc->level = level;
@@ -197,14 +197,14 @@ int ff_isom_get_vpcc_features(AVFormatContext *s, AVCodecParameters *par,
return 0; return 0;
} }
int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb, int ff_isom_write_vpcc(void *logctx, AVIOContext *pb,
const uint8_t *data, int len, const uint8_t *data, int len,
AVCodecParameters *par) AVCodecParameters *par)
{ {
VPCC vpcc; VPCC vpcc;
int ret; int ret;
ret = ff_isom_get_vpcc_features(s, par, data, len, NULL, &vpcc); ret = ff_isom_get_vpcc_features(logctx, par, data, len, NULL, &vpcc);
if (ret < 0) if (ret < 0)
return ret; return ret;

7
libavformat/vpcc.h
View File

@@ -30,7 +30,6 @@
#include "libavutil/rational.h" #include "libavutil/rational.h"
#include "libavcodec/codec_par.h" #include "libavcodec/codec_par.h"
#include "avio.h" #include "avio.h"
#include "avformat.h"
typedef struct VPCC { typedef struct VPCC {
int profile; int profile;
@@ -43,7 +42,7 @@ typedef struct VPCC {
/** /**
* Writes VP codec configuration to the provided AVIOContext. * Writes VP codec configuration to the provided AVIOContext.
* *
* @param s address of the AVFormatContext for the logging context. * @param logctx opaque pointer for logging.
* @param pb address of the AVIOContext where the vpcC shall be written. * @param pb address of the AVIOContext where the vpcC shall be written.
* @param data address of a data array which contains coded bitstream data from * @param data address of a data array which contains coded bitstream data from
* which codec information can be extracted. May be NULL. * which codec information can be extracted. May be NULL.
@@ -52,11 +51,11 @@ typedef struct VPCC {
* @return >=0 in case of success, a negative value corresponding to an AVERROR * @return >=0 in case of success, a negative value corresponding to an AVERROR
* code in case of failure * code in case of failure
*/ */
int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb, int ff_isom_write_vpcc(void *logctx, AVIOContext *pb,
const uint8_t *data, int len, const uint8_t *data, int len,
AVCodecParameters *par); AVCodecParameters *par);
int ff_isom_get_vpcc_features(AVFormatContext *s, AVCodecParameters *par, int ff_isom_get_vpcc_features(void *logctx, AVCodecParameters *par,
const uint8_t *data, int len, const uint8_t *data, int len,
AVRational *frame_rate, VPCC *vpcc); AVRational *frame_rate, VPCC *vpcc);