From patchwork Mon May 3 20:10:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Cawley X-Patchwork-Id: 27580 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:399:0:0:0:0 with SMTP id 25csp608049pxh; Mon, 3 May 2021 13:43:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZbJsoGgZ+FoWTAam53yLZm1wfEyOpsVBWw0p/MA3wbBES5lEbyt1x9B35KwT0MwQQ8phW X-Received: by 2002:a17:906:3b84:: with SMTP id u4mr18446937ejf.131.1620074619414; Mon, 03 May 2021 13:43:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620074619; cv=none; d=google.com; s=arc-20160816; b=Ni76+//A0ufuVfg9z5fdxDdzZrZ3V2BzwkYD6/KTeJfC0D2HLIQx9BAqMdplCr3mFf Ebrxkklsn4UuPQ4C7unQ3LfDEV50YTDPdyHYNC5sCR8zQeiwLI+uKWBzbgjuLG97A+4i IjhpcX/69RXywHGENqZY2k/cJhNxS0/PIla5Ia12N/DLkrXteHk9NHMXhrOBh9VjysG8 MKlIM8Q21VK27iy6Ah4ZanVhnrH2fLSap75dBsp4KAZi7CXbAcTuO6fQp3FTHK5J/hJ0 09atUSzfFTjpR3D+4XSiyre8F7rNv3oyJS2+F6ufOoZvh39ETmv5hwoRWOuMADTTiVZa HIFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=xDU07qBfK07CWys8d7vXZ37kHNMWQYfgjO6NXU0Zmhk=; b=LEvyxbcClCPiA3C+qUmD9ej0UMjXtirhJsAJ4JUC3VnBgTCHlMadv8C8wxQeo2wrz/ rSjwUCbcfBrsAHXdLgpHvpWXghOqQmV1x2WXWuuRsx17ecETtsyCMIFETwL65laTAEuT TYUBy6fEFJkQ4nZtyeMIP/FtrjedCrh9fkl9xH8c3q1QXk+EUsbBx2QjxtrDyYN3cde7 iXN4vlrKLDSvaDMcASXGGvBL+kslpke68dKKP0jcl6xSMo8mOc9HHhg7xv/jHYrTQJ7o CUSCoP6V3SXTnVfjskKJOkVw/2rOMJKC0IGd/cDy/CISqFNZu9ooj3ZCjsjX8kbMZ5SJ SFgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=N8QLhcSV; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l25si10416786edw.96.2021.05.03.13.43.38; Mon, 03 May 2021 13:43:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=N8QLhcSV; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 635ED680BBB; Mon, 3 May 2021 23:43:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D4606802B1 for ; Mon, 3 May 2021 23:43:28 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id x5so6959832wrv.13 for ; Mon, 03 May 2021 13:43:28 -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 :mime-version:content-transfer-encoding; bh=uMmAMDeUldFvgSiv0wVH7yAWu4E2C2dPsBvNLezAKHk=; b=N8QLhcSVTub51Ozeg3R7FFJ130xgNe5Mse1Bhj9ISDxsvbvPsh6D+8Wr31IGVs/yP+ mleHnnzDEV4XV/RetOdsCKrttJOhAEUOcYR+C+tA5n6anenispGojat1UClBGqNp7hdC Csctr4C/3+w8L5mMGSxLeu6sJzxHyw8SWQEvdATa5msoGBjlrV65bNV27NefM4V/4anC uzXF+/KXVtCDa+Vl7lcfcMoPIj4AkNSW/QoD7ROjyTE5G3ZXCdSitW+1m3qj/sHUILHq TXSyTDWL4uoyXOP8AIcSDpK+TlGofpX5KY3i18FP0JxSJE9h+vEmQ/sj9xAvZuBhzfNH 9PzQ== 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:mime-version:content-transfer-encoding; bh=uMmAMDeUldFvgSiv0wVH7yAWu4E2C2dPsBvNLezAKHk=; b=bon8XU+wVmA3lLyatids8XdvJdYXM7e2ctD0NlIPN6RDFx83oj2brhInQSLjNXqQ1T +vA1Tlh29PLOgA9fhY6mZNe2cbdShQaELMUJCfZ3QNDwSgt4vMjrLUgqCF4BwPspt7eu twkp06BF/0AYM5lfipjN22kSjVoHwhEfGrrZvpkBiBDnkupJklIDXY/gduUMPEaBl9am 0hOr8JNYo+mfWufHrXdwozy+/lSTO0/tof3x1TaGytbLKwjBflzoMKuAxIPs+eKMvIB0 OHM/brEcoV2qg+RSAzy2lETytLlsN5aSuCULzQpHCuELcSG4iGHFyIjmtJ//ecGhGkL8 Nn7g== X-Gm-Message-State: AOAM530/PCXQaeqaaIYLLxEWTOPt9f95c42mAsnUdPb0ZLIKdJwEg1Cz N/MvqKBTgBr7WUQN6kRDPuWgSLFW8to= X-Received: by 2002:adf:d1e1:: with SMTP id g1mr27236413wrd.401.1620072676248; Mon, 03 May 2021 13:11:16 -0700 (PDT) Received: from localhost.localdomain ([146.66.56.6]) by smtp.gmail.com with ESMTPSA id l5sm591580wmh.0.2021.05.03.13.11.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 13:11:15 -0700 (PDT) From: Cameron Cawley To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 May 2021 21:10:00 +0100 Message-Id: <20210503201000.22816-2-ccawley2011@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210503201000.22816-1-ccawley2011@gmail.com> References: <20210503201000.22816-1-ccawley2011@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/rpl: Support files containing Replay IMA ADPCM audio 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: Cameron Cawley Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 04WVe51nhd8i --- libavformat/rpl.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/rpl.c b/libavformat/rpl.c index f5d2b8fe59..39e8235b48 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -121,6 +121,7 @@ static int rpl_read_header(AVFormatContext *s) int error = 0; const char *endptr; char audio_type[RPL_LINE_LENGTH]; + char audio_codec[RPL_LINE_LENGTH]; uint32_t i; @@ -189,7 +190,9 @@ static int rpl_read_header(AVFormatContext *s) // ARMovie supports multiple audio tracks; I don't have any // samples, though. This code will ignore additional tracks. - audio_format = read_line_and_int(pb, &error); // audio format ID + error |= read_line(pb, line, sizeof(line)); + audio_format = read_int(line, &endptr, &error); // audio format ID + av_strlcpy(audio_codec, endptr, RPL_LINE_LENGTH); if (audio_format) { ast = avformat_new_stream(s, NULL); if (!ast) @@ -232,6 +235,12 @@ static int rpl_read_header(AVFormatContext *s) // There are some other formats listed as legal per the spec; // samples needed. break; + case 2: + if(av_stristr(audio_codec, "adpcm") != NULL) { + ast->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_ACORN; + break; + } + break; case 101: if (ast->codecpar->bits_per_coded_sample == 8) { // The samples with this kind of audio that I have @@ -245,8 +254,8 @@ static int rpl_read_header(AVFormatContext *s) break; } if (ast->codecpar->codec_id == AV_CODEC_ID_NONE) - avpriv_request_sample(s, "Audio format %"PRId32, - audio_format); + avpriv_request_sample(s, "Audio format %"PRId32" (%s)", + audio_format, audio_codec); avpriv_set_pts_info(ast, 32, 1, ast->codecpar->bit_rate); } else { for (i = 0; i < 3; i++)