virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/apvdec: don't fill container level fields with codec level info

Browse Source 
This is a raw demuxer, it should not read codec level information and export it
as container level information.
The generic demux code will use the recently introduced parser to take care of
that.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-04-27 17:59:14 -03:00
parent c4ea4abec2
commit 33d0d1c672
2 changed files with 7 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@@ -3649,6 +3649,7 @@ act_demuxer_select="riffdec"
adts_muxer_select="mpeg4audio" adts_muxer_select="mpeg4audio"
aiff_muxer_select="iso_media" aiff_muxer_select="iso_media"
amv_muxer_select="riffenc" amv_muxer_select="riffenc"
apv_demuxer_select="apv_parser"
asf_demuxer_select="riffdec" asf_demuxer_select="riffdec"
asf_o_demuxer_select="riffdec" asf_o_demuxer_select="riffdec"
asf_muxer_select="riffenc" asf_muxer_select="riffenc"

46
libavformat/apvdec.c
View File

@@ -36,24 +36,13 @@ typedef struct APVHeaderInfo {
int frame_width; int frame_width;
int frame_height; int frame_height;
uint8_t chroma_format_idc;
uint8_t bit_depth_minus8; uint8_t bit_depth_minus8;
enum AVPixelFormat pixel_format;
} APVHeaderInfo; } APVHeaderInfo;
static const enum AVPixelFormat apv_format_table[5][5] = { static int apv_extract_header_info(GetByteContext *gbc)
{ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16 },
{ 0 }, // 4:2:0 is not valid.
{ AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUV422P16 },
{ AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUV444P16 },
{ AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUVA444P16 },
};
static int apv_extract_header_info(APVHeaderInfo *info,
GetByteContext *gbc)
{ {
int zero, byte, bit_depth_index; APVHeaderInfo header, *info = &header;
int zero, byte;
info->pbu_type = bytestream2_get_byte(gbc); info->pbu_type = bytestream2_get_byte(gbc);
info->group_id = bytestream2_get_be16(gbc); info->group_id = bytestream2_get_be16(gbc);
@@ -81,7 +70,6 @@ static int apv_extract_header_info(APVHeaderInfo *info,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
byte = bytestream2_get_byte(gbc); byte = bytestream2_get_byte(gbc);
info->chroma_format_idc = byte >> 4;
info->bit_depth_minus8 = byte & 0xf; info->bit_depth_minus8 = byte & 0xf;
if (info->bit_depth_minus8 > 8) { if (info->bit_depth_minus8 > 8) {
@@ -91,18 +79,6 @@ static int apv_extract_header_info(APVHeaderInfo *info,
// Odd bit depths are technically valid but not useful here. // Odd bit depths are technically valid but not useful here.
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
bit_depth_index = info->bit_depth_minus8 / 2;
switch (info->chroma_format_idc) {
case APV_CHROMA_FORMAT_400:
case APV_CHROMA_FORMAT_422:
case APV_CHROMA_FORMAT_444:
case APV_CHROMA_FORMAT_4444:
info->pixel_format = apv_format_table[info->chroma_format_idc][bit_depth_index];
break;
default:
return AVERROR_INVALIDDATA;
}
// Ignore capture_time_distance. // Ignore capture_time_distance.
bytestream2_skip(gbc, 1); bytestream2_skip(gbc, 1);
@@ -117,7 +93,6 @@ static int apv_extract_header_info(APVHeaderInfo *info,
static int apv_probe(const AVProbeData *p) static int apv_probe(const AVProbeData *p)
{ {
GetByteContext gbc; GetByteContext gbc;
APVHeaderInfo header;
uint32_t au_size, signature, pbu_size; uint32_t au_size, signature, pbu_size;
int err; int err;
@@ -144,7 +119,7 @@ static int apv_probe(const AVProbeData *p)
return 0; return 0;
} }
err = apv_extract_header_info(&header, &gbc); err = apv_extract_header_info(&gbc);
if (err < 0) { if (err < 0) {
// Header does not look like APV. // Header does not look like APV.
return 0; return 0;
@@ -156,8 +131,7 @@ static int apv_read_header(AVFormatContext *s)
{ {
AVStream *st; AVStream *st;
GetByteContext gbc; GetByteContext gbc;
APVHeaderInfo header; uint8_t buffer[12];
uint8_t buffer[28];
uint32_t au_size, signature, pbu_size; uint32_t au_size, signature, pbu_size;
int err, size; int err, size;
@@ -186,22 +160,14 @@ static int apv_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
err = apv_extract_header_info(&header, &gbc);
if (err < 0)
return err;
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
st->codecpar->codec_id = AV_CODEC_ID_APV; st->codecpar->codec_id = AV_CODEC_ID_APV;
st->codecpar->format = header.pixel_format;
st->codecpar->profile = header.profile_idc;
st->codecpar->level = header.level_idc;
st->codecpar->width = header.frame_width;
st->codecpar->height = header.frame_height;
ffstream(st)->need_parsing = AVSTREAM_PARSE_HEADERS;
st->avg_frame_rate = (AVRational){ 30, 1 }; st->avg_frame_rate = (AVRational){ 30, 1 };
avpriv_set_pts_info(st, 64, 1, 30); avpriv_set_pts_info(st, 64, 1, 30);