From patchwork Tue Mar 23 14:12:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26563 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 9A25B44BC28 for ; Tue, 23 Mar 2021 16:13:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7549968AB55; Tue, 23 Mar 2021 16:13:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (unknown [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A556D689E84 for ; Tue, 23 Mar 2021 16:13:38 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=1gmrWLoc5drHVG8hcPRvDEN/wRtCijnOJMikNEW4w2E=; b=b8hBeRx+G04qE2oTpdCb2tt0ShCVWd26YE1jRNEbFG37rnSbV67dwJAStvS9exmxa6M/KK p1UPoBfJ75k3Y6D+MK0TqrqfLTWf037WBQwgWRfYA67hkYg7wu+qtYng4cdaxJZn5vA1bK EnMS/7zph4IPl8hWvtxGLUn5WGrXUPqFRiW2NE0HGlT6FrQAlasEBDcBKEZm1dQxS+cXaq lZG2gbuXFhImimlAQQ1PPC2aXrrsOdGRNRsn07zCh8HXKzVNZknlAKH04cWmg4A/6Q5bmn damq4wHr6rY6wtYNB9/3oNw+v55UHeHPTLZcxVH19kG08Mix+NbCdks3G6H1cg== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:12:55 +1000 Message-Id: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 01/11] avcodec/adpcm: add comment to has_status field 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 5b6d1040af..5c28b745b9 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -100,7 +100,7 @@ static const int8_t mtf_index_table[16] = { typedef struct ADPCMDecodeContext { ADPCMChannelStatus status[14]; int vqa_version; /**< VQA version. Used for ADPCM_IMA_WS */ - int has_status; + int has_status; /**< Status flag. Reset to 0 after a flush. */ } ADPCMDecodeContext; static av_cold int adpcm_decode_init(AVCodecContext * avctx) From patchwork Tue Mar 23 14:12:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26562 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 7228944BC28 for ; Tue, 23 Mar 2021 16:13:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B97768AB48; Tue, 23 Mar 2021 16:13:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (unknown [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4F8C6804FC for ; Tue, 23 Mar 2021 16:13:38 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K2v6zj1Py1wUqkQbIYU6BBWIUyXtTGNBShDbbXWUJ7I=; b=hgnTIMYHfqdXWutrrOj5aoYYuRNrPiEU6a/wYGRGayFcEvd04RwR+gnksW0daMwSidceXj /CaoOilbkLFlGZZXC7tLWCNJdGjaOqOwSg9tVsrgo+i21Rg32v85NP4R11XrM1/eHezD83 Dc4lGAJkoF3dUmBTX+0oZEPQ+T4ElMQztUfRjNIAUnfwHcAx7ZPlyVVsdI+P8awESyD8pZ ouO523ihS43OebUPWZZJDDDhKfWfTmoSJLqVhmwHaNgf27Lpbwk5sMfUdPwKEy+ltRIG4j cQR0p6JWmENEYWA8msbn940T9POKoydCI+XHb/jrpoB3jId8xrfXP9khkTZ+0A== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:12:56 +1000 Message-Id: <20210323141305.19229-2-zane@zanevaniperen.com> In-Reply-To: <20210323141305.19229-1-zane@zanevaniperen.com> References: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 02/11] avcodec/adpcm_zork: reset state in flush callback 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 5c28b745b9..b145622f4f 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -2077,13 +2077,6 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } break; case AV_CODEC_ID_ADPCM_ZORK: - if (!c->has_status) { - for (channel = 0; channel < avctx->channels; channel++) { - c->status[channel].predictor = 0; - c->status[channel].step_index = 0; - } - c->has_status = 1; - } for (n = 0; n < nb_samples * avctx->channels; n++) { int v = bytestream2_get_byteu(&gb); *samples++ = adpcm_zork_expand_nibble(&c->status[n % avctx->channels], v); @@ -2121,7 +2114,22 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, static void adpcm_flush(AVCodecContext *avctx) { ADPCMDecodeContext *c = avctx->priv_data; - c->has_status = 0; + + switch(avctx->codec_id) { + case AV_CODEC_ID_ADPCM_ZORK: + for (int channel = 0; channel < avctx->channels; channel++) { + c->status[channel].predictor = 0; + c->status[channel].step_index = 0; + } + break; + + default: + /* Other codecs may want to handle this during decoding. */ + c->has_status = 0; + return; + } + + c->has_status = 1; } From patchwork Tue Mar 23 14:12:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26564 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 A86C444BC28 for ; Tue, 23 Mar 2021 16:13:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A0D568AB1E; Tue, 23 Mar 2021 16:13:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (unknown [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B26CE68A176 for ; Tue, 23 Mar 2021 16:13:38 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3+4wjagbOBqEW4G4YRPS8kckN1JRZ5h5Vv2Q49YCRsI=; b=KkVoHep8Wj0ROdZR3e1DWxzvE4Zqw0JZaVxBgulOtbUl0ZdQJtL/TuVsITgmRMPaxaZV/c B1tm0xqDkUW9HGVY5tZFVKn1J8G4jS+TcrjXqZZSJgij2BZt0r8tNaoKi+YmT7d4/69qIW poYytYf0gaTbpzaOz4no9nS6ArqeqTHRhY7M1aYlF6rpNMEBWZVZsOXXHrnIgg7+9Q4PlT C5V5rTKOgl+TZhEXvkwZ3r4QB59ijM2jC9AIlbA++J2xJ7Qw5okiX+JsmlOj6mP2jK0/xm 0D+V1BTfGtGYVd3ftpor8u9zBb7hesPaeM4rtHDzLbb06IYXplckXJZHl87QDw== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:12:57 +1000 Message-Id: <20210323141305.19229-3-zane@zanevaniperen.com> In-Reply-To: <20210323141305.19229-1-zane@zanevaniperen.com> References: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 03/11] avcodec/adpcm_aica: reset state in flush callback 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index b145622f4f..b035406550 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1811,11 +1811,6 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } break; case AV_CODEC_ID_ADPCM_AICA: - if (!c->has_status) { - for (channel = 0; channel < avctx->channels; channel++) - c->status[channel].step = 0; - c->has_status = 1; - } for (channel = 0; channel < avctx->channels; channel++) { samples = samples_p[channel]; for (n = nb_samples >> 1; n > 0; n--) { @@ -2116,6 +2111,11 @@ static void adpcm_flush(AVCodecContext *avctx) ADPCMDecodeContext *c = avctx->priv_data; switch(avctx->codec_id) { + case AV_CODEC_ID_ADPCM_AICA: + for (int channel = 0; channel < avctx->channels; channel++) + c->status[channel].step = 0; + break; + case AV_CODEC_ID_ADPCM_ZORK: for (int channel = 0; channel < avctx->channels; channel++) { c->status[channel].predictor = 0; From patchwork Tue Mar 23 14:12:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26566 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 4D7C144BC28 for ; Tue, 23 Mar 2021 16:13:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A89968ABBA; Tue, 23 Mar 2021 16:13:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5CBA68AB48 for ; Tue, 23 Mar 2021 16:13:39 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8LfGxhZVxIeDQzvq8cqNAXVoBgkljUKWtl1XIm4bExE=; b=CiXAV96tAH+xI2FVdNJef89zkmFahOmvnMCyqGU/zx5sVFciPrPoza0kkgv6rVylzpTspr sptAFy6rP1Ecc3hWNk+5Q+Z78aMzOUzWXM7n4OYyUZ47dAi2oK09JxQvy0WoRyOeZdAIUv j5ZI3GUsmHR5q1AJtZNbCOjgsB6Lh7AAiWxU2Ed/KCEP9gxQLm0osT53eJhjriKFIeHxSj iJoaf5ljGfKnCgomqFCF+q4A84QUrL4lQ52lF27b78s9HdoHP6aKooB+zoo2KvEmeNFk0G T9dYdMndqljZ4kvyKD0G/MTMfU7bt5AXopZYAL5RPJIjY87MtxqQf5gbSEIFSQ== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:12:58 +1000 Message-Id: <20210323141305.19229-4-zane@zanevaniperen.com> In-Reply-To: <20210323141305.19229-1-zane@zanevaniperen.com> References: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 04/11] avcodec/adpcm_argo: reset state on flush 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Commit 003b5c800fef909fa84dd2fae43d66bd434d3f7e introduced seeking in argo_asf, but this was missed, leading to non-deterministic output. Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index b035406550..07fa1a65b3 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -2116,6 +2116,13 @@ static void adpcm_flush(AVCodecContext *avctx) c->status[channel].step = 0; break; + case AV_CODEC_ID_ADPCM_ARGO: + for (int channel = 0; channel < avctx->channels; channel++) { + c->status[channel].sample1 = 0; + c->status[channel].sample2 = 0; + } + break; + case AV_CODEC_ID_ADPCM_ZORK: for (int channel = 0; channel < avctx->channels; channel++) { c->status[channel].predictor = 0; From patchwork Tue Mar 23 14:12:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26565 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 6E1C644BC28 for ; Tue, 23 Mar 2021 16:13:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 553F368AB8F; Tue, 23 Mar 2021 16:13:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD06A6804FC for ; Tue, 23 Mar 2021 16:13:39 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2jZy/zlgRdEwfva3IGDj+AeWY8bb2B7t7CsfrvVdjrk=; b=c/HiijLcgpRyzjaWBr0GxvznqByUoLVa+IlWsp6BjGEZ2IX7Hultp2lX8HVYbl4yQVvT9W d2HhKTES5gfKcX5Nsw+Riv5VPo4xhEf6WSJlaxmfpA2YtcwwR745EzrStc6TIpNA9iYB4i vA6ll0/sEr9opyV5NiDqcTmZwKNGjGJDH3ipT33gM8HWXbWyvPufqIMPoMtnJlcYq07RdP I1QgQO6jCdLBQBMD5e9RkVw3Tjq7nG+FD4Spt4TwXkaSqvbZUfRX82B0Xc83UzZp1ntEuY UoHDcGeThWkqeOrz/cylBzcjlC8xIG10NJ9dpr9NBHudF9SdjBDkjX7t1xQPFg== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:12:59 +1000 Message-Id: <20210323141305.19229-5-zane@zanevaniperen.com> In-Reply-To: <20210323141305.19229-1-zane@zanevaniperen.com> References: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 05/11] avcodec/adpcm_ima_ssi: reset state on flush 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 07fa1a65b3..e31f68b076 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -2123,6 +2123,7 @@ static void adpcm_flush(AVCodecContext *avctx) } break; + case AV_CODEC_ID_ADPCM_IMA_SSI: case AV_CODEC_ID_ADPCM_ZORK: for (int channel = 0; channel < avctx->channels; channel++) { c->status[channel].predictor = 0; From patchwork Tue Mar 23 14:13:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26569 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 2475E44BC28 for ; Tue, 23 Mar 2021 16:13:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 104A368ABC4; Tue, 23 Mar 2021 16:13:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 098FD68A58A for ; Tue, 23 Mar 2021 16:13:44 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WN48d425w6jcQTT2CnoRDl762ctc16YkIXYiDSlS2vQ=; b=bmsw2uleJk5q6Hv0xF2Pz9wOSMtpGx0M1FryLl09k3kHRG0JwkXT0gs1bQVk6OkuGVkj+e 1lDWl5bTA+kDkUWVDAV6hrfRLaffoQcDgvh/mPM9OlAprdVqdq3f5XUqMGLfKtszRsik8c 1Qi3YXwDlRj/Yi/37eXCgx1BlXAABhPt3LPZaw0IrWpITx1P5VE4nXkqEShJSVjh+WKnoz UfXA2yZkgv8mnix/W8FR2kz+26qnJmjFdTJ06JI4xZGjdLskjMXJG5Sw2NBowbehSQkmXY +5N768aKb1IHKrAqIBZQeU+xywEGkNtbK1MPlghdQJfz3csSJR/iSxy4f3WzxA== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:13:00 +1000 Message-Id: <20210323141305.19229-6-zane@zanevaniperen.com> In-Reply-To: <20210323141305.19229-1-zane@zanevaniperen.com> References: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 06/11] avcodec/adpcm_ima_alp: reset state on flush 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index e31f68b076..f154188b5d 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -2123,6 +2123,7 @@ static void adpcm_flush(AVCodecContext *avctx) } break; + case AV_CODEC_ID_ADPCM_IMA_ALP: case AV_CODEC_ID_ADPCM_IMA_SSI: case AV_CODEC_ID_ADPCM_ZORK: for (int channel = 0; channel < avctx->channels; channel++) { From patchwork Tue Mar 23 14:13:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26571 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 890CD44BC28 for ; Tue, 23 Mar 2021 16:13:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6038168ABFE; Tue, 23 Mar 2021 16:13:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 164F068AB82 for ; Tue, 23 Mar 2021 16:13:44 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4XXOwmQpnErkSfK8d1D6ktICX2esQbVCYtbA/PmHIXc=; b=dauE8xzfMFyVVQSIdwWeIn3HUMDhWvULZCtBYk9Vu/1091LTmNxrcovi9azSoBsiN7bFkC DU/yucW4mDi0jwWFlmAKUaPB4ZlPXYx3v3Ktw5uPDxMg7s+cvYujLx6uWssOokZ3+hioxY +//ERgACGqCduhMnHHBgTFvOduo8hPLPLjYsnBguDiN3csa/E21lWbO3v1JzBHPVcPtDkl Jmz1UGDxxYMIubVjqbq5ZRrwJAU8ITrZKD8RrvvJUpbIiw/PimvyoXo7u0x//5xpEL8HMy OF3vkqprN5xns9uPoaXmK1f6AHBUhGyUoj6CPRcf6n14aQLmMWlGlw0KKltrHw== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:13:01 +1000 Message-Id: <20210323141305.19229-7-zane@zanevaniperen.com> In-Reply-To: <20210323141305.19229-1-zane@zanevaniperen.com> References: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 07/11] avcodec/adpcm_ima_cunning: reset state on flush 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index f154188b5d..8aab07e334 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -2124,6 +2124,7 @@ static void adpcm_flush(AVCodecContext *avctx) break; case AV_CODEC_ID_ADPCM_IMA_ALP: + case AV_CODEC_ID_ADPCM_IMA_CUNNING: case AV_CODEC_ID_ADPCM_IMA_SSI: case AV_CODEC_ID_ADPCM_ZORK: for (int channel = 0; channel < avctx->channels; channel++) { From patchwork Tue Mar 23 14:13:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26570 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 3777744BC28 for ; Tue, 23 Mar 2021 16:13:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22FAB68ABD5; Tue, 23 Mar 2021 16:13:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B06768AB27 for ; Tue, 23 Mar 2021 16:13:44 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nV5pd4MT4MBahGFYGelBDW0TUa3B7ygaRqwDRYvJTbQ=; b=k1ehgxbLY9MpACD4ToLWp7B/eXc8r0VJsWVpz/DcnO4ihEU6bPJRNkpQsgRird0WlgJfv8 YCP+4LUi8W0DbupJ2n4WqKX7kPLTu4/x/SsCMxIf2KNcGpH6Hq6HYybAc5nLwCjhZW/NJy dV5wzf7u+RZHgXpAKlC+7e8yQIuloV5VBda2Om/Wg4+saDirtm/pQJ876MXd4cgjGnInPD 8I/tucbogGRVPQF4E9nLFRdka1nBYxFEsRcsDoSzlU7KnC72ZsQv10WKM8lZo4NW0JiGqP ocbJsn8PrwO5X3KUsLCVFctMsP7NNtW869HTxnmdnJIP074lGBqV42ozss7Feg== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:13:02 +1000 Message-Id: <20210323141305.19229-8-zane@zanevaniperen.com> In-Reply-To: <20210323141305.19229-1-zane@zanevaniperen.com> References: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 08/11] avformat/kvag: allow seeking to start 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Allows "ffplay -loop" to work. Signed-off-by: Zane van Iperen --- libavformat/kvag.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavformat/kvag.c b/libavformat/kvag.c index 8f641873b9..91d1d8a518 100644 --- a/libavformat/kvag.c +++ b/libavformat/kvag.c @@ -110,12 +110,22 @@ static int kvag_read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } +static int kvag_seek(AVFormatContext *s, int stream_index, + int64_t pts, int flags) +{ + if (pts != 0) + return AVERROR(EINVAL); + + return avio_seek(s->pb, KVAG_HEADER_SIZE, SEEK_SET); +} + AVInputFormat ff_kvag_demuxer = { .name = "kvag", .long_name = NULL_IF_CONFIG_SMALL("Simon & Schuster Interactive VAG"), .read_probe = kvag_probe, .read_header = kvag_read_header, - .read_packet = kvag_read_packet + .read_packet = kvag_read_packet, + .read_seek = kvag_seek, }; #endif From patchwork Tue Mar 23 14:13:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26572 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 E6AE744BC28 for ; Tue, 23 Mar 2021 16:13:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFB7B68AC04; Tue, 23 Mar 2021 16:13:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38E2D68A58A for ; Tue, 23 Mar 2021 16:13:44 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=71i9UDlcFhnxWxvRLrZerH2/2qfW26XMrl6zLUFgj2M=; b=GNX7EniXk2vJjr+9cWm1OXXGBvEGelkMIfxznCWECDeYWRdNn1ZJv5Uq01t1m/Jo+dw/IV jVcHNnYLJt9DiAE/IGQx04qEzsE2y0RQkHhKnGSSyjS7gryh6d4MzvNZ9Yq2r3ZwBA2FMI lXpHmtLKjKjQ4gM7Itcnj908Ou6ysZeWr4ZO/Lj+MXAUQdpU2p0Zvbfby8InUVM6d6DcFo y71rHC5pNe/RpbcTvsgFQrhkbou6b3GOr1x2AIHfE0TcKtbUmmkKMSYBhXIHeE6mgPrQSy MBAenTK+2iJymW++KZ7ysikEBgjGRIOyKxkoS42vWEKXAa23t6FJHmEemJCJNA== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:13:03 +1000 Message-Id: <20210323141305.19229-9-zane@zanevaniperen.com> In-Reply-To: <20210323141305.19229-1-zane@zanevaniperen.com> References: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 09/11] avformat/alp: allow seeking to start 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Allows "ffplay -loop" to work. Signed-off-by: Zane van Iperen --- libavformat/alp.c | 50 ++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/libavformat/alp.c b/libavformat/alp.c index f2b0c37730..222cc246a2 100644 --- a/libavformat/alp.c +++ b/libavformat/alp.c @@ -72,38 +72,39 @@ static int alp_read_header(AVFormatContext *s) { int ret; AVStream *st; - ALPHeader hdr; + ALPHeader *hdr = s->priv_data; AVCodecParameters *par; - if ((hdr.magic = avio_rl32(s->pb)) != ALP_TAG) + if ((hdr->magic = avio_rl32(s->pb)) != ALP_TAG) return AVERROR_INVALIDDATA; - hdr.header_size = avio_rl32(s->pb); + hdr->header_size = avio_rl32(s->pb); - if (hdr.header_size != 8 && hdr.header_size != 12) { + if (hdr->header_size != 8 && hdr->header_size != 12) { return AVERROR_INVALIDDATA; } - if ((ret = avio_read(s->pb, hdr.adpcm, sizeof(hdr.adpcm))) < 0) + if ((ret = avio_read(s->pb, hdr->adpcm, sizeof(hdr->adpcm))) < 0) return ret; - else if (ret != sizeof(hdr.adpcm)) + else if (ret != sizeof(hdr->adpcm)) return AVERROR(EIO); - if (strncmp("ADPCM", hdr.adpcm, sizeof(hdr.adpcm)) != 0) + if (strncmp("ADPCM", hdr->adpcm, sizeof(hdr->adpcm)) != 0) return AVERROR_INVALIDDATA; - hdr.unk1 = avio_r8(s->pb); - hdr.num_channels = avio_r8(s->pb); + hdr->unk1 = avio_r8(s->pb); + hdr->num_channels = avio_r8(s->pb); - if (hdr.header_size == 8) { + if (hdr->header_size == 8) { /* .TUN music file */ - hdr.sample_rate = 22050; + hdr->sample_rate = 22050; + } else { /* .PCM sound file */ - hdr.sample_rate = avio_rl32(s->pb); + hdr->sample_rate = avio_rl32(s->pb); } - if (hdr.sample_rate > 44100) { + if (hdr->sample_rate > 44100) { avpriv_request_sample(s, "Sample Rate > 44100"); return AVERROR_PATCHWELCOME; } @@ -115,12 +116,12 @@ static int alp_read_header(AVFormatContext *s) par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_id = AV_CODEC_ID_ADPCM_IMA_ALP; par->format = AV_SAMPLE_FMT_S16; - par->sample_rate = hdr.sample_rate; - par->channels = hdr.num_channels; + par->sample_rate = hdr->sample_rate; + par->channels = hdr->num_channels; - if (hdr.num_channels == 1) + if (hdr->num_channels == 1) par->channel_layout = AV_CH_LAYOUT_MONO; - else if (hdr.num_channels == 2) + else if (hdr->num_channels == 2) par->channel_layout = AV_CH_LAYOUT_STEREO; else return AVERROR_INVALIDDATA; @@ -151,12 +152,25 @@ static int alp_read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } +static int alp_seek(AVFormatContext *s, int stream_index, + int64_t pts, int flags) +{ + const ALPHeader *hdr = s->priv_data; + + if (pts != 0) + return AVERROR(EINVAL); + + return avio_seek(s->pb, hdr->header_size + 8, SEEK_SET); +} + AVInputFormat ff_alp_demuxer = { .name = "alp", .long_name = NULL_IF_CONFIG_SMALL("LEGO Racers ALP"), + .priv_data_size = sizeof(ALPHeader), .read_probe = alp_probe, .read_header = alp_read_header, - .read_packet = alp_read_packet + .read_packet = alp_read_packet, + .read_seek = alp_seek, }; #endif From patchwork Tue Mar 23 14:13:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26567 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 1F28744BC28 for ; Tue, 23 Mar 2021 16:13:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0604368ABC9; Tue, 23 Mar 2021 16:13:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D0C968AB55 for ; Tue, 23 Mar 2021 16:13:46 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ELZpib16CTtvxjiFwghg4Vn1y1kTrScudnIefdKO0AA=; b=MIARmI7uqrFrdIuHrob4MDLgmVlI3xfEYx7ym9Ouw2pbqMZvNTW+Q1FLHlLS5m5ANkGfUL RkAfUfb7WloEz/NsLgXnhOX7RJ0l2jnkGTr39X2/t6FcL61+AdPaAye9QJvYA2/YV63qCq jTzPcG4i/I7oDjlkKj063tB+dDDnbw2Nbf1IGfgpnx3y5cPnPmy3h2Kk3piMlOGSjjTxV7 gVXYfOFV75ebRFnYXLM0OUlfGDwgIgeDXiZMHpn4003EHPKzib6q6BElm+ijEjX5z46akX NPDcDk3kGV1Pro8o4uNXFMWqiAHGIFDrUFX9xAnd+NKH77/r8tOhm+wTikVpGA== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:13:04 +1000 Message-Id: <20210323141305.19229-10-zane@zanevaniperen.com> In-Reply-To: <20210323141305.19229-1-zane@zanevaniperen.com> References: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 10/11] avformat/pp_bnk: allow seeking to start 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Allows "ffplay -loop" to work. Signed-off-by: Zane van Iperen --- libavformat/pp_bnk.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/libavformat/pp_bnk.c b/libavformat/pp_bnk.c index 5c89295d27..07eeca3cd5 100644 --- a/libavformat/pp_bnk.c +++ b/libavformat/pp_bnk.c @@ -313,6 +313,25 @@ static int pp_bnk_read_close(AVFormatContext *s) return 0; } +static int pp_bnk_seek(AVFormatContext *s, int stream_index, + int64_t pts, int flags) +{ + PPBnkCtx *ctx = s->priv_data; + + if (pts != 0) + return AVERROR(EINVAL); + + if (ctx->is_music) { + av_assert0(stream_index == 0); + ctx->tracks[0].bytes_read = 0; + ctx->tracks[1].bytes_read = 0; + } else { + ctx->tracks[stream_index].bytes_read = 0; + } + + return 0; +} + AVInputFormat ff_pp_bnk_demuxer = { .name = "pp_bnk", .long_name = NULL_IF_CONFIG_SMALL("Pro Pinball Series Soundbank"), @@ -320,5 +339,6 @@ AVInputFormat ff_pp_bnk_demuxer = { .read_probe = pp_bnk_probe, .read_header = pp_bnk_read_header, .read_packet = pp_bnk_read_packet, - .read_close = pp_bnk_read_close + .read_close = pp_bnk_read_close, + .read_seek = pp_bnk_seek, }; From patchwork Tue Mar 23 14:13:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 26568 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 EF58044BC28 for ; Tue, 23 Mar 2021 16:13:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C975E68ABD7; Tue, 23 Mar 2021 16:13:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A636968AB25 for ; Tue, 23 Mar 2021 16:13:48 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1616508827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cwG8rcNwBUI6jzXk/AIIDipBxMmK6UPqWyHJOS7FSlU=; b=VpO7vLchX/PiqEKyKYIuCnkmXdKqU6HKhPnvAn6bQUlCPRmPU6glQNwv/Bs4+w86Ipzofd rDmaEHgsNPWFwpa4SZeI02/g3BC9MdCiZBkQWPkh7x2d2IU8VDo9yYeJNdQIprcFtbytMU kNjTZxayz049Uh2daen9noh1g66u/i3gzdhqaOQkRYglshKlN7WxiRxjPEU3EEc0x7cpef 13eLxTp/i5dllhNLJwfPqFy+saufpdmOVuxPHouKN9leLkM+oGd5DIcUZpsqmGGY1Fg25Z BTQkF4YUqis6foFsBebZfP4n0owJE5/5R2e4XBJ0ddyahvbRexEpWuqIOY3BNA== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 00:13:05 +1000 Message-Id: <20210323141305.19229-11-zane@zanevaniperen.com> In-Reply-To: <20210323141305.19229-1-zane@zanevaniperen.com> References: <20210323141305.19229-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 11/11] MAINTAINERS: add myself as adpcm maintainer 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 3b6cfad4fc..ed8eddb317 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -138,6 +138,7 @@ Codecs: 8bps.c Roberto Togni 8svx.c Jaikrishnan Menon aacenc*, aaccoder.c Rostislav Pehlivanov + adpcm.c Zane van Iperen alacenc.c Jaikrishnan Menon alsdec.c Thilo Borgmann, Umair Khan aptx.c Aurelien Jacobs