From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 8/9] avcodec/mpeg4videodec: Avoid multiple consecutive av_log()
Date: Mon, 10 Jan 2022 23:55:35 +0100
Message-ID: <AM7PR03MB6660BAC6CCD185BA87FB2EE48F509@AM7PR03MB6660.eurprd03.prod.outlook.com> (raw)
In-Reply-To: <AM7PR03MB666049ACF3516AEE1A071A408F509@AM7PR03MB6660.eurprd03.prod.outlook.com>
These messages belong together, yet they can be torn apart
if some other call to av_log() happens between them.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/mpeg4videodec.c | 59 +++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 29 deletions(-)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 515a09d8a1..737689b35b 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -3276,62 +3276,63 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb,
continue; // no startcode
if (s->avctx->debug & FF_DEBUG_STARTCODE) {
- av_log(s->avctx, AV_LOG_DEBUG, "startcode: %3X ", startcode);
+ const char *name;
if (startcode <= 0x11F)
- av_log(s->avctx, AV_LOG_DEBUG, "Video Object Start");
+ name = "Video Object Start";
else if (startcode <= 0x12F)
- av_log(s->avctx, AV_LOG_DEBUG, "Video Object Layer Start");
+ name = "Video Object Layer Start";
else if (startcode <= 0x13F)
- av_log(s->avctx, AV_LOG_DEBUG, "Reserved");
+ name = "Reserved";
else if (startcode <= 0x15F)
- av_log(s->avctx, AV_LOG_DEBUG, "FGS bp start");
+ name = "FGS bp start";
else if (startcode <= 0x1AF)
- av_log(s->avctx, AV_LOG_DEBUG, "Reserved");
+ name = "Reserved";
else if (startcode == 0x1B0)
- av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq Start");
+ name = "Visual Object Seq Start";
else if (startcode == 0x1B1)
- av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq End");
+ name = "Visual Object Seq End";
else if (startcode == 0x1B2)
- av_log(s->avctx, AV_LOG_DEBUG, "User Data");
+ name = "User Data";
else if (startcode == 0x1B3)
- av_log(s->avctx, AV_LOG_DEBUG, "Group of VOP start");
+ name = "Group of VOP start";
else if (startcode == 0x1B4)
- av_log(s->avctx, AV_LOG_DEBUG, "Video Session Error");
+ name = "Video Session Error";
else if (startcode == 0x1B5)
- av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Start");
+ name = "Visual Object Start";
else if (startcode == 0x1B6)
- av_log(s->avctx, AV_LOG_DEBUG, "Video Object Plane start");
+ name = "Video Object Plane start";
else if (startcode == 0x1B7)
- av_log(s->avctx, AV_LOG_DEBUG, "slice start");
+ name = "slice start";
else if (startcode == 0x1B8)
- av_log(s->avctx, AV_LOG_DEBUG, "extension start");
+ name = "extension start";
else if (startcode == 0x1B9)
- av_log(s->avctx, AV_LOG_DEBUG, "fgs start");
+ name = "fgs start";
else if (startcode == 0x1BA)
- av_log(s->avctx, AV_LOG_DEBUG, "FBA Object start");
+ name = "FBA Object start";
else if (startcode == 0x1BB)
- av_log(s->avctx, AV_LOG_DEBUG, "FBA Object Plane start");
+ name = "FBA Object Plane start";
else if (startcode == 0x1BC)
- av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object start");
+ name = "Mesh Object start";
else if (startcode == 0x1BD)
- av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object Plane start");
+ name = "Mesh Object Plane start";
else if (startcode == 0x1BE)
- av_log(s->avctx, AV_LOG_DEBUG, "Still Texture Object start");
+ name = "Still Texture Object start";
else if (startcode == 0x1BF)
- av_log(s->avctx, AV_LOG_DEBUG, "Texture Spatial Layer start");
+ name = "Texture Spatial Layer start";
else if (startcode == 0x1C0)
- av_log(s->avctx, AV_LOG_DEBUG, "Texture SNR Layer start");
+ name = "Texture SNR Layer start";
else if (startcode == 0x1C1)
- av_log(s->avctx, AV_LOG_DEBUG, "Texture Tile start");
+ name = "Texture Tile start";
else if (startcode == 0x1C2)
- av_log(s->avctx, AV_LOG_DEBUG, "Texture Shape Layer start");
+ name = "Texture Shape Layer start";
else if (startcode == 0x1C3)
- av_log(s->avctx, AV_LOG_DEBUG, "stuffing start");
+ name = "stuffing start";
else if (startcode <= 0x1C5)
- av_log(s->avctx, AV_LOG_DEBUG, "reserved");
+ name = "Reserved";
else if (startcode <= 0x1FF)
- av_log(s->avctx, AV_LOG_DEBUG, "System start");
- av_log(s->avctx, AV_LOG_DEBUG, " at %d\n", get_bits_count(gb));
+ name = "System start";
+ av_log(s->avctx, AV_LOG_DEBUG, "startcode: %3X %s at %d\n",
+ startcode, name, get_bits_count(gb));
}
if (startcode >= 0x120 && startcode <= 0x12F) {
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-01-10 22:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-10 10:47 [FFmpeg-devel] [PATCH] avcodec/mpegvideo, svq3: Remove unused next_p_frame_damaged Andreas Rheinhardt
2022-01-10 17:51 ` [FFmpeg-devel] [PATCH 2/6] avcodec/svq3: Remove dead topright_samples_available variable, code Andreas Rheinhardt
2022-01-10 17:51 ` [FFmpeg-devel] [PATCH 3/6] avcodec/h264_slice: Inline H264 codec id Andreas Rheinhardt
2022-01-10 17:51 ` [FFmpeg-devel] [PATCH 4/6] avcodec/h264pred: Don't compile > 8 bit versions of VP7/8 functions Andreas Rheinhardt
2022-01-10 17:51 ` [FFmpeg-devel] [PATCH 5/6] avcodec/h264pred: Remove dead > 8 pixels checks for 8bit codecs Andreas Rheinhardt
2022-01-10 17:51 ` [FFmpeg-devel] [PATCH 6/6] avcodec/h264pred: Reindentation Andreas Rheinhardt
2022-01-10 22:55 ` [FFmpeg-devel] [PATCH 7/9] avcodec/mpegvideo: Don't set unrestricted_mv for decoders Andreas Rheinhardt
2022-01-10 22:55 ` Andreas Rheinhardt [this message]
2022-01-11 16:51 ` [FFmpeg-devel] [PATCH 8/9] avcodec/mpeg4videodec: Avoid multiple consecutive av_log() Michael Niedermayer
2022-01-10 22:55 ` [FFmpeg-devel] [PATCH 9/9] avcodec/mpegpicture: Decrease size of encoding_error array Andreas Rheinhardt
2022-01-12 9:48 ` [FFmpeg-devel] [PATCH] avcodec/mpegvideo, svq3: Remove unused next_p_frame_damaged Andreas Rheinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AM7PR03MB6660BAC6CCD185BA87FB2EE48F509@AM7PR03MB6660.eurprd03.prod.outlook.com \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git