RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 16:22:37 +00:00
Code Issues Projects Releases Wiki Activity

lavc: add HEVC Multiview Main profile

Browse Source
This commit is contained in:
Anton Khirnov 2024-05-28 14:29:19 +02:00
parent 4cbd1a8a54
commit c35a51f4bb
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07
API changes, most recent first:
2024-xx-xx - xxxxxxx - lavc 61.12.100 - defs.h
Add AV_PROFILE_HEVC_MULTIVIEW_MAIN
2024-09-xx - xxxxxxxxx - lavu 59.36.100 - opt.h
Add av_opt_set_array() and AV_OPT_ARRAY_REPLACE.

1
libavcodec/defs.h
View File

@ -160,6 +160,7 @@
#define AV_PROFILE_HEVC_MAIN_10 2
#define AV_PROFILE_HEVC_MAIN_STILL_PICTURE 3
#define AV_PROFILE_HEVC_REXT 4
#define AV_PROFILE_HEVC_MULTIVIEW_MAIN 6
#define AV_PROFILE_HEVC_SCC 9
#define AV_PROFILE_VVC_MAIN_10 1

24
libavcodec/hevc/ps.c
View File

@ -29,6 +29,7 @@
#include "h2645_vui.h"
#include "data.h"
#include "ps.h"
#include "profiles.h"
#include "refstruct.h"
static const uint8_t default_scaling_list_intra[] = {
@ -244,6 +245,7 @@ int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx,
static int decode_profile_tier_level(GetBitContext *gb, AVCodecContext *avctx,
PTLCommon *ptl)
{
const char *profile_name = NULL;
int i;
if (get_bits_left(gb) < 2+1+5 + 32 + 4 + 43 + 1)
@ -252,18 +254,16 @@ static int decode_profile_tier_level(GetBitContext *gb, AVCodecContext *avctx,
ptl->profile_space = get_bits(gb, 2);
ptl->tier_flag = get_bits1(gb);
ptl->profile_idc = get_bits(gb, 5);
if (ptl->profile_idc == AV_PROFILE_HEVC_MAIN)
av_log(avctx, AV_LOG_DEBUG, "Main profile bitstream\n");
else if (ptl->profile_idc == AV_PROFILE_HEVC_MAIN_10)
av_log(avctx, AV_LOG_DEBUG, "Main 10 profile bitstream\n");
else if (ptl->profile_idc == AV_PROFILE_HEVC_MAIN_STILL_PICTURE)
av_log(avctx, AV_LOG_DEBUG, "Main Still Picture profile bitstream\n");
else if (ptl->profile_idc == AV_PROFILE_HEVC_REXT)
av_log(avctx, AV_LOG_DEBUG, "Range Extension profile bitstream\n");
else if (ptl->profile_idc == AV_PROFILE_HEVC_SCC)
av_log(avctx, AV_LOG_DEBUG, "Screen Content Coding Extension profile bitstream\n");
else
av_log(avctx, AV_LOG_WARNING, "Unknown HEVC profile: %d\n", ptl->profile_idc);
#if !CONFIG_SMALL
for (int i = 0; ff_hevc_profiles[i].profile != AV_PROFILE_UNKNOWN; i++)
if (ff_hevc_profiles[i].profile == ptl->profile_idc) {
profile_name = ff_hevc_profiles[i].name;
break;
}
#endif
av_log(avctx, profile_name ? AV_LOG_DEBUG : AV_LOG_WARNING,
"%s profile bitstream\n", profile_name ? profile_name : "Unknown");
for (i = 0; i < 32; i++) {
ptl->profile_compatibility_flag[i] = get_bits1(gb);

1
libavcodec/profiles.c
View File

@ -99,6 +99,7 @@ const AVProfile ff_hevc_profiles[] = {
{ AV_PROFILE_HEVC_MAIN_10, "Main 10" },
{ AV_PROFILE_HEVC_MAIN_STILL_PICTURE, "Main Still Picture" },
{ AV_PROFILE_HEVC_REXT, "Rext" },
{ AV_PROFILE_HEVC_MULTIVIEW_MAIN, "Multiview Main" },
{ AV_PROFILE_HEVC_SCC, "Scc" },
{ AV_PROFILE_UNKNOWN },
};

2
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 11
#define LIBAVCODEC_VERSION_MINOR 12
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \