Re: [FFmpeg-devel] [PATCH v2 1/2] libavutil/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC

[Matthieu Bouron]

On Mon, Dec 11, 2017 at 01:27:51PM +0100, Matthieu Bouron wrote:
> On Mon, Dec 04, 2017 at 02:50:22PM +0100, Matthieu Bouron wrote:
> 
> [...]
> 
> > 
> > It works but output the following error:
> > 
> > Invalid setup for format mediacodec: does not match the type of the 
> > provided device context.
> > Invalid return from get_format(): mediacodec not in possible list.
> > 
> > avctx->get_format is set to a function that returns AV_PIX_FMT_MEDIACODEC.
> 
> New patch attached including the 2 fixes posted in my previous emails.
> 
> Regards,
> 
> --
> Matthieu B.

> From aacfb16369f4e49d67c3e8bd2528b1ebeec80d96 Mon Sep 17 00:00:00 2001
> From: Aman Gupta 
> Date: Sun, 3 Dec 2017 17:32:21 -0800
> Subject: [PATCH 1/2] libavutil/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC
> 
> Signed-off-by: Matthieu Bouron 
> ---
>  libavutil/Makefile   |  2 ++
>  libavutil/hwcontext.c|  4 
>  libavutil/hwcontext.h|  1 +
>  libavutil/hwcontext_internal.h   |  1 +
>  libavutil/hwcontext_mediacodec.c | 50 
> 
>  libavutil/hwcontext_mediacodec.h | 36 +
>  6 files changed, 94 insertions(+)
>  create mode 100644 libavutil/hwcontext_mediacodec.c
>  create mode 100644 libavutil/hwcontext_mediacodec.h
> 
> diff --git a/libavutil/Makefile b/libavutil/Makefile
> index 721784086c..66b894d66e 100644
> --- a/libavutil/Makefile
> +++ b/libavutil/Makefile
> @@ -37,6 +37,7 @@ HEADERS = adler32.h 
> \
>hwcontext_drm.h   \
>hwcontext_dxva2.h \
>hwcontext_qsv.h   \
> +  hwcontext_mediacodec.h\
>hwcontext_vaapi.h \
>hwcontext_videotoolbox.h  \
>hwcontext_vdpau.h \
> @@ -166,6 +167,7 @@ OBJS-$(CONFIG_OPENCL)   += 
> hwcontext_opencl.o
>  OBJS-$(CONFIG_VAAPI)+= hwcontext_vaapi.o
>  OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o
>  OBJS-$(CONFIG_VDPAU)+= hwcontext_vdpau.o
> +OBJS-$(CONFIG_MEDIACODEC)   += hwcontext_mediacodec.o
>  
>  OBJS += $(COMPAT_OBJS:%=../compat/%)
>  
> diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
> index f47158f811..31ac12807b 100644
> --- a/libavutil/hwcontext.c
> +++ b/libavutil/hwcontext.c
> @@ -55,6 +55,9 @@ static const HWContextType * const hw_table[] = {
>  #endif
>  #if CONFIG_VIDEOTOOLBOX
>  _hwcontext_type_videotoolbox,
> +#endif
> +#if CONFIG_MEDIACODEC
> +_hwcontext_type_mediacodec,
>  #endif
>  NULL,
>  };
> @@ -69,6 +72,7 @@ static const char *const hw_type_names[] = {
>  [AV_HWDEVICE_TYPE_VAAPI]  = "vaapi",
>  [AV_HWDEVICE_TYPE_VDPAU]  = "vdpau",
>  [AV_HWDEVICE_TYPE_VIDEOTOOLBOX] = "videotoolbox",
> +[AV_HWDEVICE_TYPE_MEDIACODEC] = "mediacodec",
>  };
>  
>  enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name)
> diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
> index 8d27b987df..f5a4b62387 100644
> --- a/libavutil/hwcontext.h
> +++ b/libavutil/hwcontext.h
> @@ -35,6 +35,7 @@ enum AVHWDeviceType {
>  AV_HWDEVICE_TYPE_D3D11VA,
>  AV_HWDEVICE_TYPE_DRM,
>  AV_HWDEVICE_TYPE_OPENCL,
> +AV_HWDEVICE_TYPE_MEDIACODEC,
>  };
>  
>  typedef struct AVHWDeviceInternal AVHWDeviceInternal;
> diff --git a/libavutil/hwcontext_internal.h b/libavutil/hwcontext_internal.h
> index 28ff0f9ee6..332062ddaa 100644
> --- a/libavutil/hwcontext_internal.h
> +++ b/libavutil/hwcontext_internal.h
> @@ -166,5 +166,6 @@ extern const HWContextType ff_hwcontext_type_qsv;
>  extern const HWContextType ff_hwcontext_type_vaapi;
>  extern const HWContextType ff_hwcontext_type_vdpau;
>  extern const HWContextType ff_hwcontext_type_videotoolbox;
> +extern const HWContextType ff_hwcontext_type_mediacodec;
>  
>  #endif /* AVUTIL_HWCONTEXT_INTERNAL_H */
> diff --git a/libavutil/hwcontext_mediacodec.c 
> b/libavutil/hwcontext_mediacodec.c
> new file mode 100644
> index 00..b0d8993e15
> --- /dev/null
> +++ b/libavutil/hwcontext_mediacodec.c
> @@ -0,0 +1,50 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public 

Re: [FFmpeg-devel] [PATCH v2 1/2] libavutil/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC

[Matthieu Bouron]

On Mon, Dec 04, 2017 at 02:50:22PM +0100, Matthieu Bouron wrote:

[...]

> 
> It works but output the following error:
> 
> Invalid setup for format mediacodec: does not match the type of the provided 
> device context.
> Invalid return from get_format(): mediacodec not in possible list.
> 
> avctx->get_format is set to a function that returns AV_PIX_FMT_MEDIACODEC.

New patch attached including the 2 fixes posted in my previous emails.

Regards,

--
Matthieu B.
>From aacfb16369f4e49d67c3e8bd2528b1ebeec80d96 Mon Sep 17 00:00:00 2001
From: Aman Gupta 
Date: Sun, 3 Dec 2017 17:32:21 -0800
Subject: [PATCH 1/2] libavutil/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC

Signed-off-by: Matthieu Bouron 
---
 libavutil/Makefile   |  2 ++
 libavutil/hwcontext.c|  4 
 libavutil/hwcontext.h|  1 +
 libavutil/hwcontext_internal.h   |  1 +
 libavutil/hwcontext_mediacodec.c | 50 
 libavutil/hwcontext_mediacodec.h | 36 +
 6 files changed, 94 insertions(+)
 create mode 100644 libavutil/hwcontext_mediacodec.c
 create mode 100644 libavutil/hwcontext_mediacodec.h

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 721784086c..66b894d66e 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -37,6 +37,7 @@ HEADERS = adler32.h   
  \
   hwcontext_drm.h   \
   hwcontext_dxva2.h \
   hwcontext_qsv.h   \
+  hwcontext_mediacodec.h\
   hwcontext_vaapi.h \
   hwcontext_videotoolbox.h  \
   hwcontext_vdpau.h \
@@ -166,6 +167,7 @@ OBJS-$(CONFIG_OPENCL)   += 
hwcontext_opencl.o
 OBJS-$(CONFIG_VAAPI)+= hwcontext_vaapi.o
 OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o
 OBJS-$(CONFIG_VDPAU)+= hwcontext_vdpau.o
+OBJS-$(CONFIG_MEDIACODEC)   += hwcontext_mediacodec.o
 
 OBJS += $(COMPAT_OBJS:%=../compat/%)
 
diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
index f47158f811..31ac12807b 100644
--- a/libavutil/hwcontext.c
+++ b/libavutil/hwcontext.c
@@ -55,6 +55,9 @@ static const HWContextType * const hw_table[] = {
 #endif
 #if CONFIG_VIDEOTOOLBOX
 _hwcontext_type_videotoolbox,
+#endif
+#if CONFIG_MEDIACODEC
+_hwcontext_type_mediacodec,
 #endif
 NULL,
 };
@@ -69,6 +72,7 @@ static const char *const hw_type_names[] = {
 [AV_HWDEVICE_TYPE_VAAPI]  = "vaapi",
 [AV_HWDEVICE_TYPE_VDPAU]  = "vdpau",
 [AV_HWDEVICE_TYPE_VIDEOTOOLBOX] = "videotoolbox",
+[AV_HWDEVICE_TYPE_MEDIACODEC] = "mediacodec",
 };
 
 enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name)
diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
index 8d27b987df..f5a4b62387 100644
--- a/libavutil/hwcontext.h
+++ b/libavutil/hwcontext.h
@@ -35,6 +35,7 @@ enum AVHWDeviceType {
 AV_HWDEVICE_TYPE_D3D11VA,
 AV_HWDEVICE_TYPE_DRM,
 AV_HWDEVICE_TYPE_OPENCL,
+AV_HWDEVICE_TYPE_MEDIACODEC,
 };
 
 typedef struct AVHWDeviceInternal AVHWDeviceInternal;
