Skip to content

F
ffmpeg.wasm-core
Commit da7c65f0 authored by Aneesh Dogra's avatar Aneesh Dogra Committed by Anton Khirnov
Browse files
Options

avplay: K&R cleanup 

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent 60d62665
Hide whitespace changes
Inline Side-by-side
Showing with 275 additions and 271 deletions
avplay.c
View file @ da7c65f0
...@@ -80,7 +80,7 @@ const int program_birth_year = 2003; ...@@ -80,7 +80,7 @@ const int program_birth_year = 2003;
#define AUDIO_DIFF_AVG_NB 20 #define AUDIO_DIFF_AVG_NB 20
/* NOTE: the size must be big enough to compensate the hardware audio buffersize size */ /* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
#define SAMPLE_ARRAY_SIZE (2*65536) #define SAMPLE_ARRAY_SIZE (2 * 65536)
static int sws_flags = SWS_BICUBIC; static int sws_flags = SWS_BICUBIC;
...@@ -97,9 +97,9 @@ typedef struct PacketQueue { ...@@ -97,9 +97,9 @@ typedef struct PacketQueue {
#define SUBPICTURE_QUEUE_SIZE 4 #define SUBPICTURE_QUEUE_SIZE 4
typedef struct VideoPicture { typedef struct VideoPicture {
double pts; ///<presentation time stamp for this picture double pts; ///< presentation time stamp for this picture
double target_clock; ///<av_gettime() time at which this should be displayed ideally double target_clock; ///< av_gettime() time at which this should be displayed ideally
int64_t pos; ///<byte position in file int64_t pos; ///< byte position in file
SDL_Overlay *bmp; SDL_Overlay *bmp;
int width, height; /* source height & width */ int width, height; /* source height & width */
int allocated; int allocated;
...@@ -186,13 +186,13 @@ typedef struct VideoState { ...@@ -186,13 +186,13 @@ typedef struct VideoState {
double frame_timer; double frame_timer;
double frame_last_pts; double frame_last_pts;
double frame_last_delay; double frame_last_delay;
double video_clock; ///<pts of last decoded frame / predicted pts of next decoded frame double video_clock; ///< pts of last decoded frame / predicted pts of next decoded frame
int video_stream; int video_stream;
AVStream *video_st; AVStream *video_st;
PacketQueue videoq; PacketQueue videoq;
double video_current_pts; ///<current displayed pts (different from video_clock if frame fifos are used) double video_current_pts; ///< current displayed pts (different from video_clock if frame fifos are used)
double video_current_pts_drift; ///<video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts double video_current_pts_drift; ///< video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts
int64_t video_current_pos; ///<current displayed file pos int64_t video_current_pos; ///< current displayed file pos
VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE]; VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
int pictq_size, pictq_rindex, pictq_windex; int pictq_size, pictq_rindex, pictq_windex;
SDL_mutex *pictq_mutex; SDL_mutex *pictq_mutex;
...@@ -208,7 +208,7 @@ typedef struct VideoState { ...@@ -208,7 +208,7 @@ typedef struct VideoState {
PtsCorrectionContext pts_ctx; PtsCorrectionContext pts_ctx;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
AVFilterContext *out_video_filter; ///<the last filter in the video chain AVFilterContext *out_video_filter; ///< the last filter in the video chain
#endif #endif
float skip_frames; float skip_frames;
...@@ -224,16 +224,16 @@ static const char *input_filename; ...@@ -224,16 +224,16 @@ static const char *input_filename;
static const char *window_title; static const char *window_title;
static int fs_screen_width; static int fs_screen_width;
static int fs_screen_height; static int fs_screen_height;
static int screen_width = 0; static int screen_width = 0;
static int screen_height = 0; static int screen_height = 0;
static int audio_disable; static int audio_disable;
static int video_disable; static int video_disable;
static int wanted_stream[AVMEDIA_TYPE_NB]={ static int wanted_stream[AVMEDIA_TYPE_NB] = {
[AVMEDIA_TYPE_AUDIO]=-1, [AVMEDIA_TYPE_AUDIO] = -1,
[AVMEDIA_TYPE_VIDEO]=-1, [AVMEDIA_TYPE_VIDEO] = -1,
[AVMEDIA_TYPE_SUBTITLE]=-1, [AVMEDIA_TYPE_SUBTITLE] = -1,
}; };
static int seek_by_bytes=-1; static int seek_by_bytes = -1;
static int display_disable; static int display_disable;
static int show_status = 1; static int show_status = 1;
static int av_sync_type = AV_SYNC_AUDIO_MASTER; static int av_sync_type = AV_SYNC_AUDIO_MASTER;
...@@ -248,19 +248,19 @@ static int fast = 0; ...@@ -248,19 +248,19 @@ static int fast = 0;
static int genpts = 0; static int genpts = 0;
static int lowres = 0; static int lowres = 0;
static int idct = FF_IDCT_AUTO; static int idct = FF_IDCT_AUTO;
static enum AVDiscard skip_frame= AVDISCARD_DEFAULT; static enum AVDiscard skip_frame = AVDISCARD_DEFAULT;
static enum AVDiscard skip_idct= AVDISCARD_DEFAULT; static enum AVDiscard skip_idct = AVDISCARD_DEFAULT;
static enum AVDiscard skip_loop_filter= AVDISCARD_DEFAULT; static enum AVDiscard skip_loop_filter = AVDISCARD_DEFAULT;
static int error_recognition = FF_ER_CAREFUL; static int error_recognition = FF_ER_CAREFUL;
static int error_concealment = 3; static int error_concealment = 3;
static int decoder_reorder_pts= -1; static int decoder_reorder_pts = -1;
static int autoexit; static int autoexit;
static int exit_on_keydown; static int exit_on_keydown;
static int exit_on_mousedown; static int exit_on_mousedown;
static int loop=1; static int loop = 1;
static int framedrop=1; static int framedrop = 1;
static int rdftspeed=20; static int rdftspeed = 20;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
static char *vfilters = NULL; static char *vfilters = NULL;
#endif #endif
...@@ -299,7 +299,7 @@ static void packet_queue_flush(PacketQueue *q) ...@@ -299,7 +299,7 @@ static void packet_queue_flush(PacketQueue *q)
AVPacketList *pkt, *pkt1; AVPacketList *pkt, *pkt1;
SDL_LockMutex(q->mutex); SDL_LockMutex(q->mutex);
for(pkt = q->first_pkt; pkt != NULL; pkt = pkt1) { for (pkt = q->first_pkt; pkt != NULL; pkt = pkt1) {
pkt1 = pkt->next; pkt1 = pkt->next;
av_free_packet(&pkt->pkt); av_free_packet(&pkt->pkt);
av_freep(&pkt); av_freep(&pkt);
...@@ -323,7 +323,7 @@ static int packet_queue_put(PacketQueue *q, AVPacket *pkt) ...@@ -323,7 +323,7 @@ static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
AVPacketList *pkt1; AVPacketList *pkt1;
/* duplicate the packet */ /* duplicate the packet */
if (pkt!=&flush_pkt && av_dup_packet(pkt) < 0) if (pkt != &flush_pkt && av_dup_packet(pkt) < 0)
return -1; return -1;
pkt1 = av_malloc(sizeof(AVPacketList)); pkt1 = av_malloc(sizeof(AVPacketList));
...@@ -369,7 +369,7 @@ static int packet_queue_get(PacketQueue *q, AVPacket *pkt, int block) ...@@ -369,7 +369,7 @@ static int packet_queue_get(PacketQueue *q, AVPacket *pkt, int block)
SDL_LockMutex(q->mutex); SDL_LockMutex(q->mutex);
for(;;) { for (;;) {
if (q->abort_request) { if (q->abort_request) {
ret = -1; ret = -1;
break; break;
...@@ -451,8 +451,8 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, ...@@ -451,8 +451,8 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw,
dstx = av_clip(rect->x, 0, imgw - dstw); dstx = av_clip(rect->x, 0, imgw - dstw);
dsty = av_clip(rect->y, 0, imgh - dsth); dsty = av_clip(rect->y, 0, imgh - dsth);
lum = dst->data[0] + dsty * dst->linesize[0]; lum = dst->data[0] + dsty * dst->linesize[0];
cb = dst->data[1] + (dsty >> 1) * dst->linesize[1]; cb = dst->data[1] + (dsty >> 1) * dst->linesize[1];
cr = dst->data[2] + (dsty >> 1) * dst->linesize[2]; cr = dst->data[2] + (dsty >> 1) * dst->linesize[2];
width2 = ((dstw + 1) >> 1) + (dstx & ~dstw & 1); width2 = ((dstw + 1) >> 1) + (dstx & ~dstw & 1);
skip2 = dstx >> 1; skip2 = dstx >> 1;
...@@ -476,7 +476,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, ...@@ -476,7 +476,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw,
lum++; lum++;
p += BPP; p += BPP;
} }
for(w = dstw - (dstx & 1); w >= 2; w -= 2) { for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
YUVA_IN(y, u, v, a, p, pal); YUVA_IN(y, u, v, a, p, pal);
u1 = u; u1 = u;
v1 = v; v1 = v;
...@@ -508,7 +508,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, ...@@ -508,7 +508,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw,
cb += dst->linesize[1] - width2 - skip2; cb += dst->linesize[1] - width2 - skip2;
cr += dst->linesize[2] - width2 - skip2; cr += dst->linesize[2] - width2 - skip2;
} }
for(h = dsth - (dsty & 1); h >= 2; h -= 2) { for (h = dsth - (dsty & 1); h >= 2; h -= 2) {
lum += dstx; lum += dstx;
cb += skip2; cb += skip2;
cr += skip2; cr += skip2;
...@@ -533,7 +533,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, ...@@ -533,7 +533,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw,
p += -wrap3 + BPP; p += -wrap3 + BPP;
lum += -wrap + 1; lum += -wrap + 1;
} }
for(w = dstw - (dstx & 1); w >= 2; w -= 2) { for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
YUVA_IN(y, u, v, a, p, pal); YUVA_IN(y, u, v, a, p, pal);
u1 = u; u1 = u;
v1 = v; v1 = v;
...@@ -609,7 +609,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, ...@@ -609,7 +609,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw,
lum++; lum++;
p += BPP; p += BPP;
} }
for(w = dstw - (dstx & 1); w >= 2; w -= 2) { for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
YUVA_IN(y, u, v, a, p, pal); YUVA_IN(y, u, v, a, p, pal);
u1 = u; u1 = u;
v1 = v; v1 = v;
...@@ -742,15 +742,15 @@ static void video_audio_display(VideoState *s) ...@@ -742,15 +742,15 @@ static void video_audio_display(VideoState *s)
int16_t time_diff; int16_t time_diff;
int rdft_bits, nb_freq; int rdft_bits, nb_freq;
for(rdft_bits=1; (1<<rdft_bits)<2*s->height; rdft_bits++) for (rdft_bits = 1; (1 << rdft_bits) < 2 * s->height; rdft_bits++)
; ;
nb_freq= 1<<(rdft_bits-1); nb_freq = 1 << (rdft_bits - 1);
/* compute display index : center on currently output samples */ /* compute display index : center on currently output samples */
channels = s->audio_st->codec->channels; channels = s->audio_st->codec->channels;
nb_display_channels = channels; nb_display_channels = channels;
if (!s->paused) { if (!s->paused) {
int data_used= s->show_audio==1 ? s->width : (2*nb_freq); int data_used = s->show_audio == 1 ? s->width : (2 * nb_freq);
n = 2 * channels; n = 2 * channels;
delay = audio_write_get_buf_size(s); delay = audio_write_get_buf_size(s);
delay /= n; delay /= n;
...@@ -762,23 +762,23 @@ static void video_audio_display(VideoState *s) ...@@ -762,23 +762,23 @@ static void video_audio_display(VideoState *s)
delay -= (time_diff * s->audio_st->codec->sample_rate) / 1000000; delay -= (time_diff * s->audio_st->codec->sample_rate) / 1000000;
} }
delay += 2*data_used; delay += 2 * data_used;
if (delay < data_used) if (delay < data_used)
delay = data_used; delay = data_used;
i_start= x = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE); i_start= x = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE);
if(s->show_audio==1){ if (s->show_audio == 1) {
h= INT_MIN; h = INT_MIN;
for(i=0; i<1000; i+=channels){ for (i = 0; i < 1000; i += channels) {
int idx= (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE; int idx = (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE;
int a= s->sample_array[idx]; int a = s->sample_array[idx];
int b= s->sample_array[(idx + 4*channels)%SAMPLE_ARRAY_SIZE]; int b = s->sample_array[(idx + 4 * channels) % SAMPLE_ARRAY_SIZE];
int c= s->sample_array[(idx + 5*channels)%SAMPLE_ARRAY_SIZE]; int c = s->sample_array[(idx + 5 * channels) % SAMPLE_ARRAY_SIZE];
int d= s->sample_array[(idx + 9*channels)%SAMPLE_ARRAY_SIZE]; int d = s->sample_array[(idx + 9 * channels) % SAMPLE_ARRAY_SIZE];
int score= a-d; int score = a - d;
if(h<score && (b^c)<0){ if (h < score && (b ^ c) < 0) {
h= score; h = score;
i_start= idx; i_start = idx;
} }
} }
} }
...@@ -789,7 +789,7 @@ static void video_audio_display(VideoState *s) ...@@ -789,7 +789,7 @@ static void video_audio_display(VideoState *s)
} }
bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00); bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
if(s->show_audio==1){ if (s->show_audio == 1) {
fill_rectangle(screen, fill_rectangle(screen,
s->xleft, s->ytop, s->width, s->height, s->xleft, s->ytop, s->width, s->height,
bgcolor); bgcolor);
...@@ -800,10 +800,10 @@ static void video_audio_display(VideoState *s) ...@@ -800,10 +800,10 @@ static void video_audio_display(VideoState *s)
h = s->height / nb_display_channels; h = s->height / nb_display_channels;
/* graph height / 2 */ /* graph height / 2 */
h2 = (h * 9) / 20; h2 = (h * 9) / 20;
for(ch = 0;ch < nb_display_channels; ch++) { for (ch = 0; ch < nb_display_channels; ch++) {
i = i_start + ch; i = i_start + ch;
y1 = s->ytop + ch * h + (h / 2); /* position of center line */ y1 = s->ytop + ch * h + (h / 2); /* position of center line */
for(x = 0; x < s->width; x++) { for (x = 0; x < s->width; x++) {
y = (s->sample_array[i] * h2) >> 15; y = (s->sample_array[i] * h2) >> 15;
if (y < 0) { if (y < 0) {
y = -y; y = -y;
...@@ -822,45 +822,45 @@ static void video_audio_display(VideoState *s) ...@@ -822,45 +822,45 @@ static void video_audio_display(VideoState *s)
fgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0xff); fgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0xff);
for(ch = 1;ch < nb_display_channels; ch++) { for (ch = 1; ch < nb_display_channels; ch++) {
y = s->ytop + ch * h; y = s->ytop + ch * h;
fill_rectangle(screen, fill_rectangle(screen,
s->xleft, y, s->width, 1, s->xleft, y, s->width, 1,
fgcolor); fgcolor);
} }
SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height); SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
}else{ } else {
nb_display_channels= FFMIN(nb_display_channels, 2); nb_display_channels= FFMIN(nb_display_channels, 2);
if(rdft_bits != s->rdft_bits){ if (rdft_bits != s->rdft_bits) {
av_rdft_end(s->rdft); av_rdft_end(s->rdft);
av_free(s->rdft_data); av_free(s->rdft_data);
s->rdft = av_rdft_init(rdft_bits, DFT_R2C); s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
s->rdft_bits= rdft_bits; s->rdft_bits = rdft_bits;
s->rdft_data= av_malloc(4*nb_freq*sizeof(*s->rdft_data)); s->rdft_data = av_malloc(4 * nb_freq * sizeof(*s->rdft_data));
} }
{ {
FFTSample *data[2]; FFTSample *data[2];
for(ch = 0;ch < nb_display_channels; ch++) { for (ch = 0; ch < nb_display_channels; ch++) {
data[ch] = s->rdft_data + 2*nb_freq*ch; data[ch] = s->rdft_data + 2 * nb_freq * ch;
i = i_start + ch; i = i_start + ch;
for(x = 0; x < 2*nb_freq; x++) { for (x = 0; x < 2 * nb_freq; x++) {
double w= (x-nb_freq)*(1.0/nb_freq); double w = (x-nb_freq) * (1.0 / nb_freq);
data[ch][x]= s->sample_array[i]*(1.0-w*w); data[ch][x] = s->sample_array[i] * (1.0 - w * w);
i += channels; i += channels;
if (i >= SAMPLE_ARRAY_SIZE) if (i >= SAMPLE_ARRAY_SIZE)
i -= SAMPLE_ARRAY_SIZE; i -= SAMPLE_ARRAY_SIZE;
} }
av_rdft_calc(s->rdft, data[ch]); av_rdft_calc(s->rdft, data[ch]);
} }
//least efficient way to do this, we should of course directly access it but its more than fast enough // least efficient way to do this, we should of course directly access it but its more than fast enough
for(y=0; y<s->height; y++){ for (y = 0; y < s->height; y++) {
double w= 1/sqrt(nb_freq); double w = 1 / sqrt(nb_freq);
int a= sqrt(w*sqrt(data[0][2*y+0]*data[0][2*y+0] + data[0][2*y+1]*data[0][2*y+1])); int a = sqrt(w * sqrt(data[0][2 * y + 0] * data[0][2 * y + 0] + data[0][2 * y + 1] * data[0][2 * y + 1]));
int b= (nb_display_channels == 2 ) ? sqrt(w*sqrt(data[1][2*y+0]*data[1][2*y+0] int b = (nb_display_channels == 2 ) ? sqrt(w * sqrt(data[1][2 * y + 0] * data[1][2 * y + 0]
+ data[1][2*y+1]*data[1][2*y+1])) : a; + data[1][2 * y + 1] * data[1][2 * y + 1])) : a;
a= FFMIN(a,255); a = FFMIN(a, 255);
b= FFMIN(b,255); b = FFMIN(b, 255);
fgcolor = SDL_MapRGB(screen->format, a, b, (a+b)/2); fgcolor = SDL_MapRGB(screen->format, a, b, (a + b) / 2);
fill_rectangle(screen, fill_rectangle(screen,
s->xpos, s->height-y, 1, 1, s->xpos, s->height-y, 1, 1,
...@@ -869,30 +869,31 @@ static void video_audio_display(VideoState *s) ...@@ -869,30 +869,31 @@ static void video_audio_display(VideoState *s)
} }
SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height); SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
s->xpos++; s->xpos++;
if(s->xpos >= s->width) if (s->xpos >= s->width)
s->xpos= s->xleft; s->xpos= s->xleft;
} }
} }
static int video_open(VideoState *is){ static int video_open(VideoState *is)
int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL; {
int flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL;
int w,h; int w,h;
if(is_full_screen) flags |= SDL_FULLSCREEN; if (is_full_screen) flags |= SDL_FULLSCREEN;
else flags |= SDL_RESIZABLE; else flags |= SDL_RESIZABLE;
if (is_full_screen && fs_screen_width) { if (is_full_screen && fs_screen_width) {
w = fs_screen_width; w = fs_screen_width;
h = fs_screen_height; h = fs_screen_height;
} else if(!is_full_screen && screen_width){ } else if (!is_full_screen && screen_width) {
w = screen_width; w = screen_width;
h = screen_height; h = screen_height;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
}else if (is->out_video_filter && is->out_video_filter->inputs[0]){ } else if (is->out_video_filter && is->out_video_filter->inputs[0]) {
w = is->out_video_filter->inputs[0]->w; w = is->out_video_filter->inputs[0]->w;
h = is->out_video_filter->inputs[0]->h; h = is->out_video_filter->inputs[0]->h;
#else #else
}else if (is->video_st && is->video_st->codec->width){ } else if (is->video_st && is->video_st->codec->width) {
w = is->video_st->codec->width; w = is->video_st->codec->width;
h = is->video_st->codec->height; h = is->video_st->codec->height;
#endif #endif
...@@ -900,7 +901,7 @@ static int video_open(VideoState *is){ ...@@ -900,7 +901,7 @@ static int video_open(VideoState *is){
w = 640; w = 640;
h = 480; h = 480;
} }
if(screen && is->width == screen->w && screen->w == w if (screen && is->width == screen->w && screen->w == w
&& is->height== screen->h && screen->h == h) && is->height== screen->h && screen->h == h)
return 0; return 0;
...@@ -918,7 +919,7 @@ static int video_open(VideoState *is){ ...@@ -918,7 +919,7 @@ static int video_open(VideoState *is){
window_title = input_filename; window_title = input_filename;
SDL_WM_SetCaption(window_title, window_title); SDL_WM_SetCaption(window_title, window_title);
is->width = screen->w; is->width = screen->w;
is->height = screen->h; is->height = screen->h;
return 0; return 0;
...@@ -927,7 +928,7 @@ static int video_open(VideoState *is){ ...@@ -927,7 +928,7 @@ static int video_open(VideoState *is){
/* display the current picture, if any */ /* display the current picture, if any */
static void video_display(VideoState *is) static void video_display(VideoState *is)
{ {
if(!screen) if (!screen)
video_open(cur_stream); video_open(cur_stream);
if (is->audio_st && is->show_audio) if (is->audio_st && is->show_audio)
video_audio_display(is); video_audio_display(is);
...@@ -938,15 +939,15 @@ static void video_display(VideoState *is) ...@@ -938,15 +939,15 @@ static void video_display(VideoState *is)
static int refresh_thread(void *opaque) static int refresh_thread(void *opaque)
{ {
VideoState *is= opaque; VideoState *is= opaque;
while(!is->abort_request){ while (!is->abort_request) {
SDL_Event event; SDL_Event event;
event.type = FF_REFRESH_EVENT; event.type = FF_REFRESH_EVENT;
event.user.data1 = opaque; event.user.data1 = opaque;
if(!is->refresh){ if (!is->refresh) {
is->refresh=1; is->refresh = 1;
SDL_PushEvent(&event); SDL_PushEvent(&event);
} }
usleep(is->audio_st && is->show_audio ? rdftspeed*1000 : 5000); //FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly usleep(is->audio_st && is->show_audio ? rdftspeed * 1000 : 5000); // FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly
} }
return 0; return 0;
} }
...@@ -961,7 +962,7 @@ static double get_audio_clock(VideoState *is) ...@@ -961,7 +962,7 @@ static double get_audio_clock(VideoState *is)
bytes_per_sec = 0; bytes_per_sec = 0;
if (is->audio_st) { if (is->audio_st) {
bytes_per_sec = is->audio_st->codec->sample_rate * bytes_per_sec = is->audio_st->codec->sample_rate *
2 * is->audio_st->codec->channels; 2 * is->audio_st->codec->channels;
} }
if (bytes_per_sec) if (bytes_per_sec)
pts -= (double)hw_buf_size / bytes_per_sec; pts -= (double)hw_buf_size / bytes_per_sec;
...@@ -1025,7 +1026,7 @@ static void stream_pause(VideoState *is) ...@@ -1025,7 +1026,7 @@ static void stream_pause(VideoState *is)
{ {
if (is->paused) { if (is->paused) {
is->frame_timer += av_gettime() / 1000000.0 + is->video_current_pts_drift - is->video_current_pts; is->frame_timer += av_gettime() / 1000000.0 + is->video_current_pts_drift - is->video_current_pts;
if(is->read_pause_return != AVERROR(ENOSYS)){ if (is->read_pause_return != AVERROR(ENOSYS)) {
is->video_current_pts = is->video_current_pts_drift + av_gettime() / 1000000.0; is->video_current_pts = is->video_current_pts_drift + av_gettime() / 1000000.0;
} }
is->video_current_pts_drift = is->video_current_pts - av_gettime() / 1000000.0; is->video_current_pts_drift = is->video_current_pts - av_gettime() / 1000000.0;
...@@ -1084,29 +1085,29 @@ static void video_refresh_timer(void *opaque) ...@@ -1084,29 +1085,29 @@ static void video_refresh_timer(void *opaque)
if (is->video_st) { if (is->video_st) {
retry: retry:
if (is->pictq_size == 0) { if (is->pictq_size == 0) {
//nothing to do, no picture to display in the que // nothing to do, no picture to display in the que
} else { } else {
double time= av_gettime()/1000000.0; double time = av_gettime() / 1000000.0;
double next_target; double next_target;
/* dequeue the picture */ /* dequeue the picture */
vp = &is->pictq[is->pictq_rindex]; vp = &is->pictq[is->pictq_rindex];
if(time < vp->target_clock) if (time < vp->target_clock)
return; return;
/* update current video pts */ /* update current video pts */
is->video_current_pts = vp->pts; is->video_current_pts = vp->pts;
is->video_current_pts_drift = is->video_current_pts - time; is->video_current_pts_drift = is->video_current_pts - time;
is->video_current_pos = vp->pos; is->video_current_pos = vp->pos;
if(is->pictq_size > 1){ if (is->pictq_size > 1) {
VideoPicture *nextvp= &is->pictq[(is->pictq_rindex+1)%VIDEO_PICTURE_QUEUE_SIZE]; VideoPicture *nextvp = &is->pictq[(is->pictq_rindex + 1) % VIDEO_PICTURE_QUEUE_SIZE];
assert(nextvp->target_clock >= vp->target_clock); assert(nextvp->target_clock >= vp->target_clock);
next_target= nextvp->target_clock; next_target= nextvp->target_clock;
}else{ } else {
next_target= vp->target_clock + is->video_clock - vp->pts; //FIXME pass durations cleanly next_target = vp->target_clock + is->video_clock - vp->pts; // FIXME pass durations cleanly
} }
if(framedrop && time > next_target){ if (framedrop && time > next_target) {
is->skip_frames *= 1.0 + FRAME_SKIP_FACTOR; is->skip_frames *= 1.0 + FRAME_SKIP_FACTOR;
if(is->pictq_size > 1 || time > next_target + 0.5){ if (is->pictq_size > 1 || time > next_target + 0.5) {
/* update queue size and signal for next picture */ /* update queue size and signal for next picture */
if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE) if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
is->pictq_rindex = 0; is->pictq_rindex = 0;
...@@ -1119,7 +1120,7 @@ retry: ...@@ -1119,7 +1120,7 @@ retry:
} }
} }
if(is->subtitle_st) { if (is->subtitle_st) {
if (is->subtitle_stream_changed) { if (is->subtitle_stream_changed) {
SDL_LockMutex(is->subpq_mutex); SDL_LockMutex(is->subpq_mutex);
...@@ -1207,7 +1208,8 @@ retry: ...@@ -1207,7 +1208,8 @@ retry:
if (is->audio_st && is->video_st) if (is->audio_st && is->video_st)
av_diff = get_audio_clock(is) - get_video_clock(is); av_diff = get_audio_clock(is) - get_video_clock(is);
printf("%7.2f A-V:%7.3f s:%3.1f aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64" \r", printf("%7.2f A-V:%7.3f s:%3.1f aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64" \r",
get_master_clock(is), av_diff, FFMAX(is->skip_frames-1, 0), aqsize / 1024, vqsize / 1024, sqsize, is->pts_ctx.num_faulty_dts, is->pts_ctx.num_faulty_pts); get_master_clock(is), av_diff, FFMAX(is->skip_frames - 1, 0), aqsize / 1024,
vqsize / 1024, sqsize, is->pts_ctx.num_faulty_dts, is->pts_ctx.num_faulty_pts);
fflush(stdout); fflush(stdout);
last_time = cur_time; last_time = cur_time;
} }
...@@ -1224,7 +1226,7 @@ static void stream_close(VideoState *is) ...@@ -1224,7 +1226,7 @@ static void stream_close(VideoState *is)
SDL_WaitThread(is->refresh_tid, NULL); SDL_WaitThread(is->refresh_tid, NULL);
/* free all pictures */ /* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i]; vp = &is->pictq[i];
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
if (vp->picref) { if (vp->picref) {
...@@ -1325,8 +1327,8 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t ...@@ -1325,8 +1327,8 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t
/* wait until we have space to put a new picture */ /* wait until we have space to put a new picture */
SDL_LockMutex(is->pictq_mutex); SDL_LockMutex(is->pictq_mutex);
if(is->pictq_size>=VIDEO_PICTURE_QUEUE_SIZE && !is->refresh) if (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE && !is->refresh)
is->skip_frames= FFMAX(1.0 - FRAME_SKIP_FACTOR, is->skip_frames * (1.0-FRAME_SKIP_FACTOR)); is->skip_frames = FFMAX(1.0 - FRAME_SKIP_FACTOR, is->skip_frames * (1.0 - FRAME_SKIP_FACTOR));
while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE && while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
!is->videoq.abort_request) { !is->videoq.abort_request) {
...@@ -1374,7 +1376,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t ...@@ -1374,7 +1376,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t
if (vp->bmp) { if (vp->bmp) {
AVPicture pict; AVPicture pict;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
if(vp->picref) if (vp->picref)
avfilter_unref_buffer(vp->picref); avfilter_unref_buffer(vp->picref);
vp->picref = src_frame->opaque; vp->picref = src_frame->opaque;
#endif #endif
...@@ -1382,7 +1384,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t ...@@ -1382,7 +1384,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t
/* get a pointer on the bitmap */ /* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp); SDL_LockYUVOverlay (vp->bmp);
memset(&pict,0,sizeof(AVPicture)); memset(&pict, 0, sizeof(AVPicture));
pict.data[0] = vp->bmp->pixels[0]; pict.data[0] = vp->bmp->pixels[0];
pict.data[1] = vp->bmp->pixels[2]; pict.data[1] = vp->bmp->pixels[2];
pict.data[2] = vp->bmp->pixels[1]; pict.data[2] = vp->bmp->pixels[1];
...@@ -1400,7 +1402,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t ...@@ -1400,7 +1402,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t
pict_src.linesize[1] = src_frame->linesize[1]; pict_src.linesize[1] = src_frame->linesize[1];
pict_src.linesize[2] = src_frame->linesize[2]; pict_src.linesize[2] = src_frame->linesize[2];
//FIXME use direct rendering // FIXME use direct rendering
av_picture_copy(&pict, &pict_src, av_picture_copy(&pict, &pict_src,
vp->pix_fmt, vp->width, vp->height); vp->pix_fmt, vp->width, vp->height);
#else #else
...@@ -1425,7 +1427,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t ...@@ -1425,7 +1427,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t
if (++is->pictq_windex == VIDEO_PICTURE_QUEUE_SIZE) if (++is->pictq_windex == VIDEO_PICTURE_QUEUE_SIZE)
is->pictq_windex = 0; is->pictq_windex = 0;
SDL_LockMutex(is->pictq_mutex); SDL_LockMutex(is->pictq_mutex);
vp->target_clock= compute_target_time(vp->pts, is); vp->target_clock = compute_target_time(vp->pts, is);
is->pictq_size++; is->pictq_size++;
SDL_UnlockMutex(is->pictq_mutex); SDL_UnlockMutex(is->pictq_mutex);
...@@ -1470,7 +1472,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke ...@@ -1470,7 +1472,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
avcodec_flush_buffers(is->video_st->codec); avcodec_flush_buffers(is->video_st->codec);
SDL_LockMutex(is->pictq_mutex); SDL_LockMutex(is->pictq_mutex);
//Make sure there are no long delay timers (ideally we should just flush the que but thats harder) // Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) { for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
is->pictq[i].target_clock= 0; is->pictq[i].target_clock= 0;
} }
...@@ -1505,7 +1507,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke ...@@ -1505,7 +1507,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
} }
is->skip_frames_index += 1; is->skip_frames_index += 1;
if(is->skip_frames_index >= is->skip_frames){ if (is->skip_frames_index >= is->skip_frames) {
is->skip_frames_index -= FFMAX(is->skip_frames, 1.0); is->skip_frames_index -= FFMAX(is->skip_frames, 1.0);
return 1; return 1;
} }
...@@ -1533,12 +1535,12 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) ...@@ -1533,12 +1535,12 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES) if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES)
perms |= AV_PERM_NEG_LINESIZES; perms |= AV_PERM_NEG_LINESIZES;
if(pic->buffer_hints & FF_BUFFER_HINTS_VALID) { if (pic->buffer_hints & FF_BUFFER_HINTS_VALID) {
if(pic->buffer_hints & FF_BUFFER_HINTS_READABLE) perms |= AV_PERM_READ; if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE) perms |= AV_PERM_READ;
if(pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) perms |= AV_PERM_PRESERVE; if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) perms |= AV_PERM_PRESERVE;
if(pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) perms |= AV_PERM_REUSE2; if (pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) perms |= AV_PERM_REUSE2;
} }
if(pic->reference) perms |= AV_PERM_READ | AV_PERM_PRESERVE; if (pic->reference) perms |= AV_PERM_READ | AV_PERM_PRESERVE;
w = codec->width; w = codec->width;
h = codec->height; h = codec->height;
...@@ -1547,13 +1549,13 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) ...@@ -1547,13 +1549,13 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
w += edge << 1; w += edge << 1;
h += edge << 1; h += edge << 1;
if(!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h))) if (!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h)))
return -1; return -1;
pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1+1; pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1 + 1;
ref->video->w = codec->width; ref->video->w = codec->width;
ref->video->h = codec->height; ref->video->h = codec->height;
for(i = 0; i < 4; i ++) { for (i = 0; i < 4; i ++) {
unsigned hshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_w : 0; unsigned hshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_w : 0;
unsigned vshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_h : 0; unsigned vshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_h : 0;
...@@ -1566,8 +1568,8 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) ...@@ -1566,8 +1568,8 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
pic->opaque = ref; pic->opaque = ref;
pic->type = FF_BUFFER_TYPE_USER; pic->type = FF_BUFFER_TYPE_USER;
pic->reordered_opaque = codec->reordered_opaque; pic->reordered_opaque = codec->reordered_opaque;
if(codec->pkt) pic->pkt_pts = codec->pkt->pts; if (codec->pkt) pic->pkt_pts = codec->pkt->pts;
else pic->pkt_pts = AV_NOPTS_VALUE; else pic->pkt_pts = AV_NOPTS_VALUE;
return 0; return 0;
} }
...@@ -1593,8 +1595,8 @@ static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic) ...@@ -1593,8 +1595,8 @@ static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic)
} }
pic->reordered_opaque = codec->reordered_opaque; pic->reordered_opaque = codec->reordered_opaque;
if(codec->pkt) pic->pkt_pts = codec->pkt->pts; if (codec->pkt) pic->pkt_pts = codec->pkt->pts;
else pic->pkt_pts = AV_NOPTS_VALUE; else pic->pkt_pts = AV_NOPTS_VALUE;
return 0; return 0;
} }
...@@ -1602,12 +1604,12 @@ static int input_init(AVFilterContext *ctx, const char *args, void *opaque) ...@@ -1602,12 +1604,12 @@ static int input_init(AVFilterContext *ctx, const char *args, void *opaque)
{ {
FilterPriv *priv = ctx->priv; FilterPriv *priv = ctx->priv;
AVCodecContext *codec; AVCodecContext *codec;
if(!opaque) return -1; if (!opaque) return -1;
priv->is = opaque; priv->is = opaque;
codec = priv->is->video_st->codec; codec = priv->is->video_st->codec;
codec->opaque = ctx; codec->opaque = ctx;
if(codec->codec->capabilities & CODEC_CAP_DR1) { if (codec->codec->capabilities & CODEC_CAP_DR1) {
priv->use_dr1 = 1; priv->use_dr1 = 1;
codec->get_buffer = input_get_buffer; codec->get_buffer = input_get_buffer;
codec->release_buffer = input_release_buffer; codec->release_buffer = input_release_buffer;
...@@ -1639,7 +1641,7 @@ static int input_request_frame(AVFilterLink *link) ...@@ -1639,7 +1641,7 @@ static int input_request_frame(AVFilterLink *link)
if (ret < 0) if (ret < 0)
return -1; return -1;
if(priv->use_dr1) { if (priv->use_dr1) {
picref = avfilter_ref_buffer(priv->frame->opaque, ~0); picref = avfilter_ref_buffer(priv->frame->opaque, ~0);
} else { } else {
picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h); picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h);
...@@ -1717,7 +1719,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c ...@@ -1717,7 +1719,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
NULL, &ffsink_ctx, graph)) < 0) NULL, &ffsink_ctx, graph)) < 0)
return ret; return ret;
if(vfilters) { if (vfilters) {
AVFilterInOut *outputs = av_malloc(sizeof(AVFilterInOut)); AVFilterInOut *outputs = av_malloc(sizeof(AVFilterInOut));
AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut)); AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut));
...@@ -1752,7 +1754,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c ...@@ -1752,7 +1754,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
static int video_thread(void *arg) static int video_thread(void *arg)
{ {
VideoState *is = arg; VideoState *is = arg;
AVFrame *frame= avcodec_alloc_frame(); AVFrame *frame = avcodec_alloc_frame();
int64_t pts_int; int64_t pts_int;
double pts; double pts;
int ret; int ret;
...@@ -1769,7 +1771,7 @@ static int video_thread(void *arg) ...@@ -1769,7 +1771,7 @@ static int video_thread(void *arg)
filt_out = is->out_video_filter; filt_out = is->out_video_filter;
#endif #endif
for(;;) { for (;;) {
#if !CONFIG_AVFILTER #if !CONFIG_AVFILTER
AVPacket pkt; AVPacket pkt;
#else #else
...@@ -1810,12 +1812,13 @@ static int video_thread(void *arg) ...@@ -1810,12 +1812,13 @@ static int video_thread(void *arg)
ret = get_video_frame(is, frame, &pts_int, &pkt); ret = get_video_frame(is, frame, &pts_int, &pkt);
#endif #endif
if (ret < 0) goto the_end; if (ret < 0)
goto the_end;
if (!ret) if (!ret)
continue; continue;
pts = pts_int*av_q2d(is->video_st->time_base); pts = pts_int * av_q2d(is->video_st->time_base);
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
ret = output_picture2(is, frame, pts, pos); ret = output_picture2(is, frame, pts, pos);
...@@ -1848,14 +1851,14 @@ static int subtitle_thread(void *arg) ...@@ -1848,14 +1851,14 @@ static int subtitle_thread(void *arg)
int i, j; int i, j;
int r, g, b, y, u, v, a; int r, g, b, y, u, v, a;
for(;;) { for (;;) {
while (is->paused && !is->subtitleq.abort_request) { while (is->paused && !is->subtitleq.abort_request) {
SDL_Delay(10); SDL_Delay(10);
} }
if (packet_queue_get(&is->subtitleq, pkt, 1) < 0) if (packet_queue_get(&is->subtitleq, pkt, 1) < 0)
break; break;
if(pkt->data == flush_pkt.data){ if (pkt->data == flush_pkt.data) {
avcodec_flush_buffers(is->subtitle_st->codec); avcodec_flush_buffers(is->subtitle_st->codec);
continue; continue;
} }
...@@ -1875,7 +1878,7 @@ static int subtitle_thread(void *arg) ...@@ -1875,7 +1878,7 @@ static int subtitle_thread(void *arg)
this packet, if any */ this packet, if any */
pts = 0; pts = 0;
if (pkt->pts != AV_NOPTS_VALUE) if (pkt->pts != AV_NOPTS_VALUE)
pts = av_q2d(is->subtitle_st->time_base)*pkt->pts; pts = av_q2d(is->subtitle_st->time_base) * pkt->pts;
avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub, avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub,
&got_subtitle, pkt); &got_subtitle, pkt);
...@@ -1994,7 +1997,7 @@ static int synchronize_audio(VideoState *is, short *samples, ...@@ -1994,7 +1997,7 @@ static int synchronize_audio(VideoState *is, short *samples,
/* too big difference : may be initial PTS errors, so /* too big difference : may be initial PTS errors, so
reset A-V filter */ reset A-V filter */
is->audio_diff_avg_count = 0; is->audio_diff_avg_count = 0;
is->audio_diff_cum = 0; is->audio_diff_cum = 0;
} }
} }
...@@ -2006,13 +2009,13 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) ...@@ -2006,13 +2009,13 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
{ {
AVPacket *pkt_temp = &is->audio_pkt_temp; AVPacket *pkt_temp = &is->audio_pkt_temp;
AVPacket *pkt = &is->audio_pkt; AVPacket *pkt = &is->audio_pkt;
AVCodecContext *dec= is->audio_st->codec; AVCodecContext *dec = is->audio_st->codec;
int n, len1, data_size, got_frame; int n, len1, data_size, got_frame;
double pts; double pts;
int new_packet = 0; int new_packet = 0;
int flush_complete = 0; int flush_complete = 0;
for(;;) { for (;;) {
/* NOTE: the audio packet can contain several frames */ /* NOTE: the audio packet can contain several frames */
while (pkt_temp->size > 0 || (!pkt_temp->data && new_packet)) { while (pkt_temp->size > 0 || (!pkt_temp->data && new_packet)) {
if (!is->frame) { if (!is->frame) {
...@@ -2059,25 +2062,25 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) ...@@ -2059,25 +2062,25 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
} }
if (is->reformat_ctx) { if (is->reformat_ctx) {
const void *ibuf[6]= { is->frame->data[0] }; const void *ibuf[6] = { is->frame->data[0] };
void *obuf[6]; void *obuf[6];
int istride[6]= {av_get_bytes_per_sample(dec->sample_fmt)}; int istride[6] = { av_get_bytes_per_sample(dec->sample_fmt) };
int ostride[6]= {2}; int ostride[6] = { 2 };
int len= data_size/istride[0]; int len= data_size/istride[0];
obuf[0] = av_realloc(is->audio_buf1, FFALIGN(len * ostride[0], 32)); obuf[0] = av_realloc(is->audio_buf1, FFALIGN(len * ostride[0], 32));
if (!obuf[0]) { if (!obuf[0]) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
is->audio_buf1 = obuf[0]; is->audio_buf1 = obuf[0];
if (av_audio_convert(is->reformat_ctx, obuf, ostride, ibuf, istride, len)<0) { if (av_audio_convert(is->reformat_ctx, obuf, ostride, ibuf, istride, len) < 0) {
printf("av_audio_convert() failed\n"); printf("av_audio_convert() failed\n");
break; break;
} }
is->audio_buf = is->audio_buf1; is->audio_buf = is->audio_buf1;
/* FIXME: existing code assume that data_size equals framesize*channels*2 /* FIXME: existing code assume that data_size equals framesize*channels*2
remove this legacy cruft */ remove this legacy cruft */
data_size= len*2; data_size = len * 2;
}else{ } else {
is->audio_buf = is->frame->data[0]; is->audio_buf = is->frame->data[0];
} }
...@@ -2176,19 +2179,20 @@ static int stream_component_open(VideoState *is, int stream_index) ...@@ -2176,19 +2179,20 @@ static int stream_component_open(VideoState *is, int stream_index)
opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index]); opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index]);
codec = avcodec_find_decoder(avctx->codec_id); codec = avcodec_find_decoder(avctx->codec_id);
avctx->debug_mv = debug_mv; avctx->debug_mv = debug_mv;
avctx->debug = debug; avctx->debug = debug;
avctx->workaround_bugs = workaround_bugs; avctx->workaround_bugs = workaround_bugs;
avctx->lowres = lowres; avctx->lowres = lowres;
if(lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE; avctx->idct_algo = idct;
avctx->idct_algo= idct; avctx->skip_frame = skip_frame;
if(fast) avctx->flags2 |= CODEC_FLAG2_FAST; avctx->skip_idct = skip_idct;
avctx->skip_frame= skip_frame; avctx->skip_loop_filter = skip_loop_filter;
avctx->skip_idct= skip_idct; avctx->error_recognition = error_recognition;
avctx->skip_loop_filter= skip_loop_filter; avctx->error_concealment = error_concealment;
avctx->error_recognition= error_recognition; avctx->thread_count = thread_count;
avctx->error_concealment= error_concealment;
avctx->thread_count= thread_count; if (lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
if (fast) avctx->flags2 |= CODEC_FLAG2_FAST;
if (!codec || if (!codec ||
avcodec_open2(avctx, codec, &opts) < 0) avcodec_open2(avctx, codec, &opts) < 0)
...@@ -2212,19 +2216,19 @@ static int stream_component_open(VideoState *is, int stream_index) ...@@ -2212,19 +2216,19 @@ static int stream_component_open(VideoState *is, int stream_index)
return -1; return -1;
} }
is->audio_hw_buf_size = spec.size; is->audio_hw_buf_size = spec.size;
is->audio_src_fmt= AV_SAMPLE_FMT_S16; is->audio_src_fmt = AV_SAMPLE_FMT_S16;
} }
ic->streams[stream_index]->discard = AVDISCARD_DEFAULT; ic->streams[stream_index]->discard = AVDISCARD_DEFAULT;
switch(avctx->codec_type) { switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
is->audio_stream = stream_index; is->audio_stream = stream_index;
is->audio_st = ic->streams[stream_index]; is->audio_st = ic->streams[stream_index];
is->audio_buf_size = 0; is->audio_buf_size = 0;
is->audio_buf_index = 0; is->audio_buf_index = 0;
/* init averaging filter */ /* init averaging filter */
is->audio_diff_avg_coef = exp(log(0.01) / AUDIO_DIFF_AVG_NB); is->audio_diff_avg_coef = exp(log(0.01) / AUDIO_DIFF_AVG_NB);
is->audio_diff_avg_count = 0; is->audio_diff_avg_count = 0;
/* since we do not have a precise anough audio fifo fullness, /* since we do not have a precise anough audio fifo fullness,
we correct audio sync only if larger than this threshold */ we correct audio sync only if larger than this threshold */
...@@ -2263,7 +2267,7 @@ static void stream_component_close(VideoState *is, int stream_index) ...@@ -2263,7 +2267,7 @@ static void stream_component_close(VideoState *is, int stream_index)
return; return;
avctx = ic->streams[stream_index]->codec; avctx = ic->streams[stream_index]->codec;
switch(avctx->codec_type) { switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
packet_queue_abort(&is->audioq); packet_queue_abort(&is->audioq);
...@@ -2319,7 +2323,7 @@ static void stream_component_close(VideoState *is, int stream_index) ...@@ -2319,7 +2323,7 @@ static void stream_component_close(VideoState *is, int stream_index)
ic->streams[stream_index]->discard = AVDISCARD_ALL; ic->streams[stream_index]->discard = AVDISCARD_ALL;
avcodec_close(avctx); avcodec_close(avctx);
switch(avctx->codec_type) { switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
is->audio_st = NULL; is->audio_st = NULL;
is->audio_stream = -1; is->audio_stream = -1;
...@@ -2354,7 +2358,7 @@ static int decode_thread(void *arg) ...@@ -2354,7 +2358,7 @@ static int decode_thread(void *arg)
int err, i, ret; int err, i, ret;
int st_index[AVMEDIA_TYPE_NB]; int st_index[AVMEDIA_TYPE_NB];
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
int eof=0; int eof = 0;
int pkt_in_play_range = 0; int pkt_in_play_range = 0;
AVDictionaryEntry *t; AVDictionaryEntry *t;
AVDictionary **opts; AVDictionary **opts;
...@@ -2382,7 +2386,7 @@ static int decode_thread(void *arg) ...@@ -2382,7 +2386,7 @@ static int decode_thread(void *arg)
} }
is->ic = ic; is->ic = ic;
if(genpts) if (genpts)
ic->flags |= AVFMT_FLAG_GENPTS; ic->flags |= AVFMT_FLAG_GENPTS;
opts = setup_find_stream_info_opts(ic, codec_opts); opts = setup_find_stream_info_opts(ic, codec_opts);
...@@ -2398,11 +2402,11 @@ static int decode_thread(void *arg) ...@@ -2398,11 +2402,11 @@ static int decode_thread(void *arg)
av_dict_free(&opts[i]); av_dict_free(&opts[i]);
av_freep(&opts); av_freep(&opts);
if(ic->pb) if (ic->pb)
ic->pb->eof_reached= 0; //FIXME hack, avplay maybe should not use url_feof() to test for the end ic->pb->eof_reached = 0; // FIXME hack, avplay maybe should not use url_feof() to test for the end
if(seek_by_bytes<0) if (seek_by_bytes < 0)
seek_by_bytes= !!(ic->iformat->flags & AVFMT_TS_DISCONT); seek_by_bytes = !!(ic->iformat->flags & AVFMT_TS_DISCONT);
/* if seeking requested, we execute it */ /* if seeking requested, we execute it */
if (start_time != AV_NOPTS_VALUE) { if (start_time != AV_NOPTS_VALUE) {
...@@ -2448,12 +2452,12 @@ static int decode_thread(void *arg) ...@@ -2448,12 +2452,12 @@ static int decode_thread(void *arg)
stream_component_open(is, st_index[AVMEDIA_TYPE_AUDIO]); stream_component_open(is, st_index[AVMEDIA_TYPE_AUDIO]);
} }
ret=-1; ret = -1;
if (st_index[AVMEDIA_TYPE_VIDEO] >= 0) { if (st_index[AVMEDIA_TYPE_VIDEO] >= 0) {
ret= stream_component_open(is, st_index[AVMEDIA_TYPE_VIDEO]); ret = stream_component_open(is, st_index[AVMEDIA_TYPE_VIDEO]);
} }
is->refresh_tid = SDL_CreateThread(refresh_thread, is); is->refresh_tid = SDL_CreateThread(refresh_thread, is);
if(ret<0) { if (ret < 0) {
if (!display_disable) if (!display_disable)
is->show_audio = 2; is->show_audio = 2;
} }
...@@ -2468,13 +2472,13 @@ static int decode_thread(void *arg) ...@@ -2468,13 +2472,13 @@ static int decode_thread(void *arg)
goto fail; goto fail;
} }
for(;;) { for (;;) {
if (is->abort_request) if (is->abort_request)
break; break;
if (is->paused != is->last_paused) { if (is->paused != is->last_paused) {
is->last_paused = is->paused; is->last_paused = is->paused;
if (is->paused) if (is->paused)
is->read_pause_return= av_read_pause(ic); is->read_pause_return = av_read_pause(ic);
else else
av_read_play(ic); av_read_play(ic);
} }
...@@ -2487,16 +2491,16 @@ static int decode_thread(void *arg) ...@@ -2487,16 +2491,16 @@ static int decode_thread(void *arg)
} }
#endif #endif
if (is->seek_req) { if (is->seek_req) {
int64_t seek_target= is->seek_pos; int64_t seek_target = is->seek_pos;
int64_t seek_min= is->seek_rel > 0 ? seek_target - is->seek_rel + 2: INT64_MIN; int64_t seek_min = is->seek_rel > 0 ? seek_target - is->seek_rel + 2: INT64_MIN;
int64_t seek_max= is->seek_rel < 0 ? seek_target - is->seek_rel - 2: INT64_MAX; int64_t seek_max = is->seek_rel < 0 ? seek_target - is->seek_rel - 2: INT64_MAX;
//FIXME the +-2 is due to rounding being not done in the correct direction in generation // FIXME the +-2 is due to rounding being not done in the correct direction in generation
// of the seek_pos/seek_rel variables // of the seek_pos/seek_rel variables
ret = avformat_seek_file(is->ic, -1, seek_min, seek_target, seek_max, is->seek_flags); ret = avformat_seek_file(is->ic, -1, seek_min, seek_target, seek_max, is->seek_flags);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "%s: error while seeking\n", is->ic->filename); fprintf(stderr, "%s: error while seeking\n", is->ic->filename);
}else{ } else {
if (is->audio_stream >= 0) { if (is->audio_stream >= 0) {
packet_queue_flush(&is->audioq); packet_queue_flush(&is->audioq);
packet_queue_put(&is->audioq, &flush_pkt); packet_queue_put(&is->audioq, &flush_pkt);
...@@ -2511,24 +2515,24 @@ static int decode_thread(void *arg) ...@@ -2511,24 +2515,24 @@ static int decode_thread(void *arg)
} }
} }
is->seek_req = 0; is->seek_req = 0;
eof= 0; eof = 0;
} }
/* if the queue are full, no need to read more */ /* if the queue are full, no need to read more */
if ( is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE if ( is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE
|| ( (is->audioq .size > MIN_AUDIOQ_SIZE || is->audio_stream<0) || ( (is->audioq .size > MIN_AUDIOQ_SIZE || is->audio_stream < 0)
&& (is->videoq .nb_packets > MIN_FRAMES || is->video_stream<0) && (is->videoq .nb_packets > MIN_FRAMES || is->video_stream < 0)
&& (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream<0))) { && (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream < 0))) {
/* wait 10 ms */ /* wait 10 ms */
SDL_Delay(10); SDL_Delay(10);
continue; continue;
} }
if(eof) { if (eof) {
if(is->video_stream >= 0){ if (is->video_stream >= 0) {
av_init_packet(pkt); av_init_packet(pkt);
pkt->data=NULL; pkt->data = NULL;
pkt->size=0; pkt->size = 0;
pkt->stream_index= is->video_stream; pkt->stream_index = is->video_stream;
packet_queue_put(&is->videoq, pkt); packet_queue_put(&is->videoq, pkt);
} }
if (is->audio_stream >= 0 && if (is->audio_stream >= 0 &&
...@@ -2540,11 +2544,11 @@ static int decode_thread(void *arg) ...@@ -2540,11 +2544,11 @@ static int decode_thread(void *arg)
packet_queue_put(&is->audioq, pkt); packet_queue_put(&is->audioq, pkt);
} }
SDL_Delay(10); SDL_Delay(10);
if(is->audioq.size + is->videoq.size + is->subtitleq.size ==0){ if (is->audioq.size + is->videoq.size + is->subtitleq.size == 0) {
if(loop!=1 && (!loop || --loop)){ if (loop != 1 && (!loop || --loop)) {
stream_seek(cur_stream, start_time != AV_NOPTS_VALUE ? start_time : 0, 0, 0); stream_seek(cur_stream, start_time != AV_NOPTS_VALUE ? start_time : 0, 0, 0);
}else if(autoexit){ } else if (autoexit) {
ret=AVERROR_EOF; ret = AVERROR_EOF;
goto fail; goto fail;
} }
} }
...@@ -2553,7 +2557,7 @@ static int decode_thread(void *arg) ...@@ -2553,7 +2557,7 @@ static int decode_thread(void *arg)
ret = av_read_frame(ic, pkt); ret = av_read_frame(ic, pkt);
if (ret < 0) { if (ret < 0) {
if (ret == AVERROR_EOF || (ic->pb && ic->pb->eof_reached)) if (ret == AVERROR_EOF || (ic->pb && ic->pb->eof_reached))
eof=1; eof = 1;
if (ic->pb && ic->pb->error) if (ic->pb && ic->pb->error)
break; break;
SDL_Delay(100); /* wait for user event */ SDL_Delay(100); /* wait for user event */
...@@ -2563,8 +2567,8 @@ static int decode_thread(void *arg) ...@@ -2563,8 +2567,8 @@ static int decode_thread(void *arg)
pkt_in_play_range = duration == AV_NOPTS_VALUE || pkt_in_play_range = duration == AV_NOPTS_VALUE ||
(pkt->pts - ic->streams[pkt->stream_index]->start_time) * (pkt->pts - ic->streams[pkt->stream_index]->start_time) *
av_q2d(ic->streams[pkt->stream_index]->time_base) - av_q2d(ic->streams[pkt->stream_index]->time_base) -
(double)(start_time != AV_NOPTS_VALUE ? start_time : 0)/1000000 (double)(start_time != AV_NOPTS_VALUE ? start_time : 0) / 1000000
<= ((double)duration/1000000); <= ((double)duration / 1000000);
if (pkt->stream_index == is->audio_stream && pkt_in_play_range) { if (pkt->stream_index == is->audio_stream && pkt_in_play_range) {
packet_queue_put(&is->audioq, pkt); packet_queue_put(&is->audioq, pkt);
} else if (pkt->stream_index == is->video_stream && pkt_in_play_range) { } else if (pkt->stream_index == is->video_stream && pkt_in_play_range) {
...@@ -2616,18 +2620,18 @@ static VideoState *stream_open(const char *filename, AVInputFormat *iformat) ...@@ -2616,18 +2620,18 @@ static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
return NULL; return NULL;
av_strlcpy(is->filename, filename, sizeof(is->filename)); av_strlcpy(is->filename, filename, sizeof(is->filename));
is->iformat = iformat; is->iformat = iformat;
is->ytop = 0; is->ytop = 0;
is->xleft = 0; is->xleft = 0;
/* start video display */ /* start video display */
is->pictq_mutex = SDL_CreateMutex(); is->pictq_mutex = SDL_CreateMutex();
is->pictq_cond = SDL_CreateCond(); is->pictq_cond = SDL_CreateCond();
is->subpq_mutex = SDL_CreateMutex(); is->subpq_mutex = SDL_CreateMutex();
is->subpq_cond = SDL_CreateCond(); is->subpq_cond = SDL_CreateCond();
is->av_sync_type = av_sync_type; is->av_sync_type = av_sync_type;
is->parse_tid = SDL_CreateThread(decode_thread, is); is->parse_tid = SDL_CreateThread(decode_thread, is);
if (!is->parse_tid) { if (!is->parse_tid) {
av_free(is); av_free(is);
return NULL; return NULL;
...@@ -2650,7 +2654,7 @@ static void stream_cycle_channel(VideoState *is, int codec_type) ...@@ -2650,7 +2654,7 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
if (start_index < (codec_type == AVMEDIA_TYPE_SUBTITLE ? -1 : 0)) if (start_index < (codec_type == AVMEDIA_TYPE_SUBTITLE ? -1 : 0))
return; return;
stream_index = start_index; stream_index = start_index;
for(;;) { for (;;) {
if (++stream_index >= is->ic->nb_streams) if (++stream_index >= is->ic->nb_streams)
{ {
if (codec_type == AVMEDIA_TYPE_SUBTITLE) if (codec_type == AVMEDIA_TYPE_SUBTITLE)
...@@ -2665,7 +2669,7 @@ static void stream_cycle_channel(VideoState *is, int codec_type) ...@@ -2665,7 +2669,7 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
st = ic->streams[stream_index]; st = ic->streams[stream_index];
if (st->codec->codec_type == codec_type) { if (st->codec->codec_type == codec_type) {
/* check that parameters are OK */ /* check that parameters are OK */
switch(codec_type) { switch (codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
if (st->codec->sample_rate != 0 && if (st->codec->sample_rate != 0 &&
st->codec->channels != 0) st->codec->channels != 0)
...@@ -2720,8 +2724,8 @@ static void toggle_audio_display(void) ...@@ -2720,8 +2724,8 @@ static void toggle_audio_display(void)
int bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00); int bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
cur_stream->show_audio = (cur_stream->show_audio + 1) % 3; cur_stream->show_audio = (cur_stream->show_audio + 1) % 3;
fill_rectangle(screen, fill_rectangle(screen,
cur_stream->xleft, cur_stream->ytop, cur_stream->width, cur_stream->height, cur_stream->xleft, cur_stream->ytop, cur_stream->width, cur_stream->height,
bgcolor); bgcolor);
SDL_UpdateRect(screen, cur_stream->xleft, cur_stream->ytop, cur_stream->width, cur_stream->height); SDL_UpdateRect(screen, cur_stream->xleft, cur_stream->ytop, cur_stream->width, cur_stream->height);
} }
} }
...@@ -2732,16 +2736,16 @@ static void event_loop(void) ...@@ -2732,16 +2736,16 @@ static void event_loop(void)
SDL_Event event; SDL_Event event;
double incr, pos, frac; double incr, pos, frac;
for(;;) { for (;;) {
double x; double x;
SDL_WaitEvent(&event); SDL_WaitEvent(&event);
switch(event.type) { switch (event.type) {
case SDL_KEYDOWN: case SDL_KEYDOWN:
if (exit_on_keydown) { if (exit_on_keydown) {
do_exit(); do_exit();
break; break;
} }
switch(event.key.keysym.sym) { switch (event.key.keysym.sym) {
case SDLK_ESCAPE: case SDLK_ESCAPE:
case SDLK_q: case SDLK_q:
do_exit(); do_exit();
...@@ -2753,7 +2757,7 @@ static void event_loop(void) ...@@ -2753,7 +2757,7 @@ static void event_loop(void)
case SDLK_SPACE: case SDLK_SPACE:
toggle_pause(); toggle_pause();
break; break;
case SDLK_s: //S: Step to next frame case SDLK_s: // S: Step to next frame
step_to_next_frame(); step_to_next_frame();
break; break;
case SDLK_a: case SDLK_a:
...@@ -2785,11 +2789,11 @@ static void event_loop(void) ...@@ -2785,11 +2789,11 @@ static void event_loop(void)
do_seek: do_seek:
if (cur_stream) { if (cur_stream) {
if (seek_by_bytes) { if (seek_by_bytes) {
if (cur_stream->video_stream >= 0 && cur_stream->video_current_pos>=0){ if (cur_stream->video_stream >= 0 && cur_stream->video_current_pos >= 0) {
pos= cur_stream->video_current_pos; pos = cur_stream->video_current_pos;
}else if(cur_stream->audio_stream >= 0 && cur_stream->audio_pkt.pos>=0){ } else if (cur_stream->audio_stream >= 0 && cur_stream->audio_pkt.pos >= 0) {
pos= cur_stream->audio_pkt.pos; pos = cur_stream->audio_pkt.pos;
}else } else
pos = avio_tell(cur_stream->ic->pb); pos = avio_tell(cur_stream->ic->pb);
if (cur_stream->ic->bit_rate) if (cur_stream->ic->bit_rate)
incr *= cur_stream->ic->bit_rate / 8.0; incr *= cur_stream->ic->bit_rate / 8.0;
...@@ -2814,33 +2818,33 @@ static void event_loop(void) ...@@ -2814,33 +2818,33 @@ static void event_loop(void)
break; break;
} }
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
if(event.type ==SDL_MOUSEBUTTONDOWN){ if (event.type == SDL_MOUSEBUTTONDOWN) {
x= event.button.x; x = event.button.x;
}else{ } else {
if(event.motion.state != SDL_PRESSED) if (event.motion.state != SDL_PRESSED)
break; break;
x= event.motion.x; x = event.motion.x;
} }
if (cur_stream) { if (cur_stream) {
if(seek_by_bytes || cur_stream->ic->duration<=0){ if (seek_by_bytes || cur_stream->ic->duration <= 0) {
uint64_t size= avio_size(cur_stream->ic->pb); uint64_t size = avio_size(cur_stream->ic->pb);
stream_seek(cur_stream, size*x/cur_stream->width, 0, 1); stream_seek(cur_stream, size*x/cur_stream->width, 0, 1);
}else{ } else {
int64_t ts; int64_t ts;
int ns, hh, mm, ss; int ns, hh, mm, ss;
int tns, thh, tmm, tss; int tns, thh, tmm, tss;
tns = cur_stream->ic->duration/1000000LL; tns = cur_stream->ic->duration / 1000000LL;
thh = tns/3600; thh = tns / 3600;
tmm = (tns%3600)/60; tmm = (tns % 3600) / 60;
tss = (tns%60); tss = (tns % 60);
frac = x/cur_stream->width; frac = x / cur_stream->width;
ns = frac*tns; ns = frac * tns;
hh = ns/3600; hh = ns / 3600;
mm = (ns%3600)/60; mm = (ns % 3600) / 60;
ss = (ns%60); ss = (ns % 60);
fprintf(stderr, "Seek to %2.0f%% (%2d:%02d:%02d) of total duration (%2d:%02d:%02d) \n", frac*100, fprintf(stderr, "Seek to %2.0f%% (%2d:%02d:%02d) of total duration (%2d:%02d:%02d) \n", frac*100,
hh, mm, ss, thh, tmm, tss); hh, mm, ss, thh, tmm, tss);
ts = frac*cur_stream->ic->duration; ts = frac * cur_stream->ic->duration;
if (cur_stream->ic->start_time != AV_NOPTS_VALUE) if (cur_stream->ic->start_time != AV_NOPTS_VALUE)
ts += cur_stream->ic->start_time; ts += cur_stream->ic->start_time;
stream_seek(cur_stream, ts, 0, 0); stream_seek(cur_stream, ts, 0, 0);
...@@ -2851,8 +2855,8 @@ static void event_loop(void) ...@@ -2851,8 +2855,8 @@ static void event_loop(void)
if (cur_stream) { if (cur_stream) {
screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0, screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0,
SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL); SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
screen_width = cur_stream->width = event.resize.w; screen_width = cur_stream->width = event.resize.w;
screen_height= cur_stream->height= event.resize.h; screen_height = cur_stream->height = event.resize.h;
} }
break; break;
case SDL_QUIT: case SDL_QUIT:
...@@ -2865,7 +2869,7 @@ static void event_loop(void) ...@@ -2865,7 +2869,7 @@ static void event_loop(void)
break; break;
case FF_REFRESH_EVENT: case FF_REFRESH_EVENT:
video_refresh_timer(event.user.data1); video_refresh_timer(event.user.data1);
cur_stream->refresh=0; cur_stream->refresh = 0;
break; break;
default: default:
break; break;
...@@ -2951,7 +2955,7 @@ static int opt_vismv(const char *opt, const char *arg) ...@@ -2951,7 +2955,7 @@ static int opt_vismv(const char *opt, const char *arg)
static int opt_thread_count(const char *opt, const char *arg) static int opt_thread_count(const char *opt, const char *arg)
{ {
thread_count= parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX); thread_count = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
#if !HAVE_THREADS #if !HAVE_THREADS
fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n"); fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n");
#endif #endif
...@@ -2960,49 +2964,49 @@ static int opt_thread_count(const char *opt, const char *arg) ...@@ -2960,49 +2964,49 @@ static int opt_thread_count(const char *opt, const char *arg)
static const OptionDef options[] = { static const OptionDef options[] = {
#include "cmdutils_common_opts.h" #include "cmdutils_common_opts.h"
{ "x", HAS_ARG, {(void*)opt_width}, "force displayed width", "width" }, { "x", HAS_ARG, { (void*)opt_width }, "force displayed width", "width" },
{ "y", HAS_ARG, {(void*)opt_height}, "force displayed height", "height" }, { "y", HAS_ARG, { (void*)opt_height }, "force displayed height", "height" },
{ "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" }, { "s", HAS_ARG | OPT_VIDEO, { (void*)opt_frame_size }, "set frame size (WxH or abbreviation)", "size" },
{ "fs", OPT_BOOL, {(void*)&is_full_screen}, "force full screen" }, { "fs", OPT_BOOL, { (void*)&is_full_screen }, "force full screen" },
{ "an", OPT_BOOL, {(void*)&audio_disable}, "disable audio" }, { "an", OPT_BOOL, { (void*)&audio_disable }, "disable audio" },
{ "vn", OPT_BOOL, {(void*)&video_disable}, "disable video" }, { "vn", OPT_BOOL, { (void*)&video_disable }, "disable video" },
{ "ast", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_AUDIO]}, "select desired audio stream", "stream_number" }, { "ast", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_AUDIO] }, "select desired audio stream", "stream_number" },
{ "vst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_VIDEO]}, "select desired video stream", "stream_number" }, { "vst", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_VIDEO] }, "select desired video stream", "stream_number" },
{ "sst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_SUBTITLE]}, "select desired subtitle stream", "stream_number" }, { "sst", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_SUBTITLE] }, "select desired subtitle stream", "stream_number" },
{ "ss", HAS_ARG, {(void*)&opt_seek}, "seek to a given position in seconds", "pos" }, { "ss", HAS_ARG, { (void*)&opt_seek }, "seek to a given position in seconds", "pos" },
{ "t", HAS_ARG, {(void*)&opt_duration}, "play \"duration\" seconds of audio/video", "duration" }, { "t", HAS_ARG, { (void*)&opt_duration }, "play \"duration\" seconds of audio/video", "duration" },
{ "bytes", OPT_INT | HAS_ARG, {(void*)&seek_by_bytes}, "seek by bytes 0=off 1=on -1=auto", "val" }, { "bytes", OPT_INT | HAS_ARG, { (void*)&seek_by_bytes }, "seek by bytes 0=off 1=on -1=auto", "val" },
{ "nodisp", OPT_BOOL, {(void*)&display_disable}, "disable graphical display" }, { "nodisp", OPT_BOOL, { (void*)&display_disable }, "disable graphical display" },
{ "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" }, { "f", HAS_ARG, { (void*)opt_format }, "force format", "fmt" },
{ "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_frame_pix_fmt}, "set pixel format", "format" }, { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { (void*)opt_frame_pix_fmt }, "set pixel format", "format" },
{ "stats", OPT_BOOL | OPT_EXPERT, {(void*)&show_status}, "show status", "" }, { "stats", OPT_BOOL | OPT_EXPERT, { (void*)&show_status }, "show status", "" },
{ "debug", HAS_ARG | OPT_EXPERT, {(void*)opt_debug}, "print specific debug info", "" }, { "debug", HAS_ARG | OPT_EXPERT, { (void*)opt_debug }, "print specific debug info", "" },
{ "bug", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&workaround_bugs}, "workaround bugs", "" }, { "bug", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&workaround_bugs }, "workaround bugs", "" },
{ "vismv", HAS_ARG | OPT_EXPERT, {(void*)opt_vismv}, "visualize motion vectors", "" }, { "vismv", HAS_ARG | OPT_EXPERT, { (void*)opt_vismv }, "visualize motion vectors", "" },
{ "fast", OPT_BOOL | OPT_EXPERT, {(void*)&fast}, "non spec compliant optimizations", "" }, { "fast", OPT_BOOL | OPT_EXPERT, { (void*)&fast }, "non spec compliant optimizations", "" },
{ "genpts", OPT_BOOL | OPT_EXPERT, {(void*)&genpts}, "generate pts", "" }, { "genpts", OPT_BOOL | OPT_EXPERT, { (void*)&genpts }, "generate pts", "" },
{ "drp", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&decoder_reorder_pts}, "let decoder reorder pts 0=off 1=on -1=auto", ""}, { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&decoder_reorder_pts }, "let decoder reorder pts 0=off 1=on -1=auto", ""},
{ "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&lowres}, "", "" }, { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&lowres }, "", "" },
{ "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_loop_filter}, "", "" }, { "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_loop_filter }, "", "" },
{ "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_frame}, "", "" }, { "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_frame }, "", "" },
{ "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_idct}, "", "" }, { "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_idct }, "", "" },
{ "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo", "algo" }, { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&idct }, "set idct algo", "algo" },
{ "er", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_recognition}, "set error detection threshold (0-4)", "threshold" }, { "er", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&error_recognition }, "set error detection threshold (0-4)", "threshold" },
{ "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&error_concealment }, "set error concealment options", "bit_mask" },
{ "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, { "sync", HAS_ARG | OPT_EXPERT, { (void*)opt_sync }, "set audio-video sync. type (type=audio/video/ext)", "type" },
{ "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, { "threads", HAS_ARG | OPT_EXPERT, { (void*)opt_thread_count }, "thread count", "count" },
{ "autoexit", OPT_BOOL | OPT_EXPERT, {(void*)&autoexit}, "exit at the end", "" }, { "autoexit", OPT_BOOL | OPT_EXPERT, { (void*)&autoexit }, "exit at the end", "" },
{ "exitonkeydown", OPT_BOOL | OPT_EXPERT, {(void*)&exit_on_keydown}, "exit on key down", "" }, { "exitonkeydown", OPT_BOOL | OPT_EXPERT, { (void*)&exit_on_keydown }, "exit on key down", "" },
{ "exitonmousedown", OPT_BOOL | OPT_EXPERT, {(void*)&exit_on_mousedown}, "exit on mouse down", "" }, { "exitonmousedown", OPT_BOOL | OPT_EXPERT, { (void*)&exit_on_mousedown }, "exit on mouse down", "" },
{ "loop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&loop}, "set number of times the playback shall be looped", "loop count" }, { "loop", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&loop }, "set number of times the playback shall be looped", "loop count" },
{ "framedrop", OPT_BOOL | OPT_EXPERT, {(void*)&framedrop}, "drop frames when cpu is too slow", "" }, { "framedrop", OPT_BOOL | OPT_EXPERT, { (void*)&framedrop }, "drop frames when cpu is too slow", "" },
{ "window_title", OPT_STRING | HAS_ARG, {(void*)&window_title}, "set window title", "window title" }, { "window_title", OPT_STRING | HAS_ARG, { (void*)&window_title }, "set window title", "window title" },
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
{ "vf", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" }, { "vf", OPT_STRING | HAS_ARG, { (void*)&vfilters }, "video filters", "filter list" },
#endif #endif
{ "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, {(void*)&rdftspeed}, "rdft speed", "msecs" }, { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, { (void*)&rdftspeed }, "rdft speed", "msecs" },
{ "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, { (void*)opt_default }, "generic catch all option", "" },
{ "i", 0, {NULL}, "avconv compatibility dummy option", ""}, { "i", 0, { NULL }, "avconv compatibility dummy option", ""},
{ NULL, }, { NULL, },
}; };
...@@ -3111,7 +3115,7 @@ int main(int argc, char **argv) ...@@ -3111,7 +3115,7 @@ int main(int argc, char **argv)
SDL_EventState(SDL_USEREVENT, SDL_IGNORE); SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
av_init_packet(&flush_pkt); av_init_packet(&flush_pkt);
flush_pkt.data= "FLUSH"; flush_pkt.data = "FLUSH";
cur_stream = stream_open(input_filename, file_iformat); cur_stream = stream_open(input_filename, file_iformat);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment