From patchwork Sun Jan 21 21:08:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Luchitz X-Patchwork-Id: 45695 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a402:b0:199:de12:6fa6 with SMTP id z2csp1101775pzk; Sun, 21 Jan 2024 13:08:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IEqpU63sU3n4DAzsyTI435K7kmiCOtoaW/u6MRZJKk9iyhxd3+P5p/TjP5BmDafH/fVXmjo X-Received: by 2002:a17:906:158b:b0:a28:bbb9:a07a with SMTP id k11-20020a170906158b00b00a28bbb9a07amr1372342ejd.154.1705871306058; Sun, 21 Jan 2024 13:08:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705871306; cv=none; d=google.com; s=arc-20160816; b=Y6uX3cxKpN7yK06kRZTZ7cTFO3TYZvRzBV2AODMHKI7ejTFxDI/t2yXZqDhmWvGlm/ 1HUzTsxovwRF2wcXmK63sabqczGkdbhH8rUdEZuqu9jlzc7pv5qYo7cL3BmBgeuJBVQy qESrHjYcR9oo/IjfNhTPGjKvXeJlaAA7gany2DstdHCkln+0fE+HCHToSmTQ2YcAz/GA a/g5pFRLVRE7KZhDksjYLXCyusIl7FpRnjpgFr6HThzJuQiEYQIfu+Fmgit/GCbyFVLO 9L4Hcuf+4rFd+ccn0FcGQJeKAB31YJTi4Lxyio/p6rDAgXds6iueJJXMRBlXZgD2/6// gbVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=e1n5W+eKs/FwE8ehHxVTqnyvmGuTK0L2J4889oUnFio=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=x6v6/HPzIdoGZD+N/96t3Lz1yImbJdDssY8nLokU6sX9Go3ATY+Zxz4rn28x02n55D hlNHjrP7ijdUDBUeq7B+Jm3RWhkkXmCzk67CorqlzvGL6JBo8L3ObK0jSELYmq2BqPWI pgOXrBpNdmkLFTbfX2rTHYCSn/LIvuGp3OCzA67y9nn6t+6ZwfGLfaaJ7+U4Lu3aZbAw qyHjpfS+SINyR6q+WlwQUd7Nup49TfTe4Z8Wf7M3mAb61/QzCMG6M333BZjtEBbsJmW2 937mY9h9hN3qYX/zsu3G1syCJHavOK8ZXHoStlgijznLmL63okZLYRDtpZ8mecVI3ZPW zNww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=R5NdKPhi; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i18-20020a170906091200b00a28e7106217si10222965ejd.694.2024.01.21.13.08.25; Sun, 21 Jan 2024 13:08:26 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=R5NdKPhi; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B737A68D060; Sun, 21 Jan 2024 23:08:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61BF968CB57 for ; Sun, 21 Jan 2024 23:08:15 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-50e7dd8bce8so2694117e87.1 for ; Sun, 21 Jan 2024 13:08:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705871294; x=1706476094; darn=ffmpeg.org; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=nRm+RCT5N/7+SIiXn3c2G2WXjYbLgb8usI7SH9y+aHg=; b=R5NdKPhiu2XNuRY52vffmTzZz2AAsx8VvWRIx+rRrMr9751ft+RRtNfVqNcXbXCT3+ WBFCIuOYyukLwF92Rp9FYx5kkWnE7zFaqblo9ppxMva+9Ann6vU1lL2jx+aF+opWTgr4 vyMlixS1KZ9WNx+jCGZQH0Su6sDIWd3wD1FjLxX6PMRBQsyn/XlHmszIzvG5Z3PPaunJ 2huZso18nfrnAJZ1QhqwzhE4LmBY22rAow1pnf8WAluqBO0rO9OMhwyiMiPq0d49gDXB 1VxendGrYL6cVPb4ZSFH0LyA1nAA6pxvLiyINOdES6S0ZBD8GPZMJiftVrVeRqS91rl0 oz7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705871294; x=1706476094; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=nRm+RCT5N/7+SIiXn3c2G2WXjYbLgb8usI7SH9y+aHg=; b=X6GXt15/G6dl9CX/WRTN2qj5Kr5/ih/caZj0cuMIU/u3KIQvfYMXxmx7W/Ex5PHn96 GUVKWREYahkggNqIbDC7LhAAgGP/gNo1TXUYYHnm7uyzZC+r38iKuzNu+r/vj1tcuGAc oKK88e36BeqmjF2M6xVfyQUM9rv6AZzu6KEqSPHOd065lPyRgTql7VokghgxEj1Djfs0 eVud6lyjEV6w42AsrKlXzcf68ABjGok9KEMxi1Q94UCZ03L8bWbZ+rIqe2Nkyl6zsbI9 EJLW38ayTvl8rmyJPwYeZF0hzAO4YV9nONcTvQn1hUS0XZtX1TeOMOFyu8WYGEMN593K bA2Q== X-Gm-Message-State: AOJu0YwGwX8wQz09rIctha8FF40OKwETSaeJEzpQbIIgLFzwD9PlvLgY tzoASuASCa0NwxFw+5RTsBUMWdGTvG4EJbyeHe3X58iBLib+MvBAWBX4+nYZvks= X-Received: by 2002:a05:6512:b90:b0:50f:c24:39f2 with SMTP id b16-20020a0565120b9000b0050f0c2439f2mr1501339lfv.92.1705871293586; Sun, 21 Jan 2024 13:08:13 -0800 (PST) Received: from [192.168.1.3] ([176.193.23.254]) by smtp.gmail.com with ESMTPSA id y18-20020a196412000000b0050eed79975dsm1781002lfb.24.2024.01.21.13.08.13 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 21 Jan 2024 13:08:13 -0800 (PST) Message-ID: Date: Mon, 22 Jan 2024 00:08:13 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Victor Luchits To: ffmpeg-devel@ffmpeg.org Content-Language: ru Subject: [FFmpeg-devel] [PATCH] liavcodec: add bit-rate support to RoQ video encoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EtRFbgNhGOZ3 One can now use the bitrate option (-b) to specify bit rate of the video stream in the RoQ encoder. The option only becomes effective for values above 800kbit/s, which is roughly equivalent to bandwidth of a 1x-speed CD-ROM drive, minus the bandwidth taken up by stereo DPCM stream. Values below this threshold produce visually inadequate results. Original patch by Joseph Fenton aka Chilly Willy Signed-off-by: Victor Luchits --- Changelog | 1 + libavcodec/roqvideo.h | 1 + libavcodec/roqvideodec.c | 15 +++++ libavcodec/roqvideoenc.c | 118 ++++++++++++++++++++++++++++++++++----- libavcodec/version.h | 2 +- 5 files changed, 123 insertions(+), 14 deletions(-) diff --git a/Changelog b/Changelog index c40b6d08fd..6974312f9d 100644 --- a/Changelog +++ b/Changelog @@ -22,6 +22,7 @@ version : - ffmpeg CLI -bsf option may now be used for input as well as output - ffmpeg CLI options may now be used as -/opt , which is equivalent to -opt > +- RoQ video bit rate option support version 6.1: - libaribcaption decoder diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h index 2c2e42884d..6d30bcaada 100644 --- a/libavcodec/roqvideo.h +++ b/libavcodec/roqvideo.h @@ -43,6 +43,7 @@ typedef struct RoqContext { AVFrame *last_frame; AVFrame *current_frame; int width, height; + int key_frame; roq_cell cb2x2[256]; roq_qcell cb4x4[256]; diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index bfc69a65c9..07d6b8bb8f 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -70,6 +70,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) chunk_start = bytestream2_tell(gb); xpos = ypos = 0; + ri->key_frame = 1; if (chunk_size > bytestream2_get_bytes_left(gb)) { av_log(ri->logctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n"); @@ -92,12 +93,14 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) switch(vqid) { case RoQ_ID_MOT: + ri->key_frame = 0; break; case RoQ_ID_FCC: { int byte = bytestream2_get_byte(gb); mx = 8 - (byte >> 4) - ((signed char) (chunk_arg >> 8)); my = 8 - (byte & 0xf) - ((signed char) chunk_arg); ff_apply_motion_8x8(ri, xp, yp, mx, my); + ri->key_frame = 0; break; } case RoQ_ID_SLD: @@ -125,12 +128,14 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) vqflg_pos--; switch(vqid) { case RoQ_ID_MOT: + ri->key_frame = 0; break; case RoQ_ID_FCC: { int byte = bytestream2_get_byte(gb); mx = 8 - (byte >> 4) - ((signed char) (chunk_arg >> 8)); my = 8 - (byte & 0xf) - ((signed char) chunk_arg); ff_apply_motion_4x4(ri, x, y, mx, my); + ri->key_frame = 0; break; } case RoQ_ID_SLD: @@ -214,6 +219,16 @@ static int roq_decode_frame(AVCodecContext *avctx, AVFrame *rframe, if ((ret = av_frame_ref(rframe, s->current_frame)) < 0) return ret; + + /* Keyframe when no MOT or FCC codes in frame */ + if (s->key_frame) { + av_log(avctx, AV_LOG_VERBOSE, "\nFound keyframe!\n"); + rframe->pict_type = AV_PICTURE_TYPE_I; + avpkt->flags |= AV_PKT_FLAG_KEY; + } else { + rframe->pict_type = AV_PICTURE_TYPE_P; + } + *got_frame = 1; /* shuffle frames */ diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index 0933abf4f9..bcead80bbd 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -79,6 +79,9 @@ /* The cast is useful when multiplying it by INT_MAX */ #define ROQ_LAMBDA_SCALE ((uint64_t) FF_LAMBDA_SCALE) +/* The default minimum bitrate, set around the value of a 1x speed CD-ROM drive */ +#define ROQ_DEFAULT_MIN_BIT_RATE 800*1024 + typedef struct RoqCodebooks { int numCB4; int numCB2; @@ -136,6 +139,8 @@ typedef struct RoqEncContext { struct ELBGContext *elbg; AVLFG randctx; uint64_t lambda; + uint64_t last_lambda; + int lambda_delta; motion_vect *this_motion4; motion_vect *last_motion4; @@ -887,8 +892,9 @@ static int generate_new_codebooks(RoqEncContext *enc) return 0; } -static int roq_encode_video(RoqEncContext *enc) +static int roq_encode_video(AVCodecContext *avctx) { + RoqEncContext *const enc = avctx->priv_data; RoqTempData *const tempData = &enc->tmp_data; RoqContext *const roq = &enc->common; int ret; @@ -910,14 +916,14 @@ static int roq_encode_video(RoqEncContext *enc) /* Quake 3 can't handle chunks bigger than 65535 bytes */ if (tempData->mainChunkSize/8 > 65535 && enc->quake3_compat) { - if (enc->lambda > 100000) { + if (enc->lambda > 100000000) { av_log(roq->logctx, AV_LOG_ERROR, "Cannot encode video in Quake compatible form\n"); return AVERROR(EINVAL); } av_log(roq->logctx, AV_LOG_ERROR, "Warning, generated a frame too big for Quake (%d > 65535), " - "now switching to a bigger qscale value.\n", - tempData->mainChunkSize/8); + "now switching to a bigger qscale value (%d).\n", + tempData->mainChunkSize/8, (int)enc->lambda); enc->lambda *= 1.5; tempData->mainChunkSize = 0; memset(tempData->used_option, 0, sizeof(tempData->used_option)); @@ -931,6 +937,80 @@ static int roq_encode_video(RoqEncContext *enc) remap_codebooks(enc); + /* bit rate control code - could make encoding very slow */ + if (avctx->bit_rate > ROQ_DEFAULT_MIN_BIT_RATE) { + /* a bit rate has been specified - try to match it */ + int ftotal = (tempData->mainChunkSize / 8 + tempData->numCB2*6 + tempData->numCB4*4) * avctx->time_base.den * 8; + int64_t tol = avctx->bit_rate_tolerance; + + /* tolerance > bit rate, set to 5% of the bit rate */ + if (tol > avctx->bit_rate) + tol = avctx->bit_rate / 20; + + av_log(roq->logctx, AV_LOG_VERBOSE, + "\nDesired bit rate (%d kbps), " + "Bit rate tolerance (%d), " + "Frame rate (%d)\n", + (int)avctx->bit_rate, (int)tol, avctx->time_base.den); + + if (ftotal > (avctx->bit_rate + tol)) { + /* frame is too big - increase qscale */ + if (enc->lambda > 100000000) { + av_log(roq->logctx, AV_LOG_ERROR, "\nCannot encode video at desired bitrate\n"); + return AVERROR(EINVAL); + } + enc->lambda_delta = enc->lambda_delta <= 0 ? 1 : enc->lambda_delta < 65536 ? enc->lambda_delta*2 : 65536; + enc->last_lambda = enc->lambda; + enc->lambda += enc->lambda_delta; + av_log(roq->logctx, AV_LOG_INFO, + "\nGenerated a frame too big for desired bit rate (%d kbps), " + "now switching to a bigger qscale value (%d).\n", + ftotal / 1000, (int)enc->lambda); + tempData->mainChunkSize = 0; + memset(tempData->used_option, 0, sizeof(tempData->used_option)); + memset(tempData->codebooks.usedCB4, 0, + sizeof(tempData->codebooks.usedCB4)); + memset(tempData->codebooks.usedCB2, 0, + sizeof(tempData->codebooks.usedCB2)); + + goto retry_encode; + } else if (ftotal < (avctx->bit_rate - tol)) { + /* frame is too small - decrease qscale */ + if (enc->lambda <= 1) { + av_log(roq->logctx, AV_LOG_WARNING, + "\nGenerated a frame too small for desired bit rate (%d kbps), " + "qscale value cannot be lowered any further (%d).\n", + ftotal / 1000, (int)enc->lambda); + } else if ((enc->lambda - enc->last_lambda) == 1) { + av_log(roq->logctx, AV_LOG_WARNING, + "\nCannot find qscale that gives desired bit rate within desired tolerance, " + "using lower bitrate (%d kbps) with higher qscale value (%d).\n", + ftotal / 1000, (int)enc->lambda); + } else { + enc->lambda_delta = 0; + if (enc->lambda == enc->last_lambda) { + enc->lambda >>= 1; + enc->last_lambda = enc->lambda; + } else { + enc->lambda = enc->last_lambda; + //enc->lambda *= (float)(tempData->mainChunkSize * avctx->time_base.den) / avctx->bit_rate; + av_log(roq->logctx, AV_LOG_INFO, + "\nGenerated a frame too small for desired bit rate (%d kbps), " + "reverting lambda and using smaller inc on qscale (%d).\n", + ftotal / 1000, (int)enc->lambda); + } + tempData->mainChunkSize = 0; + memset(tempData->used_option, 0, sizeof(tempData->used_option)); + memset(tempData->codebooks.usedCB4, 0, + sizeof(tempData->codebooks.usedCB4)); + memset(tempData->codebooks.usedCB2, 0, + sizeof(tempData->codebooks.usedCB2)); + + goto retry_encode; + } + } + } + write_codebooks(enc); reconstruct_and_encode_image(enc, roq->width, roq->height, @@ -980,19 +1060,26 @@ static av_cold int roq_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (avctx->width > 65535 || avctx->height > 65535) { - av_log(avctx, AV_LOG_ERROR, "Dimensions are max %d\n", enc->quake3_compat ? 32768 : 65535); + if (enc->quake3_compat && ((avctx->width > 32767 || avctx->height > 32767))) { + av_log(avctx, AV_LOG_ERROR, "Dimensions are max %d\n", 32767); + return AVERROR(EINVAL); + } + else if (avctx->width > 65535 || avctx->height > 65535) { + av_log(avctx, AV_LOG_ERROR, "Dimensions are max %d\n", 65535); return AVERROR(EINVAL); } - if (((avctx->width)&(avctx->width-1))||((avctx->height)&(avctx->height-1))) + if (enc->quake3_compat && ((avctx->width)&(avctx->width-1))||((avctx->height)&(avctx->height-1))) av_log(avctx, AV_LOG_ERROR, "Warning: dimensions not power of two, this is not supported by quake\n"); roq->width = avctx->width; roq->height = avctx->height; + enc->lambda = 2*ROQ_LAMBDA_SCALE; enc->framesSinceKeyframe = 0; enc->first_frame = 1; + enc->last_lambda = 1; + enc->lambda_delta = 0; roq->last_frame = av_frame_alloc(); roq->current_frame = av_frame_alloc(); @@ -1043,9 +1130,11 @@ static void roq_write_video_info_chunk(RoqEncContext *enc) /* Height */ bytestream_put_le16(&enc->out_buf, enc->common.height); - /* Unused in Quake 3, mimics the output of the real encoder */ + /* Quake 3: starting size for cell subdivision */ bytestream_put_byte(&enc->out_buf, 0x08); bytestream_put_byte(&enc->out_buf, 0x00); + + /* Quake 3: ending size for cell subdivision */ bytestream_put_byte(&enc->out_buf, 0x04); bytestream_put_byte(&enc->out_buf, 0x00); } @@ -1059,10 +1148,13 @@ static int roq_encode_frame(AVCodecContext *avctx, AVPacket *pkt, enc->frame_to_enc = frame; - if (frame->quality) - enc->lambda = frame->quality - 1; - else - enc->lambda = 2*ROQ_LAMBDA_SCALE; + if (avctx->bit_rate <= ROQ_DEFAULT_MIN_BIT_RATE) { + /* no specific bit rate desired, use frame quality */ + if (frame->quality) + enc->lambda = frame->quality - 1; + else + enc->lambda = 2*ROQ_LAMBDA_SCALE; + } /* 138 bits max per 8x8 block + * 256 codebooks*(6 bytes 2x2 + 4 bytes 4x4) + 8 bytes frame header */ @@ -1089,7 +1181,7 @@ static int roq_encode_frame(AVCodecContext *avctx, AVPacket *pkt, } /* Encode the actual frame */ - ret = roq_encode_video(enc); + ret = roq_encode_video(avctx); if (ret < 0) return ret; diff --git a/libavcodec/version.h b/libavcodec/version.h index 376388c5bb..581151cda7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 37 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \