Re: [FFmpeg-devel] [PATCH] videotoolbox: require hardware acceleration

2015-09-29 Thread wm4 
On Mon, 28 Sep 2015 22:24:14 +0200
wm4  wrote:

> From: Stefano Pigozzi 
> 
> VideoToolbox also implements a software decoder for h264, and will fallback to
> using it if the file cannot be doceded on the CPU. In these cases though
> we want the hwaccel to fail so that we can use the libavcodec software decoder
> instead.
> ---
>  libavcodec/videotoolbox.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
> index b78238a..a910a33 100644
> --- a/libavcodec/videotoolbox.c
> +++ b/libavcodec/videotoolbox.c
> @@ -32,8 +32,8 @@
>  #include "h264.h"
>  #include "mpegvideo.h"
>  
> -#ifndef kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder
> -#  define kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder 
> CFSTR("EnableHardwareAcceleratedVideoDecoder")
> +#ifndef kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder
> +#  define 
> kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder 
> CFSTR("RequireHardwareAcceleratedVideoDecoder")
>  #endif
>  
>  #define VIDEOTOOLBOX_ESDS_EXTRADATA_PADDING  12
> @@ -398,7 +398,7 @@ static CFDictionaryRef 
> videotoolbox_decoder_config_create(CMVideoCodecType codec
> 
> &kCFTypeDictionaryValueCallBacks);
>  
>  CFDictionarySetValue(config_info,
> - 
> kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder,
> + 
> kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder,
>   kCFBooleanTrue);
>  
>  if (avctx->extradata_size) {

Pushed, with typos in the commit message fixed by the original author.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] videotoolbox: require hardware acceleration

2015-09-29 Thread wm4 
On Mon, 28 Sep 2015 22:24:14 +0200
wm4  wrote:

> From: Stefano Pigozzi 
> 
> VideoToolbox also implements a software decoder for h264, and will fallback to
> using it if the file cannot be doceded on the CPU. In these cases though
> we want the hwaccel to fail so that we can use the libavcodec software decoder
> instead.
> ---
>  libavcodec/videotoolbox.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
> index b78238a..a910a33 100644
> --- a/libavcodec/videotoolbox.c
> +++ b/libavcodec/videotoolbox.c
> @@ -32,8 +32,8 @@
>  #include "h264.h"
>  #include "mpegvideo.h"
>  
> -#ifndef kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder
> -#  define kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder 
> CFSTR("EnableHardwareAcceleratedVideoDecoder")
> +#ifndef kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder
> +#  define 
> kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder 
> CFSTR("RequireHardwareAcceleratedVideoDecoder")
>  #endif
>  
>  #define VIDEOTOOLBOX_ESDS_EXTRADATA_PADDING  12
> @@ -398,7 +398,7 @@ static CFDictionaryRef 
> videotoolbox_decoder_config_create(CMVideoCodecType codec
> 
> &kCFTypeDictionaryValueCallBacks);
>  
>  CFDictionarySetValue(config_info,
> - 
> kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder,
> + 
> kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder,
>   kCFBooleanTrue);
>  
>  if (avctx->extradata_size) {

If nobody minds, I'll apply in 1 hour.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] videotoolbox: require hardware acceleration

2015-09-28 Thread wm4 
From: Stefano Pigozzi 

VideoToolbox also implements a software decoder for h264, and will fallback to
using it if the file cannot be doceded on the CPU. In these cases though
we want the hwaccel to fail so that we can use the libavcodec software decoder
instead.
---
 libavcodec/videotoolbox.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index b78238a..a910a33 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -32,8 +32,8 @@
 #include "h264.h"
 #include "mpegvideo.h"
 
-#ifndef kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder
-#  define kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder 
CFSTR("EnableHardwareAcceleratedVideoDecoder")
+#ifndef kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder
+#  define kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder 
CFSTR("RequireHardwareAcceleratedVideoDecoder")
 #endif
 
 #define VIDEOTOOLBOX_ESDS_EXTRADATA_PADDING  12
@@ -398,7 +398,7 @@ static CFDictionaryRef 
videotoolbox_decoder_config_create(CMVideoCodecType codec

&kCFTypeDictionaryValueCallBacks);
 
 CFDictionarySetValue(config_info,
- 
kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder,
+ 
kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder,
  kCFBooleanTrue);
 
 if (avctx->extradata_size) {
-- 
2.5.1

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