From patchwork Wed Sep 27 22:19:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5317 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp60253jaa; Wed, 27 Sep 2017 15:19:38 -0700 (PDT) X-Received: by 10.28.159.6 with SMTP id i6mr1584936wme.119.1506550778126; Wed, 27 Sep 2017 15:19:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506550778; cv=none; d=google.com; s=arc-20160816; b=kWUizTdsMs70RjZULQ/UTD2u5SvCG4qdttemu6BiTFRzDMXKZVck8/Bku2uKyBpy7A aSzkUUDRkGTUCwx2AZKW6CvWWHLIY+CWxf6p6iR7T/EqifAiz5Nwr/mIwWgoSnEn5lFw kl8gsS995zz7xIPEyV2o/CerHoO7iocXNHjbl8zbxoUpTTgkxLDDNbRPnDy7DCJlAura kDGLt0DH0i48g4JyZqx3KPpVjxl/5j/hhaNQNeF3qNi4sYdwwmU+CcCNvgOkH/ftNqW9 +egyiQYb3/kkCkHHkJ8te57pkT4v64UkwmfDeGUYRrD40Zezs534N6Q30KcQ5rkZlV8d NZww== 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:dkim-signature :delivered-to:arc-authentication-results; bh=TJILWCl1StZeJlSjg9YW+rabdnhdOxVe01PTo3LmRxw=; b=JMnxDZ/8W73UusXmFRPl26Ybw+cdRDIo6QvbKz9WpadIV+8yLmYF57L0OWU8IU/HLa i5/cIxBXRokPaAIksvQ19WsJW1WDXVOzmETPpD1+EoTLH1GzZ0XCAAEbxDtuhJUdCBCF 3Mpnd6CYn5Zz8nk0WM6g3R7A59D/imkiObf8xh28i5N4djZb6GwBtpXTY2Twm8tgHSmF MPW3kIebz98AGBNaLS8c6GEHygnoLd7HLdOo5/hvdCVkBL2xgar+zZiLPvrsmu4tdpZI FoIMj28trzPaYmicwGbCHRAabjFuIzFm2lrW+vEsWw/qFGT6MADUPPpPAk9+4qO6TgFi nyWQ== 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=W9kSvQ4v; 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 f137si253579wme.223.2017.09.27.15.19.33; Wed, 27 Sep 2017 15:19:38 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=W9kSvQ4v; 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 2987A689744; Thu, 28 Sep 2017 01:19:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 036AE6882C5 for ; Thu, 28 Sep 2017 01:19:14 +0300 (EEST) Received: by mail-pf0-f195.google.com with SMTP id h4so7849863pfk.0 for ; Wed, 27 Sep 2017 15:19:26 -0700 (PDT) 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; bh=9gIsV0pHpV6EA5Wfa7d7WEuzFb5eLy3kzl+LedBnUZ8=; b=W9kSvQ4vcMmEOrC3QEKBYzl73AG1nUVtUeD69rPMQeU8NEgmsjmTOa/L2r54h2IDLE UChQAsgOcz8ZYKjU3Uq7UVd5Lag384VegOYn7eVJQYGqr8sUY3hQmFuszg0HaiTeq/08 NQUubn5ha3WGPDwV+P1dQmiK9k+YiJbyjl6M713/Mi+gil3S/kYa9qLgpL2+uz5KDJrU a972cJmr+f/X1wiSnOE9hCeoWndLRSPbXRaSR0+PqbDJLysTAFYIxabQ4y2VwzK90olu M8txyKUlrU1/Vb3bkTM7e7PDPA1HmjFozr7x6of/LKqyBSy/FP4zptCHxvsQpo6jjS+W QeuQ== 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; bh=9gIsV0pHpV6EA5Wfa7d7WEuzFb5eLy3kzl+LedBnUZ8=; b=M+5DTbC5Fw+v7pY7LE4snOqYk+a/cO76LOiRUPsHU9TZkN/uYUekIJaWDqKhs3ND2z GBOUd+AZCrUq5IhlJtX2KiGQKH1U1Lt5XLRXpE4z9nkpU/rzstVZvA3+5P1O2dOzV7P/ bNNFfjCX7SoY+ZfFKcK5gGmBVaKtZtmYlrRFbPmEk4wPMvo5eE150q4r8hlfw93eBsJI HCPEWVa4qI6Xz0yRJrw+jvcE+8FB/5GwAb6hL4HAbh/iXArzdSCqy3SC/Wt+KtYWqHX8 TwPbERbXIRHO1HhDaShTNtB5s94FQQQF2m/hrDqBqO0C58mg1wQVmwigV/FlU5CrOiz6 uIQg== X-Gm-Message-State: AHPjjUgad6Uu+KgmuABKeVxQv4dKc64dYB+C91FbMnr1SqEpiTYsDxDB SUR+lX1oEfNmfEF1HMkkcrpYUXfN X-Google-Smtp-Source: AOwi7QArLPAV4MqClp9h3g7WtGubSbBHW1LSGxJIL2w2YAuKwPgq1HPVoEVlQ3Hg7IwnDbOHRdWp5g== X-Received: by 10.99.173.67 with SMTP id y3mr2450957pgo.69.1506550764416; Wed, 27 Sep 2017 15:19:24 -0700 (PDT) Received: from tmm1-macbook.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id x8sm8149pff.104.2017.09.27.15.19.23 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Sep 2017 15:19:23 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2017 15:19:19 -0700 Message-Id: <20170927221920.46302-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.13.5 (Apple Git-94) Subject: [FFmpeg-devel] [PATCH v2 1/2] avcodec/videotoolbox: use AV_WB16 where possible 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: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta additional changes to hevc patchset, as suggested on-list if these look fine, I will squash into previous patchset and push it to master. --- libavcodec/videotoolbox.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 078174cc61..c96200cbdb 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -165,10 +165,8 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx) ptlc.non_packed_constraint_flag << 5 | ptlc.frame_only_constraint_flag << 4); AV_W8(p + 7, 0); - AV_W8(p + 8, 0); - AV_W8(p + 9, 0); - AV_W8(p + 10, 0); - AV_W8(p + 11, 0); + AV_WB16(p + 8, 0); + AV_WB16(p + 10, 0); /* unsigned int(8) general_level_idc; */ AV_W8(p + 12, ptlc.level_idc); @@ -215,8 +213,7 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx) AV_W8(p + 18, (sps->bit_depth_chroma - 8) | 0xfc); /* bit(16) avgFrameRate; */ - AV_W8(p + 19, 0); - AV_W8(p + 20, 0); + AV_WB16(p + 19, 0); /* * bit(2) constantFrameRate; @@ -242,11 +239,9 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx) AV_W8(p, 1 << 7 | HEVC_NAL_VPS & 0x3f); /* unsigned int(16) numNalus; */ - AV_W8(p + 1, 0); - AV_W8(p + 2, 1); + AV_WB16(p + 1, 1); /* unsigned int(16) nalUnitLength; */ - AV_W8(p + 3, vps->data_size >> 8); - AV_W8(p + 4, vps->data_size & 0xffff); + AV_WB16(p + 3, vps->data_size); /* bit(8*nalUnitLength) nalUnit; */ memcpy(p + 5, vps->data, vps->data_size); p += 5 + vps->data_size; @@ -254,24 +249,20 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx) /* sps */ AV_W8(p, 1 << 7 | HEVC_NAL_SPS & 0x3f); - AV_W8(p + 1, 0); - AV_W8(p + 2, 1); - AV_W8(p + 3, sps->data_size >> 8); - AV_W8(p + 4, sps->data_size & 0xffff); + AV_WB16(p + 1, 1); + AV_WB16(p + 3, sps->data_size); memcpy(p + 5, sps->data, sps->data_size); p += 5 + sps->data_size; /* pps */ AV_W8(p, 1 << 7 | HEVC_NAL_PPS & 0x3f); - AV_W8(p + 1, num_pps >> 8); - AV_W8(p + 2, num_pps & 0xffff); + AV_WB16(p + 1, num_pps); p += 3; for (i = 0; i < MAX_PPS_COUNT; i++) { if (h->ps.pps_list[i]) { const HEVCPPS *pps = (const HEVCPPS *)h->ps.pps_list[i]->data; - AV_W8(p + 0, pps->data_size >> 8); - AV_W8(p + 1, pps->data_size & 0xffff); + AV_WB16(p, pps->data_size); memcpy(p + 2, pps->data, pps->data_size); p += 2 + pps->data_size; }