apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-31 12:36:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

avformat/matroskadec: parse all BlockAdditionMapping elements and export the correct value as BlockAdditional side data

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2023-04-05 12:16:29 -03:00
parent b564ad8eac
commit 88de01d878
1 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
libavformat/matroskadec.c
View File

@@ -2392,17 +2392,23 @@ static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, M
MatroskaBlockAdditionMapping *mapping = &mappings[i]; MatroskaBlockAdditionMapping *mapping = &mappings[i];
switch (mapping->type) { switch (mapping->type) {
case MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT:
av_log(s, AV_LOG_DEBUG,
"Explicit block Addition Mapping type \"Use BlockAddIDValue\", value %"PRIu64","
" name \"%s\" found.\n", mapping->value, mapping->name ? mapping->name : "");
break;
case MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE:
case MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35: case MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35:
if (mapping->value != MATROSKA_BLOCK_ADD_ID_ITU_T_T35) { if (mapping->value != mapping->type) {
int strict = s->strict_std_compliance >= FF_COMPLIANCE_STRICT; int strict = s->strict_std_compliance >= FF_COMPLIANCE_STRICT;
av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING, av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING,
"Invalid Block Addition Value 0x%"PRIx64" for Block Addition Mapping Type " "Invalid Block Addition Value 0x%"PRIx64" for Block Addition Mapping Type "
"\"ITU T.35 metadata\"\n", mapping->value); "0x%"PRIx64", name \"%s\"\n", mapping->value, mapping->type,
if (!strict) mapping->name ? mapping->name : "");
break; if (strict)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
track->blockaddid_itu_t_t35 = 1; track->blockaddid_itu_t_t35 |= mapping->type == MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35;
break; break;
case MATROSKA_BLOCK_ADD_ID_TYPE_DVCC: case MATROSKA_BLOCK_ADD_ID_TYPE_DVCC:
case MATROSKA_BLOCK_ADD_ID_TYPE_DVVC: case MATROSKA_BLOCK_ADD_ID_TYPE_DVVC:
@@ -2412,8 +2418,18 @@ static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, M
break; break;
default: default:
av_log(s, AV_LOG_DEBUG, av_log(s, AV_LOG_DEBUG,
"Unknown block additional mapping type 0x%"PRIx64", value %"PRIu64", name \"%s\"\n", "Unknown Block Addition Mapping type 0x%"PRIx64", value %"PRIu64", name \"%s\"\n",
mapping->type, mapping->value, mapping->name ? mapping->name : ""); mapping->type, mapping->value, mapping->name ? mapping->name : "");
if (mapping->value < 2) {
int strict = s->strict_std_compliance >= FF_COMPLIANCE_STRICT;
av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING,
"Invalid Block Addition value 0x%"PRIu64" for unknown Block Addition Mapping "
"type %"PRIx64", name \"%s\"\n", mapping->value, mapping->type,
mapping->name ? mapping->name : "");
if (strict)
return AVERROR_INVALIDDATA;
}
break;
} }
} }
@@ -3638,11 +3654,28 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
MatroskaTrack *track, AVPacket *pkt, MatroskaTrack *track, AVPacket *pkt,
const uint8_t *data, int size, uint64_t id) const uint8_t *data, int size, uint64_t id)
{ {
const EbmlList *mappings_list = &track->block_addition_mappings;
MatroskaBlockAdditionMapping *mappings = mappings_list->elem, *mapping = NULL;
uint8_t *side_data; uint8_t *side_data;
int res; int res;
for (int i = 0; i < mappings_list->nb_elem; i++) {
if (id != mappings[i].value)
continue;
mapping = &mappings[i];
break;
}
if (id != 1 && !matroska->is_webm && !mapping) {
av_log(matroska->ctx, AV_LOG_WARNING, "BlockAddID %"PRIu64" has no mapping. Skipping\n", id);
return 0;
}
if (mapping && mapping->type)
id = mapping->type;
switch (id) { switch (id) {
case 4: { case MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35: {
GetByteContext bc; GetByteContext bc;
int country_code, provider_code; int country_code, provider_code;
int provider_oriented_code, application_identifier; int provider_oriented_code, application_identifier;
@@ -3678,13 +3711,9 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
av_free(hdrplus); av_free(hdrplus);
return res; return res;
} }
return 0;
}
default:
break; break;
} }
default:
side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
size + (size_t)8); size + (size_t)8);
if (!side_data) if (!side_data)
@@ -3692,6 +3721,8 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
AV_WB64(side_data, id); AV_WB64(side_data, id);
memcpy(side_data + 8, data, size); memcpy(side_data + 8, data, size);
break;
}
return 0; return 0;
} }