diff --git a/libavutil/hwcontext_internal.h b/libavutil/hwcontext_internal.h
index 28ff0f9ee6..332062ddaa 100644
--- a/libavutil/hwcontext_internal.h
+++ b/libavutil/hwcontext_internal.h
@@ -166,5 +166,6 @@ extern const HWContextType ff_hwcontext_type_qsv;
 extern const HWContextType ff_hwcontext_type_vaapi;
 extern const HWContextType ff_hwcontext_type_vdpau;
 extern const HWContextType ff_hwcontext_type_videotoolbox;
+extern const HWContextType ff_hwcontext_type_mediacodec;
 
 #endif /* AVUTIL_HWCONTEXT_INTERNAL_H */
diff --git a/libavutil/hwcontext_mediacodec.c b/libavutil/hwcontext_mediacodec.c
new file mode 100644
index 00..b0d8993e15
--- /dev/null
+++ b/libavutil/hwcontext_mediacodec.c
@@ -0,0 +1,50 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#include "buffer.h"
+#include "common.h"

Re: [FFmpeg-devel] [PATCH v2 1/2] libavutil/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC

[Matthieu Bouron]

On Mon, Dec 04, 2017 at 12:45:45PM +0100, Matthieu Bouron wrote:
> On Mon, Dec 04, 2017 at 11:52:44AM +0100, Matthieu Bouron wrote:
> > On Mon, Dec 04, 2017 at 11:19:52AM +0100, Matthieu Bouron wrote:
> > > On Sun, Dec 03, 2017 at 05:32:21PM -0800, Aman Gupta wrote:
> > > > From: Aman Gupta 
> > > > 
> > > > ---
> > > >  libavutil/Makefile   |  1 +
> > > >  libavutil/hwcontext.c|  4 
> > > >  libavutil/hwcontext.h|  1 +
> > > >  libavutil/hwcontext_mediacodec.c | 50 
> > > > 
> > > >  libavutil/hwcontext_mediacodec.h | 36 +
> > > >  5 files changed, 92 insertions(+)
> > > >  create mode 100644 libavutil/hwcontext_mediacodec.c
> > > >  create mode 100644 libavutil/hwcontext_mediacodec.h
> > > > 
> > > > diff --git a/libavutil/Makefile b/libavutil/Makefile
> > > > index 721784086c..0b73a14f0b 100644
> > > > --- a/libavutil/Makefile
> > > > +++ b/libavutil/Makefile
> > > > @@ -166,6 +166,7 @@ OBJS-$(CONFIG_OPENCL)   += 
> > > > hwcontext_opencl.o
> > > >  OBJS-$(CONFIG_VAAPI)+= hwcontext_vaapi.o
> > > >  OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o
> > > >  OBJS-$(CONFIG_VDPAU)+= hwcontext_vdpau.o
> > > > +OBJS-$(CONFIG_MEDIACODEC)   += hwcontext_mediacodec.o
> > > >  
> > > >  OBJS += $(COMPAT_OBJS:%=../compat/%)
> > > >  
> > > > diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
> > > > index f47158f811..31ac12807b 100644
> > > > --- a/libavutil/hwcontext.c
> > > > +++ b/libavutil/hwcontext.c
> > > > @@ -56,6 +56,9 @@ static const HWContextType * const hw_table[] = {
> > > >  #if CONFIG_VIDEOTOOLBOX
> > > >  _hwcontext_type_videotoolbox,
> > > >  #endif
> > > > +#if CONFIG_MEDIACODEC
> > > > +_hwcontext_type_mediacodec,
> > > > +#endif
> > > >  NULL,
> > > >  };
> > > >  
> > > > @@ -69,6 +72,7 @@ static const char *const hw_type_names[] = {
> > > >  [AV_HWDEVICE_TYPE_VAAPI]  = "vaapi",
> > > >  [AV_HWDEVICE_TYPE_VDPAU]  = "vdpau",
> > > >  [AV_HWDEVICE_TYPE_VIDEOTOOLBOX] = "videotoolbox",
> > > > +[AV_HWDEVICE_TYPE_MEDIACODEC] = "mediacodec",
> > > >  };
> > > >  
> > > >  enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name)
> > > > diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
> > > > index 8d27b987df..f5a4b62387 100644
> > > > --- a/libavutil/hwcontext.h
> > > > +++ b/libavutil/hwcontext.h
> > > > @@ -35,6 +35,7 @@ enum AVHWDeviceType {
> > > >  AV_HWDEVICE_TYPE_D3D11VA,
> > > >  AV_HWDEVICE_TYPE_DRM,
> > > >  AV_HWDEVICE_TYPE_OPENCL,
> > > > +AV_HWDEVICE_TYPE_MEDIACODEC,
> > > >  };
> > > >  
> > > >  typedef struct AVHWDeviceInternal AVHWDeviceInternal;
> > > > diff --git a/libavutil/hwcontext_mediacodec.c 
> > > > b/libavutil/hwcontext_mediacodec.c
> > > > new file mode 100644
> > > > index 00..b0d8993e15
> > > > --- /dev/null
> > > > +++ b/libavutil/hwcontext_mediacodec.c
> > > > @@ -0,0 +1,50 @@
> > > > +/*
> > > > + * This file is part of FFmpeg.
> > > > + *
> > > > + * FFmpeg is free software; you can redistribute it and/or
> > > > + * modify it under the terms of the GNU Lesser General Public
> > > > + * License as published by the Free Software Foundation; either
> > > > + * version 2.1 of the License, or (at your option) any later version.
> > > > + *
> > > > + * FFmpeg is distributed in the hope that it will be useful,
> > > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > > > + * Lesser General Public License for more details.
> > > > + *
> > > > + * You should have received a copy of the GNU Lesser General Public
> > > > + * License along with FFmpeg; if not, write to the Free Software
> > > > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 
> > > > 02110-1301 USA
> > > > + */
> > > > +
> > > > +#include "config.h"
> > > > +
> > > > +#include "buffer.h"
> > > > +#include "common.h"
> > > > +#include "hwcontext.h"
> > > > +#include "hwcontext_internal.h"
> > > > +#include "hwcontext_mediacodec.h"
> > > > +
> > > > +static int mc_device_create(AVHWDeviceContext *ctx, const char *device,
> > > > +AVDictionary *opts, int flags)
> > > > +{
> > > > +if (device && device[0]) {
> > > > +av_log(ctx, AV_LOG_ERROR, "Device selection unsupported.\n");
> > > > +return AVERROR_UNKNOWN;
> > > > +}
> > > > +
> > > > +return 0;
> > > > +}
> > > > +
> > > > +const HWContextType ff_hwcontext_type_mediacodec = {
> > > > +.type = AV_HWDEVICE_TYPE_MEDIACODEC,
> > > > +.name = "mediacodec",
> > > > +
> > > > +.device_hwctx_size= sizeof(AVMediaCodecDeviceContext),
> > > > +
> > > > +.device_create= mc_device_create,
> > > > +
> > > > +.pix_fmts = (const enum AVPixelFormat[]){
> > > 

Re: [FFmpeg-devel] [PATCH v2 1/2] libavutil/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC

[Matthieu Bouron]

On Mon, Dec 04, 2017 at 11:52:44AM +0100, Matthieu Bouron wrote:
> On Mon, Dec 04, 2017 at 11:19:52AM +0100, Matthieu Bouron wrote:
> > On Sun, Dec 03, 2017 at 05:32:21PM -0800, Aman Gupta wrote:
> > > From: Aman Gupta 
> > > 
> > > ---
> > >  libavutil/Makefile   |  1 +
> > >  libavutil/hwcontext.c|  4 
> > >  libavutil/hwcontext.h|  1 +
> > >  libavutil/hwcontext_mediacodec.c | 50 
> > > 
> > >  libavutil/hwcontext_mediacodec.h | 36 +
> > >  5 files changed, 92 insertions(+)
> > >  create mode 100644 libavutil/hwcontext_mediacodec.c
> > >  create mode 100644 libavutil/hwcontext_mediacodec.h
> > > 
> > > diff --git a/libavutil/Makefile b/libavutil/Makefile
> > > index 721784086c..0b73a14f0b 100644
> > > --- a/libavutil/Makefile
> > > +++ b/libavutil/Makefile
> > > @@ -166,6 +166,7 @@ OBJS-$(CONFIG_OPENCL)   += 
> > > hwcontext_opencl.o
> > >  OBJS-$(CONFIG_VAAPI)+= hwcontext_vaapi.o
> > >  OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o
> > >  OBJS-$(CONFIG_VDPAU)+= hwcontext_vdpau.o
> > > +OBJS-$(CONFIG_MEDIACODEC)   += hwcontext_mediacodec.o
> > >  
> > >  OBJS += $(COMPAT_OBJS:%=../compat/%)
> > >  
> > > diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
> > > index f47158f811..31ac12807b 100644
> > > --- a/libavutil/hwcontext.c
> > > +++ b/libavutil/hwcontext.c
> > > @@ -56,6 +56,9 @@ static const HWContextType * const hw_table[] = {
> > >  #if CONFIG_VIDEOTOOLBOX
> > >  _hwcontext_type_videotoolbox,
> > >  #endif
> > > +#if CONFIG_MEDIACODEC
> > > +_hwcontext_type_mediacodec,
> > > +#endif
> > >  NULL,
> > >  };
> > >  
> > > @@ -69,6 +72,7 @@ static const char *const hw_type_names[] = {
> > >  [AV_HWDEVICE_TYPE_VAAPI]  = "vaapi",
> > >  [AV_HWDEVICE_TYPE_VDPAU]  = "vdpau",
> > >  [AV_HWDEVICE_TYPE_VIDEOTOOLBOX] = "videotoolbox",
> > > +[AV_HWDEVICE_TYPE_MEDIACODEC] = "mediacodec",
> > >  };
> > >  
> > >  enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name)
> > > diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
> > > index 8d27b987df..f5a4b62387 100644
> > > --- a/libavutil/hwcontext.h
> > > +++ b/libavutil/hwcontext.h
> > > @@ -35,6 +35,7 @@ enum AVHWDeviceType {
> > >  AV_HWDEVICE_TYPE_D3D11VA,
> > >  AV_HWDEVICE_TYPE_DRM,
> > >  AV_HWDEVICE_TYPE_OPENCL,
> > > +AV_HWDEVICE_TYPE_MEDIACODEC,
> > >  };
> > >  
> > >  typedef struct AVHWDeviceInternal AVHWDeviceInternal;
> > > diff --git a/libavutil/hwcontext_mediacodec.c 
> > > b/libavutil/hwcontext_mediacodec.c
> > > new file mode 100644
> > > index 00..b0d8993e15
> > > --- /dev/null
> > > +++ b/libavutil/hwcontext_mediacodec.c
> > > @@ -0,0 +1,50 @@
> > > +/*
> > > + * This file is part of FFmpeg.
> > > + *
> > > + * FFmpeg is free software; you can redistribute it and/or
> > > + * modify it under the terms of the GNU Lesser General Public
> > > + * License as published by the Free Software Foundation; either
> > > + * version 2.1 of the License, or (at your option) any later version.
> > > + *
> > > + * FFmpeg is distributed in the hope that it will be useful,
> > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > > + * Lesser General Public License for more details.
> > > + *
> > > + * You should have received a copy of the GNU Lesser General Public
> > > + * License along with FFmpeg; if not, write to the Free Software
> > > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 
> > > 02110-1301 USA
> > > + */
> > > +
> > > +#include "config.h"
> > > +
> > > +#include "buffer.h"
> > > +#include "common.h"
> > > +#include "hwcontext.h"
> > > +#include "hwcontext_internal.h"
> > > +#include "hwcontext_mediacodec.h"
> > > +
> > > +static int mc_device_create(AVHWDeviceContext *ctx, const char *device,
> > > +AVDictionary *opts, int flags)
> > > +{
> > > +if (device && device[0]) {
> > > +av_log(ctx, AV_LOG_ERROR, "Device selection unsupported.\n");
> > > +return AVERROR_UNKNOWN;
> > > +}
> > > +
> > > +return 0;
> > > +}
> > > +
> > > +const HWContextType ff_hwcontext_type_mediacodec = {
> > > +.type = AV_HWDEVICE_TYPE_MEDIACODEC,
> > > +.name = "mediacodec",
> > > +
> > > +.device_hwctx_size= sizeof(AVMediaCodecDeviceContext),
> > > +
> > > +.device_create= mc_device_create,
> > > +
> > > +.pix_fmts = (const enum AVPixelFormat[]){
> > > +AV_PIX_FMT_MEDIACODEC,
> > > +AV_PIX_FMT_NONE
> > > +},
> > > +};
> > > diff --git a/libavutil/hwcontext_mediacodec.h 
> > > b/libavutil/hwcontext_mediacodec.h
> > > new file mode 100644
> > > index 00..101a9806d5
> > > --- /dev/null
> > > +++ 

Re: [FFmpeg-devel] [PATCH v2 1/2] libavutil/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC

[Matthieu Bouron]

On Mon, Dec 04, 2017 at 11:19:52AM +0100, Matthieu Bouron wrote:
> On Sun, Dec 03, 2017 at 05:32:21PM -0800, Aman Gupta wrote:
> > From: Aman Gupta 
> > 
> > ---
> >  libavutil/Makefile   |  1 +
> >  libavutil/hwcontext.c|  4 
> >  libavutil/hwcontext.h|  1 +
> >  libavutil/hwcontext_mediacodec.c | 50 
> > 
> >  libavutil/hwcontext_mediacodec.h | 36 +
> >  5 files changed, 92 insertions(+)
> >  create mode 100644 libavutil/hwcontext_mediacodec.c
> >  create mode 100644 libavutil/hwcontext_mediacodec.h
> > 
> > diff --git a/libavutil/Makefile b/libavutil/Makefile
> > index 721784086c..0b73a14f0b 100644
> > --- a/libavutil/Makefile
> > +++ b/libavutil/Makefile
> > @@ -166,6 +166,7 @@ OBJS-$(CONFIG_OPENCL)   += 
> > hwcontext_opencl.o
> >  OBJS-$(CONFIG_VAAPI)+= hwcontext_vaapi.o
> >  OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o
> >  OBJS-$(CONFIG_VDPAU)+= hwcontext_vdpau.o
> > +OBJS-$(CONFIG_MEDIACODEC)   += hwcontext_mediacodec.o
> >  
> >  OBJS += $(COMPAT_OBJS:%=../compat/%)
> >  
> > diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
> > index f47158f811..31ac12807b 100644
> > --- a/libavutil/hwcontext.c
> > +++ b/libavutil/hwcontext.c
> > @@ -56,6 +56,9 @@ static const HWContextType * const hw_table[] = {
> >  #if CONFIG_VIDEOTOOLBOX
> >  _hwcontext_type_videotoolbox,
> >  #endif
> > +#if CONFIG_MEDIACODEC
> > +_hwcontext_type_mediacodec,
> > +#endif
> >  NULL,
> >  };
> >  
> > @@ -69,6 +72,7 @@ static const char *const hw_type_names[] = {
> >  [AV_HWDEVICE_TYPE_VAAPI]  = "vaapi",
> >  [AV_HWDEVICE_TYPE_VDPAU]  = "vdpau",
> >  [AV_HWDEVICE_TYPE_VIDEOTOOLBOX] = "videotoolbox",
> > +[AV_HWDEVICE_TYPE_MEDIACODEC] = "mediacodec",
> >  };
> >  
> >  enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name)
> > diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
> > index 8d27b987df..f5a4b62387 100644
> > --- a/libavutil/hwcontext.h
> > +++ b/libavutil/hwcontext.h
> > @@ -35,6 +35,7 @@ enum AVHWDeviceType {
> >  AV_HWDEVICE_TYPE_D3D11VA,
> >  AV_HWDEVICE_TYPE_DRM,
> >  AV_HWDEVICE_TYPE_OPENCL,
> > +AV_HWDEVICE_TYPE_MEDIACODEC,
> >  };
> >  
> >  typedef struct AVHWDeviceInternal AVHWDeviceInternal;
> > diff --git a/libavutil/hwcontext_mediacodec.c 
> > b/libavutil/hwcontext_mediacodec.c
> > new file mode 100644
> > index 00..b0d8993e15
> > --- /dev/null
> > +++ b/libavutil/hwcontext_mediacodec.c
> > @@ -0,0 +1,50 @@
> > +/*
> > + * This file is part of FFmpeg.
> > + *
> > + * FFmpeg is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU Lesser General Public
> > + * License as published by the Free Software Foundation; either
> > + * version 2.1 of the License, or (at your option) any later version.
> > + *
> > + * FFmpeg is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > + * Lesser General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU Lesser General Public
> > + * License along with FFmpeg; if not, write to the Free Software
> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 
> > 02110-1301 USA
> > + */
> > +
> > +#include "config.h"
> > +
> > +#include "buffer.h"
> > +#include "common.h"
> > +#include "hwcontext.h"
> > +#include "hwcontext_internal.h"
> > +#include "hwcontext_mediacodec.h"
> > +
> > +static int mc_device_create(AVHWDeviceContext *ctx, const char *device,
> > +AVDictionary *opts, int flags)
> > +{
> > +if (device && device[0]) {
> > +av_log(ctx, AV_LOG_ERROR, "Device selection unsupported.\n");
> > +return AVERROR_UNKNOWN;
> > +}
> > +
> > +return 0;
> > +}
> > +
> > +const HWContextType ff_hwcontext_type_mediacodec = {
> > +.type = AV_HWDEVICE_TYPE_MEDIACODEC,
> > +.name = "mediacodec",
> > +
> > +.device_hwctx_size= sizeof(AVMediaCodecDeviceContext),
> > +
> > +.device_create= mc_device_create,
> > +
> > +.pix_fmts = (const enum AVPixelFormat[]){
> > +AV_PIX_FMT_MEDIACODEC,
> > +AV_PIX_FMT_NONE
> > +},
> > +};
> > diff --git a/libavutil/hwcontext_mediacodec.h 
> > b/libavutil/hwcontext_mediacodec.h
> > new file mode 100644
> > index 00..101a9806d5
> > --- /dev/null
> > +++ b/libavutil/hwcontext_mediacodec.h
> > @@ -0,0 +1,36 @@
> > +/*
> > + * This file is part of FFmpeg.
> > + *
> > + * FFmpeg is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU Lesser General Public
> > + * License as published by the Free Software Foundation; either
> > + * version 2.1 of the 

Re: [FFmpeg-devel] [PATCH v2 1/2] libavutil/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC

[Matthieu Bouron]

On Sun, Dec 03, 2017 at 05:32:21PM -0800, Aman Gupta wrote:
> From: Aman Gupta 
> 
> ---
>  libavutil/Makefile   |  1 +
>  libavutil/hwcontext.c|  4 
>  libavutil/hwcontext.h|  1 +
>  libavutil/hwcontext_mediacodec.c | 50 
> 
>  libavutil/hwcontext_mediacodec.h | 36 +
>  5 files changed, 92 insertions(+)
>  create mode 100644 libavutil/hwcontext_mediacodec.c
>  create mode 100644 libavutil/hwcontext_mediacodec.h
> 
> diff --git a/libavutil/Makefile b/libavutil/Makefile
> index 721784086c..0b73a14f0b 100644
> --- a/libavutil/Makefile
> +++ b/libavutil/Makefile
> @@ -166,6 +166,7 @@ OBJS-$(CONFIG_OPENCL)   += 
> hwcontext_opencl.o
>  OBJS-$(CONFIG_VAAPI)+= hwcontext_vaapi.o
>  OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o
>  OBJS-$(CONFIG_VDPAU)+= hwcontext_vdpau.o
> +OBJS-$(CONFIG_MEDIACODEC)   += hwcontext_mediacodec.o
>  
>  OBJS += $(COMPAT_OBJS:%=../compat/%)
>  
> diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
> index f47158f811..31ac12807b 100644
> --- a/libavutil/hwcontext.c
> +++ b/libavutil/hwcontext.c
> @@ -56,6 +56,9 @@ static const HWContextType * const hw_table[] = {
>  #if CONFIG_VIDEOTOOLBOX
>  _hwcontext_type_videotoolbox,
>  #endif
> +#if CONFIG_MEDIACODEC
> +_hwcontext_type_mediacodec,
> +#endif
>  NULL,
>  };
>  
> @@ -69,6 +72,7 @@ static const char *const hw_type_names[] = {
>  [AV_HWDEVICE_TYPE_VAAPI]  = "vaapi",
>  [AV_HWDEVICE_TYPE_VDPAU]  = "vdpau",
>  [AV_HWDEVICE_TYPE_VIDEOTOOLBOX] = "videotoolbox",
> +[AV_HWDEVICE_TYPE_MEDIACODEC] = "mediacodec",
>  };
>  
>  enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name)
> diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
> index 8d27b987df..f5a4b62387 100644
> --- a/libavutil/hwcontext.h
> +++ b/libavutil/hwcontext.h
> @@ -35,6 +35,7 @@ enum AVHWDeviceType {
>  AV_HWDEVICE_TYPE_D3D11VA,
>  AV_HWDEVICE_TYPE_DRM,
>  AV_HWDEVICE_TYPE_OPENCL,
> +AV_HWDEVICE_TYPE_MEDIACODEC,
>  };
>  
>  typedef struct AVHWDeviceInternal AVHWDeviceInternal;
> diff --git a/libavutil/hwcontext_mediacodec.c 
> b/libavutil/hwcontext_mediacodec.c
> new file mode 100644
> index 00..b0d8993e15
> --- /dev/null
> +++ b/libavutil/hwcontext_mediacodec.c
> @@ -0,0 +1,50 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
> USA
> + */
> +
> +#include "config.h"
> +
> +#include "buffer.h"
> +#include "common.h"
> +#include "hwcontext.h"
> +#include "hwcontext_internal.h"
> +#include "hwcontext_mediacodec.h"
> +
> +static int mc_device_create(AVHWDeviceContext *ctx, const char *device,
> +AVDictionary *opts, int flags)
> +{
> +if (device && device[0]) {
> +av_log(ctx, AV_LOG_ERROR, "Device selection unsupported.\n");
> +return AVERROR_UNKNOWN;
> +}
> +
> +return 0;
> +}
> +
> +const HWContextType ff_hwcontext_type_mediacodec = {
> +.type = AV_HWDEVICE_TYPE_MEDIACODEC,
> +.name = "mediacodec",
> +
> +.device_hwctx_size= sizeof(AVMediaCodecDeviceContext),
> +
> +.device_create= mc_device_create,
> +
> +.pix_fmts = (const enum AVPixelFormat[]){
> +AV_PIX_FMT_MEDIACODEC,
> +AV_PIX_FMT_NONE
> +},
> +};
> diff --git a/libavutil/hwcontext_mediacodec.h 
> b/libavutil/hwcontext_mediacodec.h
> new file mode 100644
> index 00..101a9806d5
> --- /dev/null
> +++ b/libavutil/hwcontext_mediacodec.h
> @@ -0,0 +1,36 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should 

