From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 09/15] avcodec/h264dec: Move inline functions only used by CABAC/CAVLC code
Date: Wed, 2 Aug 2023 12:58:31 +0200
Message-ID: <GV1P250MB07379EDB68EF89143343D96F8F0BA@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <GV1P250MB07372D6E72B1402AB543507C8F0BA@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
Most of the inline functions in h264dec.h are only used
by h264_cavlc.c and h264_cabac.c. Therefore move them
to the common header for these two, namely h264_mvpred.h.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
Does someone have a better name than h264_mvpred.h for the destination?
libavcodec/h264_mb.c | 1 +
libavcodec/h264_mvpred.h | 132 +++++++++++++++++++++++++++++++++++++++
libavcodec/h264dec.h | 132 ---------------------------------------
3 files changed, 133 insertions(+), 132 deletions(-)
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c
index 0b31774556..32d29cfb4d 100644
--- a/libavcodec/h264_mb.c
+++ b/libavcodec/h264_mb.c
@@ -34,6 +34,7 @@
#include "h264dec.h"
#include "h264_ps.h"
#include "qpeldsp.h"
+#include "rectangle.h"
#include "threadframe.h"
static inline int get_lowest_part_list_y(H264SliceContext *sl,
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h
index 46ae2738f9..bc9fef50e4 100644
--- a/libavcodec/h264_mvpred.h
+++ b/libavcodec/h264_mvpred.h
@@ -30,10 +30,142 @@
#include "h264dec.h"
#include "mpegutils.h"
+#include "rectangle.h"
+
#include "libavutil/avassert.h"
#include "libavutil/mem_internal.h"
+/**
+ * Get the predicted intra4x4 prediction mode.
+ */
+static av_always_inline int pred_intra_mode(const H264Context *h,
+ H264SliceContext *sl, int n)
+{
+ const int index8 = scan8[n];
+ const int left = sl->intra4x4_pred_mode_cache[index8 - 1];
+ const int top = sl->intra4x4_pred_mode_cache[index8 - 8];
+ const int min = FFMIN(left, top);
+
+ ff_tlog(h->avctx, "mode:%d %d min:%d\n", left, top, min);
+
+ if (min < 0)
+ return DC_PRED;
+ else
+ return min;
+}
+
+static av_always_inline void write_back_intra_pred_mode(const H264Context *h,
+ H264SliceContext *sl)
+{
+ int8_t *i4x4 = sl->intra4x4_pred_mode + h->mb2br_xy[sl->mb_xy];
+ int8_t *i4x4_cache = sl->intra4x4_pred_mode_cache;
+
+ AV_COPY32(i4x4, i4x4_cache + 4 + 8 * 4);
+ i4x4[4] = i4x4_cache[7 + 8 * 3];
+ i4x4[5] = i4x4_cache[7 + 8 * 2];
+ i4x4[6] = i4x4_cache[7 + 8 * 1];
+}
+
+static av_always_inline void write_back_non_zero_count(const H264Context *h,
+ H264SliceContext *sl)
+{
+ const int mb_xy = sl->mb_xy;
+ uint8_t *nnz = h->non_zero_count[mb_xy];
+ uint8_t *nnz_cache = sl->non_zero_count_cache;
+
+ AV_COPY32(&nnz[ 0], &nnz_cache[4 + 8 * 1]);
+ AV_COPY32(&nnz[ 4], &nnz_cache[4 + 8 * 2]);
+ AV_COPY32(&nnz[ 8], &nnz_cache[4 + 8 * 3]);
+ AV_COPY32(&nnz[12], &nnz_cache[4 + 8 * 4]);
+ AV_COPY32(&nnz[16], &nnz_cache[4 + 8 * 6]);
+ AV_COPY32(&nnz[20], &nnz_cache[4 + 8 * 7]);
+ AV_COPY32(&nnz[32], &nnz_cache[4 + 8 * 11]);
+ AV_COPY32(&nnz[36], &nnz_cache[4 + 8 * 12]);
+
+ if (!h->chroma_y_shift) {
+ AV_COPY32(&nnz[24], &nnz_cache[4 + 8 * 8]);
+ AV_COPY32(&nnz[28], &nnz_cache[4 + 8 * 9]);
+ AV_COPY32(&nnz[40], &nnz_cache[4 + 8 * 13]);
+ AV_COPY32(&nnz[44], &nnz_cache[4 + 8 * 14]);
+ }
+}
+
+static av_always_inline void write_back_motion_list(const H264Context *h,
+ H264SliceContext *sl,
+ int b_stride,
+ int b_xy, int b8_xy,
+ int mb_type, int list)
+{
+ int16_t(*mv_dst)[2] = &h->cur_pic.motion_val[list][b_xy];
+ int16_t(*mv_src)[2] = &sl->mv_cache[list][scan8[0]];
+ AV_COPY128(mv_dst + 0 * b_stride, mv_src + 8 * 0);
+ AV_COPY128(mv_dst + 1 * b_stride, mv_src + 8 * 1);
+ AV_COPY128(mv_dst + 2 * b_stride, mv_src + 8 * 2);
+ AV_COPY128(mv_dst + 3 * b_stride, mv_src + 8 * 3);
+ if (CABAC(h)) {
+ uint8_t (*mvd_dst)[2] = &sl->mvd_table[list][FMO ? 8 * sl->mb_xy
+ : h->mb2br_xy[sl->mb_xy]];
+ uint8_t(*mvd_src)[2] = &sl->mvd_cache[list][scan8[0]];
+ if (IS_SKIP(mb_type)) {
+ AV_ZERO128(mvd_dst);
+ } else {
+ AV_COPY64(mvd_dst, mvd_src + 8 * 3);
+ AV_COPY16(mvd_dst + 3 + 3, mvd_src + 3 + 8 * 0);
+ AV_COPY16(mvd_dst + 3 + 2, mvd_src + 3 + 8 * 1);
+ AV_COPY16(mvd_dst + 3 + 1, mvd_src + 3 + 8 * 2);
+ }
+ }
+
+ {
+ int8_t *ref_index = &h->cur_pic.ref_index[list][b8_xy];
+ int8_t *ref_cache = sl->ref_cache[list];
+ ref_index[0 + 0 * 2] = ref_cache[scan8[0]];
+ ref_index[1 + 0 * 2] = ref_cache[scan8[4]];
+ ref_index[0 + 1 * 2] = ref_cache[scan8[8]];
+ ref_index[1 + 1 * 2] = ref_cache[scan8[12]];
+ }
+}
+
+static av_always_inline void write_back_motion(const H264Context *h,
+ H264SliceContext *sl,
+ int mb_type)
+{
+ const int b_stride = h->b_stride;
+ const int b_xy = 4 * sl->mb_x + 4 * sl->mb_y * h->b_stride; // try mb2b(8)_xy
+ const int b8_xy = 4 * sl->mb_xy;
+
+ if (USES_LIST(mb_type, 0)) {
+ write_back_motion_list(h, sl, b_stride, b_xy, b8_xy, mb_type, 0);
+ } else {
+ fill_rectangle(&h->cur_pic.ref_index[0][b8_xy],
+ 2, 2, 2, (uint8_t)LIST_NOT_USED, 1);
+ }
+ if (USES_LIST(mb_type, 1))
+ write_back_motion_list(h, sl, b_stride, b_xy, b8_xy, mb_type, 1);
+
+ if (sl->slice_type_nos == AV_PICTURE_TYPE_B && CABAC(h)) {
+ if (IS_8X8(mb_type)) {
+ uint8_t *direct_table = &h->direct_table[4 * sl->mb_xy];
+ direct_table[1] = sl->sub_mb_type[1] >> 1;
+ direct_table[2] = sl->sub_mb_type[2] >> 1;
+ direct_table[3] = sl->sub_mb_type[3] >> 1;
+ }
+ }
+}
+
+static av_always_inline int get_dct8x8_allowed(const H264Context *h, H264SliceContext *sl)
+{
+ if (h->ps.sps->direct_8x8_inference_flag)
+ return !(AV_RN64A(sl->sub_mb_type) &
+ ((MB_TYPE_16x8 | MB_TYPE_8x16 | MB_TYPE_8x8) *
+ 0x0001000100010001ULL));
+ else
+ return !(AV_RN64A(sl->sub_mb_type) &
+ ((MB_TYPE_16x8 | MB_TYPE_8x16 | MB_TYPE_8x8 | MB_TYPE_DIRECT2) *
+ 0x0001000100010001ULL));
+}
+
static av_always_inline int fetch_diagonal_mv(const H264Context *h, H264SliceContext *sl,
const int16_t **C,
int i, int list, int part_width)
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 9a1ec1bace..beaab3902c 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -29,7 +29,6 @@
#define AVCODEC_H264DEC_H
#include "libavutil/buffer.h"
-#include "libavutil/intreadwrite.h"
#include "libavutil/mem_internal.h"
#include "cabac.h"
@@ -44,7 +43,6 @@
#include "h264qpel.h"
#include "h274.h"
#include "mpegutils.h"
-#include "rectangle.h"
#include "videodsp.h"
#define H264_MAX_PICTURE_COUNT 36
@@ -649,136 +647,6 @@ static av_always_inline int get_chroma_qp(const PPS *pps, int t, int qscale)
return pps->chroma_qp_table[t][qscale];
}
-/**
- * Get the predicted intra4x4 prediction mode.
- */
-static av_always_inline int pred_intra_mode(const H264Context *h,
- H264SliceContext *sl, int n)
-{
- const int index8 = scan8[n];
- const int left = sl->intra4x4_pred_mode_cache[index8 - 1];
- const int top = sl->intra4x4_pred_mode_cache[index8 - 8];
- const int min = FFMIN(left, top);
-
- ff_tlog(h->avctx, "mode:%d %d min:%d\n", left, top, min);
-
- if (min < 0)
- return DC_PRED;
- else
- return min;
-}
-
-static av_always_inline void write_back_intra_pred_mode(const H264Context *h,
- H264SliceContext *sl)
-{
- int8_t *i4x4 = sl->intra4x4_pred_mode + h->mb2br_xy[sl->mb_xy];
- int8_t *i4x4_cache = sl->intra4x4_pred_mode_cache;
-
- AV_COPY32(i4x4, i4x4_cache + 4 + 8 * 4);
- i4x4[4] = i4x4_cache[7 + 8 * 3];
- i4x4[5] = i4x4_cache[7 + 8 * 2];
- i4x4[6] = i4x4_cache[7 + 8 * 1];
-}
-
-static av_always_inline void write_back_non_zero_count(const H264Context *h,
- H264SliceContext *sl)
-{
- const int mb_xy = sl->mb_xy;
- uint8_t *nnz = h->non_zero_count[mb_xy];
- uint8_t *nnz_cache = sl->non_zero_count_cache;
-
- AV_COPY32(&nnz[ 0], &nnz_cache[4 + 8 * 1]);
- AV_COPY32(&nnz[ 4], &nnz_cache[4 + 8 * 2]);
- AV_COPY32(&nnz[ 8], &nnz_cache[4 + 8 * 3]);
- AV_COPY32(&nnz[12], &nnz_cache[4 + 8 * 4]);
- AV_COPY32(&nnz[16], &nnz_cache[4 + 8 * 6]);
- AV_COPY32(&nnz[20], &nnz_cache[4 + 8 * 7]);
- AV_COPY32(&nnz[32], &nnz_cache[4 + 8 * 11]);
- AV_COPY32(&nnz[36], &nnz_cache[4 + 8 * 12]);
-
- if (!h->chroma_y_shift) {
- AV_COPY32(&nnz[24], &nnz_cache[4 + 8 * 8]);
- AV_COPY32(&nnz[28], &nnz_cache[4 + 8 * 9]);
- AV_COPY32(&nnz[40], &nnz_cache[4 + 8 * 13]);
- AV_COPY32(&nnz[44], &nnz_cache[4 + 8 * 14]);
- }
-}
-
-static av_always_inline void write_back_motion_list(const H264Context *h,
- H264SliceContext *sl,
- int b_stride,
- int b_xy, int b8_xy,
- int mb_type, int list)
-{
- int16_t(*mv_dst)[2] = &h->cur_pic.motion_val[list][b_xy];
- int16_t(*mv_src)[2] = &sl->mv_cache[list][scan8[0]];
- AV_COPY128(mv_dst + 0 * b_stride, mv_src + 8 * 0);
- AV_COPY128(mv_dst + 1 * b_stride, mv_src + 8 * 1);
- AV_COPY128(mv_dst + 2 * b_stride, mv_src + 8 * 2);
- AV_COPY128(mv_dst + 3 * b_stride, mv_src + 8 * 3);
- if (CABAC(h)) {
- uint8_t (*mvd_dst)[2] = &sl->mvd_table[list][FMO ? 8 * sl->mb_xy
- : h->mb2br_xy[sl->mb_xy]];
- uint8_t(*mvd_src)[2] = &sl->mvd_cache[list][scan8[0]];
- if (IS_SKIP(mb_type)) {
- AV_ZERO128(mvd_dst);
- } else {
- AV_COPY64(mvd_dst, mvd_src + 8 * 3);
- AV_COPY16(mvd_dst + 3 + 3, mvd_src + 3 + 8 * 0);
- AV_COPY16(mvd_dst + 3 + 2, mvd_src + 3 + 8 * 1);
- AV_COPY16(mvd_dst + 3 + 1, mvd_src + 3 + 8 * 2);
- }
- }
-
- {
- int8_t *ref_index = &h->cur_pic.ref_index[list][b8_xy];
- int8_t *ref_cache = sl->ref_cache[list];
- ref_index[0 + 0 * 2] = ref_cache[scan8[0]];
- ref_index[1 + 0 * 2] = ref_cache[scan8[4]];
- ref_index[0 + 1 * 2] = ref_cache[scan8[8]];
- ref_index[1 + 1 * 2] = ref_cache[scan8[12]];
- }
-}
-
-static av_always_inline void write_back_motion(const H264Context *h,
- H264SliceContext *sl,
- int mb_type)
-{
- const int b_stride = h->b_stride;
- const int b_xy = 4 * sl->mb_x + 4 * sl->mb_y * h->b_stride; // try mb2b(8)_xy
- const int b8_xy = 4 * sl->mb_xy;
-
- if (USES_LIST(mb_type, 0)) {
- write_back_motion_list(h, sl, b_stride, b_xy, b8_xy, mb_type, 0);
- } else {
- fill_rectangle(&h->cur_pic.ref_index[0][b8_xy],
- 2, 2, 2, (uint8_t)LIST_NOT_USED, 1);
- }
- if (USES_LIST(mb_type, 1))
- write_back_motion_list(h, sl, b_stride, b_xy, b8_xy, mb_type, 1);
-
- if (sl->slice_type_nos == AV_PICTURE_TYPE_B && CABAC(h)) {
- if (IS_8X8(mb_type)) {
- uint8_t *direct_table = &h->direct_table[4 * sl->mb_xy];
- direct_table[1] = sl->sub_mb_type[1] >> 1;
- direct_table[2] = sl->sub_mb_type[2] >> 1;
- direct_table[3] = sl->sub_mb_type[3] >> 1;
- }
- }
-}
-
-static av_always_inline int get_dct8x8_allowed(const H264Context *h, H264SliceContext *sl)
-{
- if (h->ps.sps->direct_8x8_inference_flag)
- return !(AV_RN64A(sl->sub_mb_type) &
- ((MB_TYPE_16x8 | MB_TYPE_8x16 | MB_TYPE_8x8) *
- 0x0001000100010001ULL));
- else
- return !(AV_RN64A(sl->sub_mb_type) &
- ((MB_TYPE_16x8 | MB_TYPE_8x16 | MB_TYPE_8x8 | MB_TYPE_DIRECT2) *
- 0x0001000100010001ULL));
-}
-
int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup);
int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src);
--
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:[~2023-08-02 11:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-02 6:38 [FFmpeg-devel] [PATCH 1/5] avcodec/nvdec_(mjpeg|vp8): Constify AVHWAccels Andreas Rheinhardt
2023-08-02 6:43 ` [FFmpeg-devel] [PATCH 2/5] avcodec/error_resilience, mpeg12dec: Remove always-true checks Andreas Rheinhardt
2023-08-02 6:43 ` [FFmpeg-devel] [PATCH 3/5] avcodec/hwconfig: Move HWACCEL_CAP_* to a new header Andreas Rheinhardt
2023-08-05 10:01 ` Andreas Rheinhardt
2023-08-02 6:43 ` [FFmpeg-devel] [PATCH 4/5] avcodec/decode: Extend ff_hwaccel_frame_priv_alloc()'s task Andreas Rheinhardt
2023-08-02 6:43 ` [FFmpeg-devel] [PATCH 5/5] avcodec/avcodec: Add FFHWAccel, hide internals of AVHWAccel Andreas Rheinhardt
2023-08-02 10:58 ` [FFmpeg-devel] [PATCH 06/15] avcodec/avcodec: Remove unnecessary forward declaration Andreas Rheinhardt
2023-08-04 10:06 ` Andreas Rheinhardt
2023-08-02 10:58 ` [FFmpeg-devel] [PATCH 07/15] avdevice/pulse_audio_common: Avoid inclusion of avcodec.h Andreas Rheinhardt
2023-08-02 10:58 ` [FFmpeg-devel] [PATCH 08/15] avcodec/tak: Use void* instead of AVCodecContext* for logcontext Andreas Rheinhardt
2023-08-02 10:58 ` Andreas Rheinhardt [this message]
2023-08-02 10:58 ` [FFmpeg-devel] [PATCH 10/15] avformat/av1dec: Remove avcodec.h inclusion Andreas Rheinhardt
2023-08-02 10:58 ` [FFmpeg-devel] [PATCH 11/15] avformat/evcdec: Remove unused headers Andreas Rheinhardt
2023-08-02 10:58 ` [FFmpeg-devel] [PATCH 12/15] avformat/internal: Use forward declaration for AVCodecDescriptor Andreas Rheinhardt
2023-08-02 10:58 ` [FFmpeg-devel] [PATCH 13/15] avcodec/dirac: Include used headers directly Andreas Rheinhardt
2023-08-02 10:58 ` [FFmpeg-devel] [PATCH 14/15] avformat/rawdec: Don't include avcodec.h Andreas Rheinhardt
2023-08-02 10:58 ` [FFmpeg-devel] [PATCH 15/15] avcodec/h264_metadata_bsf: Improve included headers Andreas Rheinhardt
2023-08-02 12:18 ` [FFmpeg-devel] [PATCH 1/5] avcodec/nvdec_(mjpeg|vp8): Constify AVHWAccels Timo Rothenpieler
2023-08-02 12:54 ` [FFmpeg-devel] [PATCH 16/19] avcodec/internal: Move FF_MAX_EXTRADATA_SIZE to its only user Andreas Rheinhardt
2023-08-02 12:54 ` [FFmpeg-devel] [PATCH 17/19] avcodec/utils: Move ff_color_frame() " Andreas Rheinhardt
2023-08-02 12:54 ` [FFmpeg-devel] [PATCH 18/19] avcodec/utils: Move ff_int_from_list_or_default() " Andreas Rheinhardt
2023-08-02 12:54 ` [FFmpeg-devel] [PATCH 19/19] avcodec/svq1enc: Remove unnecessary cast 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=GV1P250MB07379EDB68EF89143343D96F8F0BA@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