From patchwork Sat Apr 22 09:04:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 3471 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp652791vsd; Sat, 22 Apr 2017 02:13:31 -0700 (PDT) X-Received: by 10.223.136.235 with SMTP id g40mr849363wrg.107.1492852410941; Sat, 22 Apr 2017 02:13:30 -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 g6si6665752wrd.40.2017.04.22.02.13.30; Sat, 22 Apr 2017 02:13:30 -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; 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=NONE 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 C1315689A5A; Sat, 22 Apr 2017 12:13:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f196.google.com (mail-io0-f196.google.com [209.85.223.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93D3B689A48 for ; Sat, 22 Apr 2017 12:13:20 +0300 (EEST) Received: by mail-io0-f196.google.com with SMTP id x86so36641121ioe.3 for ; Sat, 22 Apr 2017 02:13:20 -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; bh=ND69b5eFdoUKG2bz7eYazMKgBOXCOk1e6AKmbAsf8F4=; b=MnimMQG/eajF1wXHht8AXeGM2kRVMbZrSVU19OFlr0R70R3VqHPrjyNpqHU3xDZLQ5 JBsP/0IXnQfAB9QA6fhenCuyQk1rNPiC0IuAFNYPAaOCeBjLH5hMuiusSmwLlIJk+WXk bh6m33lkK00bQ/fTygIOUGlv/rv3TvZ77q6WyyfM2psZcLllv6ishSooJH5Wzd77qDdE eVwU7MGqaWJ8N6hT7Yd7iHH4Ngc8P/+tzqjU10ML+9SjCyO/QGqZFcqb9bM9m4xLR4oE 0WA94P2PkSEhtfyTvMMwDFcDCMwyC5N6KHtLXmBbMBNOHWyS3rlgmOxs7iU3b2557/pi hWEA== 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; bh=ND69b5eFdoUKG2bz7eYazMKgBOXCOk1e6AKmbAsf8F4=; b=owNM+Sy2GFAr7bkwPrjlCuouKs/JA9yuJO++s2dGx2Hyiyl6cEedzG8Pcu5iedtXDb zNrImqv7a9eDQ06zuC0lWxwogORLkMlAxjiDGXECZWQv+lhT9I5JIJp3nI4iPuJpTkPE KzCmVGi1EkkEgm9PtKIzwCVSv4BSenjhclXLgIzGSAwqCoQX5SkS5hf5vI2OHIcJJXRm SWI44qwpNIjigCcj81BNZXm4X2TjsBZMgQswlMDIyBSjgtsgXMeIP9ex3apEG/cfzbgj JYGk7D0DZLCXtsLqRUX2OCJgTWOeKcHFpRHYn8fL6vcqJ3QKUPKqRC4yHARgzRpNj5ZR glCw== X-Gm-Message-State: AN3rC/4kclalMp//dmu8ysHeav37F1ULg31W/BonZiXJnt980HgPhUK+ aGijx8uiaGA70A== X-Received: by 10.98.195.10 with SMTP id v10mr16060077pfg.219.1492851899327; Sat, 22 Apr 2017 02:04:59 -0700 (PDT) Received: from localhost.localdomain ([114.120.232.5]) by smtp.gmail.com with ESMTPSA id o10sm20296935pgc.18.2017.04.22.02.04.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Apr 2017 02:04:58 -0700 (PDT) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Apr 2017 16:04:24 +0700 Message-Id: <20170422090428.6459-3-mfcc64@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170422090428.6459-1-mfcc64@gmail.com> References: <20170422090428.6459-1-mfcc64@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/7] avdevice: do not use AVFrame accessor 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: Muhammad Faiz MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Muhammad Faiz --- libavdevice/alsa_enc.c | 2 +- libavdevice/lavfi.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavdevice/alsa_enc.c b/libavdevice/alsa_enc.c index bddc61f..0bef625 100644 --- a/libavdevice/alsa_enc.c +++ b/libavdevice/alsa_enc.c @@ -130,7 +130,7 @@ static int audio_write_frame(AVFormatContext *s1, int stream_index, pkt.data = (*frame)->data[0]; pkt.size = (*frame)->nb_samples * s->frame_size; pkt.dts = (*frame)->pkt_dts; - pkt.duration = av_frame_get_pkt_duration(*frame); + pkt.duration = (*frame)->pkt_duration; return audio_write_packet(s1, &pkt); } diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index eca3f15..ede391f 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -376,7 +376,7 @@ static int create_subcc_packet(AVFormatContext *avctx, AVFrame *frame, memcpy(lavfi->subcc_packet.data, sd->data, sd->size); lavfi->subcc_packet.stream_index = stream_idx; lavfi->subcc_packet.pts = frame->pts; - lavfi->subcc_packet.pos = av_frame_get_pkt_pos(frame); + lavfi->subcc_packet.pos = frame->pkt_pos; return 0; } @@ -440,15 +440,15 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) av_image_copy_to_buffer(pkt->data, size, (const uint8_t **)frame->data, frame->linesize, frame->format, frame->width, frame->height, 1); - } else if (av_frame_get_channels(frame) /* FIXME test audio */) { + } else if (frame->channels /* FIXME test audio */) { size = frame->nb_samples * av_get_bytes_per_sample(frame->format) * - av_frame_get_channels(frame); + frame->channels; if ((ret = av_new_packet(pkt, size)) < 0) return ret; memcpy(pkt->data, frame->data[0], size); } - frame_metadata = av_frame_get_metadata(frame); + frame_metadata = frame->metadata; if (frame_metadata) { uint8_t *metadata; AVDictionaryEntry *e = NULL; @@ -479,7 +479,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) pkt->stream_index = stream_idx; pkt->pts = frame->pts; - pkt->pos = av_frame_get_pkt_pos(frame); + pkt->pos = frame->pkt_pos; pkt->size = size; av_frame_unref(frame); return size;