highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/libdav1d: use named constants for ITU-T T.35 metadata

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2024-03-11 11:01:04 -03:00
parent a1f714d197
commit 61519cc654
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/libdav1d.c
View File

@@ -37,6 +37,7 @@
#include "decode.h" #include "decode.h"
#include "dovi_rpu.h" #include "dovi_rpu.h"
#include "internal.h" #include "internal.h"
#include "itut35.h"
#define FF_DAV1D_VERSION_AT_LEAST(x,y) \ #define FF_DAV1D_VERSION_AT_LEAST(x,y) \
(DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y)) (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y))
@@ -542,7 +543,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
provider_code = bytestream2_get_be16(&gb); provider_code = bytestream2_get_be16(&gb);
switch (provider_code) { switch (provider_code) {
case 0x31: { // atsc_provider_code case ITU_T_T35_PROVIDER_CODE_ATSC: {
uint32_t user_identifier = bytestream2_get_be32(&gb); uint32_t user_identifier = bytestream2_get_be32(&gb);
switch (user_identifier) { switch (user_identifier) {
case MKBETAG('G', 'A', '9', '4'): { // closed captions case MKBETAG('G', 'A', '9', '4'): { // closed captions
@@ -566,12 +567,12 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
} }
break; break;
} }
case 0x3C: { // smpte_provider_code case ITU_T_T35_PROVIDER_CODE_SMTPE: {
AVDynamicHDRPlus *hdrplus; AVDynamicHDRPlus *hdrplus;
int provider_oriented_code = bytestream2_get_be16(&gb); int provider_oriented_code = bytestream2_get_be16(&gb);
int application_identifier = bytestream2_get_byte(&gb); int application_identifier = bytestream2_get_byte(&gb);
if (itut_t35->country_code != 0xB5 || if (itut_t35->country_code != ITU_T_T35_COUNTRY_CODE_US ||
provider_oriented_code != 1 || application_identifier != 4) provider_oriented_code != 1 || application_identifier != 4)
break; break;
@@ -587,9 +588,10 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
goto fail; goto fail;
break; break;
} }
case 0x3B: { // dolby_provider_code case ITU_T_T35_PROVIDER_CODE_DOLBY: {
int provider_oriented_code = bytestream2_get_be32(&gb); int provider_oriented_code = bytestream2_get_be32(&gb);
if (itut_t35->country_code != 0xB5 || provider_oriented_code != 0x800) if (itut_t35->country_code != ITU_T_T35_COUNTRY_CODE_US ||
provider_oriented_code != 0x800)
break; break;
res = ff_dovi_rpu_parse(&dav1d->dovi, gb.buffer, gb.buffer_end - gb.buffer); res = ff_dovi_rpu_parse(&dav1d->dovi, gb.buffer, gb.buffer_end - gb.buffer);