#include "libavdevice/avdevice.h"
#include "libswscale/swscale.h"
#include "libavcodec/audioconvert.h"
+#include "libavcodec/opt.h"
#include "cmdutils.h"
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_resilience = FF_ER_CAREFUL;
+static int error_recognition = FF_ER_CAREFUL;
static int error_concealment = 3;
static int decoder_reorder_pts= 0;
static VideoState *cur_stream;
static int64_t audio_callback_time;
-AVPacket flush_pkt;
+static AVPacket flush_pkt;
#define FF_ALLOC_EVENT (SDL_USEREVENT)
#define FF_REFRESH_EVENT (SDL_USEREVENT + 1)
#define FF_QUIT_EVENT (SDL_USEREVENT + 2)
-SDL_Surface *screen;
+static SDL_Surface *screen;
/* packet queue handling */
static void packet_queue_init(PacketQueue *q)
vp = &is->pictq[is->pictq_rindex];
if (vp->bmp) {
/* XXX: use variable in the frame */
- if (is->video_st->codec->sample_aspect_ratio.num == 0)
- aspect_ratio = 0;
+ if (is->video_st->sample_aspect_ratio.num)
+ aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio);
+ else if (is->video_st->codec->sample_aspect_ratio.num)
+ aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
else
- aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio)
- * is->video_st->codec->width / is->video_st->codec->height;
+ aspect_ratio = 0;
if (aspect_ratio <= 0.0)
- aspect_ratio = (float)is->video_st->codec->width /
- (float)is->video_st->codec->height;
+ aspect_ratio = 1.0;
+ aspect_ratio *= (float)is->video_st->codec->width / is->video_st->codec->height;
/* if an active format is indicated, then it overrides the
mpeg format */
#if 0
/* XXX: we suppose the screen has a 1.0 pixel ratio */
height = is->height;
- width = ((int)rint(height * aspect_ratio)) & -3;
+ width = ((int)rint(height * aspect_ratio)) & ~1;
if (width > is->width) {
width = is->width;
- height = ((int)rint(width / aspect_ratio)) & -3;
+ height = ((int)rint(width / aspect_ratio)) & ~1;
}
x = (is->width - width) / 2;
y = (is->height - height) / 2;
/* schedule a video refresh in 'delay' ms */
static void schedule_refresh(VideoState *is, int delay)
{
+ if(!delay) delay=1; //SDL seems to be buggy when the delay is 0
SDL_AddTimer(delay, sdl_refresh_timer_cb, is);
}
pict.linesize[0] = vp->bmp->pitches[0];
pict.linesize[1] = vp->bmp->pitches[2];
pict.linesize[2] = vp->bmp->pitches[1];
+ sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
img_convert_ctx = sws_getCachedContext(img_convert_ctx,
is->video_st->codec->width, is->video_st->codec->height,
is->video_st->codec->pix_fmt,
return queue_picture(is, src_frame, pts);
}
-static uint64_t global_video_pkt_pts= AV_NOPTS_VALUE;
-
-static int my_get_buffer(struct AVCodecContext *c, AVFrame *pic){
- int ret= avcodec_default_get_buffer(c, pic);
- uint64_t *pts= av_malloc(sizeof(uint64_t));
- *pts= global_video_pkt_pts;
- pic->opaque= pts;
- return ret;
-}
-
-static void my_release_buffer(struct AVCodecContext *c, AVFrame *pic){
- if(pic) av_freep(&pic->opaque);
- avcodec_default_release_buffer(c, pic);
-}
-
static int video_thread(void *arg)
{
VideoState *is = arg;
/* NOTE: ipts is the PTS of the _first_ picture beginning in
this packet, if any */
- global_video_pkt_pts= pkt->pts;
+ is->video_st->codec->reordered_opaque= pkt->pts;
len1 = avcodec_decode_video(is->video_st->codec,
frame, &got_picture,
pkt->data, pkt->size);
if( (decoder_reorder_pts || pkt->dts == AV_NOPTS_VALUE)
- && frame->opaque && *(uint64_t*)frame->opaque != AV_NOPTS_VALUE)
- pts= *(uint64_t*)frame->opaque;
+ && frame->reordered_opaque != AV_NOPTS_VALUE)
+ pts= frame->reordered_opaque;
else if(pkt->dts != AV_NOPTS_VALUE)
pts= pkt->dts;
else
enc->skip_frame= skip_frame;
enc->skip_idct= skip_idct;
enc->skip_loop_filter= skip_loop_filter;
- enc->error_resilience= error_resilience;
+ enc->error_recognition= error_recognition;
enc->error_concealment= error_concealment;
+
+ set_context_opts(enc, avctx_opts[enc->codec_type], 0);
+
if (!codec ||
avcodec_open(enc, codec) < 0)
return -1;
packet_queue_init(&is->videoq);
is->video_tid = SDL_CreateThread(video_thread, is);
-
- enc-> get_buffer= my_get_buffer;
- enc->release_buffer= my_release_buffer;
break;
case CODEC_TYPE_SUBTITLE:
is->subtitle_stream = stream_index;
{ "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_frame}, "", "" },
{ "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_idct}, "", "" },
{ "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo", "algo" },
- { "er", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_resilience}, "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" },
{ "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
{ "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
+ { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
{ NULL, },
};
/* Called from the main */
int main(int argc, char **argv)
{
- int flags;
+ int flags, i;
/* register all codecs, demux and protocols */
avcodec_register_all();
avdevice_register_all();
av_register_all();
+ for(i=0; i<CODEC_TYPE_NB; i++){
+ avctx_opts[i]= avcodec_alloc_context2(i);
+ }
+ avformat_opts = av_alloc_format_context();
+ sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL);
+
show_banner();
parse_options(argc, argv, options, opt_input_file);
if (!input_filename) {
- show_help();
+ fprintf(stderr, "An input file must be specified\n");
exit(1);
}
projects / ffmpeg / blobdiff