From 1eaa35876d552bdfe836e4f06a5cbebb2512a36e Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 11 Oct 2020 21:21:04 +0300 Subject: [PATCH] ffmpeg: remove some patch leftovers --- ...ble-bit-rate-control-for-mfc-encoder.patch | 27 ------------ ...rs-add-handling-for-NV21-and-YUV420P.patch | 41 ------------------- 2 files changed, 68 deletions(-) delete mode 100644 package/ffmpeg/1003-avcodec-v4l2-enable-bit-rate-control-for-mfc-encoder.patch delete mode 100644 package/ffmpeg/1007-v4l2-buffers-add-handling-for-NV21-and-YUV420P.patch diff --git a/package/ffmpeg/1003-avcodec-v4l2-enable-bit-rate-control-for-mfc-encoder.patch b/package/ffmpeg/1003-avcodec-v4l2-enable-bit-rate-control-for-mfc-encoder.patch deleted file mode 100644 index 7eee3bf041..0000000000 --- a/package/ffmpeg/1003-avcodec-v4l2-enable-bit-rate-control-for-mfc-encoder.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 24ae67b3fb9e081b9306c2391a79b4388152332f -Author: memeka -Date: Thu Oct 19 13:22:18 2017 +1030 - - avcodec/v4l2: enable bit rate control for MFC encoder - - Signed-off-by: memeka - -diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c -index e40a120b53..2c35f95847 100644 ---- a/libavcodec/v4l2_m2m_enc.c -+++ b/libavcodec/v4l2_m2m_enc.c -@@ -183,8 +183,13 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) - - /* set ext ctrls */ - v4l2_set_ext_ctrl(s, MPEG_CID(HEADER_MODE), MPEG_VIDEO(HEADER_MODE_SEPARATE), "header mode"); -+ /* enable bit rate control */ -+ if (avctx->bit_rate > 1) { -+ v4l2_set_ext_ctrl(s, MPEG_CID(FRAME_RC_ENABLE) , 1, "rate control"); -+ av_log(avctx, AV_LOG_INFO, "h264_v4l2m2m encoder: enabling bit rate control: %llu\n", avctx->bit_rate); -+ } - v4l2_set_ext_ctrl(s, MPEG_CID(BITRATE) , avctx->bit_rate, "bit rate"); -- v4l2_set_ext_ctrl(s, MPEG_CID(GOP_SIZE), avctx->gop_size,"gop size"); -+ v4l2_set_ext_ctrl(s, MPEG_CID(GOP_SIZE), avctx->gop_size, "gop size"); - - av_log(avctx, AV_LOG_DEBUG, - "Encoder Context: id (%d), profile (%d), frame rate(%d/%d), number b-frames (%d), " diff --git a/package/ffmpeg/1007-v4l2-buffers-add-handling-for-NV21-and-YUV420P.patch b/package/ffmpeg/1007-v4l2-buffers-add-handling-for-NV21-and-YUV420P.patch deleted file mode 100644 index c669ebf6f9..0000000000 --- a/package/ffmpeg/1007-v4l2-buffers-add-handling-for-NV21-and-YUV420P.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 0550486542f4c4628abf9e5cf1090c8f328f215f -Author: Dave Stevenson -Date: Thu Mar 22 16:01:35 2018 +0000 - - v4l2_buffers: Add handling for NV21 and YUV420P - -diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c -index aef911f..0f4dbb2 100644 ---- a/libavcodec/v4l2_buffers.c -+++ b/libavcodec/v4l2_buffers.c -@@ -321,11 +321,21 @@ int ff_v4l2_buffer_buf_to_avframe(AVFrame *frame, V4L2Buffer *avbuf) - /* 1.1 fixup special cases */ - switch (avbuf->context->av_pix_fmt) { - case AV_PIX_FMT_NV12: -+ case AV_PIX_FMT_NV21: - if (avbuf->num_planes > 1) - break; - frame->linesize[1] = avbuf->plane_info[0].bytesperline; - frame->data[1] = frame->buf[0]->data + avbuf->plane_info[0].bytesperline * avbuf->context->format.fmt.pix_mp.height; - break; -+ case AV_PIX_FMT_YUV420P: -+ /* No YV12? support? */ -+ if (avbuf->num_planes > 1) -+ break; -+ frame->linesize[1] = avbuf->plane_info[0].bytesperline >> 1; -+ frame->linesize[2] = avbuf->plane_info[0].bytesperline >> 1; -+ frame->data[1] = frame->buf[0]->data + avbuf->plane_info[0].bytesperline * avbuf->context->format.fmt.pix_mp.height; -+ frame->data[2] = frame->data[1] + ((avbuf->plane_info[0].bytesperline * avbuf->context->format.fmt.pix_mp.height) >> 2); -+ break; - default: - break; - } -@@ -468,6 +478,7 @@ int ff_v4l2_buffer_enqueue(V4L2Buffer* avbuf) - - avbuf->buf.flags = avbuf->flags; - -+ av_log(NULL, AV_LOG_ERROR, "ff_v4l2_buffer_enqueue: VIDIOC_QBUF : fd %d, index %u type %u\n", buf_to_m2mctx(avbuf)->fd, avbuf->buf.index, avbuf->buf.type); - ret = ioctl(buf_to_m2mctx(avbuf)->fd, VIDIOC_QBUF, &avbuf->buf); - if (ret < 0) - return AVERROR(errno); -