RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/matroskadec: export cropping values 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-03-23 16:18:23 -03:00
parent dc763efe70
commit 79e8e980c2
2 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libavformat/matroskadec.c
View File

@ -213,7 +213,13 @@ typedef struct MatroskaTrackVideo {
uint64_t display_height; uint64_t display_height;
uint64_t pixel_width; uint64_t pixel_width;
uint64_t pixel_height; uint64_t pixel_height;
uint64_t cropped_width;
uint64_t cropped_height;
EbmlBin color_space; EbmlBin color_space;
uint64_t pixel_cropt;
uint64_t pixel_cropl;
uint64_t pixel_cropb;
uint64_t pixel_cropr;
uint64_t display_unit; uint64_t display_unit;
uint64_t interlaced; uint64_t interlaced;
uint64_t field_order; uint64_t field_order;
@ -527,10 +533,10 @@ static EbmlSyntax matroska_track_video[] = {
{ MATROSKA_ID_VIDEOALPHAMODE, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, alpha_mode), { .u = 0 } }, { MATROSKA_ID_VIDEOALPHAMODE, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, alpha_mode), { .u = 0 } },
{ MATROSKA_ID_VIDEOCOLOR, EBML_NEST, 0, sizeof(MatroskaTrackVideoColor), offsetof(MatroskaTrackVideo, color), { .n = matroska_track_video_color } }, { MATROSKA_ID_VIDEOCOLOR, EBML_NEST, 0, sizeof(MatroskaTrackVideoColor), offsetof(MatroskaTrackVideo, color), { .n = matroska_track_video_color } },
{ MATROSKA_ID_VIDEOPROJECTION, EBML_NEST, 0, 0, offsetof(MatroskaTrackVideo, projection), { .n = matroska_track_video_projection } }, { MATROSKA_ID_VIDEOPROJECTION, EBML_NEST, 0, 0, offsetof(MatroskaTrackVideo, projection), { .n = matroska_track_video_projection } },
{ MATROSKA_ID_VIDEOPIXELCROPB, EBML_NONE }, { MATROSKA_ID_VIDEOPIXELCROPB, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropb), {.u = 0 } },
{ MATROSKA_ID_VIDEOPIXELCROPT, EBML_NONE }, { MATROSKA_ID_VIDEOPIXELCROPT, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropt), {.u = 0 } },
{ MATROSKA_ID_VIDEOPIXELCROPL, EBML_NONE }, { MATROSKA_ID_VIDEOPIXELCROPL, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropl), {.u = 0 } },
{ MATROSKA_ID_VIDEOPIXELCROPR, EBML_NONE }, { MATROSKA_ID_VIDEOPIXELCROPR, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropr), {.u = 0 } },
{ MATROSKA_ID_VIDEODISPLAYUNIT, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, display_unit), { .u= MATROSKA_VIDEO_DISPLAYUNIT_PIXELS } }, { MATROSKA_ID_VIDEODISPLAYUNIT, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, display_unit), { .u= MATROSKA_VIDEO_DISPLAYUNIT_PIXELS } },
{ MATROSKA_ID_VIDEOFLAGINTERLACED, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, interlaced), { .u = MATROSKA_VIDEO_INTERLACE_FLAG_UNDETERMINED } }, { MATROSKA_ID_VIDEOFLAGINTERLACED, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, interlaced), { .u = MATROSKA_VIDEO_INTERLACE_FLAG_UNDETERMINED } },
{ MATROSKA_ID_VIDEOFIELDORDER, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, field_order), { .u = MATROSKA_VIDEO_FIELDORDER_UNDETERMINED } }, { MATROSKA_ID_VIDEOFIELDORDER, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, field_order), { .u = MATROSKA_VIDEO_FIELDORDER_UNDETERMINED } },
@ -2967,14 +2973,30 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st,
if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) {
if (track->video.display_width && track->video.display_height && if (track->video.display_width && track->video.display_height &&
track->video.display_width != -1 && track->video.display_height != -1 && track->video.display_width != -1 && track->video.display_height != -1 &&
par->height < INT64_MAX / track->video.display_width / display_width_mul && track->video.cropped_height < INT64_MAX / track->video.display_width / display_width_mul &&
par->width < INT64_MAX / track->video.display_height / display_height_mul) track->video.cropped_width < INT64_MAX / track->video.display_height / display_height_mul)
av_reduce(&st->sample_aspect_ratio.num, av_reduce(&st->sample_aspect_ratio.num,
&st->sample_aspect_ratio.den, &st->sample_aspect_ratio.den,
par->height * track->video.display_width * display_width_mul, track->video.cropped_height * track->video.display_width * display_width_mul,
par->width * track->video.display_height * display_height_mul, track->video.cropped_width * track->video.display_height * display_height_mul,
INT_MAX); INT_MAX);
} }
if (track->video.cropped_width != track->video.pixel_width ||
track->video.cropped_height != track->video.pixel_height) {
uint8_t *cropping;
AVPacketSideData *sd = av_packet_side_data_new(&st->codecpar->coded_side_data,
&st->codecpar->nb_coded_side_data,
AV_PKT_DATA_FRAME_CROPPING,
sizeof(uint32_t) * 4, 0);
if (!sd)
return AVERROR(ENOMEM);
cropping = sd->data;
bytestream_put_le32(&cropping, track->video.pixel_cropt);
bytestream_put_le32(&cropping, track->video.pixel_cropb);
bytestream_put_le32(&cropping, track->video.pixel_cropl);
bytestream_put_le32(&cropping, track->video.pixel_cropr);
}
if (par->codec_id != AV_CODEC_ID_HEVC) if (par->codec_id != AV_CODEC_ID_HEVC)
sti->need_parsing = AVSTREAM_PARSE_HEADERS; sti->need_parsing = AVSTREAM_PARSE_HEADERS;
@ -3140,11 +3162,20 @@ static int matroska_parse_tracks(AVFormatContext *s)
track->default_duration = default_duration; track->default_duration = default_duration;
} }
} }
if (track->video.pixel_cropl >= INT_MAX - track->video.pixel_cropr ||
track->video.pixel_cropt >= INT_MAX - track->video.pixel_cropb ||
(track->video.pixel_cropl + track->video.pixel_cropr) >= track->video.pixel_width ||
(track->video.pixel_cropt + track->video.pixel_cropb) >= track->video.pixel_height)
return AVERROR_INVALIDDATA;
track->video.cropped_width = track->video.pixel_width -
track->video.pixel_cropl - track->video.pixel_cropr;
track->video.cropped_height = track->video.pixel_height -
track->video.pixel_cropt - track->video.pixel_cropb;
if (track->video.display_unit == MATROSKA_VIDEO_DISPLAYUNIT_PIXELS) { if (track->video.display_unit == MATROSKA_VIDEO_DISPLAYUNIT_PIXELS) {
if (track->video.display_width == -1) if (track->video.display_width == -1)
track->video.display_width = track->video.pixel_width; track->video.display_width = track->video.cropped_width;
if (track->video.display_height == -1) if (track->video.display_height == -1)
track->video.display_height = track->video.pixel_height; track->video.display_height = track->video.cropped_height;
} }
} else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
if (!track->audio.out_samplerate) if (!track->audio.out_samplerate)

2
libavformat/version.h
View File

@ -32,7 +32,7 @@
#include "version_major.h" #include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR 5 #define LIBAVFORMAT_VERSION_MINOR 5
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \