From patchwork Sun Jan 2 00:43:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33001 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp15081777iog; Sat, 1 Jan 2022 16:44:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvYCko2RSXzmPBi4gC0vxZNhUuvhA2DSZMr4u0CUdBHpcWXdQ7xDRwcO/ga8mBxoq9hD+j X-Received: by 2002:a17:906:4a55:: with SMTP id a21mr32499017ejv.268.1641084246161; Sat, 01 Jan 2022 16:44:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641084246; cv=none; d=google.com; s=arc-20160816; b=Q1TqHaL+iaeO7X1fBAPybhI4MNPh2utIkeLrJgrkvPfqdOo/WAQeuW3Trb2L+Gpx5B RxTYsbyM/UBlaadAm9IvspNbTKsEyRvY/CPXZ9iYEnN/aF9qBu02Bl1jX7okmGJr/mcz ykXwm9osIEz8/hsqhAMgUz8XcF1BvyulA+x7oScmmLlmu/KFm54EaueLOL9Rg7RxNxMx 25AIdzJX9j9Q4yhXVYlwidzN2n/wA4kh6w0GGG/XvahItiY8+uPA/csJrL/oXCctuslH bx0pyKwD9nsx1A7QxzzP/JFdWPzTo+BDcPIn1zvW50YsfxUbgkFUTcBMMznv7EelYmH1 D59Q== 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; bh=T+UnlGNEVJoN/WjHxDHd4Jvmmg4y10jQchsPS23sHb8=; b=UMHQx0jE04aqb2+gIcyNcPi6ckMsnhi+N4xfSMiHaf5FQGkzVjc+SE70tAw1AOMnhN nIgjEo7bCSyRg1WcIxAGxnv0iqYWD/sNoItqaH0DD7qkc//CSEH45aQzpSQB1HL+Hvj7 zFJTnsKUZC1tajw3c1DNhIJM5x27/Vg7XklDqJic7dKsp58593DfS3NzbM/v6x6Crt1H XfM8qGwJmSSJtnsgD2UwyEyDLgt7VXP10eE3FrQAyIDQrMpdIAvVh/egRjlY3Gh+w5vk pGXMfwnF8d3eC8L1HuYzulWLcJg/aKTMixov0nsy8avndqZCjXnZ96UKWwnMl8IUfncC DAxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PfAiArIz; 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 z11si17209918edb.494.2022.01.01.16.44.05; Sat, 01 Jan 2022 16:44:06 -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=20210112 header.b=PfAiArIz; 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 7ED4468B111; Sun, 2 Jan 2022 02:43:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A98468B09C for ; Sun, 2 Jan 2022 02:43:43 +0200 (EET) Received: by mail-pj1-f44.google.com with SMTP id y16-20020a17090a6c9000b001b13ffaa625so34134113pjj.2 for ; Sat, 01 Jan 2022 16:43:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=Vu5m+9X2XviKOg8ZP5HsIH0pQ8x/gmtDa6lz4SagRow=; b=PfAiArIzY9+Vx2Ev4CWyvLarKqKSDClLW2wy3XJkPjx4+vKoWBF6WMz2llQ55aZ9Ig 4WnwvlwmSf/Lg8Y4gVl/+HcOrvV0ASt4yoWrNlqVEZQUrkPSol3ZXwT1XoGeN3N+Ytdd mkiScyxhlvm1um1wVi5TQpYu0DPdLQClAWamBgn0bcn6V/mCmQwZFfDdNPG+sAGnmETO OAcwJU3s1BNWquINNkd8fVvG/qjriPd/NgR1qS16zZbJ4rLmpQWHUtsoiUyU3YMRbf7u 5mjAypelkpMMaZGxnpfURtDBKjyOiiU9ACceK500AuS29gIANcinIngykQX6MAkfrmVa iP6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Vu5m+9X2XviKOg8ZP5HsIH0pQ8x/gmtDa6lz4SagRow=; b=8DaqPrCOJ9H4fOjIa56/rOIpiMAE74v1eJtYn1QnFwzeyxwmN5fi+G7VtIlKk9kMTg PeZWXulELgKqFLfb6uzVfXQZW6TwQg8mj74fAIVKQRim3QwZKfPYLqDlEncQFkVNm6Dd zOhJbhliRgU72HSKX6f0FWjRQYeaxfJDi7eGonfioV+BKeM2uHcfDzsMjz2Xp3fxAnvp AubLIdlY2A6U425kM5ebFq8GCh7C1vfkDd8YWOllzOKf75rqDSulTCar0yYz9I2JZ/uR LgyQ2kmyd+Rr8ar0dIKMEZlLlTtYwAZ+k9EHXupU0jInc4Mq6u2oc8zPp5eluNRDHW6U 6CzA== X-Gm-Message-State: AOAM5316A2ylj9Fm6rLcPR/g01Tm7E+c+F28v88zycy2xSC1uzXTDsxh nSBB2jcpGi1nIWKArSAEPb9GJXUEcug= X-Received: by 2002:a17:903:11d0:b0:149:a969:400c with SMTP id q16-20020a17090311d000b00149a969400cmr10733550plh.120.1641084220271; Sat, 01 Jan 2022 16:43:40 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c12sm337690pjo.55.2022.01.01.16.43.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Jan 2022 16:43:39 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jan 2022 08:43:30 +0800 Message-Id: <1641084211-21706-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iACrBbQD1ynp 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; From patchwork Sun Jan 2 00:43:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33000 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp15081684iog; Sat, 1 Jan 2022 16:43:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJy33XSlLSQVKZn5uPyZCG8TIaA882K93zdcvOpHAL+kYcu0FuBxE2NnKzFlkh18OUnYkRFO X-Received: by 2002:a17:907:948f:: with SMTP id dm15mr33282361ejc.250.1641084235545; Sat, 01 Jan 2022 16:43:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641084235; cv=none; d=google.com; s=arc-20160816; b=B3HfxFhFczB3Bag7vYLo7Ly4iovwoYurta9Nxe6i6YNM0HU6Ikxzv6LWICJ4eQS/j0 VdWCWPdshUp9CqtHbFQ6L7AAGToqdzfPWfayms9bpEN1AIzjrq3jezPkYXdf28AGFOMT e50r0JKd3xWdNwNEptSG1ZmnFKyOIKV+UtkVt4XKca8m7FNbnZ7P3fSIuQUXBZMtOARR O5UVBuZSHg5+7dqItGg7cw3nsc37UGIUONL82kn1L/T2xkUKz0TX/uW65MAppJl6bLdQ GCAmy+KD00gQyg04nHPmoVVEocqlIwqEvZsu1kGxG9ZPcDt6rGfZaMWKzNyypoZXXRG7 nmNQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=BL3uQPh5vathtHLDBW7biddiG+9DQW8trg6Z/GPYc8I=; b=X8grq+6R2wkDgacz7EHfjOmPMizvtjmb4Hq+/0Feya+wzSDmuE4j9thNcd3MX64EN1 Q00YzCYzykURZW5yyPjP+678vnTDU1iyce0cwzlMo/3JAp27jLQVEcIYBFUaUHVUGy8Z krdQ776++mOzXHV5TOVltoBRk+HW1E5ngUNR9RYDuem7dHN0pWH6L7XxtI0AuKgdYuys pY+F0cX2k0L3LyTh7W33xK/6myGT8rKSQsO8xcJKjGW3DRdvusf8Og6Ei4rr8WPsYO5M qOfleR+QT3gsWWbWbOslBEf/CCH3s29qlU59yihzIjL+eWLLHCsaBTr/wSVUutYg6LLt mKZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BaJqE7om; 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 n8si15493030edr.225.2022.01.01.16.43.54; Sat, 01 Jan 2022 16:43:55 -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=20210112 header.b=BaJqE7om; 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 75DD568B0F7; Sun, 2 Jan 2022 02:43:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6925568B095 for ; Sun, 2 Jan 2022 02:43:43 +0200 (EET) Received: by mail-pl1-f181.google.com with SMTP id w24so22519694ply.12 for ; Sat, 01 Jan 2022 16:43:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4I4aNgQQxL8mwUaisK6MQLrgKFzLUX6sLDmsIU4K8qQ=; b=BaJqE7omHaYCK+AbXZd/YosSNYSR8dw9STAdl8SXFgcO01jZNe9JdpPtlJDLFK3HXh 1OhM+3a+HqdwObf76BPweKNI8RflhTc1I7bOVacKVkzY3fQRfxu+yPLLuh6lubSxXot5 Li9l5l4Ko4UwghboQ4gYhrt3NytvkdNnTkN5uutXvgIrIHh+2ag8ay/ohPl3TxWUjcIt MXHpWNouwWupT8e4Elz7p/15UcK37MS/1g+Tp70fB03ITRcXHZD1lUOLSgaGG5QaWIGM OCw4omlP1rA4OosIYCAR5jGNJS6fPd/eYoASQ0dyfyO0b3r544LQtoAmc07FexxpnVXF 6VLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4I4aNgQQxL8mwUaisK6MQLrgKFzLUX6sLDmsIU4K8qQ=; b=6Sj9DU86dMe98e+SWpuXDbxXqeEYw0apKl0YYhYiQ7t7fJHRl/DoQdNLYkmFV05+7r 7G0/PP0q7GEVXL/xiJeBKFoqJCnXpWExRwv7ICufEiDBHMaH7pW/CEXvgXW5/6/zLBAZ bXqlxOu0NdD2uW/Z8+gFdq+7qz68LqIefIhpX3w8jzcoWAkyitfmoRfVTkrQW3UzfVgh jfKMaW+b3VtcI1cB3pZJygG2GsPusfxHL1e87bxTrPZ3QyViIOoCSoct976fCBQucRnM cdtvuadamZRkfnc/BEN5WIf+k909g0KMNVhJk+QF+a0LY/dnM+Yzwo2+eDWFdc4i95ce uIyg== X-Gm-Message-State: AOAM532JTAuEHt0Q5nDcon8glOgpmZUKIjH75tdATY1aP0Nr36pyzieR vxJi/04da6LWJmKcQQDrq5VxLS7r2aI= X-Received: by 2002:a17:902:8ec9:b0:149:8864:cfd4 with SMTP id x9-20020a1709028ec900b001498864cfd4mr25230999plo.16.1641084221469; Sat, 01 Jan 2022 16:43:41 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c12sm337690pjo.55.2022.01.01.16.43.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Jan 2022 16:43:41 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jan 2022 08:43:31 +0800 Message-Id: <1641084211-21706-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1641084211-21706-1-git-send-email-lance.lmwang@gmail.com> References: <1641084211-21706-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/rtpenc_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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /XBSCcX9ckW0 From: Limin Wang Below is step for how to test in your local machine: wget --no-check-certificate https://samples.ffmpeg.org/MPEG2/interlaced/burosch1.mpg 1. test interlace: ffmpeg -re -i ./burosch1.mpg -c:v bitpacked -pix_fmt yuv422p10 -f rtp rtp://239.255.0.1:6000 copy and create sdp file test.sdp ffplay -buffer_size 671088640 -protocol_whitelist "file,http,https,rtp,udp,tcp,tls" test.sdp 2. test progressive: ffmpeg -re -i ./burosch1.mpg -vf yadif -c:v bitpacked -pix_fmt yuv422p10 -f rtp rtp://239.255.0.1:6000 copy and create sdp file test.sdp ffplay -buffer_size 671088640 -protocol_whitelist "file,http,https,rtp,udp,tcp,tls" test.sdp Signed-off-by: Limin Wang --- If someone have other interface source from hardware, please help to test. libavformat/rtpenc.c | 9 +++++++-- libavformat/rtpenc.h | 2 +- libavformat/rtpenc_rfc4175.c | 31 +++++++++++++++++++++---------- libavformat/sdp.c | 5 ++++- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 17f5d9d..6be67b5 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -622,9 +622,14 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) ff_rtp_send_jpeg(s1, pkt->data, size); break; case AV_CODEC_ID_BITPACKED: - case AV_CODEC_ID_RAWVIDEO: - ff_rtp_send_raw_rfc4175 (s1, pkt->data, size); + case AV_CODEC_ID_RAWVIDEO: { + int interlaced = st->codecpar->field_order != AV_FIELD_PROGRESSIVE; + + ff_rtp_send_raw_rfc4175(s1, pkt->data, size, interlaced, 0); + if (interlaced) + ff_rtp_send_raw_rfc4175(s1, pkt->data, size, interlaced, 1); break; + } case AV_CODEC_ID_OPUS: if (size > s->max_payload_size) { av_log(s1, AV_LOG_ERROR, diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index 70ea85b..9c8ad14 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -95,7 +95,7 @@ void ff_rtp_send_vc2hq(AVFormatContext *s1, const uint8_t *buf, int size, int in void ff_rtp_send_vp8(AVFormatContext *s1, const uint8_t *buff, int size); void ff_rtp_send_vp9(AVFormatContext *s1, const uint8_t *buff, int size); void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buff, int size); -void ff_rtp_send_raw_rfc4175(AVFormatContext *s1, const uint8_t *buf, int size); +void ff_rtp_send_raw_rfc4175(AVFormatContext *s1, const uint8_t *buf, int size, int interlaced, int field); const uint8_t *ff_h263_find_resync_marker_reverse(const uint8_t *av_restrict start, const uint8_t *av_restrict end); diff --git a/libavformat/rtpenc_rfc4175.c b/libavformat/rtpenc_rfc4175.c index ea4c370..257d072 100644 --- a/libavformat/rtpenc_rfc4175.c +++ b/libavformat/rtpenc_rfc4175.c @@ -21,36 +21,40 @@ #include "avformat.h" #include "rtpenc.h" -void ff_rtp_send_raw_rfc4175(AVFormatContext *s1, const uint8_t *buf, int size) +void ff_rtp_send_raw_rfc4175(AVFormatContext *s1, const uint8_t *buf, int size, int interlaced, int field) { RTPMuxContext *s = s1->priv_data; int width = s1->streams[0]->codecpar->width; int height = s1->streams[0]->codecpar->height; int xinc, yinc, pgroup; - int field = 0; int i = 0; int offset = 0; s->timestamp = s->cur_timestamp; switch (s1->streams[0]->codecpar->format) { case AV_PIX_FMT_UYVY422: - xinc = yinc = 2; + xinc = 2; + yinc = 1 << interlaced; pgroup = 4; break; case AV_PIX_FMT_YUV422P10: - xinc = yinc = 2; + xinc = 2; + yinc = 1 << interlaced; pgroup = 5; break; case AV_PIX_FMT_YUV420P: - xinc = yinc = 4; + xinc = 4; + yinc = 1 << interlaced; pgroup = 6; break; case AV_PIX_FMT_RGB24: - xinc = yinc = 1; + xinc = 1; + yinc = 1 << interlaced; pgroup = 3; break; case AV_PIX_FMT_BGR24: - xinc = yinc = 1; + xinc = 1; + yinc = 1 << interlaced; pgroup = 3; break; default: @@ -72,7 +76,9 @@ void ff_rtp_send_raw_rfc4175(AVFormatContext *s1, const uint8_t *buf, int size) headers = dest; do { - pixels = width * xinc - offset; + int l_line; + + pixels = width - offset; length = (pixels * pgroup) / xinc; left -= head_size; @@ -90,8 +96,9 @@ void ff_rtp_send_raw_rfc4175(AVFormatContext *s1, const uint8_t *buf, int size) *dest++ = length & 0xff; /* Line No */ - *dest++ = ((i >> 8) & 0x7f) | ((field << 7) & 0x80); - *dest++ = i & 0xff; + l_line = i >> interlaced; + *dest++ = ((l_line >> 8) & 0x7f) | ((field << 7) & 0x80); + *dest++ = l_line & 0xff; if (next_line) i += yinc; cont = (left > (head_size + pgroup) && i < height) ? 0x80 : 0x00; @@ -106,16 +113,20 @@ void ff_rtp_send_raw_rfc4175(AVFormatContext *s1, const uint8_t *buf, int size) } while (cont); do { + int l_field; int l_line; int l_off; int copy_offset; length = (headers[0] << 8) | headers[1]; + l_field = (headers[2] & 0x80) >> 7; l_line = ((headers[2] & 0x7f) << 8) | headers[3]; l_off = ((headers[4] & 0x7f) << 8) | headers[5]; cont = headers[4] & 0x80; headers += head_size; + if (interlaced) + l_line = 2 * l_line + l_field; copy_offset = (l_line * width + l_off) * pgroup / xinc; if (copy_offset + length > size) break; diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 111a25b..ec05d4b 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -728,9 +728,12 @@ static int sdp_write_media_attributes(char *buff, int size, const AVStream *st, av_strlcatf(buff, size, "a=rtpmap:%d raw/90000\r\n" "a=fmtp:%d sampling=%s; " "width=%d; height=%d; " - "depth=%d\r\n", + "depth=%d", payload_type, payload_type, pix_fmt, p->width, p->height, bit_depth); + if (p->field_order != AV_FIELD_PROGRESSIVE) + av_strlcatf(buff, size, "; interlace"); + av_strlcatf(buff, size, "\r\n"); break; }