From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 385714F887 for ; Mon, 23 Jun 2025 13:45:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3DFEE68C0DA; Mon, 23 Jun 2025 16:40:47 +0300 (EEST) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id BA3EA68C10A for ; Mon, 23 Jun 2025 16:40:45 +0300 (EEST) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-b31e0ead80eso2859265a12.0 for ; Mon, 23 Jun 2025 06:40:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750686044; x=1751290844; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=NsLf9V+mEvUvdCqbf9pOjX6XAL5IGrtJN5/LRLgbpfo=; b=Z0tJ4RoqwqCKst9JPMd4/wamxWM79niLPzz2SDxWklNeN9ib5M3lnBpOw+TkbbkKnW 1T5XOpkHN+HCjDz87MmUy96XnhMngVWcgZn+ww0C/UTHt8qlDxslNj0jdyxNCbD7PewJ B9LPkdQaj4kjqVWB4BDWC0A/hw92OCLyjK4dd4Ehi/ghXTTbGuxjRg8kCyAAesyOG/xU V9sej5OB2lGg5VQWX7WN7SwI4PcbIw6nCY/13jl0kFSTZM0nAeyk92gpymvceqq9Sygw wgcNvTJ3b2t5TSf6E+yhjVMtEENxd5OemUDlR290DT+dOab2Vs4evB/xxKjeuDG5gwp8 HI/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750686044; x=1751290844; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=NsLf9V+mEvUvdCqbf9pOjX6XAL5IGrtJN5/LRLgbpfo=; b=ZtFtAYObPQwZVyuL/GLaU7vizpN3wjmB+eQ98aMvLvhbFk+vAvEMoK6nyNBr4F394a KNAvAyMOqmMAwEmfAF0QqYXa/iNrky3xtt8JyTOChW6K3E3b627NDaESjzhwqrnOlaqB tm6D1dmrbw/GhGGGyAbXzm8rUpoeBvqr1Nw7g/68/9gdhKbavUEugKYEJxzCWjg2NqhV ZYTJYOfwG/mMvRQMTxedSXmqSUFjgHMp3Upl5/ZNvhkAHN7scdjXlRT6IAnGytHpiw6/ CIRzxP2GV7+/quuMa4sgUJyjTu3y0z6OKlPlHEC1onDgmOXcWSRVc8yPdQ5RG+VUY5Hk oOXw== X-Gm-Message-State: AOJu0YxSVU98SumNOqmRU1wZ9Vf9sFUbG8+dVPkBhjyTDI4ip3sdEyuS vX8JoOR/OD8m3NQPh55DFv1e6qtLGqNv7JsEo1X7JrfIC3Sdpu3vZLdGH0ahkw== X-Gm-Gg: ASbGnctrAoAOcqVz2UPlaTbidhoIeH/xutnTMpm1sni+jF8rvWtZ3SDIuQEwQsJOB4/ gKhwUlL00GJimL0D/ZUYIC9HWijAQKKCBECZF5kg6U4I2kdo1tJdSfn5yzu55lnoDKd0Mb8n+px oGYasuprEMoMSIhoaFsxlT1b2uEd0zv8+q0pa3NLk3WWZzmwRnRl5L7+a81FJgmeCe8DoxoxOQ5 QM92wEZAjKsIEBqvlELNFa4gq/BwOsp41d2Vvs82pZw9LxjkKWUhNj1AG4IZSdpzfwj1+LEElBO gpAVhz0ZRyrplzmqjL01bayfB1AheG5IF45Bb/yORE5/+yazbhZ0trI+NmciJwujEXgjJRnSc0v WKcMd+vly98qXkXk2 X-Google-Smtp-Source: AGHT+IFZeukt60+5SAD6cdakbwg3/PvwFSxLGS2IhC6n/VDshEtf3eG8UFVT/g6nJkO+wwX57W1HTQ== X-Received: by 2002:a17:90b:2ec3:b0:2fa:157e:c790 with SMTP id 98e67ed59e1d1-3159d62b21emr17726672a91.5.1750686043655; Mon, 23 Jun 2025 06:40:43 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3159e0488c3sm9121706a91.29.2025.06.23.06.40.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 06:40:43 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <319f52efe2c9cd0c474296c53f3e7058c9175b7b.1750685809.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 23 Jun 2025 13:36:41 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 41/48] avcodec/ituh263enc: Inline value of h263_flv 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 Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Andreas Rheinhardt It is always two when we encode FLV1. Signed-off-by: Andreas Rheinhardt --- libavcodec/flvenc.c | 2 +- libavcodec/ituh263enc.c | 12 ++++-------- libavcodec/mpegvideo_enc.c | 1 - 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index 4143e7eecf..91e1f07365 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -33,7 +33,7 @@ int ff_flv_encode_picture_header(MPVMainEncContext *const m) put_bits(&s->pb, 17, 1); /* 0: H.263 escape codes 1: 11-bit escape codes */ - put_bits(&s->pb, 5, (s->c.h263_flv - 1)); + put_bits(&s->pb, 5, 1); put_bits(&s->pb, 8, (((int64_t) s->c.picture_number * 30 * s->c.avctx->time_base.num) / // FIXME use timestamp s->c.avctx->time_base.den) & 0xff); /* TemporalReference */ diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 4ec851cab9..682d4bd24e 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -536,7 +536,7 @@ static void h263_encode_block(MPVEncContext *const s, int16_t block[], int n) code = get_rl_index(rl, last, run, level); put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); if (code == rl->n) { - if (!CONFIG_FLV_ENCODER || s->c.h263_flv <= 1) { + if (!CONFIG_FLV_ENCODER || s->c.codec_id != AV_CODEC_ID_FLV1) { put_bits(&s->pb, 1, last); put_bits(&s->pb, 6, run); @@ -861,13 +861,9 @@ av_cold void ff_h263_encode_init(MPVMainEncContext *const m) #if CONFIG_FLV_ENCODER case AV_CODEC_ID_FLV1: m->encode_picture_header = ff_flv_encode_picture_header; - if (s->c.h263_flv > 1) { - s->min_qcoeff= -1023; - s->max_qcoeff= 1023; - } else { - s->min_qcoeff= -127; - s->max_qcoeff= 127; - } + /* format = 1; 11-bit codes */ + s->min_qcoeff = -1023; + s->max_qcoeff = 1023; break; #endif default: //nothing needed - default table already set in mpegvideo.c diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index a16cb6bd19..f54f458ab8 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -936,7 +936,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) break; case AV_CODEC_ID_FLV1: s->c.out_format = FMT_H263; - s->c.h263_flv = 2; /* format = 1; 11-bit codes */ s->me.unrestricted_mv = 1; s->rtp_mode = 0; /* don't allow GOB */ avctx->delay = 0; -- ffmpeg-codebot _______________________________________________ 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".