diff mbox

[FFmpeg-devel] avfilter/vf_dnn_processing: correct duplicate statement

Message ID 1573185310-131042-1-git-send-email-leozhang@qiyi.com
State Accepted
Commit c79307b7de9c562c10d45eda2ac58d5d5262e666
Headers show

Commit Message

leozhang Nov. 8, 2019, 3:55 a.m. UTC 
Signed-off-by: leozhang <leozhang@qiyi.com>
---
 libavfilter/vf_dnn_processing.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Guo, Yejun Nov. 8, 2019, 4:34 a.m. UTC | #1 
> -----Original Message-----

> From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On Behalf Of

> leozhang

> Sent: Friday, November 08, 2019 11:55 AM

> To: ffmpeg-devel@ffmpeg.org

> Subject: [FFmpeg-devel] [PATCH] avfilter/vf_dnn_processing: correct duplicate

> statement

> 

> Signed-off-by: leozhang <leozhang@qiyi.com>

> ---

>  libavfilter/vf_dnn_processing.c | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c

> index 87ad354..e119f4d 100644

> --- a/libavfilter/vf_dnn_processing.c

> +++ b/libavfilter/vf_dnn_processing.c

> @@ -204,7 +204,7 @@ static int config_output(AVFilterLink *outlink)

>  static int copy_from_frame_to_dnn(DNNData *dnn_data, const AVFrame *in)

>  {

>      // extend this function to support more formats

> -    av_assert0(in->format == AV_PIX_FMT_RGB24 || in->format ==

> AV_PIX_FMT_RGB24);

> +    av_assert0(in->format == AV_PIX_FMT_RGB24 || in->format ==

> AV_PIX_FMT_BGR24);

> 

>      if (dnn_data->dt == DNN_FLOAT) {

>          float *dnn_input = dnn_data->data;

> @@ -233,7 +233,7 @@ static int copy_from_frame_to_dnn(DNNData

> *dnn_data, const AVFrame *in)

>  static int copy_from_dnn_to_frame(AVFrame *out, const DNNData

> *dnn_data)

>  {

>      // extend this function to support more formats

> -    av_assert0(out->format == AV_PIX_FMT_RGB24 || out->format ==

> AV_PIX_FMT_RGB24);

> +    av_assert0(out->format == AV_PIX_FMT_RGB24 || out->format ==

> AV_PIX_FMT_BGR24);

> 

>      if (dnn_data->dt == DNN_FLOAT) {

>          float *dnn_output = dnn_data->data;

> --


yes, thanks for the catch.

> 1.8.3.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".
Michael Niedermayer Nov. 8, 2019, 2:56 p.m. UTC | #2 
On Fri, Nov 08, 2019 at 04:34:01AM +0000, Guo, Yejun wrote:
> 
> 
> > -----Original Message-----
> > From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On Behalf Of
> > leozhang
> > Sent: Friday, November 08, 2019 11:55 AM
> > To: ffmpeg-devel@ffmpeg.org
> > Subject: [FFmpeg-devel] [PATCH] avfilter/vf_dnn_processing: correct duplicate
> > statement
> > 
> > Signed-off-by: leozhang <leozhang@qiyi.com>
> > ---
> >  libavfilter/vf_dnn_processing.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c
> > index 87ad354..e119f4d 100644
> > --- a/libavfilter/vf_dnn_processing.c
> > +++ b/libavfilter/vf_dnn_processing.c
> > @@ -204,7 +204,7 @@ static int config_output(AVFilterLink *outlink)
> >  static int copy_from_frame_to_dnn(DNNData *dnn_data, const AVFrame *in)
> >  {
> >      // extend this function to support more formats
> > -    av_assert0(in->format == AV_PIX_FMT_RGB24 || in->format ==
> > AV_PIX_FMT_RGB24);
> > +    av_assert0(in->format == AV_PIX_FMT_RGB24 || in->format ==
> > AV_PIX_FMT_BGR24);
> > 
> >      if (dnn_data->dt == DNN_FLOAT) {
> >          float *dnn_input = dnn_data->data;
> > @@ -233,7 +233,7 @@ static int copy_from_frame_to_dnn(DNNData
> > *dnn_data, const AVFrame *in)
> >  static int copy_from_dnn_to_frame(AVFrame *out, const DNNData
> > *dnn_data)
> >  {
> >      // extend this function to support more formats
> > -    av_assert0(out->format == AV_PIX_FMT_RGB24 || out->format ==
> > AV_PIX_FMT_RGB24);
> > +    av_assert0(out->format == AV_PIX_FMT_RGB24 || out->format ==
> > AV_PIX_FMT_BGR24);
> > 
> >      if (dnn_data->dt == DNN_FLOAT) {
> >          float *dnn_output = dnn_data->data;
> > --
> 
> yes, thanks for the catch.

applied

thx

[...]
diff mbox

Patch

diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c
index 87ad354..e119f4d 100644
--- a/libavfilter/vf_dnn_processing.c
+++ b/libavfilter/vf_dnn_processing.c
@@ -204,7 +204,7 @@  static int config_output(AVFilterLink *outlink)
 static int copy_from_frame_to_dnn(DNNData *dnn_data, const AVFrame *in)
 {
     // extend this function to support more formats
-    av_assert0(in->format == AV_PIX_FMT_RGB24 || in->format == AV_PIX_FMT_RGB24);
+    av_assert0(in->format == AV_PIX_FMT_RGB24 || in->format == AV_PIX_FMT_BGR24);
 
     if (dnn_data->dt == DNN_FLOAT) {
         float *dnn_input = dnn_data->data;
@@ -233,7 +233,7 @@  static int copy_from_frame_to_dnn(DNNData *dnn_data, const AVFrame *in)
 static int copy_from_dnn_to_frame(AVFrame *out, const DNNData *dnn_data)
 {
     // extend this function to support more formats
-    av_assert0(out->format == AV_PIX_FMT_RGB24 || out->format == AV_PIX_FMT_RGB24);
+    av_assert0(out->format == AV_PIX_FMT_RGB24 || out->format == AV_PIX_FMT_BGR24);
 
     if (dnn_data->dt == DNN_FLOAT) {
         float *dnn_output = dnn_data->data;