[FFmpeg-devel] [PATCH v2 1/2] libavutil/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC

[Aman Gupta]

From: Aman Gupta 

---
 libavutil/Makefile   |  1 +
 libavutil/hwcontext.c|  4 
 libavutil/hwcontext.h|  1 +
 libavutil/hwcontext_mediacodec.c | 50 
 libavutil/hwcontext_mediacodec.h | 36 +
 5 files changed, 92 insertions(+)
 create mode 100644 libavutil/hwcontext_mediacodec.c
 create mode 100644 libavutil/hwcontext_mediacodec.h

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 721784086c..0b73a14f0b 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -166,6 +166,7 @@ OBJS-$(CONFIG_OPENCL)   += 
hwcontext_opencl.o
 OBJS-$(CONFIG_VAAPI)+= hwcontext_vaapi.o
 OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o
 OBJS-$(CONFIG_VDPAU)+= hwcontext_vdpau.o
+OBJS-$(CONFIG_MEDIACODEC)   += hwcontext_mediacodec.o
 
 OBJS += $(COMPAT_OBJS:%=../compat/%)
 
diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
index f47158f811..31ac12807b 100644
--- a/libavutil/hwcontext.c
+++ b/libavutil/hwcontext.c
@@ -56,6 +56,9 @@ static const HWContextType * const hw_table[] = {
 #if CONFIG_VIDEOTOOLBOX
 _hwcontext_type_videotoolbox,
 #endif
+#if CONFIG_MEDIACODEC
+_hwcontext_type_mediacodec,
+#endif
 NULL,
 };
 
