From patchwork Fri Nov 24 09:37:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jeyapal, Karthick" X-Patchwork-Id: 6329 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1901633jah; Fri, 24 Nov 2017 01:37:46 -0800 (PST) X-Google-Smtp-Source: AGs4zMZ0rbPtQBeB1rFS3vgVl/qXB7EA4rwgXj7DvNyl+7wfZZ9odktIBgW211MB2BpJmbrZukus X-Received: by 10.223.138.212 with SMTP id z20mr24879830wrz.154.1511516266198; Fri, 24 Nov 2017 01:37:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511516266; cv=none; d=google.com; s=arc-20160816; b=xtMJfYqBUD6CuZ15vX5gsuSfLiqfq1nQkr+Tbblcj5C5uGm4wTpsz9QAygQtxfbUM4 MFkxFcekgp1vlxEWdxIU8mpmO4wRSrlivXh6GxZ/FUPTPn98H5oo5d/6f63rKfrXCmHC 66Xye99tH3Wel6U9Q98lXStvHf+vguBQI2h/lf2Px8jgf2GBhZHeJc+N6/5vrBEgUcPa 5r4gXGPyM2FWcATIsGe5TjhAHZMR0ffvWid6aEAjj18Xk8Cng1ImCD8OwxgddQ0eE8h3 CAcTdLrOwCV0kJ4HkThuTqlL+9C7ru8Wt0pPmEMBu8WeOghPdXeokTINSle/oizL+J6K gEgQ== 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:feedback-id:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=pHfGaQg34dqIkhZOLsZRh/HNfy52G1ftbeLiDaXOk9w=; b=GPZVno5C7JMIp7RVfaA41o+/rxL45xcbY+NKD0AsvhmVj38/Gw8DiMeLJlRzQFs+bh Qdw6DRFmKFVmtav34np2lPj7AQGjHxUm1x6u5shOG3kVgweLnQ1TsumbkLoAwbqU4yQW lV0eHkpEPg3NXTbvEI8Jw6J+qGVOLSRDcahD987ZgPZiYJ3wFt5n2Nlr5wgBqUnxkh1k oXo+HgMNAFcWTP6HI42D5kVqDG34XqAJgwgYi09qoowG8sz2Qx0C0h8pSPMBxbFgOzhz LuKxX14fq8fD8ncSL7QMj24S+q9Y8Y6pJPzNF9TUIVPGgDBm2U39A5HmdyMD6E8nA0td B0BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=yTmP8yHZ; 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=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f13si14937574wre.420.2017.11.24.01.37.45; Fri, 24 Nov 2017 01:37:46 -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=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=yTmP8yHZ; 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=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D38EB68A13A; Fri, 24 Nov 2017 11:37:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5CD7689FCD for ; Fri, 24 Nov 2017 11:37:37 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1511517164; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=4SNBHdSskji/RCBfdezGbaM0lN/vZd4Z7OkHidUrKkw=; b=yTmP8yHZ Hm4Lg1qiFpA67LOfxpZZc3OQ3/nvK1nzoyjxyGlJ4/e5nLmIqAmcdQUTnuyhpjJc/DtFCpS+vml3k 5gSCZ8bEs9YAqcFsOb0tqDEg5nnNns2rWoHl2q9uHlHTeXWKLA3aiOnr+ftMuzM/0nOQ1K2uj4y/T W58M69xeK0yOWjsAN9ef5aWbai+rWGaZGczLZvQbXTEbOIDspDsi7HRbXOTRq6PFY6aS73msxlmAg FptN7/BS+jMK6tecrtjsEoGq1zllGXscz+t8sgSN0VlDDsG5H8L86TgHeGZjPUXEx8Zc+6Hyu/6uH rCQlsGUrSi5T9ZgqK5esmkwhtA==; From: Karthick J To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Nov 2017 15:07:29 +0530 Message-Id: <1511516249-20195-1-git-send-email-kjeyapal@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1EE45EAB-1C74-48F7-8583-6E60A23DCEF8@akamai.com> References: <1EE45EAB-1C74-48F7-8583-6E60A23DCEF8@akamai.com> X-Smtpcorp-Track: 1-mjQQNmF8I_RY.F6hfREhjq Feedback-ID: 337386m:337386asVRLGB:337386s412iUh0dB:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v2 2/3] avcodec/libx264:setting profile and level in avcodec context 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: Vishwanath Dixit MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Vishwanath Dixit --- libavcodec/libx264.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 9c67c91..6b93aa8 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -454,6 +454,9 @@ static av_cold int X264_init(AVCodecContext *avctx) X264Context *x4 = avctx->priv_data; AVCPBProperties *cpb_props; int sw,sh; + x264_nal_t *nal; + uint8_t *p; + int nnal, s, i; if (avctx->global_quality > 0) av_log(avctx, AV_LOG_WARNING, "-qscale is ignored, -crf is recommended.\n"); @@ -799,12 +802,11 @@ FF_ENABLE_DEPRECATION_WARNINGS if (!x4->enc) return AVERROR_EXTERNAL; - if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { - x264_nal_t *nal; - uint8_t *p; - int nnal, s, i; + s = x264_encoder_headers(x4->enc, &nal, &nnal); + avctx->profile = nal->p_payload[5]; + avctx->level = nal->p_payload[7]; - s = x264_encoder_headers(x4->enc, &nal, &nnal); + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { avctx->extradata = p = av_mallocz(s + AV_INPUT_BUFFER_PADDING_SIZE); if (!p) return AVERROR(ENOMEM);