From patchwork Sat Aug 29 20:44:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 22001 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 EF65C44ADFF for ; Sat, 29 Aug 2020 23:51:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEA0368828E; Sat, 29 Aug 2020 23:51:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 221C1680378 for ; Sat, 29 Aug 2020 23:51:18 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1kC7j7-0008iK-09 for ffmpeg-devel@ffmpeg.org; Sat, 29 Aug 2020 22:45:29 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id C7i8kY36sIr7GC7i8kNAN3; Sat, 29 Aug 2020 22:44:29 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=QN4WuTDL c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=EjiuyzussyPvQW1F0fIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 29 Aug 2020 22:44:27 +0200 Message-Id: <20200829204428.11064-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfEo3bP9AgRieaAU+WdHLNvu+orE9QCAC/lXs/vsqgXHnln0EPXtsTj26Eydon4t5Hjy1+11oQq6IlRjuqcO3xjZKFAli4EFsEnilM4BgVBDulRhV198X +SjQ1STQuHl8OjLe+Ll3mYhqvgLcMgiiCFF0mOFi90jTruRKexgxrGuZ Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/cfhd: Replace a few literal numbers by named constants 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavcodec/cfhd.c | 8 ++++---- libavcodec/cfhd.h | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 036df00f72..ea35f03869 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -593,20 +593,20 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, break; } s->planes = data == 2 ? 4 : av_pix_fmt_count_planes(s->coded_format); - } else if (tag == -85) { + } else if (tag == -DisplayHeight) { av_log(avctx, AV_LOG_DEBUG, "Cropped height %"PRIu16"\n", data); s->cropped_height = data; - } else if (tag == -75) { + } else if (tag == -PeakOffsetLow) { s->peak.offset &= ~0xffff; s->peak.offset |= (data & 0xffff); s->peak.base = gb; s->peak.level = 0; - } else if (tag == -76) { + } else if (tag == -PeakOffsetHigh) { s->peak.offset &= 0xffff; s->peak.offset |= (data & 0xffffU)<<16; s->peak.base = gb; s->peak.level = 0; - } else if (tag == -74 && s->peak.offset) { + } else if (tag == -PeakLevel && s->peak.offset) { s->peak.level = data; bytestream2_seek(&s->peak.base, s->peak.offset - 4, SEEK_CUR); } else diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h index fdc6f1e546..8ea91270cd 100644 --- a/libavcodec/cfhd.h +++ b/libavcodec/cfhd.h @@ -83,10 +83,14 @@ enum CFHDParam { Precision = 70, InputFormat = 71, BandCodingFlags = 72, + PeakLevel = 74, + PeakOffsetLow = 75, + PeakOffsetHigh = 76, Version = 79, BandSecondPass = 82, PrescaleTable = 83, EncodedFormat = 84, + DisplayHeight = 85, ChannelWidth = 104, ChannelHeight = 105, };