Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6117 → Rev 6118

/contrib/media/fplay/fplay.c
16,6 → 16,10
#include "sound.h"
#include "fplay.h"
 
#ifdef HAVE_VAAPI
int va_check_codec_support(enum AVCodecID id);
#endif
 
volatile enum player_state player_state = STOP;
volatile enum player_state decoder_state = PREPARE;
volatile enum player_state sound_state = STOP;
22,8 → 26,6
 
uint32_t win_width, win_height;
 
void decoder();
int fplay_init_context(AVCodecContext *avctx);
 
AVFrame *pFrame;
 
35,7 → 37,7
extern int sample_rate;
char *movie_file;
 
void flush_video();
void flush_video(vst_t* vst);
 
 
int64_t rewind_pos;
78,6 → 80,10
avdevice_register_all();
av_register_all();
 
#ifdef HAVE_VAAPI
fplay_vaapi_init();
#endif
 
if( avformat_open_input(&vst.fCtx, movie_file, NULL, NULL) < 0)
{
printf("Cannot open file %s\n\r", movie_file);
152,8 → 158,20
return -1; // Codec not found
}
 
#ifdef HAVE_VAAPI
int hwdec = va_check_codec_support(vst.vCtx->codec_id);
 
if(hwdec)
{
printf("hardware decode supported\n");
 
if (fplay_init_context(&vst) < 0)
{
printf("context initialization failed\n");
return -1;
};
};
#endif
 
if(avcodec_open2(vst.vCtx, vst.vCodec, NULL) < 0)
{
298,7 → 316,7
while( get_packet(&vst->q_audio, &packet)!= 0)
av_free_packet(&packet);
 
flush_video();
flush_video(vst);
 
astream.count = 0;
};