From patchwork Fri Nov 10 21:40:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5964 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3884961jah; Fri, 10 Nov 2017 13:42:56 -0800 (PST) X-Google-Smtp-Source: AGs4zMYX14BOTAgXGZ2REtlseZnvMMuujccC9X1sMqGMAEnWmMWvQXnA4Cca0oniou2KYUbAwJli X-Received: by 10.28.222.70 with SMTP id v67mr1110847wmg.99.1510350176293; Fri, 10 Nov 2017 13:42:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510350176; cv=none; d=google.com; s=arc-20160816; b=u3tW4gsUYSz+AaaGZIMwI8GuTez7DEK6/GslmIcfCHJtfiDybJKKqfWjy3e6YN8vw8 91r7lOSoC0z8iMOgLWMfgm3nkK4dY9JP+IAgKcNHV7gkK/lPu6ObkKp9s9fbDleGsOCY L0iwAVOJzCeNd5IX24xrSsOj+zWQEGpW1wVaRXIT/vpPGD0rDeGPo2Q9IPPgnN6bdCxx ii0q/qgXHxnA4n3F5mx+M+OZySNGWcIF+G6vd5iwnxVuFC+4ZKW/O0X77PAkvn750CMK jQDOnfyk9+HOASqQ7ABC/Bzstbwn4fbbfydIn61exBp9VtRKN+BYfzCzodHUS9FYUE/r 4D4g== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=cI0sPrT89Pnl3nDFF+qD26zCbNhEy9oijzIrEpS2YwM=; b=bx7p6pSMWxHzt0s2xd4Ui802ft/jz+CuIThiLvoYEv82bWeXOf7igKJpdPsHj6WM5l dEjcwYs0v0pGUz2XpCer76W0bEX4tHA2/g5FYHSRPSANjvVt4WB0M0JdX2zDyer2/Xux Sk7magDvF/PQLaY5VQz0hOJ1APPIP5fzav8Fmy1Bc/mIHDBfLn+WB7UfEtrXVaBkoNou bHlJsWdzP2HENb+X7EGZOfllTanGPr7/5LBv3C1kSMBxYxpVuKQ/fSlnz3QWjc6nt3iL UKay2luulJQKeEN3wol62EHCnH7LTBqi+/n8XGNEtWOn3umeh2yrBMEvuVnPyGqAWuXa sLIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=rimGZChW; 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 11si2088595wmh.188.2017.11.10.13.42.55; Fri, 10 Nov 2017 13:42:56 -0800 (PST) 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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=rimGZChW; 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 D366A689F9C; Fri, 10 Nov 2017 23:41:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f175.google.com (mail-pf0-f175.google.com [209.85.192.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FD0A689EEF for ; Fri, 10 Nov 2017 23:40:59 +0200 (EET) Received: by mail-pf0-f175.google.com with SMTP id z80so7498602pff.4 for ; Fri, 10 Nov 2017 13:41:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=z8rQETeqbYCw865ZhEGgjEnJ8gnjEmV04b+hR+8KxxM=; b=rimGZChWOrRZLDO7CKbTAmfiWEJhoFxo/+yHZcW2cwK9o5+r3zG8qXTQ9gFRO7wjkw 17iPmnX8G2CMYFhKxEA3kuciRohWYRQDMgw0zG3HvpMWxIL+Zh93ZBBaIXBVKzEIloyA DbnHkL4iGX4E5tYKkhgqs7DelFhLtDbuhwYlIEeK5955wDso9ADr4Copuc/XhSOE7FR8 Wg9VSZUVcK6Lm0AoAPqCXC5Tl+qy60oIHacGC7oBe3E9Iv0CQ3X8u2powfUgj9xRme4f H25Y4/HLk9aHaXZ9HOBvYo3Dg9tAQWHmzL1xFPNOv63jafLqtCqWFzZCs641lden506l wvjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=z8rQETeqbYCw865ZhEGgjEnJ8gnjEmV04b+hR+8KxxM=; b=cJuP5jieDMCSGTRX9+36KvMFlVgA74tAu9G/zcx0MeKl29qFZu3+OExoodEBLHRgNp FF1yGc+kvH9v/rNkyNhPsDf+BO5ERX71208r64EAQCOnwrrhz9Vl7FA34Yx8feHo9s4k PFFV3tBkQxCySMejtSuo+42wF3SRObua5Q7GZbBcVMeH6z1RKmvplFOzIQH0YHqLEtOD UjbmRfL4RLdX9D6s6m7/5xRl1pHJGts5rRtsrQWHwjNGp7IWC6GTuCuf9TofoOSFS6ea lkM8B8Tbiz0XGjoEBlXm3WtmB5ajBVRvNIJxw+fHE3fICQ5EcDWj0Tb7g+of8ia8rUwz Cmqg== X-Gm-Message-State: AJaThX5hUbv2OKoVj/5Bkjg682FupskwSRhkXObqZ462pnKrVpMOAuyp QalgiPgpRaRBfjL5t8/HUywMLa1X X-Received: by 10.101.65.2 with SMTP id w2mr1691409pgp.131.1510350071355; Fri, 10 Nov 2017 13:41:11 -0800 (PST) Received: from tmm1-imac.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id 81sm20734554pfh.145.2017.11.10.13.41.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Nov 2017 13:41:10 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Nov 2017 13:40:54 -0800 Message-Id: <20171110214059.84891-9-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171110214059.84891-1-ffmpeg@tmm1.net> References: <20171110214059.84891-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH v4 09/14] avcodec/videotoolbox: create avcC even when h264 extradata is missing 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: nfxjfg@googlemail.com, Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Removes the avctx->extradata_size requirement when creating avcC/hvcC, since avctx->extradata is only used in the esds code path. This fixes an issue where the VideoToolbox decoder would not work unless avformat_find_stream_info() was called. --- libavcodec/videotoolbox.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 2496e4969c..ff8ba41821 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -702,7 +702,7 @@ static CFDictionaryRef videotoolbox_decoder_config_create(CMVideoCodecType codec kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder, kCFBooleanTrue); - if (avctx->extradata_size) { + if (1) { CFMutableDictionaryRef avc_info; CFDataRef data = NULL; @@ -713,7 +713,8 @@ static CFDictionaryRef videotoolbox_decoder_config_create(CMVideoCodecType codec switch (codec_type) { case kCMVideoCodecType_MPEG4Video : - data = videotoolbox_esds_extradata_create(avctx); + if (avctx->extradata_size) + data = videotoolbox_esds_extradata_create(avctx); if (data) CFDictionarySetValue(avc_info, CFSTR("esds"), data); break;