*
* This program 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
+ * 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
# include "config.h"
#endif
+#include <assert.h>
+
#include <vlc_common.h>
#include <vlc_vout.h>
-#include <assert.h>
+#include <vlc_plugin.h>
#include <libavcodec/avcodec.h>
#include <libavcodec/vda.h>
#include <VideoDecodeAcceleration/VDADecoder.h>
-typedef struct
+static int Open( vlc_va_t *, int, const es_format_t * );
+static void Close( vlc_va_t * );
+
+static const int nvda_pix_fmt_list[] = { 0, 1 };
+static const char *const nvda_pix_fmt_list_text[] =
+ { N_("420YpCbCr8Planar"), N_("422YpCbCr8") };
+
+vlc_module_begin ()
+ set_description( N_("Video Decode Acceleration Framework (VDA)") )
+ set_capability( "hw decoder", 50 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_VCODEC )
+ set_callbacks( Open, Close )
+ add_integer ( "avcodec-vda-pix-fmt", 0, VDA_PIX_FMT_TEXT,
+ VDA_PIX_FMT_LONGTEXT, false)
+ change_integer_list( nvda_pix_fmt_list, nvda_pix_fmt_list_text )
+vlc_module_end ()
+
+struct vlc_va_sys_t
{
- vlc_va_t va;
struct vda_context hw_ctx;
- const uint8_t *p_extradata;
+ uint8_t *p_extradata;
int i_extradata;
vlc_fourcc_t i_chroma;
vlc_object_t *p_log;
-} vlc_va_vda_t;
+};
+
+typedef struct vlc_va_sys_t vlc_va_vda_t;
-static vlc_va_vda_t *vlc_va_vda_Get( void *p_va )
+static vlc_va_vda_t *vlc_va_vda_Get( vlc_va_t *p_va )
{
- return p_va;
+ return p_va->sys;
}
/*****************************************************************************
uint8_t *pp_plane[3];
size_t pi_pitch[3];
+ if (!buffer)
+ return;
+
CVPixelBufferLockBaseAddress( buffer, 0 );
for( int i = 0; i < 3; i++ )
i_width, i_height, cache );
CVPixelBufferUnlockBaseAddress( buffer, 0 );
+ CVPixelBufferRelease( buffer );
}
/*****************************************************************************
}
CVPixelBufferUnlockBaseAddress( buffer, 0 );
+ CVPixelBufferRelease( buffer );
}
-static int Setup( vlc_va_t *p_external, void **pp_hw_ctx, vlc_fourcc_t *pi_chroma,
+static int Setup( vlc_va_t *external, void **pp_hw_ctx, vlc_fourcc_t *pi_chroma,
int i_width, int i_height )
{
-
- vlc_va_vda_t *p_va = vlc_va_vda_Get( p_external );
+ vlc_va_vda_t *p_va = vlc_va_vda_Get( external );
if( p_va->hw_ctx.width == i_width
&& p_va->hw_ctx.height == i_height
p_va->hw_ctx.width = i_width;
p_va->hw_ctx.height = i_height;
p_va->hw_ctx.format = 'avc1';
- p_va->hw_ctx.use_sync_decoding = 1;
int i_pix_fmt = var_CreateGetInteger( p_va->p_log, "avcodec-vda-pix-fmt" );
case 1 :
p_va->hw_ctx.cv_pix_fmt_type = kCVPixelFormatType_422YpCbCr8;
p_va->i_chroma = VLC_CODEC_UYVY;
+ msg_Dbg(p_va->p_log, "using pixel format 422YpCbCr8");
break;
case 0 :
default :
p_va->hw_ctx.cv_pix_fmt_type = kCVPixelFormatType_420YpCbCr8Planar;
p_va->i_chroma = VLC_CODEC_I420;
CopyInitCache( &p_va->image_cache, i_width );
+ msg_Dbg(p_va->p_log, "using pixel format 420YpCbCr8Planar");
}
ok:
p_va->i_extradata );
if( status )
{
- msg_Err( p_va->p_log, "Failed to create the decoder : %i", status );
+ msg_Err( p_va->p_log, "Failed to create decoder: %i", status );
return VLC_EGENERIC;
}
+ else
+ msg_Dbg( p_va->p_log, "VDA decoder created");
return VLC_SUCCESS;
}
-static int Get( vlc_va_t *p_external, AVFrame *p_ff )
+static int Get( vlc_va_t *external, AVFrame *p_ff )
{
- VLC_UNUSED( p_external );
+ msg_Dbg(external, "Get");
+ VLC_UNUSED( external );
/* */
for( int i = 0; i < 4; i++ )
p_ff->linesize[i] = 0;
if( i == 0 || i == 3 )
- p_ff->data[i] = 1; // dummy
+ p_ff->data[i] = (uint8_t *)1; // dummy
}
return VLC_SUCCESS;
}
-static int Extract( vlc_va_t *p_external, picture_t *p_picture, AVFrame *p_ff )
+static int Extract( vlc_va_t *external, picture_t *p_picture, AVFrame *p_ff )
{
- vlc_va_vda_t *p_va = vlc_va_vda_Get( p_external );
+ vlc_va_vda_t *p_va = vlc_va_vda_Get( external );
CVPixelBufferRef cv_buffer = ( CVPixelBufferRef )p_ff->data[3];
if( !cv_buffer )
if( p_va->hw_ctx.cv_pix_fmt_type == kCVPixelFormatType_420YpCbCr8Planar )
{
- if( !p_va->image_cache.buffer )
+ if( !p_va->image_cache.buffer ) {
+ CVPixelBufferRelease( cv_buffer );
return VLC_EGENERIC;
+ }
vda_Copy420YpCbCr8Planar( p_picture,
cv_buffer,
return VLC_SUCCESS;
}
-static void Release( vlc_va_t *p_external, AVFrame *p_ff )
+static void Release( vlc_va_t *external, AVFrame *p_ff )
{
- VLC_UNUSED( p_external );
+ VLC_UNUSED( external );
CVPixelBufferRef cv_buffer = ( CVPixelBufferRef )p_ff->data[3];
if ( cv_buffer )
- CFRelease( cv_buffer );
+ CVPixelBufferRelease( cv_buffer );
}
-static void Close( vlc_va_t *p_external )
+static void Close( vlc_va_t *external )
{
- vlc_va_vda_t *p_va = vlc_va_vda_Get( p_external );
+ vlc_va_vda_t *p_va = vlc_va_vda_Get( external );
+
+ msg_Dbg(p_va->p_log, "destroying VDA decoder");
ff_vda_destroy_decoder( &p_va->hw_ctx ) ;
free( p_va );
}
-vlc_va_t *vlc_va_New( vlc_object_t *p_log, int pixfmt, int i_codec_id,
- const es_format_t *fmt )
+static int Open( vlc_va_t *external, int i_codec_id, const es_format_t *fmt )
{
- if( pixfmt != PIX_FMT_VDA_VLD || i_codec_id != CODEC_ID_H264 )
- return NULL;
+ msg_Dbg( external, "opening VDA module" );
+ if( i_codec_id != AV_CODEC_ID_H264 )
+ {
+ msg_Warn( external, "input codec isn't H264, canceling VDA decoding" );
+ return VLC_EGENERIC;
+ }
if( fmt->p_extra == NULL || fmt->i_extra < 7 )
{
- msg_Warn( p_log, "VDA requires extradata." );
- return NULL;
+ msg_Warn( external, "VDA requires extradata." );
+ return VLC_EGENERIC;
}
vlc_va_vda_t *p_va = calloc( 1, sizeof(*p_va) );
if( !p_va )
- return NULL;
+ return VLC_EGENERIC;
- p_va->p_log = p_log;
+ p_va->p_log = VLC_OBJECT(external);
p_va->p_extradata = fmt->p_extra;
p_va->i_extradata = fmt->i_extra;
- p_va->va.setup = Setup;
- p_va->va.get = Get;
- p_va->va.release = Release;
- p_va->va.extract = Extract;
- p_va->va.close = Close;
+ external->sys = p_va;
+ external->description = (char *)"VDA";
+ external->pix_fmt = PIX_FMT_VDA_VLD;
+ external->setup = Setup;
+ external->get = Get;
+ external->release = Release;
+ external->extract = Extract;
- return &p_va->va;
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff