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

spherical: Change types of bounding and pad to uint32_t 

These values are defined to be 32bit in the specification,
so it makes more sense to store them as fixed width.

Based on a patch by Micahel Niedermayer <michael@niedermayer.cc>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara 2017-03-16 17:20:47 -04:00
parent 21a8e751ad
commit f20bcec4c2
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/dump.c
View File

@ -375,7 +375,7 @@ static void dump_spherical(void *ctx, AVCodecParameters *par, AVPacketSideData *
&l, &t, &r, &b); &l, &t, &r, &b);
av_log(ctx, AV_LOG_INFO, "[%zu, %zu, %zu, %zu] ", l, t, r, b); av_log(ctx, AV_LOG_INFO, "[%zu, %zu, %zu, %zu] ", l, t, r, b);
} else if (spherical->projection == AV_SPHERICAL_CUBEMAP) { } else if (spherical->projection == AV_SPHERICAL_CUBEMAP) {
av_log(ctx, AV_LOG_INFO, "[pad %zu] ", spherical->padding); av_log(ctx, AV_LOG_INFO, "[pad %"PRIu32"] ", spherical->padding);
} }
} }

7
libavformat/matroskadec.c
View File

@ -1913,8 +1913,8 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track)
AVSphericalMapping *spherical; AVSphericalMapping *spherical;
enum AVSphericalProjection projection; enum AVSphericalProjection projection;
size_t spherical_size; size_t spherical_size;
size_t l = 0, t = 0, r = 0, b = 0; uint32_t l = 0, t = 0, r = 0, b = 0;
size_t padding = 0; uint32_t padding = 0;
int ret; int ret;
GetByteContext gb; GetByteContext gb;
@ -1939,8 +1939,7 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track)
if (b >= UINT_MAX - t || r >= UINT_MAX - l) { if (b >= UINT_MAX - t || r >= UINT_MAX - l) {
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"Invalid bounding rectangle coordinates " "Invalid bounding rectangle coordinates "
"%"SIZE_SPECIFIER",%"SIZE_SPECIFIER"," "%"PRIu32",%"PRIu32",%"PRIu32",%"PRIu32"\n",
"%"SIZE_SPECIFIER",%"SIZE_SPECIFIER"\n",
l, t, r, b); l, t, r, b);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

8
libavformat/mov.c
View File

@ -4637,9 +4637,8 @@ static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom)
MOVStreamContext *sc; MOVStreamContext *sc;
int size, layout; int size, layout;
int32_t yaw, pitch, roll; int32_t yaw, pitch, roll;
size_t l = 0, t = 0, r = 0, b = 0; uint32_t l = 0, t = 0, r = 0, b = 0;
size_t padding = 0; uint32_t tag, padding = 0;
uint32_t tag;
enum AVSphericalProjection projection; enum AVSphericalProjection projection;
if (c->fc->nb_streams < 1) if (c->fc->nb_streams < 1)
@ -4717,8 +4716,7 @@ static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (b >= UINT_MAX - t || r >= UINT_MAX - l) { if (b >= UINT_MAX - t || r >= UINT_MAX - l) {
av_log(c->fc, AV_LOG_ERROR, av_log(c->fc, AV_LOG_ERROR,
"Invalid bounding rectangle coordinates %"SIZE_SPECIFIER"," "Invalid bounding rectangle coordinates %"SIZE_SPECIFIER","
"%"SIZE_SPECIFIER",%"SIZE_SPECIFIER",%"SIZE_SPECIFIER"\n", "%"PRIu32",%"PRIu32",%"PRIu32",%"PRIu32"\n", l, t, r, b);
l, t, r, b);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

10
libavutil/spherical.h
View File

@ -164,10 +164,10 @@ typedef struct AVSphericalMapping {
* projection type (@ref AV_SPHERICAL_EQUIRECTANGULAR_TILE), * projection type (@ref AV_SPHERICAL_EQUIRECTANGULAR_TILE),
* and should be ignored in all other cases. * and should be ignored in all other cases.
*/ */
size_t bound_left; ///< Distance from the left edge uint32_t bound_left; ///< Distance from the left edge
size_t bound_top; ///< Distance from the top edge uint32_t bound_top; ///< Distance from the top edge
size_t bound_right; ///< Distance from the right edge uint32_t bound_right; ///< Distance from the right edge
size_t bound_bottom; ///< Distance from the bottom edge uint32_t bound_bottom; ///< Distance from the bottom edge
/** /**
* @} * @}
*/ */
@ -179,7 +179,7 @@ typedef struct AVSphericalMapping {
* (@ref AV_SPHERICAL_CUBEMAP), and should be ignored in all other * (@ref AV_SPHERICAL_CUBEMAP), and should be ignored in all other
* cases. * cases.
*/ */
size_t padding; uint32_t padding;
} AVSphericalMapping; } AVSphericalMapping;
/** /**