From patchwork Fri Mar 19 05:58:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26476 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6751F449D11 for ; Fri, 19 Mar 2021 07:59:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FE0368A993; Fri, 19 Mar 2021 07:59:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FF3368A830 for ; Fri, 19 Mar 2021 07:59:44 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id bx7so9378500edb.12 for ; Thu, 18 Mar 2021 22:59:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=YK6gsndloiIFdoq4Ot1YAG9nKgORIXp78bGOkzHEJeY=; b=p5tW9tIQk02KwQOaHakvJObZ5Nn8ooghcyEUtT0vqqJ9QEF+RwTPtcgyMkF4IWILZD rVXLOaVfwmO+6G80c9fDeCfuhJxzI6gmbY22nSreo3WV+3Zg90lm3cHKB76XuXTnmPP0 VMmCbDqLxm5bsEG47Vw0K4Cq+MqoI8JM4G9RAWKjxPfcUzUzxrzB6QQHlgiwxlnvQc4w ZJ+mQeiPR2h6OIT+Dv8H3Aa6UY+82Onv2d0ivgTZ35S6AhzGag7slDHzAN/YzuueQf4U 2Y9dwaPKgncpG1eKZc0dpB7gbeGZs846tYnKlCcktr5n/CKBF5lQQjlGKwhu3Nba9HWY z1pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=YK6gsndloiIFdoq4Ot1YAG9nKgORIXp78bGOkzHEJeY=; b=SVE3DwPvHAEkiLJQ4cGWt02t1WoFrvOSIyxDi/h1Mqt2iSlCvk8UjkpcR0hjfy37ux PdHDvGxVuKREjL2xoHfGoMPl+dSPa5+pB5ojtfTRPb8jIxReO6XsyOI5yKVvP7dW8ETn ZXPhWcsXUB0+RfC9GYlWQJ1O24tVGyZ1CRfBEp7Dy7fs0DekFWQemggag8Tls76o4hYT vKHu0hYoqBR7SCWw+k5Lp9gFiYrDuWHbrVNsWUXauuEQIii2Ur7RWodQ2i5rLDv9xrcq HTav9j6Ze0sRsfC3QrHrPzmgFXmkJNQbyQIzchJkEgo6NuTZ/qLDjUJdQ+5IZEMCsz62 R/Yg== X-Gm-Message-State: AOAM531yDYt8QjRAWhK4TOoK5foToB2uiXdXPpninKlzlX07afsBtdz9 iEmCdn7tEFsgs2UZDzIH3Ph7A95aaLgsrA== X-Google-Smtp-Source: ABdhPJw27yfxohkdMny/ChLWaPN5h/e6UXNvqG/QQGxQPO3nIU5Wh7nAF031b38f7kxvR5SaAsOz/A== X-Received: by 2002:a50:fd8b:: with SMTP id o11mr7623481edt.346.1616133583493; Thu, 18 Mar 2021 22:59:43 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id x17sm3109344ejd.68.2021.03.18.22.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 22:59:43 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 06:58:56 +0100 Message-Id: <20210319055904.2264501-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210319055904.2264501-1-andreas.rheinhardt@gmail.com> References: <20210319055904.2264501-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/18] avformat/ipmovie: Deduplicate parsing video data opcodes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/ipmovie.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 3f40bb8fe8..f1cc30b6c0 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -560,28 +560,11 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, break; case OPCODE_VIDEO_DATA_06: - av_log(s->avf, AV_LOG_TRACE, "set video data format 0x06\n"); - s->frame_format = 0x06; - - /* log position and move on for now */ - s->video_chunk_offset = avio_tell(pb); - s->video_chunk_size = opcode_size; - avio_skip(pb, opcode_size); - break; - case OPCODE_VIDEO_DATA_10: - av_log(s->avf, AV_LOG_TRACE, "set video data format 0x10\n"); - s->frame_format = 0x10; - - /* log position and move on for now */ - s->video_chunk_offset = avio_tell(pb); - s->video_chunk_size = opcode_size; - avio_skip(pb, opcode_size); - break; - case OPCODE_VIDEO_DATA_11: - av_log(s->avf, AV_LOG_TRACE, "set video data format 0x11\n"); - s->frame_format = 0x11; + s->frame_format = opcode_type; + av_log(s->avf, AV_LOG_TRACE, "set video data format 0x%02X\n", + opcode_type); /* log position and move on for now */ s->video_chunk_offset = avio_tell(pb);