From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 39B30428AF for ; Sun, 9 Jan 2022 02:33:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36E1A68A83E; Sun, 9 Jan 2022 04:33:46 +0200 (EET) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 925C1689F59 for ; Sun, 9 Jan 2022 04:33:39 +0200 (EET) Received: by mail-pl1-f173.google.com with SMTP id w7so9113029plp.13 for ; Sat, 08 Jan 2022 18:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=Zhy8kK7m7x/aX0R87R2/qENab5RP3aX6NkszjAR3cWc=; b=CwTAhgzD34aNLv6NlYtCb6yhY+uxuQ1MeLLc2PiOBJrmU2BSx62xFMkP4eZDEhSh8n XNVlsO+JGfuVan1inaKF6Ff+lOyX3G0yM+ir7+FInG9ZF4fjwQE8oU/z0MBmdtIL2VBL oaAneE/UhoA2t16zMPkH65SzAg40sP17T6C39ibsE55SNx/GW5axLioB8Q1yIQBwrgXp bzbaXryPU5hjKIScWvjiEXe9HMJhPYXyQNB0FaBrxBRNgWIHEWf2PgfF901Tx1tVRy0q yCYF/kaFv+3fv21o0gI8PmvTQ79xYC6ObWwgSybSo4SPfJhqCX1OUztod+jAWyWEnWoa WYYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to; bh=Zhy8kK7m7x/aX0R87R2/qENab5RP3aX6NkszjAR3cWc=; b=FUUhL6hAl2mvm/8CIg41pvHcorWtIBN3Djd6Z1h47mJK9N8TjovVM7CgAS5D4Tv6qi Bp0nJjJudJfcH9ifV48Lx0aa9z8jGQ17jcJrbKxTWs/So4gdGaXkuYqWxBB5NQtm9gCF ZuEKFKwKip+3RQYYL3rql23d635SyRlWcxm44q3F7tmePJeR91esS/OEgCL7gNPx8YhJ 9FPCyrhqoF5AvaNf3+VNooWSXDYYXYFsdjsnvR5WfW2nOnfKFFNOLLrme/VSq1y8M3+G IvTXMcqIuXtFOcaJwHfIqvp+Qq/lXSh73cALE86c88HTK2+yiGEdNvMRmUnNUJey80qT AC2Q== X-Gm-Message-State: AOAM5321BrO4A5cUoq7xBCU50HWSp/JXYTerpPcNBX0RKN5gLrkxT871 WrfrUi/2Zx100AvrbP0+hRC/TfM+oDs= X-Google-Smtp-Source: ABdhPJw+uOCXmp/vQNPvXlNHM/L+oJ06lN3j5tZVL3V9nohF5FSigSeqersb/t2ogXs3dFpjBTNEuQ== X-Received: by 2002:a17:90b:50e:: with SMTP id r14mr3587270pjz.156.1641695617176; Sat, 08 Jan 2022 18:33:37 -0800 (PST) Received: from gmail.com ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id oa2sm3334043pjb.51.2022.01.08.18.33.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Jan 2022 18:33:36 -0800 (PST) Date: Sun, 9 Jan 2022 10:33:33 +0800 From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Message-ID: <20220109023333.GA8948@gmail.com> Mail-Followup-To: ffmpeg-devel@ffmpeg.org References: <1641084211-21706-1-git-send-email-lance.lmwang@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1641084211-21706-1-git-send-email-lance.lmwang@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH 1/2] avformat/rtpdec_rfc4175: support for interlace format X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sun, Jan 02, 2022 at 08:43:30AM +0800, lance.lmwang@gmail.com wrote: > From: Limin Wang > > Signed-off-by: Limin Wang > --- > FYI, other patches have submit to support for the interface format few years ago: > https://patchwork.ffmpeg.org/project/ffmpeg/patch/1531259521-19421-2-git-send-email-patrick.keroulas@savoirfairelinux.com/ > > I proposal to process the interlace format from packet level. > > libavformat/rtpdec_rfc4175.c | 25 +++++++++++++++++++++---- > 1 file changed, 21 insertions(+), 4 deletions(-) > > diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c > index a66e00d..e0a708e 100644 > --- a/libavformat/rtpdec_rfc4175.c > +++ b/libavformat/rtpdec_rfc4175.c > @@ -33,6 +33,8 @@ struct PayloadContext { > int depth; > int width; > int height; > + int interlaced; > + int field; > > uint8_t *frame; > unsigned int frame_size; > @@ -104,6 +106,11 @@ static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) > stream->codecpar->bits_per_coded_sample = av_get_bits_per_pixel(desc); > data->frame_size = data->width * data->height * data->pgroup / data->xinc; > > + if (data->interlaced) > + stream->codecpar->field_order = AV_FIELD_TT; > + else > + stream->codecpar->field_order = AV_FIELD_PROGRESSIVE; > + > if (data->framerate.den > 0) { > stream->avg_frame_rate = data->framerate; > stream->codecpar->bit_rate = data->frame_size * av_q2d(data->framerate) * 8; > @@ -124,6 +131,8 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, > data->sampling = av_strdup(value); > else if (!strncmp(attr, "depth", 5)) > data->depth = atoi(value); > + else if (!strncmp(attr, "interlace", 9)) > + data->interlaced = 1; > else if (!strncmp(attr, "exactframerate", 14)) { > if (av_parse_video_rate(&data->framerate, value) < 0) > return AVERROR(EINVAL); > @@ -195,15 +204,18 @@ static int rfc4175_parse_sdp_line(AVFormatContext *s, int st_index, > static int rfc4175_finalize_packet(PayloadContext *data, AVPacket *pkt, > int stream_index) > { > - int ret; > + int ret = 0; > > pkt->stream_index = stream_index; > + if (!data->interlaced || data->field) { > ret = av_packet_from_data(pkt, data->frame, data->frame_size); > if (ret < 0) { > av_freep(&data->frame); > } > - > data->frame = NULL; > + } > + > + data->field = 0; > > return ret; > } > @@ -213,7 +225,7 @@ static int rfc4175_handle_packet(AVFormatContext *ctx, PayloadContext *data, > const uint8_t * buf, int len, > uint16_t seq, int flags) > { > - int length, line, offset, cont; > + int length, line, offset, cont, field; > const uint8_t *headers = buf + 2; /* skip extended seqnum */ > const uint8_t *payload = buf + 2; > int payload_len = len - 2; > @@ -266,10 +278,12 @@ static int rfc4175_handle_packet(AVFormatContext *ctx, PayloadContext *data, > return AVERROR_INVALIDDATA; > > length = (headers[0] << 8) | headers[1]; > + field = (headers[2] & 0x80) >> 7; > line = ((headers[2] & 0x7f) << 8) | headers[3]; > offset = ((headers[4] & 0x7f) << 8) | headers[5]; > cont = headers[4] & 0x80; > headers += 6; > + data->field = field; > > if (!data->pgroup || length % data->pgroup) > return AVERROR_INVALIDDATA; > @@ -277,9 +291,12 @@ static int rfc4175_handle_packet(AVFormatContext *ctx, PayloadContext *data, > if (length > payload_len) > length = payload_len; > > + if (data->interlaced) > + line = 2 * line + field; > + > /* prevent ill-formed packets to write after buffer's end */ > copy_offset = (line * data->width + offset) * data->pgroup / data->xinc; > - if (copy_offset + length > data->frame_size) > + if (copy_offset + length > data->frame_size || !data->frame) > return AVERROR_INVALIDDATA; > > dest = data->frame + copy_offset; > -- > 1.8.3.1 > ping, please help to test if have other sources from hardware. Now only line number from 0 is supported. -- Thanks, Limin Wang _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".