---
avplay.c | 250 +++++++++++++++++++++++++++++++-------------------------------
1 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/avplay.c b/avplay.c
index 5fcfaa6..330d8d6 100644
--- a/avplay.c
+++ b/avplay.c
@@ -228,10 +228,10 @@ static int screen_width = 0;
static int screen_height = 0;
static int audio_disable;
static int video_disable;
-static int wanted_stream[AVMEDIA_TYPE_NB]={
- [AVMEDIA_TYPE_AUDIO]=-1,
- [AVMEDIA_TYPE_VIDEO]=-1,
- [AVMEDIA_TYPE_SUBTITLE]=-1,
+static int wanted_stream[AVMEDIA_TYPE_NB] = {
+ [AVMEDIA_TYPE_AUDIO] = -1,
+ [AVMEDIA_TYPE_VIDEO] = -1,
+ [AVMEDIA_TYPE_SUBTITLE] = -1,
};
static int seek_by_bytes=-1;
static int display_disable;
@@ -248,19 +248,19 @@ static int fast = 0;
static int genpts = 0;
static int lowres = 0;
static int idct = FF_IDCT_AUTO;
-static enum AVDiscard skip_frame= AVDISCARD_DEFAULT;
-static enum AVDiscard skip_idct= AVDISCARD_DEFAULT;
-static enum AVDiscard skip_loop_filter= AVDISCARD_DEFAULT;
+static enum AVDiscard skip_frame = AVDISCARD_DEFAULT;
+static enum AVDiscard skip_idct = AVDISCARD_DEFAULT;
+static enum AVDiscard skip_loop_filter = AVDISCARD_DEFAULT;
static int error_recognition = FF_ER_CAREFUL;
static int error_concealment = 3;
-static int decoder_reorder_pts= -1;
+static int decoder_reorder_pts = -1;
static int autoexit;
static int exit_on_keydown;
static int exit_on_mousedown;
-static int loop=1;
-static int framedrop=1;
+static int loop = 1;
+static int framedrop = 1;
-static int rdftspeed=20;
+static int rdftspeed = 20;
#if CONFIG_AVFILTER
static char *vfilters = NULL;
#endif
@@ -323,7 +323,7 @@ static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
AVPacketList *pkt1;
/* duplicate the packet */
- if (pkt!=&flush_pkt && av_dup_packet(pkt) < 0)
+ if (pkt != &flush_pkt && av_dup_packet(pkt) < 0)
return -1;
pkt1 = av_malloc(sizeof(AVPacketList));
@@ -767,18 +767,18 @@ static void video_audio_display(VideoState *s)
delay = data_used;
i_start= x = compute_mod(s->sample_array_index - delay * channels,
SAMPLE_ARRAY_SIZE);
- if(s->show_audio==1){
- h= INT_MIN;
- for(i=0; i<1000; i+=channels){
- int idx= (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE;
- int a= s->sample_array[idx];
- int b= s->sample_array[(idx + 4*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 score= a-d;
- if(h<score && (b^c)<0){
- h= score;
- i_start= idx;
+ if (s->show_audio==1) {
+ h = INT_MIN;
+ for(i=0; i<1000; i+=channels) {
+ int idx = (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE;
+ int a = s->sample_array[idx];
+ int b = s->sample_array[(idx + 4*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 score = a-d;
+ if (h<score && (b^c)<0) {
+ h = score;
+ i_start = idx;
}
}
}
@@ -789,7 +789,7 @@ static void video_audio_display(VideoState *s)
}
bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
- if(s->show_audio==1){
+ if (s->show_audio == 1) {
fill_rectangle(screen,
s->xleft, s->ytop, s->width, s->height,
bgcolor);
@@ -829,9 +829,9 @@ static void video_audio_display(VideoState *s)
fgcolor);
}
SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
- }else{
+ } else {
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_free(s->rdft_data);
s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
@@ -853,13 +853,13 @@ static void video_audio_display(VideoState *s)
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
- for(y=0; y<s->height; y++){
- 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 b= (nb_display_channels == 2 ) ?
sqrt(w*sqrt(data[1][2*y+0]*data[1][2*y+0]
+ for(y = 0; y<s->height; y++) {
+ 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 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;
- a= FFMIN(a,255);
- b= FFMIN(b,255);
+ a = FFMIN(a,255);
+ b = FFMIN(b,255);
fgcolor = SDL_MapRGB(screen->format, a, b, (a+b)/2);
fill_rectangle(screen,
@@ -869,30 +869,30 @@ static void video_audio_display(VideoState *s)
}
SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
s->xpos++;
- if(s->xpos >= s->width)
- s->xpos= s->xleft;
+ if (s->xpos >= s->width)
+ 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 w,h;
- if(is_full_screen) flags |= SDL_FULLSCREEN;
+ if (is_full_screen) flags |= SDL_FULLSCREEN;
else flags |= SDL_RESIZABLE;
if (is_full_screen && fs_screen_width) {
w = fs_screen_width;
h = fs_screen_height;
- } else if(!is_full_screen && screen_width){
+ } else if (!is_full_screen && screen_width) {
w = screen_width;
h = screen_height;
#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;
h = is->out_video_filter->inputs[0]->h;
#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;
h = is->video_st->codec->height;
#endif
@@ -900,8 +900,8 @@ static int video_open(VideoState *is){
w = 640;
h = 480;
}
- if(screen && is->width == screen->w && screen->w == w
- && is->height== screen->h && screen->h == h)
+ if (screen && is->width == screen->w && screen->w == w
+ && is->height == screen->h && screen->h == h)
return 0;
#if defined(__APPLE__) && !SDL_VERSION_ATLEAST(1, 2, 14)
@@ -927,7 +927,7 @@ static int video_open(VideoState *is){
/* display the current picture, if any */
static void video_display(VideoState *is)
{
- if(!screen)
+ if (!screen)
video_open(cur_stream);
if (is->audio_st && is->show_audio)
video_audio_display(is);
@@ -937,13 +937,13 @@ static void video_display(VideoState *is)
static int refresh_thread(void *opaque)
{
- VideoState *is= opaque;
- while(!is->abort_request){
+ VideoState *is = opaque;
+ while(!is->abort_request) {
SDL_Event event;
event.type = FF_REFRESH_EVENT;
event.user.data1 = opaque;
- if(!is->refresh){
- is->refresh=1;
+ if (!is->refresh) {
+ is->refresh = 1;
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
@@ -1025,7 +1025,7 @@ static void stream_pause(VideoState *is)
{
if (is->paused) {
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_drift = is->video_current_pts - av_gettime() /
1000000.0;
@@ -1086,27 +1086,27 @@ retry:
if (is->pictq_size == 0) {
//nothing to do, no picture to display in the que
} else {
- double time= av_gettime()/1000000.0;
+ double time = av_gettime()/1000000.0;
double next_target;
/* dequeue the picture */
vp = &is->pictq[is->pictq_rindex];
- if(time < vp->target_clock)
+ if (time < vp->target_clock)
return;
/* update current video pts */
is->video_current_pts = vp->pts;
is->video_current_pts_drift = is->video_current_pts - time;
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];
assert(nextvp->target_clock >= vp->target_clock);
- next_target= nextvp->target_clock;
- }else{
- next_target= vp->target_clock + is->video_clock - vp->pts;
//FIXME pass durations cleanly
+ next_target = nextvp->target_clock;
+ } else {
+ 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;
- 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 */
if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
is->pictq_rindex = 0;
@@ -1119,7 +1119,7 @@ retry:
}
}
- if(is->subtitle_st) {
+ if (is->subtitle_st) {
if (is->subtitle_stream_changed) {
SDL_LockMutex(is->subpq_mutex);
@@ -1325,7 +1325,7 @@ static int queue_picture(VideoState *is, AVFrame
*src_frame, double pts, int64_t
/* wait until we have space to put a new picture */
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));
while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
@@ -1374,7 +1374,7 @@ static int queue_picture(VideoState *is, AVFrame
*src_frame, double pts, int64_t
if (vp->bmp) {
AVPicture pict;
#if CONFIG_AVFILTER
- if(vp->picref)
+ if (vp->picref)
avfilter_unref_buffer(vp->picref);
vp->picref = src_frame->opaque;
#endif
@@ -1505,7 +1505,7 @@ static int get_video_frame(VideoState *is, AVFrame
*frame, int64_t *pts, AVPacke
}
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);
return 1;
}
@@ -1533,12 +1533,12 @@ static int input_get_buffer(AVCodecContext *codec,
AVFrame *pic)
if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES)
perms |= AV_PERM_NEG_LINESIZES;
- 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_PRESERVE) perms |=
AV_PERM_PRESERVE;
- if(pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) perms |=
AV_PERM_REUSE2;
+ 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_PRESERVE) perms |=
AV_PERM_PRESERVE;
+ 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;
h = codec->height;
@@ -1547,7 +1547,7 @@ static int input_get_buffer(AVCodecContext *codec,
AVFrame *pic)
w += 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;
pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1+1;
@@ -1566,7 +1566,7 @@ static int input_get_buffer(AVCodecContext *codec,
AVFrame *pic)
pic->opaque = ref;
pic->type = FF_BUFFER_TYPE_USER;
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;
return 0;
}
@@ -1593,7 +1593,7 @@ static int input_reget_buffer(AVCodecContext *codec,
AVFrame *pic)
}
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;
return 0;
}
@@ -1602,12 +1602,12 @@ static int input_init(AVFilterContext *ctx, const char
*args, void *opaque)
{
FilterPriv *priv = ctx->priv;
AVCodecContext *codec;
- if(!opaque) return -1;
+ if (!opaque) return -1;
priv->is = opaque;
codec = priv->is->video_st->codec;
codec->opaque = ctx;
- if(codec->codec->capabilities & CODEC_CAP_DR1) {
+ if (codec->codec->capabilities & CODEC_CAP_DR1) {
priv->use_dr1 = 1;
codec->get_buffer = input_get_buffer;
codec->release_buffer = input_release_buffer;
@@ -1639,7 +1639,7 @@ static int input_request_frame(AVFilterLink *link)
if (ret < 0)
return -1;
- if(priv->use_dr1) {
+ if (priv->use_dr1) {
picref = avfilter_ref_buffer(priv->frame->opaque, ~0);
} else {
picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w,
link->h);
@@ -1717,7 +1717,7 @@ static int configure_video_filters(AVFilterGraph *graph,
VideoState *is, const c
NULL, &ffsink_ctx, graph)) < 0)
return ret;
- if(vfilters) {
+ if (vfilters) {
AVFilterInOut *outputs = av_malloc(sizeof(AVFilterInOut));
AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut));
@@ -1752,7 +1752,7 @@ static int configure_video_filters(AVFilterGraph *graph,
VideoState *is, const c
static int video_thread(void *arg)
{
VideoState *is = arg;
- AVFrame *frame= avcodec_alloc_frame();
+ AVFrame *frame = avcodec_alloc_frame();
int64_t pts_int;
double pts;
int ret;
@@ -1855,7 +1855,7 @@ static int subtitle_thread(void *arg)
if (packet_queue_get(&is->subtitleq, pkt, 1) < 0)
break;
- if(pkt->data == flush_pkt.data){
+ if (pkt->data == flush_pkt.data) {
avcodec_flush_buffers(is->subtitle_st->codec);
continue;
}
@@ -2059,11 +2059,11 @@ static int audio_decode_frame(VideoState *is, double
*pts_ptr)
}
if (is->reformat_ctx) {
- const void *ibuf[6]= { is->frame->data[0] };
+ const void *ibuf[6] = { is->frame->data[0] };
void *obuf[6];
- int istride[6]= {av_get_bytes_per_sample(dec->sample_fmt)};
- int ostride[6]= {2};
- int len= data_size/istride[0];
+ int istride[6] = {av_get_bytes_per_sample(dec->sample_fmt)};
+ int ostride[6] = {2};
+ int len = data_size/istride[0];
obuf[0] = av_realloc(is->audio_buf1, FFALIGN(len * ostride[0],
32));
if (!obuf[0]) {
return AVERROR(ENOMEM);
@@ -2076,8 +2076,8 @@ static int audio_decode_frame(VideoState *is, double
*pts_ptr)
is->audio_buf = is->audio_buf1;
/* FIXME: existing code assume that data_size equals
framesize*channels*2
remove this legacy cruft */
- data_size= len*2;
- }else{
+ data_size = len*2;
+ } else {
is->audio_buf = is->frame->data[0];
}
@@ -2179,15 +2179,15 @@ static int stream_component_open(VideoState *is, int
stream_index)
avctx->debug = debug;
avctx->workaround_bugs = workaround_bugs;
avctx->lowres = lowres;
- if(lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
- avctx->idct_algo= idct;
- if(fast) avctx->flags2 |= CODEC_FLAG2_FAST;
- avctx->skip_frame= skip_frame;
- avctx->skip_idct= skip_idct;
- avctx->skip_loop_filter= skip_loop_filter;
- avctx->error_recognition= error_recognition;
- avctx->error_concealment= error_concealment;
- avctx->thread_count= thread_count;
+ if (lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
+ avctx->idct_algo = idct;
+ if (fast) avctx->flags2 |= CODEC_FLAG2_FAST;
+ avctx->skip_frame = skip_frame;
+ avctx->skip_idct = skip_idct;
+ avctx->skip_loop_filter = skip_loop_filter;
+ avctx->error_recognition = error_recognition;
+ avctx->error_concealment = error_concealment;
+ avctx->thread_count = thread_count;
if (!codec ||
avcodec_open2(avctx, codec, &opts) < 0)
@@ -2353,7 +2353,7 @@ static int decode_thread(void *arg)
int err, i, ret;
int st_index[AVMEDIA_TYPE_NB];
AVPacket pkt1, *pkt = &pkt1;
- int eof=0;
+ int eof = 0;
int pkt_in_play_range = 0;
AVDictionaryEntry *t;
AVDictionary **opts;
@@ -2381,7 +2381,7 @@ static int decode_thread(void *arg)
}
is->ic = ic;
- if(genpts)
+ if (genpts)
ic->flags |= AVFMT_FLAG_GENPTS;
opts = setup_find_stream_info_opts(ic, codec_opts);
@@ -2397,11 +2397,11 @@ static int decode_thread(void *arg)
av_dict_free(&opts[i]);
av_freep(&opts);
- if(ic->pb)
- ic->pb->eof_reached= 0; //FIXME hack, avplay maybe should not use
url_feof() to test for the end
+ if (ic->pb)
+ ic->pb->eof_reached = 0; //FIXME hack, avplay maybe should not use
url_feof() to test for the end
- if(seek_by_bytes<0)
- seek_by_bytes= !!(ic->iformat->flags & AVFMT_TS_DISCONT);
+ if (seek_by_bytes<0)
+ seek_by_bytes = !!(ic->iformat->flags & AVFMT_TS_DISCONT);
/* if seeking requested, we execute it */
if (start_time != AV_NOPTS_VALUE) {
@@ -2447,12 +2447,12 @@ static int decode_thread(void *arg)
stream_component_open(is, st_index[AVMEDIA_TYPE_AUDIO]);
}
- ret=-1;
+ ret = -1;
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);
- if(ret<0) {
+ if (ret<0) {
if (!display_disable)
is->show_audio = 2;
}
@@ -2473,7 +2473,7 @@ static int decode_thread(void *arg)
if (is->paused != is->last_paused) {
is->last_paused = is->paused;
if (is->paused)
- is->read_pause_return= av_read_pause(ic);
+ is->read_pause_return = av_read_pause(ic);
else
av_read_play(ic);
}
@@ -2486,16 +2486,16 @@ static int decode_thread(void *arg)
}
#endif
if (is->seek_req) {
- 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_max= is->seek_rel < 0 ? seek_target - is->seek_rel -
2: INT64_MAX;
+ 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_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
// of the seek_pos/seek_rel variables
ret = avformat_seek_file(is->ic, -1, seek_min, seek_target,
seek_max, is->seek_flags);
if (ret < 0) {
fprintf(stderr, "%s: error while seeking\n", is->ic->filename);
- }else{
+ } else {
if (is->audio_stream >= 0) {
packet_queue_flush(&is->audioq);
packet_queue_put(&is->audioq, &flush_pkt);
@@ -2522,12 +2522,12 @@ static int decode_thread(void *arg)
SDL_Delay(10);
continue;
}
- if(eof) {
- if(is->video_stream >= 0){
+ if (eof) {
+ if (is->video_stream >= 0) {
av_init_packet(pkt);
- pkt->data=NULL;
- pkt->size=0;
- pkt->stream_index= is->video_stream;
+ pkt->data = NULL;
+ pkt->size = 0;
+ pkt->stream_index = is->video_stream;
packet_queue_put(&is->videoq, pkt);
}
if (is->audio_stream >= 0 &&
@@ -2539,11 +2539,11 @@ static int decode_thread(void *arg)
packet_queue_put(&is->audioq, pkt);
}
SDL_Delay(10);
- if(is->audioq.size + is->videoq.size + is->subtitleq.size ==0){
- if(loop!=1 && (!loop || --loop)){
+ if (is->audioq.size + is->videoq.size + is->subtitleq.size == 0) {
+ if (loop != 1 && (!loop || --loop)) {
stream_seek(cur_stream, start_time != AV_NOPTS_VALUE ?
start_time : 0, 0, 0);
- }else if(autoexit){
- ret=AVERROR_EOF;
+ } else if (autoexit) {
+ ret = AVERROR_EOF;
goto fail;
}
}
@@ -2784,11 +2784,11 @@ static void event_loop(void)
do_seek:
if (cur_stream) {
if (seek_by_bytes) {
- if (cur_stream->video_stream >= 0 &&
cur_stream->video_current_pos>=0){
- pos= cur_stream->video_current_pos;
- }else if(cur_stream->audio_stream >= 0 &&
cur_stream->audio_pkt.pos>=0){
+ if (cur_stream->video_stream >= 0 &&
cur_stream->video_current_pos >= 0) {
+ pos = cur_stream->video_current_pos;
+ } else if (cur_stream->audio_stream >= 0 &&
cur_stream->audio_pkt.pos >= 0) {
pos= cur_stream->audio_pkt.pos;
- }else
+ } else
pos = avio_tell(cur_stream->ic->pb);
if (cur_stream->ic->bit_rate)
incr *= cur_stream->ic->bit_rate / 8.0;
@@ -2813,18 +2813,18 @@ static void event_loop(void)
break;
}
case SDL_MOUSEMOTION:
- if(event.type ==SDL_MOUSEBUTTONDOWN){
+ if (event.type == SDL_MOUSEBUTTONDOWN) {
x= event.button.x;
- }else{
- if(event.motion.state != SDL_PRESSED)
+ } else {
+ if (event.motion.state != SDL_PRESSED)
break;
x= event.motion.x;
}
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);
stream_seek(cur_stream, size*x/cur_stream->width, 0, 1);
- }else{
+ } else {
int64_t ts;
int ns, hh, mm, ss;
int tns, thh, tmm, tss;
@@ -2850,8 +2850,8 @@ static void event_loop(void)
if (cur_stream) {
screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0,
SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
- screen_width = cur_stream->width = event.resize.w;
- screen_height= cur_stream->height= event.resize.h;
+ screen_width = cur_stream->width = event.resize.w;
+ screen_height = cur_stream->height = event.resize.h;
}
break;
case SDL_QUIT:
@@ -2950,7 +2950,7 @@ static int opt_vismv(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
fprintf(stderr, "Warning: not compiled with thread support, using thread
emulation\n");
#endif
@@ -3110,7 +3110,7 @@ int main(int argc, char **argv)
SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
av_init_packet(&flush_pkt);
- flush_pkt.data= "FLUSH";
+ flush_pkt.data = "FLUSH";
cur_stream = stream_open(input_filename, file_iformat);
--
1.7.4.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
