---
avplay.c | 327 +++++++++++++++++++++++++++++++-------------------------------
1 files changed, 164 insertions(+), 163 deletions(-)
diff --git a/avplay.c b/avplay.c
index 5fcfaa6..dca0695 100644
--- a/avplay.c
+++ b/avplay.c
@@ -228,12 +228,12 @@ 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 seek_by_bytes = -1;
static int display_disable;
static int show_status = 1;
static int av_sync_type = AV_SYNC_AUDIO_MASTER;
@@ -257,10 +257,10 @@ 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
@@ -299,7 +299,7 @@ static void packet_queue_flush(PacketQueue *q)
AVPacketList *pkt, *pkt1;
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;
av_free_packet(&pkt->pkt);
av_freep(&pkt);
@@ -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));
@@ -369,7 +369,7 @@ static int packet_queue_get(PacketQueue *q, AVPacket *pkt,
int block)
SDL_LockMutex(q->mutex);
- for(;;) {
+ for (;;) {
if (q->abort_request) {
ret = -1;
break;
@@ -476,7 +476,7 @@ static void blend_subrect(AVPicture *dst, const
AVSubtitleRect *rect, int imgw,
lum++;
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);
u1 = u;
v1 = v;
@@ -508,7 +508,7 @@ static void blend_subrect(AVPicture *dst, const
AVSubtitleRect *rect, int imgw,
cb += dst->linesize[1] - 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;
cb += skip2;
cr += skip2;
@@ -533,7 +533,7 @@ static void blend_subrect(AVPicture *dst, const
AVSubtitleRect *rect, int imgw,
p += -wrap3 + BPP;
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);
u1 = u;
v1 = v;
@@ -609,7 +609,7 @@ static void blend_subrect(AVPicture *dst, const
AVSubtitleRect *rect, int imgw,
lum++;
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);
u1 = u;
v1 = v;
@@ -742,15 +742,15 @@ static void video_audio_display(VideoState *s)
int16_t time_diff;
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 */
channels = s->audio_st->codec->channels;
nb_display_channels = channels;
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;
delay = audio_write_get_buf_size(s);
delay /= n;
@@ -762,22 +762,22 @@ static void video_audio_display(VideoState *s)
delay -= (time_diff * s->audio_st->codec->sample_rate) / 1000000;
}
- delay += 2*data_used;
+ delay += 2 * data_used;
if (delay < data_used)
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;
+ 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);
@@ -800,10 +800,10 @@ static void video_audio_display(VideoState *s)
h = s->height / nb_display_channels;
/* graph height / 2 */
h2 = (h * 9) / 20;
- for(ch = 0;ch < nb_display_channels; ch++) {
+ for (ch = 0;ch < nb_display_channels; ch++) {
i = i_start + ch;
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;
if (y < 0) {
y = -y;
@@ -822,16 +822,16 @@ static void video_audio_display(VideoState *s)
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;
fill_rectangle(screen,
s->xleft, y, s->width, 1,
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);
@@ -840,10 +840,10 @@ static void video_audio_display(VideoState *s)
}
{
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;
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);
data[ch][x]= s->sample_array[i]*(1.0-w*w);
i += channels;
@@ -853,7 +853,7 @@ 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++){
+ 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]
@@ -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)
+ 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,7 +900,7 @@ static int video_open(VideoState *is){
w = 640;
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)
return 0;
@@ -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);
@@ -938,11 +938,11 @@ static void video_display(VideoState *is)
static int refresh_thread(void *opaque)
{
VideoState *is= opaque;
- while(!is->abort_request){
+ while (!is->abort_request) {
SDL_Event event;
event.type = FF_REFRESH_EVENT;
event.user.data1 = opaque;
- if(!is->refresh){
+ if (!is->refresh) {
is->refresh=1;
SDL_PushEvent(&event);
}
@@ -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){
- VideoPicture *nextvp=
&is->pictq[(is->pictq_rindex+1)%VIDEO_PICTURE_QUEUE_SIZE];
+ 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
+ } 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);
@@ -1207,7 +1207,8 @@ retry:
if (is->audio_st && is->video_st)
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",
- 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);
last_time = cur_time;
}
@@ -1224,7 +1225,7 @@ static void stream_close(VideoState *is)
SDL_WaitThread(is->refresh_tid, NULL);
/* 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];
#if CONFIG_AVFILTER
if (vp->picref) {
@@ -1325,8 +1326,8 @@ 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)
- is->skip_frames= FFMAX(1.0 - FRAME_SKIP_FACTOR, is->skip_frames *
(1.0-FRAME_SKIP_FACTOR));
+ 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 &&
!is->videoq.abort_request) {
@@ -1374,7 +1375,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
@@ -1382,7 +1383,7 @@ static int queue_picture(VideoState *is, AVFrame
*src_frame, double pts, int64_t
/* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp);
- memset(&pict,0,sizeof(AVPicture));
+ memset(&pict, 0, sizeof(AVPicture));
pict.data[0] = vp->bmp->pixels[0];
pict.data[1] = vp->bmp->pixels[2];
pict.data[2] = vp->bmp->pixels[1];
@@ -1505,7 +1506,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 +1534,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,13 +1548,13 @@ 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;
+ pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1 + 1;
ref->video->w = codec->width;
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 vshift = (i == 1 || i == 2) ?
av_pix_fmt_descriptors[ref->format].log2_chroma_h : 0;
@@ -1566,7 +1567,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 +1594,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 +1603,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 +1640,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 +1718,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));
@@ -1769,7 +1770,7 @@ static int video_thread(void *arg)
filt_out = is->out_video_filter;
#endif
- for(;;) {
+ for (;;) {
#if !CONFIG_AVFILTER
AVPacket pkt;
#else
@@ -1815,7 +1816,7 @@ static int video_thread(void *arg)
if (!ret)
continue;
- pts = pts_int*av_q2d(is->video_st->time_base);
+ pts = pts_int * av_q2d(is->video_st->time_base);
#if CONFIG_AVFILTER
ret = output_picture2(is, frame, pts, pos);
@@ -1848,14 +1849,14 @@ static int subtitle_thread(void *arg)
int i, j;
int r, g, b, y, u, v, a;
- for(;;) {
+ for (;;) {
while (is->paused && !is->subtitleq.abort_request) {
SDL_Delay(10);
}
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;
}
@@ -2012,7 +2013,7 @@ static int audio_decode_frame(VideoState *is, double
*pts_ptr)
int new_packet = 0;
int flush_complete = 0;
- for(;;) {
+ for (;;) {
/* NOTE: the audio packet can contain several frames */
while (pkt_temp->size > 0 || (!pkt_temp->data && new_packet)) {
if (!is->frame) {
@@ -2061,8 +2062,8 @@ static int audio_decode_frame(VideoState *is, double
*pts_ptr)
if (is->reformat_ctx) {
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 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]) {
@@ -2076,8 +2077,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 +2180,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)
@@ -2211,11 +2212,11 @@ static int stream_component_open(VideoState *is, int
stream_index)
return -1;
}
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;
- switch(avctx->codec_type) {
+ switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO:
is->audio_stream = stream_index;
is->audio_st = ic->streams[stream_index];
@@ -2262,7 +2263,7 @@ static void stream_component_close(VideoState *is, int
stream_index)
return;
avctx = ic->streams[stream_index]->codec;
- switch(avctx->codec_type) {
+ switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO:
packet_queue_abort(&is->audioq);
@@ -2318,7 +2319,7 @@ static void stream_component_close(VideoState *is, int
stream_index)
ic->streams[stream_index]->discard = AVDISCARD_ALL;
avcodec_close(avctx);
- switch(avctx->codec_type) {
+ switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO:
is->audio_st = NULL;
is->audio_stream = -1;
@@ -2353,7 +2354,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 +2382,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 +2398,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 +2448,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;
}
@@ -2467,13 +2468,13 @@ static int decode_thread(void *arg)
goto fail;
}
- for(;;) {
+ for (;;) {
if (is->abort_request)
break;
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 +2487,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);
@@ -2510,24 +2511,24 @@ static int decode_thread(void *arg)
}
}
is->seek_req = 0;
- eof= 0;
+ eof = 0;
}
/* if the queue are full, no need to read more */
if ( is->audioq.size + is->videoq.size + is->subtitleq.size >
MAX_QUEUE_SIZE
- || ( (is->audioq .size > MIN_AUDIOQ_SIZE ||
is->audio_stream<0)
- && (is->videoq .nb_packets > MIN_FRAMES ||
is->video_stream<0)
- && (is->subtitleq.nb_packets > MIN_FRAMES ||
is->subtitle_stream<0))) {
+ || ( (is->audioq .size > MIN_AUDIOQ_SIZE || is->audio_stream
< 0)
+ && (is->videoq .nb_packets > MIN_FRAMES || is->video_stream
< 0)
+ && (is->subtitleq.nb_packets > MIN_FRAMES ||
is->subtitle_stream < 0))) {
/* wait 10 ms */
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 +2540,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;
}
}
@@ -2552,7 +2553,7 @@ static int decode_thread(void *arg)
ret = av_read_frame(ic, pkt);
if (ret < 0) {
if (ret == AVERROR_EOF || (ic->pb && ic->pb->eof_reached))
- eof=1;
+ eof = 1;
if (ic->pb && ic->pb->error)
break;
SDL_Delay(100); /* wait for user event */
@@ -2562,8 +2563,8 @@ static int decode_thread(void *arg)
pkt_in_play_range = duration == AV_NOPTS_VALUE ||
(pkt->pts - ic->streams[pkt->stream_index]->start_time) *
av_q2d(ic->streams[pkt->stream_index]->time_base) -
- (double)(start_time != AV_NOPTS_VALUE ? start_time : 0)/1000000
- <= ((double)duration/1000000);
+ (double)(start_time != AV_NOPTS_VALUE ? start_time : 0) /
1000000
+ <= ((double)duration / 1000000);
if (pkt->stream_index == is->audio_stream && pkt_in_play_range) {
packet_queue_put(&is->audioq, pkt);
} else if (pkt->stream_index == is->video_stream && pkt_in_play_range)
{
@@ -2649,7 +2650,7 @@ static void stream_cycle_channel(VideoState *is, int
codec_type)
if (start_index < (codec_type == AVMEDIA_TYPE_SUBTITLE ? -1 : 0))
return;
stream_index = start_index;
- for(;;) {
+ for (;;) {
if (++stream_index >= is->ic->nb_streams)
{
if (codec_type == AVMEDIA_TYPE_SUBTITLE)
@@ -2664,7 +2665,7 @@ static void stream_cycle_channel(VideoState *is, int
codec_type)
st = ic->streams[stream_index];
if (st->codec->codec_type == codec_type) {
/* check that parameters are OK */
- switch(codec_type) {
+ switch (codec_type) {
case AVMEDIA_TYPE_AUDIO:
if (st->codec->sample_rate != 0 &&
st->codec->channels != 0)
@@ -2731,16 +2732,16 @@ static void event_loop(void)
SDL_Event event;
double incr, pos, frac;
- for(;;) {
+ for (;;) {
double x;
SDL_WaitEvent(&event);
- switch(event.type) {
+ switch (event.type) {
case SDL_KEYDOWN:
if (exit_on_keydown) {
do_exit();
break;
}
- switch(event.key.keysym.sym) {
+ switch (event.key.keysym.sym) {
case SDLK_ESCAPE:
case SDLK_q:
do_exit();
@@ -2784,11 +2785,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){
- pos= cur_stream->audio_pkt.pos;
- }else
+ 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
pos = avio_tell(cur_stream->ic->pb);
if (cur_stream->ic->bit_rate)
incr *= cur_stream->ic->bit_rate / 8.0;
@@ -2813,33 +2814,33 @@ static void event_loop(void)
break;
}
case SDL_MOUSEMOTION:
- if(event.type ==SDL_MOUSEBUTTONDOWN){
- x= event.button.x;
- }else{
- if(event.motion.state != SDL_PRESSED)
+ if (event.type == SDL_MOUSEBUTTONDOWN) {
+ x = event.button.x;
+ } else {
+ if (event.motion.state != SDL_PRESSED)
break;
- x= event.motion.x;
+ x = event.motion.x;
}
if (cur_stream) {
- if(seek_by_bytes || cur_stream->ic->duration<=0){
- uint64_t size= avio_size(cur_stream->ic->pb);
+ 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;
- tns = cur_stream->ic->duration/1000000LL;
- thh = tns/3600;
- tmm = (tns%3600)/60;
- tss = (tns%60);
- frac = x/cur_stream->width;
- ns = frac*tns;
- hh = ns/3600;
- mm = (ns%3600)/60;
- ss = (ns%60);
+ tns = cur_stream->ic->duration / 1000000LL;
+ thh = tns / 3600;
+ tmm = (tns % 3600) / 60;
+ tss = (tns % 60);
+ frac = x / cur_stream->width;
+ ns = frac * tns;
+ hh = ns / 3600;
+ mm = (ns % 3600) / 60;
+ ss = (ns % 60);
fprintf(stderr, "Seek to %2.0f%% (%2d:%02d:%02d) of total
duration (%2d:%02d:%02d) \n", frac*100,
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)
ts += cur_stream->ic->start_time;
stream_seek(cur_stream, ts, 0, 0);
@@ -2950,7 +2951,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 +3111,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
