From patchwork Mon Jul 24 21:10:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 4450 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp4682433vsb; Mon, 24 Jul 2017 14:10:24 -0700 (PDT) X-Received: by 10.223.135.38 with SMTP id a35mr17343120wra.78.1500930623986; Mon, 24 Jul 2017 14:10:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500930623; cv=none; d=google.com; s=arc-20160816; b=fPXUAZnKlArqPqnX++QK6nAmkzQ6wIAUa3U3/vwXD8x6m0T4oNPsElFQnZuqmBocOd H83znkmGEN2kpkPCOmG4jc5/WVezDkcWnPHolnwyowqKzB1sKDh/Ex0pRHpNAPG7np4+ qj1G+2OYsAzJsor4oF7usl5p8JffXdChietT0+o8WYzsFZxMUpT8pGXanN4JkWG6nKJP XxVl+YPWSvy6txUP5xN2wt91ePVl6hDEECBu2fQ3fMzgOQLOoH863Uu89TYu1xry1q7E +nvKgFxRXuRFxej3L/92dMU+jfKUjQaZ3B6kqugcd1o/vkgu2614SOSFmhlAIgYZDTMF Ecig== 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:delivered-to :arc-authentication-results; bh=AQpctiA5zWbHS3xogASyAyvkLQDjj7qiLwmkguZvGr4=; b=vkpFeivPFVygH68K3zG9wQnf6FC27Z1QLYbnh9cnZt2hH9UeVmuBrr+PUAgklrepAr smI6A0zbim4MmXzjVYgHxmDhBZru30kS/1y0uBlzYfa8YdbcLLJMkejGomL3GzSE4evf jUYSrNM8DkIzoMok/xIEEPEzoVC8yMNW7pcbEFJTDLy8CCMjT7Y5lJ6uaz6G5YjMO3Pq 3TzZZxfft5lIPOr9laCgJY/1ZT0Ps5QEhgyil8OhZIL59ZzasmCuU4VXIDGPcRan5wz4 619zEMQLmKUEI7alBP0Bn+ml3TkoQvAHU6Z/eo02I/lCLa6sE+4p2ULwNh7gF5aEEyjm NB4w== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 66si118146wmu.16.2017.07.24.14.10.23; Mon, 24 Jul 2017 14:10:23 -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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F117E689B6E; Tue, 25 Jul 2017 00:10:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D50CE689B18 for ; Tue, 25 Jul 2017 00:10:02 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 5D1AE1031CB; Mon, 24 Jul 2017 23:10:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BQRXc+UmiUDY; Mon, 24 Jul 2017 23:10:11 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 0831D1013BC; Mon, 24 Jul 2017 23:10:11 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jul 2017 23:10:05 +0200 Message-Id: <20170724211005.10668-1-cus@passwd.hu> X-Mailer: git-send-email 2.12.3 Subject: [FFmpeg-devel] [PATCH] avdevice/decklink_dec: set field order via codecpar 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- libavdevice/decklink_dec.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 8b5c1a20c1..72449a8eca 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -731,6 +731,19 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) st->codecpar->bit_rate = av_rescale(ctx->bmd_width * ctx->bmd_height * 16, st->time_base.den, st->time_base.num); } + switch (ctx->bmd_field_dominance) { + case bmdUpperFieldFirst: + st->codecpar->field_order = AV_FIELD_TT; + break; + case bmdLowerFieldFirst: + st->codecpar->field_order = AV_FIELD_BB; + break; + case bmdProgressiveFrame: + case bmdProgressiveSegmentedFrame: + st->codecpar->field_order = AV_FIELD_PROGRESSIVE; + break; + } + avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ ctx->video_st=st; @@ -788,15 +801,8 @@ int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt) { struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; - AVFrame *frame = ctx->video_st->codec->coded_frame; avpacket_queue_get(&ctx->queue, pkt, 1); - if (frame && (ctx->bmd_field_dominance == bmdUpperFieldFirst || ctx->bmd_field_dominance == bmdLowerFieldFirst)) { - frame->interlaced_frame = 1; - if (ctx->bmd_field_dominance == bmdUpperFieldFirst) { - frame->top_field_first = 1; - } - } return 0; }