From patchwork Sat Mar 23 10:34:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 12398 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 D8B5B446025 for ; Sat, 23 Mar 2019 12:34:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF02D68A8CF; Sat, 23 Mar 2019 12:34:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8947B689DA5 for ; Sat, 23 Mar 2019 12:34:30 +0200 (EET) X-QQ-mid: bizesmtp21t1553337264tlarxnd7 Received: from localhost (unknown [47.90.47.25]) by esmtp6.qq.com (ESMTP) with id ; Sat, 23 Mar 2019 18:34:23 +0800 (CST) X-QQ-SSF: 01100000002000K0ZOF1000A0000000 X-QQ-FEAT: laoG+lc2pQ9SiG8Cq1gGVSDnAI3j4Qk/jYl4Iqy9j7Z8ZBKq6R5t8eKYV9Kij caPN7OwcQqJ2MXrKQdDAtCEZGPaD/TvPNLYysKmYTIv9xYQFwfLFCP5GEq4UZZvxaO0Hw9q j9wh1aIpvGABnrhBq3uizh9Y8yBwQaaoJcB0aiVhEJ8g3/VSjVexaJq7ho6ic22UEyj433a wpKNsbXF+DK50pwOy4IPIb0Rx3JkZWxnpcjQYgoIYeBGPWF0QT16sk/5KQ+42ZkqfPvolRS So2SiJp1A/NeOXO61h0tbaPjCHbN+CWQwnkA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2019 18:34:18 +0800 Message-Id: <20190323103418.25379-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <20190323102303.25150-1-lq@chinaffmpeg.org> References: <20190323102303.25150-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] avfilter/src_movie: change the deprecate API to new decode api 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavfilter/src_movie.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index bcabfcc4c2..65561a3959 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -172,8 +172,6 @@ static int open_stream(void *log, MovieStream *st) if (ret < 0) return ret; - st->codec_ctx->refcounted_frames = 1; - if ((ret = avcodec_open2(st->codec_ctx, codec, NULL)) < 0) { av_log(log, AV_LOG_ERROR, "Failed to open codec\n"); return ret; @@ -524,17 +522,22 @@ static int movie_push_frame(AVFilterContext *ctx, unsigned out_id) return AVERROR(ENOMEM); frame_type = st->st->codecpar->codec_type; - switch (frame_type) { - case AVMEDIA_TYPE_VIDEO: - ret = avcodec_decode_video2(st->codec_ctx, frame, &got_frame, pkt); - break; - case AVMEDIA_TYPE_AUDIO: - ret = avcodec_decode_audio4(st->codec_ctx, frame, &got_frame, pkt); - break; - default: + if (frame_type == AVMEDIA_TYPE_VIDEO || frame_type == AVMEDIA_TYPE_AUDIO) { + ret = avcodec_send_packet(st->codec_ctx, pkt); + if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) { + ret = 0; + } + if (ret >= 0) { + ret = avcodec_receive_frame(st->codec_ctx, frame); + if (ret >= 0) + got_frame = 1; + if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) + ret = 0; + } + } else { ret = AVERROR(ENOSYS); - break; } + if (ret < 0) { av_log(ctx, AV_LOG_WARNING, "Decode error: %s\n", av_err2str(ret)); av_frame_free(&frame);