@@ -69,6 +72,7 @@ static const char *const hw_type_names[] = {
 [AV_HWDEVICE_TYPE_VAAPI]  = "vaapi",
 [AV_HWDEVICE_TYPE_VDPAU]  = "vdpau",
 [AV_HWDEVICE_TYPE_VIDEOTOOLBOX] = "videotoolbox",
+[AV_HWDEVICE_TYPE_MEDIACODEC] = "mediacodec",
 };
 
 enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name)
diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
index 8d27b987df..f5a4b62387 100644
--- a/libavutil/hwcontext.h
+++ b/libavutil/hwcontext.h
@@ -35,6 +35,7 @@ enum AVHWDeviceType {
 AV_HWDEVICE_TYPE_D3D11VA,
 AV_HWDEVICE_TYPE_DRM,
 AV_HWDEVICE_TYPE_OPENCL,
+AV_HWDEVICE_TYPE_MEDIACODEC,
 };
 
 typedef struct AVHWDeviceInternal AVHWDeviceInternal;
diff --git a/libavutil/hwcontext_mediacodec.c b/libavutil/hwcontext_mediacodec.c
new file mode 100644
index 00..b0d8993e15
--- /dev/null
+++ b/libavutil/hwcontext_mediacodec.c
@@ -0,0 +1,50 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#include "buffer.h"
+#include "common.h"
+#include "hwcontext.h"
+#include "hwcontext_internal.h"
+#include "hwcontext_mediacodec.h"
+
+static int mc_device_create(AVHWDeviceContext *ctx, const char *device,
+AVDictionary *opts, int flags)
+{
+if (device && device[0]) {
+av_log(ctx, AV_LOG_ERROR, "Device selection unsupported.\n");
+return AVERROR_UNKNOWN;
+}
+
+return 0;
+}
+
+const HWContextType ff_hwcontext_type_mediacodec = {
+.type = AV_HWDEVICE_TYPE_MEDIACODEC,
+.name = "mediacodec",
+
+.device_hwctx_size= sizeof(AVMediaCodecDeviceContext),
+
+.device_create= mc_device_create,
+
+.pix_fmts = (const enum AVPixelFormat[]){
+AV_PIX_FMT_MEDIACODEC,
+AV_PIX_FMT_NONE
+},
+};
diff --git a/libavutil/hwcontext_mediacodec.h b/libavutil/hwcontext_mediacodec.h
new file mode 100644
index 00..101a9806d5
--- /dev/null
+++ b/libavutil/hwcontext_mediacodec.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_HWCONTEXT_MEDIACODEC_H
+#define AVUTIL_HWCONTEXT_MEDIACODEC_H
+
+/**
+ * MediaCodec details.
+ *
+ * Allocated as