From patchwork Mon Sep 17 22:36:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 10352 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp4022311jap; Mon, 17 Sep 2018 15:36:48 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZHfV2lPeVcNVvZKd+sMrQvSH7CXzevAggWZFLTCDQHSfIbgw0ZFud82zqvWD/CZXcRO5FI X-Received: by 2002:a5d:6b01:: with SMTP id v1-v6mr2882425wrw.208.1537223808863; Mon, 17 Sep 2018 15:36:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537223808; cv=none; d=google.com; s=arc-20160816; b=FrlAsOCVLKjOWJOFzD0Wgh0De0MybsJCRRZB/Megtl4l0jf84rnHjhhsqFX+ua7AJK I+a/OA/01BTG3HxwRLsd0NZF44osHzNrMun0rMi33g7tXJIEiI4ZBq/+aYMdQ56gdCMC zWc+T5nKTADxQSu9pD+e+AHyOEuJ2E0/1ZO8D0CNqpGpXg39Wtr7mio7vEXw0F6a07fE R2xwdZ6/KnofMV0jbHNRVvFfVFUSIhBezNp5SFGwn+2JspJ2Mow1GBf42HpT4iAIuAz7 9Vgz7auYkU1hnz0gTuV8Mm9RNsFrm14rtJsKqvgQCVxSHArlotZPoEnOxj7A/UJtY57f znSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=iVRNj9CyqTJ1dH+tCtKJtAISJgbgMJaAox+lNlsTdSk=; b=Hjz8gpzUm3T2NM/915jtkoxgl9KYupkpnVidfoEcLgvQCUdRA+2W3tlvVw7/3Gjmtx ClkdczJXAReIVqBbVkspzM3m7o0CPYh5zqqjT3rt2/9nqtslpMcgiEw4bX2iDEWwyySk 7yz7aa5rxKoj5YF8le+oRm3xj9QYWZEL7nszy+d+jI1geVmy/4n4eqgTK+8He9AkF2wp l6WaRLvNxXsqvVpn1gTuUe86SBNVZhf1Aw02uW+EGMLTPfA4mxWJ91va0ZXOqS9I8XBe ydQIHxwDXc0ssw4BAPY3tsD9Biy/8oQz3TsDV7Pfwtg5SnADWr37vLoxDY2YwQLGqK0F GeyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YzD4SiI6; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c4-v6si14068040wrw.86.2018.09.17.15.36.48; Mon, 17 Sep 2018 15:36:48 -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 header.s=20161025 header.b=YzD4SiI6; 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=QUARANTINE 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 0779C68A7CF; Tue, 18 Sep 2018 01:36:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f44.google.com (mail-it0-f44.google.com [209.85.214.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1C40689EA8 for ; Tue, 18 Sep 2018 01:36:28 +0300 (EEST) Received: by mail-it0-f44.google.com with SMTP id h23-v6so510067ita.5 for ; Mon, 17 Sep 2018 15:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=5nHFnMQ2pscUYnfM4dzBKVmxtY2TOIhQp1bCPdYA5GI=; b=YzD4SiI6pW1+Ifn/9eik2olzjmSSkzaqpOMcg8wCPJPVlhaP/s8p/5vgCoPD30xksC phdabm8KQ2LQjL9lkliBsMPYoPqQgdT/GFekniRubbnHRPAa/zeHm2mDmfI3/DdGPbaN YCHJBdRBOXNGIwxB7WWlSN+ouKHMl1cvpWgiNyk69HtuYQ/D0D3T5BofogOJmm9c7/yx KL+jnrxSi2oS3dzALVrA/d3a3wCIi5CgN+AG84l94mpAjl8B59mHhWs0spetfbFypq9H o0Gqt1EJXV1LSdVtpceQi57SJZm33LqdjRpQfvOsgN7mVQqo5tnWgHARA8V3czSU3Z2u Ub+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=5nHFnMQ2pscUYnfM4dzBKVmxtY2TOIhQp1bCPdYA5GI=; b=K3vy3reGTIVwf7QErEGSvNTWP2p7XJ6eQ5exMvdPIMEPnPLu+ur1eEAfJPYWB4dY/n RyMn6ziA57rHrb8hzfCuuuZQ0HMDowVjQoOVKRNhW1bnk0Zc459oSyz8u9BHo6p+wroj K2bS3BLsWRQE7h6d6aX70acZ5CHkvAeLYZd0EdrbN5wxN298exBaxolzy5dRX81kmZGR FPsSvVxWJQD5f57wu8qc1EY7o64OZ/zN9+zKIc3MSol8CRc2hMkmsM6ZDLplZrsoKvkw xNxSUbXsDD+Ix51tY7gvzOepooeb1IwLzwYQJLJryA0WYNiS2+Qn7JJH1K+R77bjKIWV prRA== X-Gm-Message-State: APzg51DPDc5c9ObHGzFRw4v4UEBDqCjuIv3VplQU9t5wI1uf0ulVf/u9 aGjUt0R4hgbyC2e5vfldkjT87rJw4AIqwnSJjP7BSg== X-Received: by 2002:a02:1857:: with SMTP id k84-v6mr24939178jad.104.1537223799975; Mon, 17 Sep 2018 15:36:39 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:731c:0:0:0:0:0 with HTTP; Mon, 17 Sep 2018 15:36:39 -0700 (PDT) From: Carl Eugen Hoyos Date: Tue, 18 Sep 2018 00:36:39 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavd/dshow: Interpret negative height as bottom-down frame 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch was tested by the reporter of ticket #7436. Please comment, Carl Eugen From 20f8ee0514a60bcc5a1dc2ddc72e92db66b8f815 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 18 Sep 2018 00:16:42 +0200 Subject: [PATCH] lavd/dshow: Interpret negative height as bottom-down frame. Fixes ticket #7436. --- libavdevice/dshow.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index de910c0..757f7a5 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -996,11 +996,15 @@ dshow_add_device(AVFormatContext *avctx, par->codec_id = AV_CODEC_ID_RAWVIDEO; if (bih->biCompression == BI_RGB || bih->biCompression == BI_BITFIELDS) { par->bits_per_coded_sample = bih->biBitCount; + if (par->height < 0) { + par->height *= -1; + } else { par->extradata = av_malloc(9 + AV_INPUT_BUFFER_PADDING_SIZE); if (par->extradata) { par->extradata_size = 9; memcpy(par->extradata, "BottomUp", 9); } + } } } } else { -- 1.7.10.4