From patchwork Sat Dec 16 10:12:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 6824 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp471743jah; Sat, 16 Dec 2017 02:20:12 -0800 (PST) X-Google-Smtp-Source: ACJfBoucSh0W0lu8h2tBun0QvQ/Kv1awy1MYRkXhdz63bxDTKUxpspXgQPtuuBDLS/zPTVnfqC+c X-Received: by 10.28.192.24 with SMTP id q24mr7161373wmf.98.1513419612108; Sat, 16 Dec 2017 02:20:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513419612; cv=none; d=google.com; s=arc-20160816; b=UWketRaIFKJn85ExfDvBTJkXZ0AOfSTXKGwonf7QoyCCfVwzlCbeTFuTbnFfSXUkaa qmxKaY+aiJ0rX6R/HhP2MtJXTaLp1VL8FtVs+0gw1yy9c/WoLMHugXBSiJbOK1n99J+C YymDPIB5jMjIp6/UJ0sAGnV+ogxeoNA+/KiEOOo10TTim9rf/f+pVdx9zpsc+GnUHC58 CwlvJoiO4yCmqNlx7EeU+QqgCs8F/cWvkUZN1gluCltbDdUsKx86MgYJjUlMaJp3xOYk Gm9OSAbBH51kGG/1bwtsNk8aAdi9jXjVRo3LviaUIwmTHAPUTWBGxTiV6ymwOOkMEzaS vXRQ== 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=n4KtmR+bSfszNxgETqXIvmT4PqogDJCJwf46QaJ5Du8=; b=HPwyAUGsanby96u3771mxMbZAUFU8wuEOt5tgZsonLHACm5l3ozRTtS75jDoYSMM+Z LTMjcco5YIPKRo+vM2BPYuK/YcAFxy1q1cq7YlEbAtamKIefXBxENRyjUONBznWHLtQR 8a34S0+mzNpJVywbNx4mFWPbyB8a63k7zDf9blvu+dHLzrX3zbMEOO2AChmOHZo/wqZ1 UQ0hJqmN+y98ZKthEtB3TwZfN4/6EtQLXcjjPIvLQwtLEys8jf+YPRnZw4QEDHYFHCCy QazEvV4KxdEczVADyHhSxOurm1wsemGAvx9k7OTiM/yloxLIsLwjD0iEavnb57Y2M/mK GYpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OjSwyjW8; 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=NONE 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 35si6888276wrc.134.2017.12.16.02.20.11; Sat, 16 Dec 2017 02:20: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=@gmail.com header.s=20161025 header.b=OjSwyjW8; 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=NONE 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 98351689B0D; Sat, 16 Dec 2017 12:20:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B318C689A39 for ; Sat, 16 Dec 2017 12:19:55 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id f140so21592726wmd.2 for ; Sat, 16 Dec 2017 02:20:05 -0800 (PST) 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=R+waECrnej3gZ8jNHOj/f0BZPX/bpYdPET/IoWvOKwc=; b=OjSwyjW8FMwbvYxeBjATv7YhQI1FquC4h4WONXgrQ/0ybsG/sLN1mQICut6g+UV9He hB68O8oFTJ2wL5JVRd/i5M1LeWufr5CFKKaXuShgg3tlfBYVQcN4h0Mlie336qUo+C1o KOaACgBd4dI0f/PNinAgxj7kH2LgJx5JNlBdmMMfk+U8GGgulrGWbTZQns7Hwa7+WPIu r1mKtN7eeaeTh+rxiQD8k9C31hVE/b/z/tG505qdl5xFbpF2R6bBhXBrOpUghUNxLdAz 3aOX71WXEZjEbUcvYIpz3P2t7nQVNB9yWNuLJIXdUYTxBfWa/eFs3C6p6Ythr4fGRj1y qypg== 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=R+waECrnej3gZ8jNHOj/f0BZPX/bpYdPET/IoWvOKwc=; b=BeWTQgh6pL7CiZCIOXMOJIZ42HBGfPOO7NpTB7zWzT7a4E//nsocbO899AbyXyMJAC 3KsaZKL8htGUMqOsyvnG01JoCx+lF8ieCmBIPdMb2Z/pxUlye+GnEGpVGbS9QbQSYFfg WDDrfKxQvspHTPahMaKtlFj8nuzbnfWiav06rfQODwxGVKg/6vtpYzT3KGXVJJzaXBXA atXTx6uW+DRsQKtrMFHgjmEQFUJLAW44wTAFySF7CYKuTRKCZaPT3yO5C8oux3TSiLsB eP9sMnTRr2793dw1YCaXtxVYIYS2Kd+//2GS8+rWcHfijZsUTnAlBGo9S18gkDicufBE 3QAQ== X-Gm-Message-State: AKGB3mIgvqZ7goemjuPbCAZTKkhkwsNbAVXv//DgvDJHJyjg+IYre8FD WR9S8fqtrLrCDUG+U0Btw3MDog== X-Received: by 10.80.194.145 with SMTP id o17mr20765482edf.59.1513419221102; Sat, 16 Dec 2017 02:13:41 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id i6sm7100034eda.6.2017.12.16.02.13.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 02:13:40 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Dec 2017 11:12:30 +0100 Message-Id: <20171216101245.26977-10-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171216101245.26977-1-onemda@gmail.com> References: <20171216101245.26977-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 10/25] 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 f1f4989231..46a52d3930 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