From patchwork Sun Aug 20 22:41:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 4762 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.37.132 with SMTP id g126csp2343164jag; Sun, 20 Aug 2017 15:42:21 -0700 (PDT) X-Received: by 10.223.149.65 with SMTP id 59mr8694947wrs.292.1503268941307; Sun, 20 Aug 2017 15:42:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503268941; cv=none; d=google.com; s=arc-20160816; b=Zgx0ctc6GHB4CcASet48/o4mrLLmi16+NDVAhpr3uK4XDpkJJLVLNnOjB9KXp/CPJA jUk+NGQk9Sco1r62HqJaZuxhhrfDlVeAJMSayMAE8Alyu0SRPUmqA8eVz1ZVKZEViyW9 iitzX/Ujxf54Q36hptnD1i9z6JauDLE4RINF+WeMHQ/MOvR6/dmgBMmG6GpKePGRlI8p LVC9jFQEIznEkTykR+icstBK6Yefm0RmXPeMjHwO+3e+w0wp4rxIEt3d4pVlOdHJgITP rVmDpEvDBJy4ZittfRlTZneLlwgbr1wVtpG1Q8MgfvQ4U87M0pMwFd3+1zKcObEmgNNZ Gd0g== 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=/RzWQuYp8b1AZ2Q0KMEYcODuGUE8CNk33BkG60D7jKw=; b=t1exZEKP5cVVy6qgVdXkb1ALmLQfqN2z9q92SiUp7xti6qkjcCOezukdmSvgKan3H2 puHEyssuZ48oSpGCz1yULe8vtiLvNyeAyMjUxyP0sg4VfLnvZR59xkQIyRkokyRf+QmN HRzJ0K5/8ZgIDpfgCR2NMIh4EQMV88Pb3l/6l5OnK5sf3/MGYIp13IcUhnH8DTzPere5 19mVqMwKxBQIcDZN2zEkROoCSG9HBkBG1sLtDl6M/QPLpIavjpzg+/ZzTiB7DYSeBwJb awl+o5zjmIS0y7L1UBxZZK2bx8ILz1iM+5mVlhnzo0MAWvLALYytFQoHjpGjz0gpDuCy Jg/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=MwPvIPSo; 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 w9si8343862wrg.265.2017.08.20.15.42.20; Sun, 20 Aug 2017 15:42:21 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=MwPvIPSo; 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 4889D6808B8; Mon, 21 Aug 2017 01:42:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f173.google.com (mail-wr0-f173.google.com [209.85.128.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C056868065E for ; Mon, 21 Aug 2017 01:41:53 +0300 (EEST) Received: by mail-wr0-f173.google.com with SMTP id k46so9444583wre.2 for ; Sun, 20 Aug 2017 15:42:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=QVZ/9GvzFBh9aJb2fRq4ZQoH00kDqmksA4UPLWP0W7E=; b=MwPvIPSoznBPe1bQu7uE9C4aNqcgtYG1CMAbcJAgYWV/T0b1xSBqZsafHF1yv12fQc Hmsbv9Y5gE1JZHr7bNrDOUQk1GLZNQRJScQbpAXUVWzUXxmiGhDQmTw+fRIAyFMj2Dmx 7ExJjRh+KkPlw8MOJdn8QFChKOu/RbLX4TX6HozaMxOEQD6Xd8yLiIQ8LPUIXTV/PTU3 BlGW27DKKOgRg5L1//Qo/yp+ksGblYznNXePqiou1YtdjKwWRM3pCMfEZ6rw7uEuNxd/ 9uLIQzMVYGqnqfuqMimY2X7D141YY6a8GuqFbw6e2iOu8rAt8v1Ip0yUASjKOnkuR9M9 e4aw== 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=QVZ/9GvzFBh9aJb2fRq4ZQoH00kDqmksA4UPLWP0W7E=; b=FNQWJmQ9OaQ3scuIZBl0nJPFGZPgPYwaKH57gwTB9Lsni9tCwORBDBDPdB2UBN+pL3 wa5E/SeKeyCjV+WLTaL6guu7SI5sEs5swlBdLFuWdWUBl1Hkkq9RxNcjJq5qB6gItNJZ 83dYzaRibTFd9xAQEcUXsaoAJGkaq/iGEaeh0NRW60PCMcfScQj0wCDDtsvkMd1uMBI4 sXhnC1JPKUaDAxUVo3gRcyIYP/PasTcsaDFkRPLK0G9gs4LcXJzTzy2LLpY4ezPnIDY6 CfCpqxF6wMRSY+j34ebuyQb2PipsedQYe1+P09znvi+KIQmtB+U9ZTQw28RPjLsaYqqc APpw== X-Gm-Message-State: AHYfb5ic5c8bOuPkZOxJNrcQpJgnrsmSxkPA4irN37fJv9H6MRorkKLl A0tT7A/CZ2yQz4toFD4= X-Received: by 10.28.5.72 with SMTP id 69mr5362914wmf.103.1503268919917; Sun, 20 Aug 2017 15:41:59 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id f9sm5391116wmf.18.2017.08.20.15.41.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Aug 2017 15:41:59 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Aug 2017 23:41:29 +0100 Message-Id: <20170820224146.21289-2-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170820224146.21289-1-sw@jkqxz.net> References: <20170820224146.21289-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 01/18] h264_sei: Add namespace prefix to all SEI values 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" This avoids confusion with equivalent H.265 SEI values when both are being used at the same time. (cherry picked from commit 6ea220cbeec8863e2006a03b73bed52db2b13ee7) --- libavcodec/h264_parser.c | 26 ++++++++++++------------- libavcodec/h264_sei.c | 20 ++++++++++---------- libavcodec/h264_sei.h | 43 +++++++++++++++++++++--------------------- libavcodec/h264_slice.c | 24 +++++++++++------------ libavcodec/vaapi_encode_h264.c | 6 +++--- 5 files changed, 60 insertions(+), 59 deletions(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 2564c6c6c3..dd0a965af0 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -473,23 +473,23 @@ static inline int parse_nal_units(AVCodecParserContext *s, if (sps->pic_struct_present_flag && p->sei.picture_timing.present) { switch (p->sei.picture_timing.pic_struct) { - case SEI_PIC_STRUCT_TOP_FIELD: - case SEI_PIC_STRUCT_BOTTOM_FIELD: + case H264_SEI_PIC_STRUCT_TOP_FIELD: + case H264_SEI_PIC_STRUCT_BOTTOM_FIELD: s->repeat_pict = 0; break; - case SEI_PIC_STRUCT_FRAME: - case SEI_PIC_STRUCT_TOP_BOTTOM: - case SEI_PIC_STRUCT_BOTTOM_TOP: + case H264_SEI_PIC_STRUCT_FRAME: + case H264_SEI_PIC_STRUCT_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP: s->repeat_pict = 1; break; - case SEI_PIC_STRUCT_TOP_BOTTOM_TOP: - case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: s->repeat_pict = 2; break; - case SEI_PIC_STRUCT_FRAME_DOUBLING: + case H264_SEI_PIC_STRUCT_FRAME_DOUBLING: s->repeat_pict = 3; break; - case SEI_PIC_STRUCT_FRAME_TRIPLING: + case H264_SEI_PIC_STRUCT_FRAME_TRIPLING: s->repeat_pict = 5; break; default: @@ -504,12 +504,12 @@ static inline int parse_nal_units(AVCodecParserContext *s, s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; if (sps->pic_struct_present_flag && p->sei.picture_timing.present) { switch (p->sei.picture_timing.pic_struct) { - case SEI_PIC_STRUCT_TOP_BOTTOM: - case SEI_PIC_STRUCT_TOP_BOTTOM_TOP: + case H264_SEI_PIC_STRUCT_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP: s->field_order = AV_FIELD_TT; break; - case SEI_PIC_STRUCT_BOTTOM_TOP: - case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: s->field_order = AV_FIELD_BB; break; default: diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 889bea2ee0..2afe48e2fe 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -81,7 +81,7 @@ static int decode_picture_timing(H264SEIPictureTiming *h, GetBitContext *gb, h->pic_struct = get_bits(gb, 4); h->ct_type = 0; - if (h->pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING) + if (h->pic_struct > H264_SEI_PIC_STRUCT_FRAME_TRIPLING) return AVERROR_INVALIDDATA; num_clock_ts = sei_num_clock_ts_table[h->pic_struct]; @@ -421,31 +421,31 @@ int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, next = get_bits_count(gb) + 8 * size; switch (type) { - case SEI_TYPE_PIC_TIMING: // Picture timing SEI + case H264_SEI_TYPE_PIC_TIMING: // Picture timing SEI ret = decode_picture_timing(&h->picture_timing, gb, ps, logctx); break; - case SEI_TYPE_USER_DATA_REGISTERED: + case H264_SEI_TYPE_USER_DATA_REGISTERED: ret = decode_registered_user_data(h, gb, logctx, size); break; - case SEI_TYPE_USER_DATA_UNREGISTERED: + case H264_SEI_TYPE_USER_DATA_UNREGISTERED: ret = decode_unregistered_user_data(&h->unregistered, gb, logctx, size); break; - case SEI_TYPE_RECOVERY_POINT: + case H264_SEI_TYPE_RECOVERY_POINT: ret = decode_recovery_point(&h->recovery_point, gb); break; - case SEI_TYPE_BUFFERING_PERIOD: + case H264_SEI_TYPE_BUFFERING_PERIOD: ret = decode_buffering_period(&h->buffering_period, gb, ps, logctx); break; - case SEI_TYPE_FRAME_PACKING: + case H264_SEI_TYPE_FRAME_PACKING: ret = decode_frame_packing_arrangement(&h->frame_packing, gb); break; - case SEI_TYPE_DISPLAY_ORIENTATION: + case H264_SEI_TYPE_DISPLAY_ORIENTATION: ret = decode_display_orientation(&h->display_orientation, gb); break; - case SEI_TYPE_GREEN_METADATA: + case H264_SEI_TYPE_GREEN_METADATA: ret = decode_green_metadata(&h->green_metadata, gb); break; - case SEI_TYPE_ALTERNATIVE_TRANSFER: + case H264_SEI_TYPE_ALTERNATIVE_TRANSFER: ret = decode_alternative_transfer(&h->alternative_transfer, gb); break; default: diff --git a/libavcodec/h264_sei.h b/libavcodec/h264_sei.h index 5f5d895e89..8cad5ea997 100644 --- a/libavcodec/h264_sei.h +++ b/libavcodec/h264_sei.h @@ -25,31 +25,32 @@ * SEI message types */ typedef enum { - SEI_TYPE_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1) - SEI_TYPE_PIC_TIMING = 1, ///< picture timing - SEI_TYPE_USER_DATA_REGISTERED = 4, ///< registered user data as specified by Rec. ITU-T T.35 - SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data - SEI_TYPE_RECOVERY_POINT = 6, ///< recovery point (frame # to decoder sync) - SEI_TYPE_FRAME_PACKING = 45, ///< frame packing arrangement - SEI_TYPE_DISPLAY_ORIENTATION = 47, ///< display orientation - SEI_TYPE_GREEN_METADATA = 56, ///< GreenMPEG information - SEI_TYPE_ALTERNATIVE_TRANSFER = 147, ///< alternative transfer -} SEI_Type; + H264_SEI_TYPE_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1) + H264_SEI_TYPE_PIC_TIMING = 1, ///< picture timing + H264_SEI_TYPE_FILLER_PAYLOAD = 3, ///< filler data + H264_SEI_TYPE_USER_DATA_REGISTERED = 4, ///< registered user data as specified by Rec. ITU-T T.35 + H264_SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data + H264_SEI_TYPE_RECOVERY_POINT = 6, ///< recovery point (frame # to decoder sync) + H264_SEI_TYPE_FRAME_PACKING = 45, ///< frame packing arrangement + H264_SEI_TYPE_DISPLAY_ORIENTATION = 47, ///< display orientation + H264_SEI_TYPE_GREEN_METADATA = 56, ///< GreenMPEG information + H264_SEI_TYPE_ALTERNATIVE_TRANSFER = 147, ///< alternative transfer +} H264_SEI_Type; /** * pic_struct in picture timing SEI message */ typedef enum { - SEI_PIC_STRUCT_FRAME = 0, ///< 0: %frame - SEI_PIC_STRUCT_TOP_FIELD = 1, ///< 1: top field - SEI_PIC_STRUCT_BOTTOM_FIELD = 2, ///< 2: bottom field - SEI_PIC_STRUCT_TOP_BOTTOM = 3, ///< 3: top field, bottom field, in that order - SEI_PIC_STRUCT_BOTTOM_TOP = 4, ///< 4: bottom field, top field, in that order - SEI_PIC_STRUCT_TOP_BOTTOM_TOP = 5, ///< 5: top field, bottom field, top field repeated, in that order - SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM = 6, ///< 6: bottom field, top field, bottom field repeated, in that order - SEI_PIC_STRUCT_FRAME_DOUBLING = 7, ///< 7: %frame doubling - SEI_PIC_STRUCT_FRAME_TRIPLING = 8 ///< 8: %frame tripling -} SEI_PicStructType; + H264_SEI_PIC_STRUCT_FRAME = 0, ///< 0: %frame + H264_SEI_PIC_STRUCT_TOP_FIELD = 1, ///< 1: top field + H264_SEI_PIC_STRUCT_BOTTOM_FIELD = 2, ///< 2: bottom field + H264_SEI_PIC_STRUCT_TOP_BOTTOM = 3, ///< 3: top field, bottom field, in that order + H264_SEI_PIC_STRUCT_BOTTOM_TOP = 4, ///< 4: bottom field, top field, in that order + H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP = 5, ///< 5: top field, bottom field, top field repeated, in that order + H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM = 6, ///< 6: bottom field, top field, bottom field repeated, in that order + H264_SEI_PIC_STRUCT_FRAME_DOUBLING = 7, ///< 7: %frame doubling + H264_SEI_PIC_STRUCT_FRAME_TRIPLING = 8 ///< 8: %frame tripling +} H264_SEI_PicStructType; /** * frame_packing_arrangement types @@ -66,7 +67,7 @@ typedef enum { typedef struct H264SEIPictureTiming { int present; - SEI_PicStructType pic_struct; + H264_SEI_PicStructType pic_struct; /** * Bit set of clock types for fields/frames in picture timing SEI message. diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index ebff7b33e3..2577edd8a6 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1150,37 +1150,37 @@ static int h264_export_frame_props(H264Context *h) if (sps->pic_struct_present_flag && h->sei.picture_timing.present) { H264SEIPictureTiming *pt = &h->sei.picture_timing; switch (pt->pic_struct) { - case SEI_PIC_STRUCT_FRAME: + case H264_SEI_PIC_STRUCT_FRAME: break; - case SEI_PIC_STRUCT_TOP_FIELD: - case SEI_PIC_STRUCT_BOTTOM_FIELD: + case H264_SEI_PIC_STRUCT_TOP_FIELD: + case H264_SEI_PIC_STRUCT_BOTTOM_FIELD: cur->f->interlaced_frame = 1; break; - case SEI_PIC_STRUCT_TOP_BOTTOM: - case SEI_PIC_STRUCT_BOTTOM_TOP: + case H264_SEI_PIC_STRUCT_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP: if (FIELD_OR_MBAFF_PICTURE(h)) cur->f->interlaced_frame = 1; else // try to flag soft telecine progressive cur->f->interlaced_frame = h->prev_interlaced_frame; break; - case SEI_PIC_STRUCT_TOP_BOTTOM_TOP: - case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: /* Signal the possibility of telecined film externally * (pic_struct 5,6). From these hints, let the applications * decide if they apply deinterlacing. */ cur->f->repeat_pict = 1; break; - case SEI_PIC_STRUCT_FRAME_DOUBLING: + case H264_SEI_PIC_STRUCT_FRAME_DOUBLING: cur->f->repeat_pict = 2; break; - case SEI_PIC_STRUCT_FRAME_TRIPLING: + case H264_SEI_PIC_STRUCT_FRAME_TRIPLING: cur->f->repeat_pict = 4; break; } if ((pt->ct_type & 3) && - pt->pic_struct <= SEI_PIC_STRUCT_BOTTOM_TOP) + pt->pic_struct <= H264_SEI_PIC_STRUCT_BOTTOM_TOP) cur->f->interlaced_frame = (pt->ct_type & (1 << 1)) != 0; } else { /* Derive interlacing flag from used decoding process. */ @@ -1195,8 +1195,8 @@ static int h264_export_frame_props(H264Context *h) if (sps->pic_struct_present_flag && h->sei.picture_timing.present) { /* Use picture timing SEI information. Even if it is a * information of a past frame, better than nothing. */ - if (h->sei.picture_timing.pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM || - h->sei.picture_timing.pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM_TOP) + if (h->sei.picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM || + h->sei.picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP) cur->f->top_field_first = 1; else cur->f->top_field_first = 0; diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 90c7f7e3cc..549867ef3f 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -644,18 +644,18 @@ static void vaapi_encode_h264_write_sei(PutBitContext *pbc, for (payload_type = 0; payload_type < 64; payload_type++) { switch (payload_type) { - case SEI_TYPE_BUFFERING_PERIOD: + case H264_SEI_TYPE_BUFFERING_PERIOD: if (!priv->send_timing_sei || pic->type != PICTURE_TYPE_IDR) continue; write_payload = &vaapi_encode_h264_write_buffering_period; break; - case SEI_TYPE_PIC_TIMING: + case H264_SEI_TYPE_PIC_TIMING: if (!priv->send_timing_sei) continue; write_payload = &vaapi_encode_h264_write_pic_timing; break; - case SEI_TYPE_USER_DATA_UNREGISTERED: + case H264_SEI_TYPE_USER_DATA_UNREGISTERED: if (pic->encode_order != 0) continue; write_payload = &vaapi_encode_h264_write_identifier;