From patchwork Thu Aug 20 09:11:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 21766 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3C4FC449EDD for ; Thu, 20 Aug 2020 12:11:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 220F868B60E; Thu, 20 Aug 2020 12:11:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15112.mail.126.com (m15112.mail.126.com [220.181.15.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF0E568B5F6 for ; Thu, 20 Aug 2020 12:11:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=KxhZN Sg1l5ZuqFWQ2OjTRVwLAFsv1WGYee+RibF7Diw=; b=GxnQWQxnF7fhZoapLkR9y iZtEqhB1GwVElPJrsKS/UwUtk9Xk8hGjCas+7vToNTQfovujxHZ5qe32x6BHthiD ZKo6CA/gHEFvlH7NloOUI9SprUjTssT97vOUBSaUr7Tri0nyM4v5snLbpwdijRlA 8DaGq2s16MXH/5yHDTbPGk= Received: from localhost.localdomain (unknown [111.34.131.254]) by smtp2 (Coremail) with SMTP id DMmowAD3Bfo2Pj5f1jALGg--.55551S2; Thu, 20 Aug 2020 17:11:22 +0800 (CST) From: hwrenx@126.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Aug 2020 17:11:05 +0800 Message-Id: <20200820091107.1035-1-hwrenx@126.com> X-Mailer: git-send-email 2.23.0.windows.1 In-Reply-To: =?unknown-8bit?b?POKAnDwyMDIwMDgyMDA3MDUxNS45MDUtMS1od3JlbnhA?= =?unknown-8bit?b?MTI2LmNvbT4=?= References: =?unknown-8bit?b?POKAnDwyMDIwMDgyMDA3MDUxNS45MDUtMS1od3JlbnhA?= =?unknown-8bit?b?MTI2LmNvbT4=?= MIME-Version: 1.0 X-CM-TRANSID: DMmowAD3Bfo2Pj5f1jALGg--.55551S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw48Ww43ZrW5tw43GF48JFb_yoW5CF4Dp3 93GF98GF1FqFnIvr4vyF15JanxWF43GF12vFW5uw4IyasakrWDWwnFgFWY93sFqrykXa45 Jr4qyF4UW3yUK37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U4E_iUUUUU= X-Originating-IP: [111.34.131.254] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiYBqG6VpEAkBk6QAAsE Subject: [FFmpeg-devel] [PATCH v2 1/3] lavc/avs2_parser.c, lavf/davs2.c: Add AVS2_* prefix 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 Cc: hwren Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: hwren Add AVS2_* prefix to macro definitions to avoid confusion Signed-off-by: hwren --- libavcodec/avs2_parser.c | 10 +++++----- libavformat/davs2.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c index 1c9b3423ff..02af08f079 100644 --- a/libavcodec/avs2_parser.c +++ b/libavcodec/avs2_parser.c @@ -21,10 +21,10 @@ #include "parser.h" -#define SLICE_MAX_START_CODE 0x000001af +#define AVS2_SLICE_MAX_START_CODE 0x000001AF -#define ISPIC(x) ((x) == 0xB3 || (x) == 0xB6) -#define ISUNIT(x) ((x) == 0xB0 || (x) == 0xB1 || (x) == 0xB2 || ISPIC(x)) +#define AVS2_ISPIC(x) ((x) == 0xB3 || (x) == 0xB6) +#define AVS2_ISUNIT(x) ((x) == 0xB0 || (x) == 0xB1 || (x) == 0xB2 || AVS2_ISPIC(x)) static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size) { @@ -35,7 +35,7 @@ static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_siz if (!pic_found) { for (; cur < buf_size; ++cur) { state = (state<<8) | buf[cur]; - if (ISUNIT(buf[cur])){ + if (AVS2_ISUNIT(buf[cur])){ ++cur; pic_found = 1; break; @@ -48,7 +48,7 @@ static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_siz return END_NOT_FOUND; for (; cur < buf_size; ++cur) { state = (state << 8) | buf[cur]; - if ((state & 0xFFFFFF00) == 0x100 && state > SLICE_MAX_START_CODE) { + if ((state & 0xFFFFFF00) == 0x100 && state > AVS2_SLICE_MAX_START_CODE) { pc->frame_start_found = 0; pc->state = -1; return cur - 3; diff --git a/libavformat/davs2.c b/libavformat/davs2.c index 59f41fd499..f8337ea500 100644 --- a/libavformat/davs2.c +++ b/libavformat/davs2.c @@ -25,11 +25,11 @@ #include "libavcodec/internal.h" #include "libavutil/intreadwrite.h" -#define ISSQH(x) ((x) == 0xB0 ) -#define ISEND(x) ((x) == 0xB1 ) -#define ISPIC(x) ((x) == 0xB3 || (x) == 0xB6) -#define ISUNIT(x) ( ISSQH(x) || ISEND(x) || (x) == 0xB2 || ISPIC(x) || (x) == 0xB5 || (x) == 0xB7 ) -#define ISAVS2(x) ((x) == 0x20 || (x) == 0x22 || (x) == 0x30 || (x) == 0x32 ) +#define AVS2_ISSQH(x) ((x) == 0xB0) +#define AVS2_ISEND(x) ((x) == 0xB1) +#define AVS2_ISPIC(x) ((x) == 0xB3 || (x) == 0xB6) +#define AVS2_ISUNIT(x) (AVS2_ISSQH(x) || AVS2_ISEND(x) || (x) == 0xB2 || AVS2_ISPIC(x) || (x) == 0xB5 || (x) == 0xB7) +#define AVS2_ISPROFILE(x) ((x) == 0x20 || (x) == 0x22 || (x) == 0x30 || (x) == 0x32) static int avs2_probe(const AVProbeData *p) { @@ -44,18 +44,18 @@ static int avs2_probe(const AVProbeData *p) ptr = avpriv_find_start_code(ptr, end, &code); state = code & 0xFF; if ((code & 0xffffff00) == 0x100) { - if (ISUNIT(state)) { + if (AVS2_ISUNIT(state)) { if (sqb && !hds) { hds = ptr - sqb; } - if (ISSQH(state)) { - if (!ISAVS2(*ptr)) + if (AVS2_ISSQH(state)) { + if (!AVS2_ISPROFILE(*ptr)) return 0; sqb = ptr; seq++; - } else if (ISPIC(state)) { + } else if (AVS2_ISPIC(state)) { pic++; - } else if (ISEND(state)) { + } else if (AVS2_ISEND(state)) { break; } } From patchwork Thu Aug 20 09:11:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 21765 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1B354449EDD for ; Thu, 20 Aug 2020 12:11:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E382C68B600; Thu, 20 Aug 2020 12:11:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15112.mail.126.com (m15112.mail.126.com [220.181.15.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 365C66898AE for ; Thu, 20 Aug 2020 12:11:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=WLs53 FWsCHNLKoJJsb6pL4mY67o5THjRydhDAuV6PSQ=; b=DC9ocjxR6F+j78qD6DFyk 268uUSU4OkklB7crVkRZinSw0cyEgRJymwXZsGbUKlhsm+lWAloFG64HdbBQsqaX zPp6XXX4+45/BBwz0OHojlVrapIHekcGVT+wnryKFyfc4bCup18rmIMa37qWeFKy DDNiQG65NBxmzWrMd1F3fs= Received: from localhost.localdomain (unknown [111.34.131.254]) by smtp2 (Coremail) with SMTP id DMmowAD3Bfo2Pj5f1jALGg--.55551S3; Thu, 20 Aug 2020 17:11:22 +0800 (CST) From: hwrenx@126.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Aug 2020 17:11:06 +0800 Message-Id: <20200820091107.1035-2-hwrenx@126.com> X-Mailer: git-send-email 2.23.0.windows.1 In-Reply-To: <20200820091107.1035-1-hwrenx@126.com> References: =?unknown-8bit?b?POKAnDwyMDIwMDgyMDA3MDUxNS45MDUtMS1od3JlbnhA?= =?unknown-8bit?b?MTI2LmNvbT4=?= =?unknown-8bit?q?_=3C20200820091107=2E1035-1-hwrenx=40126=2Ecom=3E?= MIME-Version: 1.0 X-CM-TRANSID: DMmowAD3Bfo2Pj5f1jALGg--.55551S3 X-Coremail-Antispam: 1Uf129KBjvdXoWruw4ftr1kKF4kZryUCw4xXrb_yoWkGrb_tF 93Kw4UXw4j9rsxXw4UW3yvgw4DK34kArn0y34fJrn3JayYqr45JayDuw17Jan5J3WYkr4F ka97AFZ3Awn2gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8Uku3UUUUU== X-Originating-IP: [111.34.131.254] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiZxuG6V16epgEGAAAsK Subject: [FFmpeg-devel] [PATCH v2 2/3] lavf/davs2.c: Rename as avs2dec.c for better understanding 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 Cc: hwren Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: hwren Signed-off-by: hwren --- libavformat/Makefile | 2 +- libavformat/{davs2.c => avs2dec.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename libavformat/{davs2.c => avs2dec.c} (100%) diff --git a/libavformat/Makefile b/libavformat/Makefile index cbb33fe37c..8587197f66 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -120,7 +120,7 @@ OBJS-$(CONFIG_AVI_MUXER) += avienc.o mpegtsenc.o avlanguage.o ra OBJS-$(CONFIG_AVM2_MUXER) += swfenc.o swf.o OBJS-$(CONFIG_AVR_DEMUXER) += avr.o pcm.o OBJS-$(CONFIG_AVS_DEMUXER) += avs.o voc_packet.o vocdec.o voc.o -OBJS-$(CONFIG_AVS2_DEMUXER) += davs2.o rawdec.o +OBJS-$(CONFIG_AVS2_DEMUXER) += avs2dec.o rawdec.o OBJS-$(CONFIG_AVS2_MUXER) += rawenc.o OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o diff --git a/libavformat/davs2.c b/libavformat/avs2dec.c similarity index 100% rename from libavformat/davs2.c rename to libavformat/avs2dec.c From patchwork Thu Aug 20 09:11:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 21767 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 43001449EDD for ; Thu, 20 Aug 2020 12:11:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2830B68B61C; Thu, 20 Aug 2020 12:11:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15112.mail.126.com (m15112.mail.126.com [220.181.15.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA16568B5F3 for ; Thu, 20 Aug 2020 12:11:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=M2gZu K1bF0GbmcQ5jBOeK8rVunKfFZYIQeQaHW5Ksn4=; b=RjwpL4i7JmCM8fBHseQWS kGeKIEPhVqMyn7n2leprBL8s7P4wnkyVyx4Brj9sRh80t6O2+90wRVq4SSC4l8wM URBQdajRxG+UYRqaRYavoHknvCbbGwFxX2vyhdaN3hNVlpfZzuYinrhWX1vbsGdb 2Fq6yWSc2R/pZX2Doyp0Vc= Received: from localhost.localdomain (unknown [111.34.131.254]) by smtp2 (Coremail) with SMTP id DMmowAD3Bfo2Pj5f1jALGg--.55551S4; Thu, 20 Aug 2020 17:11:23 +0800 (CST) From: hwrenx@126.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Aug 2020 17:11:07 +0800 Message-Id: <20200820091107.1035-3-hwrenx@126.com> X-Mailer: git-send-email 2.23.0.windows.1 In-Reply-To: <20200820091107.1035-1-hwrenx@126.com> References: =?unknown-8bit?b?POKAnDwyMDIwMDgyMDA3MDUxNS45MDUtMS1od3JlbnhA?= =?unknown-8bit?b?MTI2LmNvbT4=?= =?unknown-8bit?q?_=3C20200820091107=2E1035-1-hwrenx=40126=2Ecom=3E?= MIME-Version: 1.0 X-CM-TRANSID: DMmowAD3Bfo2Pj5f1jALGg--.55551S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ar47tw1xGFykJr13AF43Wrg_yoW8Wr4Dpa nrA34rGF1Iqa4xZws7tr18KFZ8GrZ7uFyjkFZxtw15KFsavr1DXFnIkrW8CrWIgr9FqFy3 Gws8u3WUJw1Ut3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07URbyZUUUUU= X-Originating-IP: [111.34.131.254] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiJBuG6VpEAfaL4gAAsQ Subject: [FFmpeg-devel] [PATCH v2 3/3] lavc/avs2_parser.c, lavf/avs2dec.c: fix code style 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 Cc: hwren Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: hwren Signed-off-by: hwren --- libavcodec/avs2_parser.c | 6 +++--- libavformat/avs2dec.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c index 02af08f079..54f687142f 100644 --- a/libavcodec/avs2_parser.c +++ b/libavcodec/avs2_parser.c @@ -34,9 +34,9 @@ static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_siz if (!pic_found) { for (; cur < buf_size; ++cur) { - state = (state<<8) | buf[cur]; + state = (state << 8) | buf[cur]; if (AVS2_ISUNIT(buf[cur])){ - ++cur; + cur++; pic_found = 1; break; } @@ -46,7 +46,7 @@ static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_siz if (pic_found) { if (!buf_size) return END_NOT_FOUND; - for (; cur < buf_size; ++cur) { + for (; cur < buf_size; cur++) { state = (state << 8) | buf[cur]; if ((state & 0xFFFFFF00) == 0x100 && state > AVS2_SLICE_MAX_START_CODE) { pc->frame_start_found = 0; diff --git a/libavformat/avs2dec.c b/libavformat/avs2dec.c index f8337ea500..51908d2b63 100644 --- a/libavformat/avs2dec.c +++ b/libavformat/avs2dec.c @@ -33,9 +33,9 @@ static int avs2_probe(const AVProbeData *p) { - uint32_t code= -1, hds=0, pic=0, seq=0; - uint8_t state=0; - const uint8_t *ptr = p->buf, *end = p->buf + p->buf_size, *sqb=0; + uint32_t code = -1, hds = 0, pic = 0, seq = 0; + uint8_t state = 0; + const uint8_t *ptr = p->buf, *end = p->buf + p->buf_size, *sqb = 0; if (AV_RB32(p->buf) != 0x1B0){ return 0; }