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 5CED34F7FC for ; Mon, 23 Jun 2025 13:45:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9EAF368DF21; Mon, 23 Jun 2025 16:40:57 +0300 (EEST) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 067DF68DD76 for ; Mon, 23 Jun 2025 16:40:50 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-235ef62066eso55933215ad.3 for ; Mon, 23 Jun 2025 06:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750686049; x=1751290849; 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=a17dree4d9sUiqiQzXh9m3g2W6Hk6oMrKTzH89o/OCk=; b=Dm53hWHfl45tkCp3SSPO47ixIMVy9WTCQXEfObhgdaZ+4dg1nrBUQocYVQw4UemlM6 KBXZAf2n9Ec6Jwbkib6rzgI4bPs9saGDLjJbL46LEWLHLNRXJQ5WNb43b3UfeN1ru6Wi ZwkaDOYwi7M58RLfI3JGEYvAok/GrizU/zxj1Bg0KEmCdA7ZEHvNBRigo+iVtws6C9r/ C8QyFhhxIWoiD5SFCCypP7RUyCv2dNu1+XiY500kqS/Qf9fR+9zIbB2p99eyJ0VdkqY7 NWAnEVSaRh+5wIx/pHqlEqsOJUB4lHbp9M90I0MJ4DDZj9H003PhSGtluFQLMZ+Hpe2r aNOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750686049; x=1751290849; 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=a17dree4d9sUiqiQzXh9m3g2W6Hk6oMrKTzH89o/OCk=; b=etA0xpZ4VGxTExXxyBvYTwML9rcPhW7L3/oP4rxn1CBKAyo9ebMLsTT7TpWl+6VqQk MgIMTBAXaneNv15utjJmsvshfRSEOJ+iwLTORsSCAnySCriA3S/ymmksdYh0v1mDtDQX tv0g0rKnIKDsXQF0v+t729DsIkBMgCKLplTBuzpu4ZsHOn0pTQIfSQIeUdVC4DQnSEaj VVSmYwalGW4lNtRwPAKaeEC7VMZ9JK/J57aEVodPyZcNyaQUxJVgUQ7lBm3VWB0XwtwY s8nyezgrOWVwYeAFO6Z4+Bd30dmwgOCFDTyr6dG3VCuWdWhI7w3wcztZIyCKBvyW1Izw WrIQ== X-Gm-Message-State: AOJu0YxF1K8SD+GGurkAjSZ4hq8JtYhI49QnL2ZhyFhcKkG5xNK/ZoI9 JKaF9oo6cY0uELqmpvFa1m7XHhvnwdTGCN0YNrk6sJk7VHcD8JYdFT+HWKEnPQ== X-Gm-Gg: ASbGncs/9PNtreCS/NpgnTIatir3dsKHZ2DIckK8j+aTxuW6NHM3bwSwARSDlEzXfVl FvR0PgMgo1iAtFhHS55tKiaGT7Z73Au4nKR6o43xBRpJTVeUGiGdYF0/VvCxCHdYNwECZl0EHd2 IbBUtQEMGt5FAtssmGUKpX7fvJ7DA7zC1E2QVON5poLNKFF7YMWZsEXA3GACmB5g1G+aWGeRiEe fvFNfYVy7mnK6z5qUH6LfiX2LkYISUpuxRKextvmH0DOtQRT7MsJ/MM6MQ3WNwotmuStvyyz9RD Dkj1ZGADsnfw/M66waxaDcp7//yrOFMNxfmZvH5GYAEWLlaUoccEg7v6hBmc9k+OrnpONVeq8+E Tw9QHo4NlAe8Xu1q2xvU6CWokTEY= X-Google-Smtp-Source: AGHT+IHzLriOBDeR+n8II0lCMlm4h/YFL8xhIlVjMAPoOGuOuLKL1ggjJtjtvb6VgRlX8FBW6+NqRg== X-Received: by 2002:a17:903:230d:b0:234:ba37:87b2 with SMTP id d9443c01a7336-237d96b75f1mr232677415ad.10.1750686049172; Mon, 23 Jun 2025 06:40:49 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237d86ef88bsm85525035ad.219.2025.06.23.06.40.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 06:40:48 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <796b562f532c140104069ad83bd3f18c3e69d20e.1750685809.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 23 Jun 2025 13:36:42 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 42/48] avcodec/flvdec: Binarize 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 used to be a tri-state encoding both whether to use FLV picture headers and whether to use the FLV way of encoding escape values, but the former is now unnecessary due to the switch to a function pointer for reading the header. So binarize h263_flv. Signed-off-by: Andreas Rheinhardt --- libavcodec/flvdec.c | 4 ++-- libavcodec/h263dec.c | 1 - libavcodec/ituh263dec.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index c70d79f483..881f63ed1a 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -40,7 +40,7 @@ int ff_flv_decode_picture_header(H263DecContext *const h) av_log(h->c.avctx, AV_LOG_ERROR, "Bad picture format\n"); return AVERROR_INVALIDDATA; } - h->c.h263_flv = format + 1; + h->c.h263_flv = format; h->c.picture_number = get_bits(&h->gb, 8); /* picture timestamp */ format = get_bits(&h->gb, 3); switch (format) { @@ -101,7 +101,7 @@ int ff_flv_decode_picture_header(H263DecContext *const h) if (h->c.avctx->debug & FF_DEBUG_PICT_INFO) { av_log(h->c.avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n", h->c.droppable ? 'D' : av_get_picture_type_char(h->c.pict_type), - h->c.h263_flv - 1, h->c.qscale, h->c.picture_number); + h->c.h263_flv, h->c.qscale, h->c.picture_number); } return 0; diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 592a22df0d..0bbc8e989e 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -155,7 +155,6 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) #endif #if CONFIG_FLV_DECODER case AV_CODEC_ID_FLV1: - s->h263_flv = 1; h->decode_header = ff_flv_decode_picture_header; break; #endif diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 94cde850b5..0cd5d073ed 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -598,7 +598,7 @@ retry: return -1; } /* escape */ - if (CONFIG_FLV_DECODER && h->c.h263_flv > 1) { + if (CONFIG_FLV_DECODER && h->c.h263_flv) { int is11 = SHOW_UBITS(re, &h->gb, 1); SKIP_CACHE(re, &h->gb, 1); run = SHOW_UBITS(re, &h->gb, 7) + 1; -- 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".