From patchwork Thu Nov 23 03:37:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 6291 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp275225jah; Wed, 22 Nov 2017 19:38:12 -0800 (PST) X-Google-Smtp-Source: AGs4zMZDOZ3dLzctyBfKH9xKb+49mhSMx+bRycrWDtXYO9rP9dWK3jg8hJ8BT6fmdIofDcqNE8VB X-Received: by 10.223.198.3 with SMTP id n3mr10664411wrg.73.1511408292755; Wed, 22 Nov 2017 19:38:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511408292; cv=none; d=google.com; s=arc-20160816; b=wlg/7F6N2bLzkw4NAw1K5va+IQg3TQ5PsUSLZckRxspbapegXNlU1aWQulqsa5vWXr wP1SkCq/8PpBP+USVZ8B0nm7hKY7+9go2+Oq6UIWIc/55eC/552YteiTmjPSOIHFTLH0 HKDPwo34xA0VZbiNcU8lQhEha8N7RvO/jhGpv1TCQw9jhKZR3GxXOjH+MkHuWoLLBKfQ LBLOqxc0kC8X2csiPRj0MKPrtEE8C8havATpbD+5JyAIqxubZd7NOWKb9lS6HccBhvEB HmN3aoAYs8Yl3usJq+6KmfjU7f4kQ5GTQj9H1YrNqiDCk+/ePtJXckhrNTvNMig0MKTU ByAw== 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=/nTw02LBuwgxGC4WjRwU/6o5Sbc/X3dblgAO1RK9cnY=; b=a5AAMM23iGOtN7wBbtq5BkoRHFAXJOReBBfbnnGKulonG8kvQh5pAkLPWE1rXtV8yf sl8mrQe5q3qg2SpaISb1rsCBHUEEtlHHDWHIk5LWYCQ8ejaT7nZ53v9lZwGp2dNAgRwK uLvrbtnhhz2fyyUhvAnNTJtv9dB7Ys7d1/ccrzjfecO8G2cpx9EHbdg+1GGPizmG6ell egbeFNxThftK8njyEgCoY5cHgZCCJM+DZ+m0reolADt4QnBPMJdD7SNJ2/Ep243oMjee aKbFWGRUld3s0Q+EqyjyZi+1GA4Gri+d7wAJd/6KX4l31SWCEpAgQrSbSRTJzDAkr/k5 93Bg== 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=x6TrXl9l; 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 c18si15353992wra.77.2017.11.22.19.38.12; Wed, 22 Nov 2017 19:38:12 -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=x6TrXl9l; 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 EC57D68A154; Thu, 23 Nov 2017 05:38:10 +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 116EA68A143 for ; Thu, 23 Nov 2017 05:38:04 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1511409190; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=3fd3q10xDqf2TtUR3FdAmfBjEpgqRnqt3OpT4R1mOsQ=; b=x6TrXl9l dMTLVGPSaWOSM74caguBgXIdKgN3BGbcMifZyFeDbicNsKI4V1QIqG07LZPvBGhnmC8V2SawnYL8+ 2nihDgkgvip8lrZ4xYkf4eibsHphP2gsZgFtzULYSdujAcMY6gI8E0CtGU+lmyFU3+oCxquNoLS9m 1vJBqFlaQMjNL72dFQCUoLLTx5rtqCKdW76/p2f7NzJ2rPQ/MYL4ZvXThCZ/69523De8tRiz7vnVY vseNSGUuPAtXejVA2M6QJYrsfqAmPiNRDXrqZbu4gjH9lQAetDB9UlGcCwis368hYNzkWARygnhLg 2z8NHfLr2JGcoUDjgoUaxdbxGw==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Nov 2017 09:07:35 +0530 Message-Id: <1511408256-24718-2-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511408256-24718-1-git-send-email-vdixit@akamai.com> References: <1511408256-24718-1-git-send-email-vdixit@akamai.com> X-Smtpcorp-Track: 1-HiKINmFjmY4J.FgKZu5bCa Feedback-ID: 337386m:337386asVRLGB:337386svC9skAcF3:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH 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: Karthick J , Vishwanath Dixit MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Vishwanath Dixit Signed-off-by: Karthick J --- libavcodec/libx264.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 9c67c91..eeafe31 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,13 @@ 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); + if (avctx->profile == FF_PROFILE_UNKNOWN) + avctx->profile = nal->p_payload[5]; + if (avctx->level == FF_LEVEL_UNKNOWN) + 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);