From patchwork Tue Sep 27 15:01:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fu.qiuping@hotmail.com X-Patchwork-Id: 746 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2521055vsd; Tue, 27 Sep 2016 08:03:42 -0700 (PDT) X-Received: by 10.28.39.133 with SMTP id n127mr3602589wmn.6.1474988622440; Tue, 27 Sep 2016 08:03:42 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f5si3319358wmh.114.2016.09.27.08.03.40; Tue, 27 Sep 2016 08:03:42 -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; 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 dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC2F3689D8E; Tue, 27 Sep 2016 18:03:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from localhost.localdomain (unknown [58.251.193.250]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15EEE689AC5 for ; Tue, 27 Sep 2016 18:02:06 +0300 (EEST) Received: by localhost.localdomain (Postfix, from userid 0) id EFA2883F29; Tue, 27 Sep 2016 08:01:15 -0700 (PDT) From: fu.qiuping@hotmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Sep 2016 08:01:13 -0700 Message-Id: <1474988473-15177-1-git-send-email-fu.qiuping@hotmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH] flv format support mp3 audio with 48khz 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: frankos2 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: frankos2 --- libavformat/flvenc.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 99903f5..296426a 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -107,6 +107,13 @@ static int get_audio_flags(AVFormatContext *s, AVCodecParameters *par) return FLV_CODECID_SPEEX | FLV_SAMPLERATE_11025HZ | FLV_SAMPLESSIZE_16BIT; } else { switch (par->sample_rate) { + case 48000: + if (par->codec_id == AV_CODEC_ID_MP3) { + flags |= FLV_SAMPLERATE_44100HZ; + break; + } else { + goto error; + } case 44100: flags |= FLV_SAMPLERATE_44100HZ; break; @@ -124,6 +131,7 @@ static int get_audio_flags(AVFormatContext *s, AVCodecParameters *par) break; } default: +error: av_log(s, AV_LOG_ERROR, "FLV does not support sample rate %d, " "choose from (44100, 22050, 11025)\n", par->sample_rate);