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/mpegutils: Reindent after the previous commit
Date: Sun, 16 Oct 2022 22:46:54 +0200
Message-ID: <GV1P250MB07374FB04068FBA9D3DF53428F269@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <GV1P250MB0737E9E7EBF1A7F66965F3958F269@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/mpegutils.c | 51 +++++++++++++++++++++---------------------
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c
index afbb16e201..36d75b9633 100644
--- a/libavcodec/mpegutils.c
+++ b/libavcodec/mpegutils.c
@@ -56,7 +56,6 @@ void ff_draw_horiz_band(AVCodecContext *avctx,
const int field_pic = picture_structure != PICT_FRAME;
const AVFrame *src;
int offset[AV_NUM_DATA_POINTERS];
- int i;
if (!avctx->draw_horiz_band)
return;
@@ -72,34 +71,34 @@ void ff_draw_horiz_band(AVCodecContext *avctx,
!(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD))
return;
- if (cur->pict_type == AV_PICTURE_TYPE_B || low_delay ||
- (avctx->slice_flags & SLICE_FLAG_CODED_ORDER))
- src = cur;
- else if (last)
- src = last;
- else
- return;
+ if (cur->pict_type == AV_PICTURE_TYPE_B || low_delay ||
+ (avctx->slice_flags & SLICE_FLAG_CODED_ORDER))
+ src = cur;
+ else if (last)
+ src = last;
+ else
+ return;
- if (cur->pict_type == AV_PICTURE_TYPE_B &&
- picture_structure == PICT_FRAME &&
- avctx->codec_id != AV_CODEC_ID_SVQ3) {
- for (i = 0; i < AV_NUM_DATA_POINTERS; i++)
- offset[i] = 0;
- } else {
- const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
- int vshift = desc->log2_chroma_h;
-
- offset[0]= y * src->linesize[0];
- offset[1]=
- offset[2]= (y >> vshift) * src->linesize[1];
- for (i = 3; i < AV_NUM_DATA_POINTERS; i++)
- offset[i] = 0;
- }
+ if (cur->pict_type == AV_PICTURE_TYPE_B &&
+ picture_structure == PICT_FRAME &&
+ avctx->codec_id != AV_CODEC_ID_SVQ3) {
+ for (int i = 0; i < AV_NUM_DATA_POINTERS; i++)
+ offset[i] = 0;
+ } else {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+ int vshift = desc->log2_chroma_h;
+
+ offset[0] = y * src->linesize[0];
+ offset[1] =
+ offset[2] = (y >> vshift) * src->linesize[1];
+ for (int i = 3; i < AV_NUM_DATA_POINTERS; i++)
+ offset[i] = 0;
+ }
- emms_c();
+ emms_c();
- avctx->draw_horiz_band(avctx, src, offset,
- y, picture_structure, h);
+ avctx->draw_horiz_band(avctx, src, offset,
+ y, picture_structure, h);
}
static char get_type_mv_char(int mb_type)
--
2.34.1
_______________________________________________
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-10-16 20:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-16 20:43 [FFmpeg-devel] [PATCH 1/9] avcodec/(ffv1|h264|png|snow)dec: Remove comment out DRAW_HORIZ_BAND cap Andreas Rheinhardt
2022-10-16 20:46 ` [FFmpeg-devel] [PATCH 2/9] avcodec/vc1_block: Remove dead calls to ff_mpeg_draw_horiz_band() Andreas Rheinhardt
2022-10-16 20:46 ` [FFmpeg-devel] [PATCH 3/9] avcodec/mpegvideo: Don't check for draw_horiz_band Andreas Rheinhardt
2022-10-16 20:46 ` [FFmpeg-devel] [PATCH 4/9] avcodec/mpegvideo: Reindent after the last commit Andreas Rheinhardt
2022-10-16 20:46 ` [FFmpeg-devel] [PATCH 5/9] avcodec/h261: Use ptrdiff_t for stride Andreas Rheinhardt
2022-10-16 20:46 ` [FFmpeg-devel] [PATCH 6/9] avcodec/mpegvideo: Move VIDEO_FORMAT_* defines to mpeg12enc.c Andreas Rheinhardt
2022-10-16 20:46 ` [FFmpeg-devel] [PATCH 7/9] avcodec/mpegutils: Return early in ff_draw_horiz_band() Andreas Rheinhardt
2022-10-16 20:46 ` Andreas Rheinhardt [this message]
2022-10-16 20:46 ` [FFmpeg-devel] [PATCH 9/9] avcodec/ffv1: Move ffv1_template.c inclusion to dec/enc templates Andreas Rheinhardt
2022-10-19 12:13 ` [FFmpeg-devel] [PATCH 1/9] avcodec/(ffv1|h264|png|snow)dec: Remove comment out DRAW_HORIZ_BAND cap 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=GV1P250MB07374FB04068FBA9D3DF53428F269@GV1P250MB0737.EURP250.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