From patchwork Thu Jul 12 12:39:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: archer.chang@gmail.com X-Patchwork-Id: 9745 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3816764jad; Tue, 17 Jul 2018 11:14:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpezaKLiNMF2+9dtmj4u/BPhx5DM2lQiybt61dn8MAuvkWc9nYoIH4PefHdd8m4A8J4FtWT2 X-Received: by 2002:a1c:2d54:: with SMTP id t81-v6mr2182238wmt.31.1531851299307; Tue, 17 Jul 2018 11:14:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531851299; cv=none; d=google.com; s=arc-20160816; b=VuFLgG79sTjvWaiKY1ygqnLNKstBy16Z/39srCQqDyKNLEmWdxPkwE6X/MxK5J0pwP qtFyUbddVuqIGEFl0FY0RrfLQZvfwfFhXimnOYpcoB43zS3QUJKlX9Ht27AF2k2EfOGM yKnGX3laZ6JPkfoTSkHd0ddFzsq9nviBKQrHzBNrob8cNqoLMz+TJKaMmVBEagESkP1O LouMQkk9hVoZflD+MdA02RwPss/5vosnB0mUKR+crm+sMgzPlwlG2pAuO5nF4QSU6d52 AHcs5uGDIXsVa09aFzuQmeJBD7Z2UUf7bIZ4RfHpZqp7RRnMho0x8FJI1vBNYuchRnXG aP2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=DRUXWMdijUSZFC1EohupV4DpiC99RuGcw65Q/FCVjzg=; b=GYZnXpkX/XSTr0VuF1NIG6xPKitq5J9dMY91Zx5BZPY6AUMmqUDTn8p1sarc9aAK0r HTwVRrXa8Fo61uPuCmPJ1/+cRSYe9jAyygfMkExuFutg3l5afdcLO4RIu+chboWiyO2J uTJ7N8ucmmVkFLPikvtTXy6lUGSt2UTVdb248+CrdoxFhlwRnkwvI7SUUqDkkkdrwQfe 3UKPaSuJCBtnJcy5rKJdk3uqF3P4p/ODwPTc66ILABeJnAbOePjLDK778G3XHxlZ9NSW GMUj5ymOGADVV9zJ3lpB3EzXoig4DbD2m5zByYHMRKejbleSejAHYPTsQIcuCs4ETAYl HNUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NBQQ93jN; 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 g17-v6si1267482wrm.57.2018.07.17.11.14.58; Tue, 17 Jul 2018 11:14:59 -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=NBQQ93jN; 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 5025868A6EB; Tue, 17 Jul 2018 21:14:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FB4568A678 for ; Thu, 12 Jul 2018 15:39:51 +0300 (EEST) Received: by mail-pg1-f175.google.com with SMTP id n9-v6so3567290pgp.12 for ; Thu, 12 Jul 2018 05:39:59 -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; bh=UPwgd6Sp1RoJ6dyf6UUcBpmrE/tprBVwvMrHr2Mrwxc=; b=NBQQ93jN9SIGQJWH5QEGvJOlv67cm3/8aE6uNYy0s481GFhxsSgDjZjRZUgKdTmP2w 16HV0IK1GavHqt87OV5LHY9wCn65EEzE0ZiOrVcYjJvUgYIxq2Ryo9AJijqmukwb+MZ1 iu66SRJQHVlmksQsYpyUuYo78JwnkwQeIGkvq2nTUvTpykZZ2VJH6PMhA/UaUeO7utoR h4cV73VnfxbPzHd+O5EB3bCuU4hHxHtrx39B/3qASO0RsEGkPS0++fcEkxHwh8IzTbAK aoYx4UQoRN4uH7hla/SLuAgLX4+BskSBtUIqiKuFDpf5lkbry/j4wO3hz+AfahoDifSW fGaw== 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; bh=UPwgd6Sp1RoJ6dyf6UUcBpmrE/tprBVwvMrHr2Mrwxc=; b=aLqFpF1ig+aVl94WXxyRUD9ExDFO1Ez9CfdQ86aP90KE++po60QeU+1/PtJRkaYVDB icM13uX9QBuaBg/1M9SykJAej/mYCMN/OT7sm6teY+pHlgUD3YqYMxTkppuFMukc34i6 bU7qk0bomxkBi4CxeEu/wTFbHY9uISw1zo0GUnmBeSlTAxLd2qK3CLnA8e8g9PO05MU6 lGiBC7DR9ipWjghMbINGrtnrGGHsSUSBzwtJH1Xytb9rIdoP/HDMyq1j0kJux70NW/lS zc7o1Rq+4wH0ncvpxbV17vNgYOPAP1xOi1NvpBhPaC6QVLK7m6dz0X1s5gRCIWxLGPsS koYg== X-Gm-Message-State: AOUpUlGstuSnx9NiDE1Ssz0fixv5ExitteNRLbjveL7wiR842Uub9lme SOHM7hmT14ToWBSCCyfkEMr+0JXZ X-Received: by 2002:a63:3190:: with SMTP id x138-v6mr1980588pgx.60.1531399197424; Thu, 12 Jul 2018 05:39:57 -0700 (PDT) Received: from localhost.localdomain (211-23-39-77.HINET-IP.hinet.net. [211.23.39.77]) by smtp.gmail.com with ESMTPSA id j190-v6sm6376636pgc.75.2018.07.12.05.39.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Jul 2018 05:39:56 -0700 (PDT) From: archer.chang@gmail.com X-Google-Original-From: archerchang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Jul 2018 20:39:43 +0800 Message-Id: <1531399183-20622-1-git-send-email-archerchang@gmail.com> X-Mailer: git-send-email 2.7.4 X-Mailman-Approved-At: Tue, 17 Jul 2018 21:14:42 +0300 Subject: [FFmpeg-devel] [PATCH] Decode the audio track of the AVI format that recorded by QNAP surveillance system 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: Archer Chang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Archer Chang Some QNAP surveillance system will only change audio type id WAVE_FORMAT_RAW_AAC1 to 0x0AAC but not audio track itself. --- libavformat/riffdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index b448f91..fe22610 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -127,6 +127,8 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, if (id == 0xFFFE) { par->codec_tag = 0; } else { + if(id == 0x0AAC) + id = 0x00FF; /* Change Audio codec id to WAVE_FORMAT_RAW_AAC1 */ par->codec_tag = id; par->codec_id = ff_wav_codec_get_id(id, par->bits_per_coded_sample);