From patchwork Wed Jul 31 05:05:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Linjie" X-Patchwork-Id: 14161 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 AAF574493B9 for ; Wed, 31 Jul 2019 08:06:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97CC36808AE; Wed, 31 Jul 2019 08:06:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56A2568071C for ; Wed, 31 Jul 2019 08:06:20 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Jul 2019 22:06:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,328,1559545200"; d="scan'208";a="174633109" Received: from icl-dev.sh.intel.com ([10.239.158.73]) by orsmga003.jf.intel.com with ESMTP; 30 Jul 2019 22:06:17 -0700 From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jul 2019 13:05:38 +0800 Message-Id: <1564549538-25724-1-git-send-email-linjie.fu@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH, v3 2/3] fftools/ffmpeg: support variable resolution encode 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: Linjie Fu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Flush encoders when resolution change happens. Use AV_CODEC_CAP_PARAM_CHANGE flag for encoder to indicate whether it supports variable/dynamic resolution encoding. Signed-off-by: Linjie Fu --- [v3]: use AV_CODEC_CAP_PARAM_CHANGE flag fftools/ffmpeg.c | 14 ++++++++++++++ libavcodec/rawenc.c | 1 + 2 files changed, 15 insertions(+) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 5d52430..35b0f89 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -130,6 +130,7 @@ static void do_video_stats(OutputStream *ost, int frame_size); static BenchmarkTimeStamps get_benchmark_time_stamps(void); static int64_t getmaxrss(void); static int ifilter_has_all_input_formats(FilterGraph *fg); +static void flush_encoders(void); static int run_as_daemon = 0; static int nb_frames_dup = 0; @@ -1067,6 +1068,19 @@ static void do_video_out(OutputFile *of, InputStream *ist = NULL; AVFilterContext *filter = ost->filter->filter; + /* flush encoders in dynamic resolution encode */ + if (next_picture && (enc->width != next_picture->width || + enc->height != next_picture->height)) { + flush_encoders(); + avcodec_flush_buffers(enc); + + if (!(enc->codec->capabilities & AV_CODEC_CAP_PARAM_CHANGE)) { + av_log(NULL, AV_LOG_ERROR, "Dynamic resolution encode " + "is not supported by %s.\n", enc->codec->name); + goto error; + } + } + if (ost->source_index >= 0) ist = input_streams[ost->source_index]; diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index d181b74..9e8cb57 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -92,4 +92,5 @@ AVCodec ff_rawvideo_encoder = { .id = AV_CODEC_ID_RAWVIDEO, .init = raw_encode_init, .encode2 = raw_encode, + .capabilities = AV_CODEC_CAP_PARAM_CHANGE, };