eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-15 04:10:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

make it work with > 0.8.5 ffmpeg (avformat > 53.x )

Browse Source
This commit is contained in:
niels
2011-10-20 20:27:22 +02:00
parent 83f285b95a
commit 3204628bc9
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
veejay-current/veejay-server/libel/vj-el.c
View File

@@ -476,7 +476,11 @@ vj_decoder *_el_new_decoder( int id , int width, int height, float fps, int pixe
} else if( id != CODEC_ID_YUV422 && id != CODEC_ID_YUV420 && id != CODEC_ID_YUV420F && id != CODEC_ID_YUV422F) } else if( id != CODEC_ID_YUV422 && id != CODEC_ID_YUV420 && id != CODEC_ID_YUV420F && id != CODEC_ID_YUV422F)
{ {
d->codec = avcodec_find_decoder( id ); d->codec = avcodec_find_decoder( id );
#if (LIBAVFORMAT_VERSION_MAJOR >= 53)
d->context = avcodec_alloc_context3(NULL); /* stripe was here! */
#else
d->context = avcodec_alloc_context(); d->context = avcodec_alloc_context();
#endif
d->context->width = width; d->context->width = width;
d->context->height = height; d->context->height = height;
d->context->opaque = d; d->context->opaque = d;
@@ -485,7 +489,7 @@ vj_decoder *_el_new_decoder( int id , int width, int height, float fps, int pixe
d->img = (VJFrame*) vj_calloc(sizeof(VJFrame)); d->img = (VJFrame*) vj_calloc(sizeof(VJFrame));
d->img->width = width; d->img->width = width;
if ( avcodec_open( d->context, d->codec ) < 0 ) if ( avcodec_open( d->context, d->codec ) < 0 )
{ {
veejay_msg(VEEJAY_MSG_ERROR, "Error initializing decoder %d",id); veejay_msg(VEEJAY_MSG_ERROR, "Error initializing decoder %d",id);
_el_free_decoder( d ); _el_free_decoder( d );
return NULL; return NULL;
@@ -1074,6 +1078,15 @@ int vj_el_set_bogus_length( editlist *el, long nframe, int len )
return 1; return 1;
} }
#if (LIBAVFORMAT_VERSION_MAJOR >= 53)
static int avcodec_decode_video( AVCodecContext *avctx, AVFrame *picture, int *got_picture, uint8_t *data, int pktsize ) {
AVPacket pkt;
veejay_memset( &pkt, 0, sizeof(AVPacket));
pkt.data = data;
pkt.size = pktsize;
return avcodec_decode_video2( avctx, picture, got_picture, &pkt );
}
#endif
int vj_el_get_video_frame(editlist *el, long nframe, uint8_t *dst[3]) int vj_el_get_video_frame(editlist *el, long nframe, uint8_t *dst[3])
{ {
@@ -1367,13 +1380,21 @@ int detect_pixel_format_with_ffmpeg( const char *filename )
AVFormatParameters avf; AVFormatParameters avf;
AVFrame *av_frame = NULL; AVFrame *av_frame = NULL;
AVPacket pkt; AVPacket pkt;
#if (LIBAVFORMAT_VERSION_MAJOR >= 53)
int err = avformat_open_input( &avformat_ctx, filename, NULL, NULL );
#else
int err = av_open_input_file( &avformat_ctx,filename,NULL,0,NULL ); int err = av_open_input_file( &avformat_ctx,filename,NULL,0,NULL );
#endif
if(err < 0 ) { if(err < 0 ) {
veejay_msg(VEEJAY_MSG_DEBUG, "FFmpeg: Unable to open %s: %d",filename,err ); veejay_msg(VEEJAY_MSG_DEBUG, "FFmpeg: Unable to open %s: %d",filename,err );
return -1; return -1;
} }
#if (LIBAVFORMAT_VERSION_MAJOR >= 53 )
err = avformat_find_stream_info( avformat_ctx, NULL );
#else
err = av_find_stream_info( avformat_ctx ); err = av_find_stream_info( avformat_ctx );
#endif
if(err < 0 ) if(err < 0 )
{ {
veejay_msg(VEEJAY_MSG_DEBUG, "FFmpeg: Stream information found in %s",filename); veejay_msg(VEEJAY_MSG_DEBUG, "FFmpeg: Stream information found in %s",filename);
@@ -1392,7 +1413,11 @@ int detect_pixel_format_with_ffmpeg( const char *filename )
{ {
if( avformat_ctx->streams[i]->codec ) if( avformat_ctx->streams[i]->codec )
{ {
#if (LIBAVFORMAT_VERSION_MAJOR >= 53)
if( avformat_ctx->streams[i]->codec->codec_type < CODEC_ID_FIRST_AUDIO )
#else
if( avformat_ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO ) if( avformat_ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
#endif
{ {
int sup_codec = 0; int sup_codec = 0;
for( j = 0; _supported_codecs[j].name != NULL; j ++ ) { for( j = 0; _supported_codecs[j].name != NULL; j ++ ) {

8
veejay-current/veejay-server/libstream/v4l2utils.c
View File

@@ -74,6 +74,7 @@
#include <poll.h> #include <poll.h>
#include <libvje/vje.h> #include <libvje/vje.h>
#include <libavutil/pixfmt.h> #include <libavutil/pixfmt.h>
#include <libavformat/avformat.h>
#include <libvevo/libvevo.h> #include <libvevo/libvevo.h>
#include <libstream/v4l2utils.h> #include <libstream/v4l2utils.h>
#include <libvjmsg/vj-msg.h> #include <libvjmsg/vj-msg.h>
@@ -1091,6 +1092,7 @@ static double calc_tc( struct v4l2_timecode *tc, float fps )
#endif #endif
return (double) tc->frames / fps; return (double) tc->frames / fps;
} }
static int v4l2_pull_frame_intern( v4l2info *v ) static int v4l2_pull_frame_intern( v4l2info *v )
{ //@ fixme more functions no pasta { //@ fixme more functions no pasta
void *src = NULL; void *src = NULL;
@@ -1139,7 +1141,8 @@ static int v4l2_pull_frame_intern( v4l2info *v )
} }
break; break;
case 2: case 2:
length = avcodec_decode_video( v->c, v->picture, &got_picture, v->tmpbuf,src ); // length = avcodec_decode_video( v->c, v->picture, &got_picture, v->tmpbuf,src );
length = -1;
if( length == -1 ) { if( length == -1 ) {
veejay_msg(0,"v4l2: error while decoding frame"); veejay_msg(0,"v4l2: error while decoding frame");
return 0; return 0;
@@ -1244,7 +1247,8 @@ int v4l2_pull_frame(void *vv,VJFrame *dst)
} }
break; break;
case 2: case 2:
length = avcodec_decode_video( v->c, v->picture, &got_picture, v->tmpbuf,src ); //length = avcodec_decode_video( v->c, v->picture, &got_picture, v->tmpbuf,src );
length = -1;
if( length == -1 ) { if( length == -1 ) {
veejay_msg(0,"v4l2: error while decoding frame"); veejay_msg(0,"v4l2: error while decoding frame");
return 0; return 0;