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

avformat/vpcc: add ff_isom_get_vpcc_features()

Browse Source 
Should be useful for muxers that require values as defined in the
vpcc atom but don't need to write the atom itself.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-01-13 16:04:55 -03:00
parent 07a566e7d6
commit 153e920892
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/vpcc.c
View File

@ -67,8 +67,8 @@ static int get_vpx_video_full_range_flag(enum AVColorRange color_range)
return color_range == AVCOL_RANGE_JPEG; return color_range == AVCOL_RANGE_JPEG;
} }
int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb, int ff_isom_get_vpcc_features(AVFormatContext *s, AVCodecParameters *par,
AVCodecParameters *par) VPCC *vpcc)
{ {
int profile = par->profile; int profile = par->profile;
int level = par->level == FF_LEVEL_UNKNOWN ? 0 : par->level; int level = par->level == FF_LEVEL_UNKNOWN ? 0 : par->level;
@ -90,9 +90,28 @@ int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb,
} }
} }
avio_w8(pb, profile); vpcc->profile = profile;
avio_w8(pb, level); vpcc->level = level;
avio_w8(pb, (bit_depth << 4) | (vpx_chroma_subsampling << 1) | vpx_video_full_range_flag); vpcc->bitdepth = bit_depth;
vpcc->chroma_subsampling = vpx_chroma_subsampling;
vpcc->full_range_flag = vpx_video_full_range_flag;
return 0;
}
int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb,
AVCodecParameters *par)
{
VPCC vpcc;
int ret;
ret = ff_isom_get_vpcc_features(s, par, &vpcc);
if (ret < 0)
return ret;
avio_w8(pb, vpcc.profile);
avio_w8(pb, vpcc.level);
avio_w8(pb, (vpcc.bitdepth << 4) | (vpcc.chroma_subsampling << 1) | vpcc.full_range_flag);
avio_w8(pb, par->color_primaries); avio_w8(pb, par->color_primaries);
avio_w8(pb, par->color_trc); avio_w8(pb, par->color_trc);
avio_w8(pb, par->color_space); avio_w8(pb, par->color_space);

11
libavformat/vpcc.h
View File

@ -32,6 +32,14 @@
#include "avformat.h" #include "avformat.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
typedef struct VPCC {
int profile;
int level;
int bitdepth;
int chroma_subsampling;
int full_range_flag;
} VPCC;
/** /**
* Writes VP codec configuration to the provided AVIOContext. * Writes VP codec configuration to the provided AVIOContext.
* *
@ -44,4 +52,7 @@
int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb, int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb,
AVCodecParameters *par); AVCodecParameters *par);
int ff_isom_get_vpcc_features(AVFormatContext *s, AVCodecParameters *par,
VPCC *vpcc);
#endif /* AVFORMAT_VPCC_H */ #endif /* AVFORMAT_VPCC_H */