Re: [FFmpeg-devel] [PATCH v3 1/3] lavc/decode: Warp get_hw_config function

2022-09-07 Thread Mark Thompson 

On 07/09/2022 09:47, Xiang, Haihao wrote:

On Wed, 2022-08-31 at 01:20 +, Wang, Fei W wrote:

On Tue, 2022-08-23 at 16:19 +0800, Fei Wang wrote:

From: Linjie Fu 

Wrap the procedure of getting the hardware config from a pixel format
into a function.

Signed-off-by: Linjie Fu 
Signed-off-by: Fei Wang 
---
  libavcodec/decode.c | 31 +++
  1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 75373989c6..3b69426c09 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -1156,6 +1156,24 @@ static void hwaccel_uninit(AVCodecContext
*avctx)
  av_buffer_unref(>hw_frames_ctx);
  }
  
+static const AVCodecHWConfigInternal *get_hw_config(AVCodecContext

*avctx, enum AVPixelFormat fmt)
+{
+const AVCodecHWConfigInternal *hw_config;
+
+if (!ffcodec(avctx->codec)->hw_configs)
+return NULL;
+
+for (int i = 0;; i++) {
+hw_config = ffcodec(avctx->codec)->hw_configs[i];
+if (!hw_config)
+return NULL;
+if (hw_config->public.pix_fmt == fmt)
+return hw_config;
+}
+
+return NULL;
+}
+
  int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat
*fmt)
  {
  const AVPixFmtDescriptor *desc;
@@ -1213,18 +1231,7 @@ int ff_get_format(AVCodecContext *avctx, const
enum AVPixelFormat *fmt)
  break;
  }
  
-if (ffcodec(avctx->codec)->hw_configs) {

-for (i = 0;; i++) {
-hw_config = ffcodec(avctx->codec)->hw_configs[i];
-if (!hw_config)
-break;
-if (hw_config->public.pix_fmt == user_choice)
-break;
-}
-} else {
-hw_config = NULL;
-}
-
+hw_config = get_hw_config(avctx, user_choice);
  if (!hw_config) {
  // No config available, so no extra setup required.
  ret = user_choice;


Ping, any more comments on V3?



The patchset LGTM and works well for me, I'll apply this patchset if no more
comment.


See 
.

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH v3 1/3] lavc/decode: Warp get_hw_config function

2022-09-07 Thread Xiang, Haihao 
On Wed, 2022-08-31 at 01:20 +, Wang, Fei W wrote:
> On Tue, 2022-08-23 at 16:19 +0800, Fei Wang wrote:
> > From: Linjie Fu 
> > 
> > Wrap the procedure of getting the hardware config from a pixel format
> > into a function.
> > 
> > Signed-off-by: Linjie Fu 
> > Signed-off-by: Fei Wang 
> > ---
> >  libavcodec/decode.c | 31 +++
> >  1 file changed, 19 insertions(+), 12 deletions(-)
> > 
> > diff --git a/libavcodec/decode.c b/libavcodec/decode.c
> > index 75373989c6..3b69426c09 100644
> > --- a/libavcodec/decode.c
> > +++ b/libavcodec/decode.c
> > @@ -1156,6 +1156,24 @@ static void hwaccel_uninit(AVCodecContext
> > *avctx)
> >  av_buffer_unref(>hw_frames_ctx);
> >  }
> >  
> > +static const AVCodecHWConfigInternal *get_hw_config(AVCodecContext
> > *avctx, enum AVPixelFormat fmt)
> > +{
> > +const AVCodecHWConfigInternal *hw_config;
> > +
> > +if (!ffcodec(avctx->codec)->hw_configs)
> > +return NULL;
> > +
> > +for (int i = 0;; i++) {
> > +hw_config = ffcodec(avctx->codec)->hw_configs[i];
> > +if (!hw_config)
> > +return NULL;
> > +if (hw_config->public.pix_fmt == fmt)
> > +return hw_config;
> > +}
> > +
> > +return NULL;
> > +}
> > +
> >  int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat
> > *fmt)
> >  {
> >  const AVPixFmtDescriptor *desc;
> > @@ -1213,18 +1231,7 @@ int ff_get_format(AVCodecContext *avctx, const
> > enum AVPixelFormat *fmt)
> >  break;
> >  }
> >  
> > -if (ffcodec(avctx->codec)->hw_configs) {
> > -for (i = 0;; i++) {
> > -hw_config = ffcodec(avctx->codec)->hw_configs[i];
> > -if (!hw_config)
> > -break;
> > -if (hw_config->public.pix_fmt == user_choice)
> > -break;
> > -}
> > -} else {
> > -hw_config = NULL;
> > -}
> > -
> > +hw_config = get_hw_config(avctx, user_choice);
> >  if (!hw_config) {
> >  // No config available, so no extra setup required.
> >  ret = user_choice;
> 
> Ping, any more comments on V3?
> 

The patchset LGTM and works well for me, I'll apply this patchset if no more
comment.

-Haihao


___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH v3 1/3] lavc/decode: Warp get_hw_config function

2022-08-30 Thread Wang, Fei W 
On Tue, 2022-08-23 at 16:19 +0800, Fei Wang wrote:
> From: Linjie Fu 
> 
> Wrap the procedure of getting the hardware config from a pixel format
> into a function.
> 
> Signed-off-by: Linjie Fu 
> Signed-off-by: Fei Wang 
> ---
>  libavcodec/decode.c | 31 +++
>  1 file changed, 19 insertions(+), 12 deletions(-)
> 
> diff --git a/libavcodec/decode.c b/libavcodec/decode.c
> index 75373989c6..3b69426c09 100644
> --- a/libavcodec/decode.c
> +++ b/libavcodec/decode.c
> @@ -1156,6 +1156,24 @@ static void hwaccel_uninit(AVCodecContext
> *avctx)
>  av_buffer_unref(>hw_frames_ctx);
>  }
>  
> +static const AVCodecHWConfigInternal *get_hw_config(AVCodecContext
> *avctx, enum AVPixelFormat fmt)
> +{
> +const AVCodecHWConfigInternal *hw_config;
> +
> +if (!ffcodec(avctx->codec)->hw_configs)
> +return NULL;
> +
> +for (int i = 0;; i++) {
> +hw_config = ffcodec(avctx->codec)->hw_configs[i];
> +if (!hw_config)
> +return NULL;
> +if (hw_config->public.pix_fmt == fmt)
> +return hw_config;
> +}
> +
> +return NULL;
> +}
> +
>  int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat
> *fmt)
>  {
>  const AVPixFmtDescriptor *desc;
> @@ -1213,18 +1231,7 @@ int ff_get_format(AVCodecContext *avctx, const
> enum AVPixelFormat *fmt)
>  break;
>  }
>  
> -if (ffcodec(avctx->codec)->hw_configs) {
> -for (i = 0;; i++) {
> -hw_config = ffcodec(avctx->codec)->hw_configs[i];
> -if (!hw_config)
> -break;
> -if (hw_config->public.pix_fmt == user_choice)
> -break;
> -}
> -} else {
> -hw_config = NULL;
> -}
> -
> +hw_config = get_hw_config(avctx, user_choice);
>  if (!hw_config) {
>  // No config available, so no extra setup required.
>  ret = user_choice;

Ping, any more comments on V3?

Thanks
Fei

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH v3 1/3] lavc/decode: Warp get_hw_config function

2022-08-23 Thread Fei Wang 
From: Linjie Fu 

Wrap the procedure of getting the hardware config from a pixel format
into a function.

Signed-off-by: Linjie Fu 
Signed-off-by: Fei Wang 
---
 libavcodec/decode.c | 31 +++
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 75373989c6..3b69426c09 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -1156,6 +1156,24 @@ static void hwaccel_uninit(AVCodecContext *avctx)
 av_buffer_unref(>hw_frames_ctx);
 }
 
+static const AVCodecHWConfigInternal *get_hw_config(AVCodecContext *avctx, 
enum AVPixelFormat fmt)
+{
+const AVCodecHWConfigInternal *hw_config;
+
+if (!ffcodec(avctx->codec)->hw_configs)
+return NULL;
+
+for (int i = 0;; i++) {
+hw_config = ffcodec(avctx->codec)->hw_configs[i];
+if (!hw_config)
+return NULL;
+if (hw_config->public.pix_fmt == fmt)
+return hw_config;
+}
+
+return NULL;
+}
+
 int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt)
 {
 const AVPixFmtDescriptor *desc;
@@ -1213,18 +1231,7 @@ int ff_get_format(AVCodecContext *avctx, const enum 
AVPixelFormat *fmt)
 break;
 }
 
-if (ffcodec(avctx->codec)->hw_configs) {
-for (i = 0;; i++) {
-hw_config = ffcodec(avctx->codec)->hw_configs[i];
-if (!hw_config)
-break;
-if (hw_config->public.pix_fmt == user_choice)
-break;
-}
-} else {
-hw_config = NULL;
-}
-
+hw_config = get_hw_config(avctx, user_choice);
 if (!hw_config) {
 // No config available, so no extra setup required.
 ret = user_choice;
-- 
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-requ...@ffmpeg.org with subject "unsubscribe".