Namely h264_slice.c.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/h264_slice.c | 34 +++++++++++++++++++++++++++++-----
libavcodec/internal.h | 2 --
libavcodec/utils.c | 28 ----------------------------
3 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 27fbd8d953..6cd7bb8fe7 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -28,15 +28,11 @@
#include "config_components.h"
#include "libavutil/avassert.h"
-#include "libavutil/display.h"
-#include "libavutil/film_grain_params.h"
#include "libavutil/pixdesc.h"
#include "libavutil/timecode.h"
-#include "internal.h"
#include "decode.h"
#include "cabac.h"
#include "cabac_functions.h"
-#include "decode.h"
#include "error_resilience.h"
#include "avcodec.h"
#include "h264.h"
@@ -299,6 +295,34 @@ static void copy_picture_range(H264Picture **to,
H264Picture **from, int count,
}
}
+static void color_frame(AVFrame *frame, const int c[4])
+{
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
+
+ av_assert0(desc->flags & AV_PIX_FMT_FLAG_PLANAR);
+
+ for (int p = 0; p < desc->nb_components; p++) {
+ uint8_t *dst = frame->data[p];
+ int is_chroma = p == 1 || p == 2;
+ int bytes = is_chroma ? AV_CEIL_RSHIFT(frame->width,
desc->log2_chroma_w) : frame->width;
+ int height = is_chroma ? AV_CEIL_RSHIFT(frame->height,
desc->log2_chroma_h) : frame->height;
+ if (desc->comp[0].depth >= 9) {
+ ((uint16_t*)dst)[0] = c[p];
+ av_memcpy_backptr(dst + 2, 2, bytes - 2);
+ dst += frame->linesize[p];
+ for (int y = 1; y < height; y++) {
+ memcpy(dst, frame->data[p], 2*bytes);
+ dst += frame->linesize[p];
+ }
+ } else {
+ for (int y = 0; y < height; y++) {
+ memset(dst, c[p], bytes);
+ dst += frame->linesize[p];
+ }
+ }
+ }
+}
+
static int h264_slice_header_init(H264Context *h);
int ff_h264_update_thread_context(AVCodecContext *dst,
@@ -1547,7 +1571,7 @@ static int h264_field_start(H264Context *h, const
H264SliceContext *sl,
if (h->short_ref[0]->field_picture)
ff_thread_report_progress(&h->short_ref[0]->tf, INT_MAX,
1);
} else if (!h->frame_recovered && !h->avctx->hwaccel)
- ff_color_frame(h->short_ref[0]->f, c);
+ color_frame(h->short_ref[0]->f, c);
h->short_ref[0]->frame_num = h->poc.prev_frame_num;
}
}
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 480b18b447..7de6c577fe 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -157,8 +157,6 @@ int ff_match_2uint16(const uint16_t (*tab)[2], int size,
int a, int b);
unsigned int ff_toupper4(unsigned int x);
-void ff_color_frame(AVFrame *frame, const int color[4]);
-
/**
* 2^(x) for integer x
* @return correctly rounded float
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 672eb15d98..da652d4db1 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -406,34 +406,6 @@ int avcodec_fill_audio_frame(AVFrame *frame, int
nb_channels,
return ret;
}
-void ff_color_frame(AVFrame *frame, const int c[4])
-{
- const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
- int p, y;
-
- av_assert0(desc->flags & AV_PIX_FMT_FLAG_PLANAR);
-
- for (p = 0; p<desc->nb_components; p++) {
- uint8_t *dst = frame->data[p];
- int is_chroma = p == 1 || p == 2;
- int bytes = is_chroma ? AV_CEIL_RSHIFT(frame->width,
desc->log2_chroma_w) : frame->width;
- int height = is_chroma ? AV_CEIL_RSHIFT(frame->height,
desc->log2_chroma_h) : frame->height;
- if (desc->comp[0].depth >= 9) {
- ((uint16_t*)dst)[0] = c[p];
- av_memcpy_backptr(dst + 2, 2, bytes - 2);
- dst += frame->linesize[p];
- for (y = 1; y < height; y++) {
- memcpy(dst, frame->data[p], 2*bytes);
- dst += frame->linesize[p];
- }
- } else {
- for (y = 0; y < height; y++) {
- memset(dst, c[p], bytes);
- dst += frame->linesize[p];
- }
- }
- }
-}
int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec){
return !!(ffcodec(codec)->caps_internal &
FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM);
--
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-requ...@ffmpeg.org with subject "unsubscribe".
