[FFmpeg-cvslog] r17569 - in trunk/libavcodec: h263dec.c h264.c internal.h mpeg12.c

[michael]

Author: michael
Date: Tue Feb 24 20:04:43 2009
New Revision: 17569

Log:
add ff_find_hwaccel() by Gwenole Beauchesne

Modified:
   trunk/libavcodec/h263dec.c
   trunk/libavcodec/h264.c
   trunk/libavcodec/internal.h
   trunk/libavcodec/mpeg12.c

Modified: trunk/libavcodec/h263dec.c
==============================================================================
--- trunk/libavcodec/h263dec.c	Tue Feb 24 19:51:16 2009	(r17568)
+++ trunk/libavcodec/h263dec.c	Tue Feb 24 20:04:43 2009	(r17569)
@@ -106,6 +106,7 @@ av_cold int ff_h263_decode_init(AVCodecC
         return -1;
     }
     s->codec_id= avctx->codec->id;
+    avctx->hwaccel= ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
 
     /* for h263, we allocate the images after having read the header */
     if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4)

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Tue Feb 24 19:51:16 2009	(r17568)
+++ trunk/libavcodec/h264.c	Tue Feb 24 20:04:43 2009	(r17569)
@@ -2182,6 +2182,7 @@ static av_cold int decode_init(AVCodecCo
         avctx->pix_fmt= PIX_FMT_VDPAU_H264;
     else
         avctx->pix_fmt= avctx->get_format(avctx, avctx->codec->pix_fmts);
+    avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
 
     decode_init_vlc();
 

Modified: trunk/libavcodec/internal.h
==============================================================================
--- trunk/libavcodec/internal.h	Tue Feb 24 19:51:16 2009	(r17568)
+++ trunk/libavcodec/internal.h	Tue Feb 24 20:04:43 2009	(r17569)
@@ -24,6 +24,9 @@
 #ifndef AVCODEC_INTERNAL_H
 #define AVCODEC_INTERNAL_H
 
+#include <stdint.h>
+#include "avcodec.h"
+
 /**
  * Logs a generic warning message about a missing feature.
  * @param[in] avc a pointer to an arbitrary struct of which the first field is
@@ -44,4 +47,14 @@ void ff_log_missing_feature(void *avc, c
  */
 void ff_log_ask_for_sample(void *avc, const char *msg);
 
+/**
+ * Returns the hardware accelerated codec for codec \p codec_id and
+ * pixel format \p pix_fmt.
+ *
+ * @param codec_id the codec to match
+ * @param pix_fmt the pixel format to match
+ * @return the hardware accelerated codec, or NULL if none was found.
+ */
+AVHWAccel *ff_find_hwaccel(enum CodecID codec_id, enum PixelFormat pix_fmt);
+
 #endif /* AVCODEC_INTERNAL_H */

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	Tue Feb 24 19:51:16 2009	(r17568)
+++ trunk/libavcodec/mpeg12.c	Tue Feb 24 20:04:43 2009	(r17569)
@@ -1302,6 +1302,7 @@ static int mpeg_decode_postinit(AVCodecC
         }//MPEG-2
 
         avctx->pix_fmt = mpeg_get_pixelformat(avctx);
+        avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
         //until then pix_fmt may be changed right after codec init
         if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ||
             avctx->hwaccel ||
@@ -2071,6 +2072,7 @@ static int vcr2_init_sequence(AVCodecCon
     s->low_delay= 1;
 
     avctx->pix_fmt = mpeg_get_pixelformat(avctx);
+    avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
 
     if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ||
         s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU )