From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 3A5704BB4B for ; Sat, 1 Feb 2025 10:41:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1837968C260; Sat, 1 Feb 2025 12:41:29 +0200 (EET) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8F8668BE56 for ; Sat, 1 Feb 2025 12:41:21 +0200 (EET) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21669fd5c7cso49427245ad.3 for ; Sat, 01 Feb 2025 02:41:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738406479; x=1739011279; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Vc6amdMKkkPLbcfTnnQS0mYJDgsPnCYSDbpnrQoGZls=; b=KnSdXt/uBXAr0gFH/Yk5ld2ZzfL02tu05bcBN/0vuIm9D+05e9Wtv4xNZ0cjl3nsOg nruU5eAg51JgRja5Y7qKN9qskXAUSHUZQvl8iY6t7CfAH4V4V77q1AUpHoYLLUs6Ea64 PgHpiLWlzjWWUu/D4HUN4bOUebMyZXrERgGkgJnIYQ3LldoRppkq2jscdiAom4bKiTY2 e4Qen49NGk+Mqf0QjZeDFJD7Kin4tr/7xQZdnxAtfs+Z+JkxGvhyR4sHxkVFha844wGp AoO3Qt8eznrWfNS1MS6cQiUQL0adPYkS4OH/kZzFWaPZ7KALzokg5NG+UAtzPMpYsUdA pKyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738406479; x=1739011279; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Vc6amdMKkkPLbcfTnnQS0mYJDgsPnCYSDbpnrQoGZls=; b=fe9FhVGqxZO/lSpduHI2a6pUg8Q8hEZgezwHz4tAwPry3TxGXlm7MQ86p72FLb9jpE sFK45B/0YNfk31xCr/1ctQzQUM/Mbids0JztbfKAEK33M/y4YsgUduBdxeFU0Ml4hJyY bnfXF0BtdutcXoXbY2n8sM8ELH8MaCfM95fTF4/fKQLRnyDSQPaLYBLOCJx4HdMIm2vR DjNVTuMuNPlk776kGEvJorXsrpPVI4pm+XwRjCHdWwxQb/lGsjPBmdftpzgHpmP600X9 b4ZmmoOwe+YN32pG8XVBE/2gqyqg5GbsPzhCP4+J19ad+dhi0nrbQ6OjjnBj1lf001xv J+Jg== X-Gm-Message-State: AOJu0YxD9lptC/6pBtoGrFViWPccssaPUTCROoHCOQ7QTfUXBEtCcBI/ MXS9UCw3EcsA9GG7jEBvSQlwEyd5YwugAZdmfr6dHsprpCnb3kMGkQrcuA== X-Gm-Gg: ASbGncsoFIiU4u3fJgAQlWXmI0S7u+3Zil3uVjR9lrIqM0XzWap/W9JCykDo0U6x8/u CoUI/lxguk0VxdAEM9SeiCxizx/dT1BcFrXDnldfEFZSJjb6G9hNJ+VTNaE/RIMPgAMtpNpytMu y/YEaPgf9uRQh+iLsdU99AqJZtlLP2jKHhORA+jdVHuKbznNasydVAt7anqJ7cMneTzAMIQvDbj tJY3OdNH7hlyPnO/Xk/yRKguFC25N3itl2MUEY4pXu/yOUDslLWzqN9pr41h7HYi46n0it9POIJ 00L2EsDjm1WfOTuFSBEy5aCcqNNethmpHsH97DEC9A== X-Google-Smtp-Source: AGHT+IHItMBw2SESoRJsoK8zV/CK5K4xezpK75MBgqw9CQYODA1OIi9GblYSiDZrLggJVZo1fSeQSQ== X-Received: by 2002:a17:902:c943:b0:21a:8dec:e59f with SMTP id d9443c01a7336-21dd7db92f3mr216213035ad.39.1738406479320; Sat, 01 Feb 2025 02:41:19 -0800 (PST) Received: from debian.login.wijungle.com ([117.250.157.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21de31efbcbsm43489545ad.30.2025.02.01.02.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 02:41:19 -0800 (PST) From: Viraaj Raulgaonkar To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Feb 2025 16:10:56 +0530 Message-Id: <20250201104057.1615411-1-viraajraulgkar@gmail.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/2] avformat/riffdec: change declaration of ff_get_wav_header() 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: Viraaj Raulgaonkar 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: Change the type of logctx from void* to AVFormatContext*, since all calls to ff_get_wav_header() pass an AVFormatContext* anyway. --- libavformat/riff.h | 2 +- libavformat/riffdec.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/riff.h b/libavformat/riff.h index a93eadfeca..0b01b1fd20 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -67,7 +67,7 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, int for_asf, int int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par, int flags); enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps); -int ff_get_wav_header(void *logctx, AVIOContext *pb, AVCodecParameters *par, +int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par, int size, int big_endian); extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_tags() diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index b7a85a6ab2..2b269b1682 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -92,14 +92,14 @@ static void parse_waveformatex(void *logctx, AVIOContext *pb, AVCodecParameters } /* "big_endian" values are needed for RIFX file format */ -int ff_get_wav_header(void *logctx, AVIOContext *pb, +int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par, int size, int big_endian) { int id, channels = 0, ret; uint64_t bitrate = 0; if (size < 14) { - avpriv_request_sample(logctx, "wav header size < 14"); + avpriv_request_sample(s, "wav header size < 14"); return AVERROR_INVALIDDATA; } @@ -140,18 +140,18 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb, if (size >= 18 && id != 0x0165) { /* We're obviously dealing with WAVEFORMATEX */ int cbSize = avio_rl16(pb); /* cbSize */ if (big_endian) { - avpriv_report_missing_feature(logctx, "WAVEFORMATEX support for RIFX files"); + avpriv_report_missing_feature(s, "WAVEFORMATEX support for RIFX files"); return AVERROR_PATCHWELCOME; } size -= 18; cbSize = FFMIN(size, cbSize); if (cbSize >= 22 && id == 0xfffe) { /* WAVEFORMATEXTENSIBLE */ - parse_waveformatex(logctx, pb, par); + parse_waveformatex(s, pb, par); cbSize -= 22; size -= 22; } if (cbSize > 0) { - ret = ff_get_extradata(logctx, par, pb, cbSize); + ret = ff_get_extradata(s, par, pb, cbSize); if (ret < 0) return ret; size -= cbSize; @@ -164,7 +164,7 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb, int nb_streams, i; size -= 4; - ret = ff_get_extradata(logctx, par, pb, size); + ret = ff_get_extradata(s, par, pb, size); if (ret < 0) return ret; nb_streams = AV_RL16(par->extradata + 4); @@ -180,7 +180,7 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb, par->bit_rate = bitrate; if (par->sample_rate <= 0) { - av_log(logctx, AV_LOG_ERROR, + av_log(s, AV_LOG_ERROR, "Invalid sample rate: %d\n", par->sample_rate); return AVERROR_INVALIDDATA; } -- 2.39.5 _______________________________________________ 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".