From patchwork Tue May 1 19:39:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8727 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4904337jad; Tue, 1 May 2018 12:42:27 -0700 (PDT) X-Google-Smtp-Source: AB8JxZosaT0KJWbIGCnjd8SZGJFO0X+gmIF2f0eVatfSmDZ35Z/ZHmgCZxzJ6DYCxr4OoMQGNnK6 X-Received: by 10.28.231.4 with SMTP id e4mr10200141wmh.119.1525203747863; Tue, 01 May 2018 12:42:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525203747; cv=none; d=google.com; s=arc-20160816; b=T4+6Y1b0SADoFUz0JXnS8gJ/f0WrVGciw2zMKQYkjsreBw+d13hh/VHOz8pC2i+uuP Wh3cpPHyXrVX7OzwacjFYnk7nFkE+gXf2I9HZnAiQRlWjN3X6CbG0c+EySwOsfGnlT/a FZYFNDDOVYTZvrPE1YoYCZBkjiNXfFv0+2Qs19gmTjZ1X4CKRegSjCIOg8RGdlQ0rEKn uF05rKff7m68UTEycfY9nufJDVUzILCvvkVfGVNuFFdYK0KVi36y5RGsnbKmNY5YTIuZ ulIo6gnTvdPmgbHeOHNowMpzxSBclaCbAEJ+GedTMEyQ4crRuMQ8GVxFwPrUo9v6rRJL 46VA== 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: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=isHLw4Fn9KY72X9P73OYz3xfILdIoLvopmm5lzeTcsM=; b=SkzaSwTHVNf0m0/YhllCzfVQNXNctW46eZpfO/ebax4PrFBXSiJK0vqUVEHtcuvVMZ K0OAppgim8HoamlR//LiZcyqpOKsgumugTvOLPmHE5vSxGjLd+cnrDZaDo6CUok7bRzS 5vNyVF8o4DATHjCnhRtDjEw2BuIdRdVWe1yrXssdZEBcjOcxoKs1McO5VXczd5j6iNK7 c/jnZ5AVJ4Zod3jJBuY143t69MDDtnY2hag7ghFDGr+FyaQkcZlZwXG3bBD4tSDky/Yr PJCmzoIUL1cu0lDFSVtg3ySjtvFnOY/p0APcr4yKU+s9q3kqBW7rPrRbCfCeqECae550 ePDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NCca8iSy; 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 w10si7300144wma.87.2018.05.01.12.42.27; Tue, 01 May 2018 12:42:27 -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=NCca8iSy; 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 295BE68A40B; Tue, 1 May 2018 22:40:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A2C868A3CF for ; Tue, 1 May 2018 22:40:34 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id o4-v6so11700693wrm.0 for ; Tue, 01 May 2018 12:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=Q7OLc0PYjsqU+QI6cCSigLoXMBg17GyZ8mOaY52N+V0=; b=NCca8iSyxM5+AGx0bMnMj5yoZaZHzjx0GtiY7tPFMXQG13XAjbQ3Se+WZtPuEOZqMY Zu66hyjwrRKfwvqmMRMgdHFrUA6T4Qwj0khTrOxiZ4EevFUZAlaLOkR1nw6+X3DE+C58 mowP//qcGnT9FObIJb+Iw9RPGSpPjTekv92eeGvNcQys94E18F5RRabi+9jVdmEFCDEo f9xcPxvqiFXIjuM9MOuCSDALSg7VQvrRZo1S1wwtQc2Hmp/T8nC1FeoH8G1nY8SZNys5 YSpqSvVzS7/416BYkTnPrWx3Cf58+kLhB14M6MHjJBVYb+PF2zGg4nMf30qJQ2pdckf1 hylg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Q7OLc0PYjsqU+QI6cCSigLoXMBg17GyZ8mOaY52N+V0=; b=IEiHwj+7jL1AuNYwFqV8cCJuBoIvnfAjJZAWud8vkDjWF6Z4XNaSgaHyysrd626r0f LNpUx3J+Y2j8n3phglFCvN6jopdZugR46H3U3e1UOwvoKa9ru5X0wnc1+J8YwDl8lxHd Q5otE7bXSd/kCWvUokbDmtTuzcoLnleAlm9lZtewJQcRWZHzp6witxNxRF+kpPbrU/lD n8/v+EHfKGUIvrmgqpWF0DSYET334RK9M/R/5+xjEVfH0V4Bw00kkIUVulyfbIJRwFo9 I7/zuiKx98KOoxXhZGNGjXtQlwIYNMkfRrO1BVOjd5ZRMeujD5bKjrRx+zQUvtvFSpSp xLmA== X-Gm-Message-State: ALQs6tCyftQhNlzVx3lKwAqG94UcO51kXlQfoOb89WR77yUyxQU4o2v8 3lxGOs4sHSwUl0Q0vDK6l5mRVg== X-Received: by 2002:adf:b083:: with SMTP id i3-v6mr12118350wra.52.1525203666878; Tue, 01 May 2018 12:41:06 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id h12sm11839115wmc.7.2018.05.01.12.41.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 12:41:06 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 May 2018 21:39:59 +0200 Message-Id: <20180501194013.9552-10-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180501194013.9552-1-onemda@gmail.com> References: <20180501194013.9552-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 10/24] avcodec/mpeg4videoenc: mark as limited color range only 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" lavf-mkv changes only because of metadata. Signed-off-by: Paul B Mahol --- libavcodec/mpeg4videoenc.c | 1 + libavcodec/mpegvideo_enc.c | 4 ++++ tests/ref/lavf/mkv | 8 ++++---- tests/ref/seek/lavf-mkv | 44 ++++++++++++++++++++++---------------------- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 494452c938..80279bb3a2 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1396,6 +1396,7 @@ AVCodec ff_mpeg4_encoder = { .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .color_ranges = (const enum AVColorRange[]) { AVCOL_RANGE_MPEG, AVCOL_RANGE_UNSPECIFIED }, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, .priv_class = &mpeg4enc_class, }; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 979e138b88..2e7950c64d 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -4864,6 +4864,7 @@ AVCodec ff_h263p_encoder = { .close = ff_mpv_encode_end, .capabilities = AV_CODEC_CAP_SLICE_THREADS, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .color_ranges = (const enum AVColorRange[]){ AVCOL_RANGE_MPEG, AVCOL_RANGE_UNSPECIFIED }, .priv_class = &h263p_class, }; @@ -4884,6 +4885,7 @@ AVCodec ff_msmpeg4v2_encoder = { .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .color_ranges = (const enum AVColorRange[]){ AVCOL_RANGE_MPEG, AVCOL_RANGE_UNSPECIFIED }, .priv_class = &msmpeg4v2_class, }; @@ -4904,6 +4906,7 @@ AVCodec ff_msmpeg4v3_encoder = { .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .color_ranges = (const enum AVColorRange[]){ AVCOL_RANGE_MPEG, AVCOL_RANGE_UNSPECIFIED }, .priv_class = &msmpeg4v3_class, }; @@ -4924,5 +4927,6 @@ AVCodec ff_wmv1_encoder = { .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .color_ranges = (const enum AVColorRange[]){ AVCOL_RANGE_MPEG, AVCOL_RANGE_UNSPECIFIED }, .priv_class = &wmv1_class, }; diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 0083033958..bd0302b14f 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,6 +1,6 @@ -7c8697c324e8ad79c5ea14364a6c39b8 *./tests/data/lavf/lavf.mkv -472759 ./tests/data/lavf/lavf.mkv +80092ba5b6833704dd04bd9f7f75366d *./tests/data/lavf/lavf.mkv +472766 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 -9767a3b526d7e56d7400164cb888990c *./tests/data/lavf/lavf.mkv -320603 ./tests/data/lavf/lavf.mkv +b919b159a2dd7c9c7cd45cc36f204754 *./tests/data/lavf/lavf.mkv +320610 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv index cea34e99ac..368e86cd14 100644 --- a/tests/ref/seek/lavf-mkv +++ b/tests/ref/seek/lavf-mkv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 834 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 841 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1057 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292483 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292483 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1057 size: 27837 ret:-1 st: 1 flags:0 ts: 2.577000 ret: 0 st: 1 flags:1 ts: 1.471000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320317 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320324 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147023 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147030 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1057 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153000 ret: 0 st: 0 flags:1 ts: 1.048000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292483 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 834 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 841 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320317 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320324 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147023 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147030 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1057 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292483 size: 27834 ret:-1 st: 1 flags:0 ts: 1.307000 ret: 0 st: 1 flags:1 ts: 0.201000 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 834 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 841 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1057 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292483 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292483 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1057 size: 27837 ret:-1 st: 1 flags:0 ts: 2.672000 ret: 0 st: 1 flags:1 ts: 1.566000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320317 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320324 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147023 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147030 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1050 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 1057 size: 27837