virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/matroskadec: Use proper context for logging

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-05-18 00:25:48 +02:00
parent 6fb79c1af5
commit 39f5bb6a3f
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/matroskadec.c
View File

@@ -1772,7 +1772,7 @@ static void matroska_convert_tags(AVFormatContext *s)
} }
} }
if (!found) { if (!found) {
av_log(NULL, AV_LOG_WARNING, av_log(s, AV_LOG_WARNING,
"The tags at index %d refer to a " "The tags at index %d refer to a "
"non-existent attachment %"PRId64".\n", "non-existent attachment %"PRId64".\n",
i, tags[i].target.attachuid); i, tags[i].target.attachuid);
@@ -1789,7 +1789,7 @@ static void matroska_convert_tags(AVFormatContext *s)
} }
} }
if (!found) { if (!found) {
av_log(NULL, AV_LOG_WARNING, av_log(s, AV_LOG_WARNING,
"The tags at index %d refer to a non-existent chapter " "The tags at index %d refer to a non-existent chapter "
"%"PRId64".\n", "%"PRId64".\n",
i, tags[i].target.chapteruid); i, tags[i].target.chapteruid);
@@ -1806,7 +1806,7 @@ static void matroska_convert_tags(AVFormatContext *s)
} }
} }
if (!found) { if (!found) {
av_log(NULL, AV_LOG_WARNING, av_log(s, AV_LOG_WARNING,
"The tags at index %d refer to a non-existent track " "The tags at index %d refer to a non-existent track "
"%"PRId64".\n", "%"PRId64".\n",
i, tags[i].target.trackuid); i, tags[i].target.trackuid);
@@ -2158,7 +2158,9 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) {
return 0; return 0;
} }
static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) { static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track,
void *logctx)
{
AVSphericalMapping *spherical; AVSphericalMapping *spherical;
enum AVSphericalProjection projection; enum AVSphericalProjection projection;
size_t spherical_size; size_t spherical_size;
@@ -2171,7 +2173,7 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track)
track->video.projection.private.size); track->video.projection.private.size);
if (bytestream2_get_byte(&gb) != 0) { if (bytestream2_get_byte(&gb) != 0) {
av_log(NULL, AV_LOG_WARNING, "Unknown spherical metadata\n"); av_log(logctx, AV_LOG_WARNING, "Unknown spherical metadata\n");
return 0; return 0;
} }
@@ -2186,14 +2188,14 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track)
r = bytestream2_get_be32(&gb); r = bytestream2_get_be32(&gb);
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(logctx, AV_LOG_ERROR,
"Invalid bounding rectangle coordinates " "Invalid bounding rectangle coordinates "
"%"PRIu32",%"PRIu32",%"PRIu32",%"PRIu32"\n", "%"PRIu32",%"PRIu32",%"PRIu32",%"PRIu32"\n",
l, t, r, b); l, t, r, b);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} else if (track->video.projection.private.size != 0) { } else if (track->video.projection.private.size != 0) {
av_log(NULL, AV_LOG_ERROR, "Unknown spherical metadata\n"); av_log(logctx, AV_LOG_ERROR, "Unknown spherical metadata\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@@ -2204,19 +2206,19 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track)
break; break;
case MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP: case MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP:
if (track->video.projection.private.size < 4) { if (track->video.projection.private.size < 4) {
av_log(NULL, AV_LOG_ERROR, "Missing projection private properties\n"); av_log(logctx, AV_LOG_ERROR, "Missing projection private properties\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else if (track->video.projection.private.size == 12) { } else if (track->video.projection.private.size == 12) {
uint32_t layout = bytestream2_get_be32(&gb); uint32_t layout = bytestream2_get_be32(&gb);
if (layout) { if (layout) {
av_log(NULL, AV_LOG_WARNING, av_log(logctx, AV_LOG_WARNING,
"Unknown spherical cubemap layout %"PRIu32"\n", layout); "Unknown spherical cubemap layout %"PRIu32"\n", layout);
return 0; return 0;
} }
projection = AV_SPHERICAL_CUBEMAP; projection = AV_SPHERICAL_CUBEMAP;
padding = bytestream2_get_be32(&gb); padding = bytestream2_get_be32(&gb);
} else { } else {
av_log(NULL, AV_LOG_ERROR, "Unknown spherical metadata\n"); av_log(logctx, AV_LOG_ERROR, "Unknown spherical metadata\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
break; break;
@@ -2224,7 +2226,7 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track)
/* No Spherical metadata */ /* No Spherical metadata */
return 0; return 0;
default: default:
av_log(NULL, AV_LOG_WARNING, av_log(logctx, AV_LOG_WARNING,
"Unknown spherical metadata type %"PRIu64"\n", "Unknown spherical metadata type %"PRIu64"\n",
track->video.projection.type); track->video.projection.type);
return 0; return 0;
@@ -2780,7 +2782,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
ret = mkv_parse_video_color(st, track); ret = mkv_parse_video_color(st, track);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = mkv_parse_video_projection(st, track); ret = mkv_parse_video_projection(st, track, matroska->ctx);
if (ret < 0) if (ret < 0)
return ret; return ret;
} else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {