Message ID | 20220502033630.70383-3-mypopydev@gmail.com |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel,1/3] lavc/libuavs3d: fix incorrect comments | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
> On May 2, 2022, at 11:36 AM, Jun Zhao <mypopydev@gmail.com> wrote: > > From: Jun Zhao <barryjzhao@tencent.com> > > Enable the Guangdian profile support > > Signed-off-by: Jun Zhao <barryjzhao@tencent.com> > --- > libavformat/cavsvideodec.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c > index 1fa3aa5e92..437ad544d3 100644 > --- a/libavformat/cavsvideodec.c > +++ b/libavformat/cavsvideodec.c > @@ -29,6 +29,7 @@ > #define CAVS_PIC_PB_START_CODE 0x000001b6 > #define CAVS_VIDEO_EDIT_CODE 0x000001b7 > #define CAVS_PROFILE_JIZHUN 0x20 > +#define CAVS_PROFILE_GUANGDIAN 0x48 Maybe add a comment here that ‘GUANGDIAN' is broadcasting profile. > > static int cavsvideo_probe(const AVProbeData *p) > { > @@ -50,7 +51,7 @@ static int cavsvideo_probe(const AVProbeData *p) > if (code == CAVS_SEQ_START_CODE) { > seq++; > /* check for the only currently supported profile */ > - if (*ptr != CAVS_PROFILE_JIZHUN) > + if (*ptr != CAVS_PROFILE_JIZHUN && *ptr != CAVS_PROFILE_GUANGDIAN) > return 0; > } else if ((code == CAVS_PIC_I_START_CODE) || > (code == CAVS_PIC_PB_START_CODE)) { > @@ -66,4 +67,4 @@ static int cavsvideo_probe(const AVProbeData *p) > return 0; > } > > -FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, NULL, AV_CODEC_ID_CAVS) > +FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, "avs", AV_CODEC_ID_CAVS) > -- > 2.25.1 > > _______________________________________________ > 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".
On Mon, May 2, 2022 at 1:15 PM "zhilizhao(赵志立)" <quinkblack@foxmail.com> wrote: > > > > > On May 2, 2022, at 11:36 AM, Jun Zhao <mypopydev@gmail.com> wrote: > > > > From: Jun Zhao <barryjzhao@tencent.com> > > > > Enable the Guangdian profile support > > > > Signed-off-by: Jun Zhao <barryjzhao@tencent.com> > > --- > > libavformat/cavsvideodec.c | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c > > index 1fa3aa5e92..437ad544d3 100644 > > --- a/libavformat/cavsvideodec.c > > +++ b/libavformat/cavsvideodec.c > > @@ -29,6 +29,7 @@ > > #define CAVS_PIC_PB_START_CODE 0x000001b6 > > #define CAVS_VIDEO_EDIT_CODE 0x000001b7 > > #define CAVS_PROFILE_JIZHUN 0x20 > > +#define CAVS_PROFILE_GUANGDIAN 0x48 > > Maybe add a comment here that ‘GUANGDIAN' is broadcasting profile. > Applied the patchset and add the comment, thx > > > > static int cavsvideo_probe(const AVProbeData *p) > > { > > @@ -50,7 +51,7 @@ static int cavsvideo_probe(const AVProbeData *p) > > if (code == CAVS_SEQ_START_CODE) { > > seq++; > > /* check for the only currently supported profile */ > > - if (*ptr != CAVS_PROFILE_JIZHUN) > > + if (*ptr != CAVS_PROFILE_JIZHUN && *ptr != CAVS_PROFILE_GUANGDIAN) > > return 0; > > } else if ((code == CAVS_PIC_I_START_CODE) || > > (code == CAVS_PIC_PB_START_CODE)) { > > @@ -66,4 +67,4 @@ static int cavsvideo_probe(const AVProbeData *p) > > return 0; > > } > > > > -FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, NULL, AV_CODEC_ID_CAVS) > > +FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, "avs", AV_CODEC_ID_CAVS) > > -- > > 2.25.1
diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c index 1fa3aa5e92..437ad544d3 100644 --- a/libavformat/cavsvideodec.c +++ b/libavformat/cavsvideodec.c @@ -29,6 +29,7 @@ #define CAVS_PIC_PB_START_CODE 0x000001b6 #define CAVS_VIDEO_EDIT_CODE 0x000001b7 #define CAVS_PROFILE_JIZHUN 0x20 +#define CAVS_PROFILE_GUANGDIAN 0x48 static int cavsvideo_probe(const AVProbeData *p) { @@ -50,7 +51,7 @@ static int cavsvideo_probe(const AVProbeData *p) if (code == CAVS_SEQ_START_CODE) { seq++; /* check for the only currently supported profile */ - if (*ptr != CAVS_PROFILE_JIZHUN) + if (*ptr != CAVS_PROFILE_JIZHUN && *ptr != CAVS_PROFILE_GUANGDIAN) return 0; } else if ((code == CAVS_PIC_I_START_CODE) || (code == CAVS_PIC_PB_START_CODE)) { @@ -66,4 +67,4 @@ static int cavsvideo_probe(const AVProbeData *p) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, NULL, AV_CODEC_ID_CAVS) +FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, "avs", AV_CODEC_ID_CAVS)