lavc/avcodec: Add HEVC Screen Content Coding Extensions profile

Described in HEVC spec A.3.7. Bump minor version and add APIchanges entry for new added profile.

Linjie Fu committed 3 years ago

Commit f4593771 parent b09f31a5 files · +8 −1Browse files

Unified · Split

5 files

doc/APIchanges +3 −0
libavcodec/avcodec.h +1 −0
libavcodec/hevc_ps.c +2 −0
libavcodec/profiles.c +1 −0
libavcodec/version.h +1 −1

doc/APIchanges+3−0

@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 · 1 unmodified line
2		2
3	API changes, most recent first:	3	API changes, most recent first:
4		4
		5	2023-02-25 - xxxxxxxxxx - lavc 60.5.100 - avcodec.h
		6	Add FF_PROFILE_HEVC_SCC.
		7
5	-------- 8< --------- FFmpeg 6.0 was cut here -------- 8< ---------	8	-------- 8< --------- FFmpeg 6.0 was cut here -------- 8< ---------
6		9
7	2023-02-16 - 927042b409 - lavf 60.2.100 - avformat.h	10	2023-02-16 - 927042b409 - lavf 60.2.100 - avformat.h

libavcodec/avcodec.h+1−0

@@ -1654,6 +1654,7 @@ typedef struct AVCodecContext { · 1653 unmodified lines
1654	#define FF_PROFILE_HEVC_MAIN_10 2	1654	#define FF_PROFILE_HEVC_MAIN_10 2
1655	#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3	1655	#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3
1656	#define FF_PROFILE_HEVC_REXT 4	1656	#define FF_PROFILE_HEVC_REXT 4
		1657	#define FF_PROFILE_HEVC_SCC 9
1657		1658
1658	#define FF_PROFILE_VVC_MAIN_10 1	1659	#define FF_PROFILE_VVC_MAIN_10 1
1659	#define FF_PROFILE_VVC_MAIN_10_444 33	1660	#define FF_PROFILE_VVC_MAIN_10_444 33

libavcodec/hevc_ps.c+2−0

@@ -259,6 +259,8 @@ static int decode_profile_tier_level(GetBitContext gb, AVCodecContext avctx, · 258 unmodified lines
259	av_log(avctx, AV_LOG_DEBUG, "Main Still Picture profile bitstream\n");	259	av_log(avctx, AV_LOG_DEBUG, "Main Still Picture profile bitstream\n");
260	else if (ptl->profile_idc == FF_PROFILE_HEVC_REXT)	260	else if (ptl->profile_idc == FF_PROFILE_HEVC_REXT)
261	av_log(avctx, AV_LOG_DEBUG, "Range Extension profile bitstream\n");	261	av_log(avctx, AV_LOG_DEBUG, "Range Extension profile bitstream\n");
		262	else if (ptl->profile_idc == FF_PROFILE_HEVC_SCC)
		263	av_log(avctx, AV_LOG_DEBUG, "Screen Content Coding Extension profile bitstream\n");
262	else	264	else
263	av_log(avctx, AV_LOG_WARNING, "Unknown HEVC profile: %d\n", ptl->profile_idc);	265	av_log(avctx, AV_LOG_WARNING, "Unknown HEVC profile: %d\n", ptl->profile_idc);
264		266

libavcodec/profiles.c+1−0

@@ -85,6 +85,7 @@ const AVProfile ff_hevc_profiles[] = { · 84 unmodified lines
85	{ FF_PROFILE_HEVC_MAIN_10, "Main 10" },	85	{ FF_PROFILE_HEVC_MAIN_10, "Main 10" },
86	{ FF_PROFILE_HEVC_MAIN_STILL_PICTURE, "Main Still Picture" },	86	{ FF_PROFILE_HEVC_MAIN_STILL_PICTURE, "Main Still Picture" },
87	{ FF_PROFILE_HEVC_REXT, "Rext" },	87	{ FF_PROFILE_HEVC_REXT, "Rext" },
		88	{ FF_PROFILE_HEVC_SCC, "Scc" },
88	{ FF_PROFILE_UNKNOWN },	89	{ FF_PROFILE_UNKNOWN },
89	};	90	};
90		91

libavcodec/version.h+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29		29
30	#include "version_major.h"	30	#include "version_major.h"
31		31
32	#define LIBAVCODEC_VERSION_MINOR 4	32	#define LIBAVCODEC_VERSION_MINOR 5
33	#define LIBAVCODEC_VERSION_MICRO 100	33	#define LIBAVCODEC_VERSION_MICRO 100
34		34
35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \	35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \